3 files changed, 2 insertions, 46 deletions
diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index 19b3c08..3a28a1e 100644
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -15,31 +15,11 @@
 #ifndef LLVM_CODEGEN_MACHINEINSTR_H
 #define LLVM_CODEGEN_MACHINEINSTR_H
 
-//************************** System Include Files **************************/
-
-#include <string>
-#include <vector>
-
-//*************************** User Include Files ***************************/
-
+#include "llvm/CodeGen/InstrForest.h"
 #include "llvm/Tools/DataTypes.h"
-#include "llvm/Instruction.h"
 #include "llvm/Support/Unique.h"
 #include "llvm/CodeGen/TargetMachine.h"
 
-
-//************************* Opaque Declarations ****************************/
-
-class Value;
-class InstrTreeNode;
-class InstructionNode;
-class MachineInstr;
-class MachineInstrInfo;
-class MachineOperand;
-
-
-//************************ Exported Data Types *****************************/
-
 //---------------------------------------------------------------------------
 // class MachineOperand 
 // 
diff --git a/include/llvm/CodeGen/Sparc.h b/include/llvm/CodeGen/Sparc.h
index f623bc2..3eab404 100644
--- a/include/llvm/CodeGen/Sparc.h
+++ b/include/llvm/CodeGen/Sparc.h
@@ -12,19 +12,7 @@
 #ifndef LLVM_CODEGEN_SPARC_H
 #define LLVM_CODEGEN_SPARC_H
 
-//************************** System Include Files **************************/
-
-//*************************** User Include Files ***************************/
-
 #include "llvm/CodeGen/TargetMachine.h"
-#include "llvm/CodeGen/MachineInstr.h"
-
-
-//************************* Opaque Declarations ****************************/
-
-
-//************************ Exported Constants ******************************/
-
 
 // OpCodeMask definitions for the Sparc V9
 // 
@@ -33,9 +21,6 @@ const OpCodeMask	Annul		= 0x20000000; // annul delay instr?
 const OpCodeMask	PredictTaken	= 0x00080000; // predict branch taken?
 
 
-//************************ Exported Data Types *****************************/
-
-
 //---------------------------------------------------------------------------
 // class UltraSparcMachine 
 // 
diff --git a/include/llvm/CodeGen/TargetMachine.h b/include/llvm/CodeGen/TargetMachine.h
index 72545f8..97bcc54 100644
--- a/include/llvm/CodeGen/TargetMachine.h
+++ b/include/llvm/CodeGen/TargetMachine.h
@@ -12,21 +12,12 @@
 #ifndef LLVM_CODEGEN_TARGETMACHINE_H
 #define LLVM_CODEGEN_TARGETMACHINE_H
 
-//************************** System Include Files **************************/
-
-//*************************** User Include Files ***************************/
-
 #include "llvm/Support/Unique.h"
 #include "llvm/Tools/DataTypes.h"
-
-//************************* Opaque Declarations ****************************/
+#include <string>
 
 class Type;
 class StructType;
-class MachineInstrInfo;
-
-
-//************************ Exported Data Types *****************************/
 
 
 //---------------------------------------------------------------------------