diff --git a/lib/Target/PowerPC/PowerPCRegisterInfo.cpp b/lib/Target/PowerPC/PowerPCRegisterInfo.cpp
index ea35cc8ac44..9b6d95c859b 100644
--- a/lib/Target/PowerPC/PowerPCRegisterInfo.cpp
+++ b/lib/Target/PowerPC/PowerPCRegisterInfo.cpp
@@ -20,17 +20,13 @@
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
-#include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetFrameInfo.h"
+#include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetMachineImpls.h"
 #include "Support/CommandLine.h"
 #include "Support/STLExtras.h"
 using namespace llvm;
 
-namespace {
-  cl::opt<bool>
-  NoFPElim("disable-fp-elim",cl::desc("Disable frame pointer elimination optimization"));
-}
-
 PowerPCRegisterInfo::PowerPCRegisterInfo()
   : PowerPCGenRegisterInfo(PPC32::ADJCALLSTACKDOWN,
                            PPC32::ADJCALLSTACKUP) {}
diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index 03fe5505aed..150ed749a1b 100644
--- a/lib/Target/X86/X86RegisterInfo.cpp
+++ b/lib/Target/X86/X86RegisterInfo.cpp
@@ -21,17 +21,15 @@
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
-#include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetFrameInfo.h"
+#include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetMachineImpls.h"
 #include "Support/CommandLine.h"
 #include "Support/STLExtras.h"
 using namespace llvm;
 
 namespace {
   cl::opt<bool>
-  NoFPElim("disable-fp-elim",
-	   cl::desc("Disable frame pointer elimination optimization"));
-  cl::opt<bool>
   NoFusing("disable-spill-fusing",
            cl::desc("Disable fusing of spill code into instructions"));
   cl::opt<bool>