2 files changed, 18 insertions, 2 deletions
diff --git a/include/llvm/Target/MachineInstrInfo.h b/include/llvm/Target/MachineInstrInfo.h
index e2489f4045..ea62376048 100644
--- a/include/llvm/Target/MachineInstrInfo.h
+++ b/include/llvm/Target/MachineInstrInfo.h
@@ -7,17 +7,25 @@
 #ifndef LLVM_TARGET_MACHINEINSTRINFO_H
 #define LLVM_TARGET_MACHINEINSTRINFO_H
 
-#include "llvm/Target/TargetMachine.h"
+#include "Support/NonCopyable.h"
 #include "Support/DataTypes.h"
+#include <string>
 #include <vector>
 
 class MachineInstrDescriptor;
 class TmpInstruction;
 class MachineInstr;
+class TargetMachine;
 class Value;
 class Instruction;
+class Method;
 
+//---------------------------------------------------------------------------
+// Data types used to define information about a single machine instruction
+//---------------------------------------------------------------------------
 
+typedef int MachineOpCode;
+typedef int OpCodeMask;
 typedef int InstrSchedClass;
 
 // Global variable holding an array of descriptors for machine instructions.
diff --git a/include/llvm/Target/TargetInstrInfo.h b/include/llvm/Target/TargetInstrInfo.h
index e2489f4045..ea62376048 100644
--- a/include/llvm/Target/TargetInstrInfo.h
+++ b/include/llvm/Target/TargetInstrInfo.h
@@ -7,17 +7,25 @@
 #ifndef LLVM_TARGET_MACHINEINSTRINFO_H
 #define LLVM_TARGET_MACHINEINSTRINFO_H
 
-#include "llvm/Target/TargetMachine.h"
+#include "Support/NonCopyable.h"
 #include "Support/DataTypes.h"
+#include <string>
 #include <vector>
 
 class MachineInstrDescriptor;
 class TmpInstruction;
 class MachineInstr;
+class TargetMachine;
 class Value;
 class Instruction;
+class Method;
 
+//---------------------------------------------------------------------------
+// Data types used to define information about a single machine instruction
+//---------------------------------------------------------------------------
 
+typedef int MachineOpCode;
+typedef int OpCodeMask;
 typedef int InstrSchedClass;
 
 // Global variable holding an array of descriptors for machine instructions.