diff --git a/lib/Target/Mips/MipsTargetAsmInfo.cpp b/lib/Target/Mips/MipsTargetAsmInfo.cpp
index 8cb58c8..f587172 100644
--- a/lib/Target/Mips/MipsTargetAsmInfo.cpp
+++ b/lib/Target/Mips/MipsTargetAsmInfo.cpp
@@ -12,10 +12,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "MipsTargetAsmInfo.h"
-#include "MipsTargetMachine.h"
 using namespace llvm;
 
-MipsTargetAsmInfo::MipsTargetAsmInfo(const MipsTargetMachine &TM) {
+MipsTargetAsmInfo::MipsTargetAsmInfo() {
   AlignmentIsInBytes          = false;
   COMMDirectiveTakesAlignment = true;
   Data16bitsDirective         = "\t.half\t";
diff --git a/lib/Target/Mips/MipsTargetAsmInfo.h b/lib/Target/Mips/MipsTargetAsmInfo.h
index cbfb50e..32e98df 100644
--- a/lib/Target/Mips/MipsTargetAsmInfo.h
+++ b/lib/Target/Mips/MipsTargetAsmInfo.h
@@ -17,11 +17,9 @@
 #include "llvm/Target/TargetAsmInfo.h"
 
 namespace llvm {
-  // Forward declaration.
-  class MipsTargetMachine;
-
-  struct MipsTargetAsmInfo : public TargetAsmInfo {
-    explicit MipsTargetAsmInfo(const MipsTargetMachine &TM);
+  class MipsTargetAsmInfo : public TargetAsmInfo {
+  public:
+    explicit MipsTargetAsmInfo();
   };
 
 } // namespace llvm
diff --git a/lib/Target/Mips/MipsTargetMachine.cpp b/lib/Target/Mips/MipsTargetMachine.cpp
index a74af26..a397756 100644
--- a/lib/Target/Mips/MipsTargetMachine.cpp
+++ b/lib/Target/Mips/MipsTargetMachine.cpp
@@ -24,10 +24,8 @@
   RegisterTargetMachine<MipselTargetMachine> Y(TheMipselTarget);
 }
 
-const TargetAsmInfo *MipsTargetMachine::
-createTargetAsmInfo() const 
-{
-  return new MipsTargetAsmInfo(*this);
+const TargetAsmInfo *MipsTargetMachine::createTargetAsmInfo() const {
+  return new MipsTargetAsmInfo();
 }
 
 // DataLayout --> Big-endian, 32-bit pointer/ABI/alignment