9 files changed, 6 insertions, 87 deletions
diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index 19b3c08985..3a28a1ee0b 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 f623bc2699..3eab4048cf 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 72545f88e9..97bcc54e25 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 *****************************/
 
 
 //---------------------------------------------------------------------------
diff --git a/include/llvm/DerivedTypes.h b/include/llvm/DerivedTypes.h
index a28210ba95..405a632d35 100644
--- a/include/llvm/DerivedTypes.h
+++ b/include/llvm/DerivedTypes.h
@@ -13,10 +13,7 @@
 
 #include "llvm/Type.h"
 #include "llvm/CodeGen/TargetMachine.h"
-#include "vector"
-
-class TargetMachine;
-
+#include <vector>
 
 // Future derived types: SIMD packed format
 
diff --git a/lib/CodeGen/InstrSelection/InstrForest.cpp b/lib/CodeGen/InstrSelection/InstrForest.cpp
index a90da0b584..5701ba4e11 100644
--- a/lib/CodeGen/InstrSelection/InstrForest.cpp
+++ b/lib/CodeGen/InstrSelection/InstrForest.cpp
@@ -25,7 +25,6 @@
 //*************************** User Include Files ***************************/
 
 #include "llvm/CodeGen/InstrForest.h"
-#include "llvm/Module.h"
 #include "llvm/Method.h"
 #include "llvm/iTerminators.h"
 #include "llvm/iMemory.h"
@@ -33,8 +32,6 @@
 #include "llvm/BasicBlock.h"
 #include "llvm/CodeGen/MachineInstr.h"
 
-//************************ Class Implementations **************************/
-
 
 //------------------------------------------------------------------------ 
 // class InstrTreeNode
diff --git a/lib/CodeGen/MachineInstr.cpp b/lib/CodeGen/MachineInstr.cpp
index e8897bf2e9..d48f2d4e35 100644
--- a/lib/CodeGen/MachineInstr.cpp
+++ b/lib/CodeGen/MachineInstr.cpp
@@ -12,22 +12,10 @@
 //	7/2/01	 -  Vikram Adve  -  Created
 //**************************************************************************/
 
-
-//************************** System Include Files **************************/
-
-#include <strstream.h>
-#include <string>
-#include <vector>
-
-//*************************** User Include Files ***************************/
-
-#include "llvm/Type.h"
-#include "llvm/DerivedTypes.h"
+#include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/ConstPoolVals.h"
-#include "llvm/Value.h"
 #include "llvm/Instruction.h"
-#include "llvm/CodeGen/InstrForest.h"
-#include "llvm/CodeGen/MachineInstr.h"
+#include <strstream>
 
 //************************ Class Implementations **************************/
 
diff --git a/lib/CodeGen/TargetMachine/Sparc/Sparc.cpp b/lib/CodeGen/TargetMachine/Sparc/Sparc.cpp
index c687da73d8..68270fae60 100644
--- a/lib/CodeGen/TargetMachine/Sparc/Sparc.cpp
+++ b/lib/CodeGen/TargetMachine/Sparc/Sparc.cpp
@@ -9,15 +9,8 @@
 //	7/15/01	 -  Vikram Adve  -  Created
 //**************************************************************************/
 
-
-//************************** System Include Files **************************/
-
-//*************************** User Include Files ***************************/
-
-#include "llvm/DerivedTypes.h"
 #include "llvm/CodeGen/Sparc.h"
 
-
 //************************ Exported Constants ******************************/
 
 
diff --git a/lib/CodeGen/TargetMachine/TargetMachine.cpp b/lib/CodeGen/TargetMachine/TargetMachine.cpp
index 9b9729c1ac..653f0217cd 100644
--- a/lib/CodeGen/TargetMachine/TargetMachine.cpp
+++ b/lib/CodeGen/TargetMachine/TargetMachine.cpp
@@ -10,23 +10,14 @@
 //**************************************************************************/
 
 
-//************************** System Include Files **************************/
-
 //*************************** User Include Files ***************************/
 
-#include "llvm/DerivedTypes.h"
 #include "llvm/CodeGen/TargetMachine.h"
-
-
-//************************* Opaque Declarations ****************************/
-
-class StructType;
-class MachineInstrInfo;
+#include "llvm/DerivedTypes.h"
 
 
 //************************ Class Implementations **************************/
 
-
 //---------------------------------------------------------------------------
 // function TargetMachine::findOptimalMemberOffsets 
 // 
diff --git a/lib/Target/SparcV9/InstrSelection/InstrForest.cpp b/lib/Target/SparcV9/InstrSelection/InstrForest.cpp
index a90da0b584..5701ba4e11 100644
--- a/lib/Target/SparcV9/InstrSelection/InstrForest.cpp
+++ b/lib/Target/SparcV9/InstrSelection/InstrForest.cpp
@@ -25,7 +25,6 @@
 //*************************** User Include Files ***************************/
 
 #include "llvm/CodeGen/InstrForest.h"
-#include "llvm/Module.h"
 #include "llvm/Method.h"
 #include "llvm/iTerminators.h"
 #include "llvm/iMemory.h"
@@ -33,8 +32,6 @@
 #include "llvm/BasicBlock.h"
 #include "llvm/CodeGen/MachineInstr.h"
 
-//************************ Class Implementations **************************/
-
 
 //------------------------------------------------------------------------ 
 // class InstrTreeNode