diff --git a/include/llvm/Target/TargetMachine.h b/include/llvm/Target/TargetMachine.h
index b4d5daa41cc..5c76ff28f80 100644
--- a/include/llvm/Target/TargetMachine.h
+++ b/include/llvm/Target/TargetMachine.h
@@ -10,8 +10,8 @@
 #include "llvm/Target/TargetData.h"
 #include "Support/NonCopyable.h"
 
-class MachineInstrInfo;
-class MachineInstrDescriptor;
+class TargetInstrInfo;
+class TargetInstrDescriptor;
 class TargetSchedInfo;
 class TargetRegInfo;
 class TargetFrameInfo;
@@ -56,7 +56,7 @@ public:
   // -- Cache hierarchy information
   // -- Machine-level optimization information (peephole only)
   // 
-  virtual const MachineInstrInfo&       getInstrInfo() const = 0;
+  virtual const TargetInstrInfo&        getInstrInfo() const = 0;
   virtual const TargetSchedInfo&        getSchedInfo() const = 0;
   virtual const TargetRegInfo&          getRegInfo()   const = 0;
   virtual const TargetFrameInfo&        getFrameInfo() const = 0;