diff --git a/include/llvm/CodeGen/InstrSelectionSupport.h b/include/llvm/CodeGen/InstrSelectionSupport.h
index b71e1c3ae33..e57c2902b52 100644
--- a/include/llvm/CodeGen/InstrSelectionSupport.h
+++ b/include/llvm/CodeGen/InstrSelectionSupport.h
@@ -10,6 +10,7 @@
 
 #include "llvm/Instruction.h"
 #include "llvm/CodeGen/MachineInstr.h"
+#include "Support/DataTypes.h"
 class InstructionNode;
 class TargetMachine;
 
diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index ca9c3a3aecb..db8132bce4a 100644
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -9,10 +9,16 @@
 #ifndef LLVM_CODEGEN_MACHINEINSTR_H
 #define LLVM_CODEGEN_MACHINEINSTR_H
 
-#include "llvm/Target/MachineInstrInfo.h"
 #include "llvm/Annotation.h"
 #include "Support/iterator"
-class Instruction;
+#include "Support/NonCopyable.h"
+#include <vector>
+class Value;
+class Function;
+
+typedef int MachineOpCode;
+typedef int OpCodeMask;
+typedef int InstrSchedClass;
 
 //---------------------------------------------------------------------------
 // class MachineOperand