diff --git a/lib/Target/X86/PeepholeOptimizer.cpp b/lib/Target/X86/PeepholeOptimizer.cpp
index 2f3280a4bbb..488dc891459 100644
--- a/lib/Target/X86/PeepholeOptimizer.cpp
+++ b/lib/Target/X86/PeepholeOptimizer.cpp
@@ -14,8 +14,7 @@
 #include "X86.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
-
-namespace llvm {
+using namespace llvm;
 
 namespace {
   struct PH : public MachineFunctionPass {
@@ -28,7 +27,7 @@ namespace {
   };
 }
 
-FunctionPass *createX86PeepholeOptimizerPass() { return new PH(); }
+FunctionPass *llvm::createX86PeepholeOptimizerPass() { return new PH(); }
 
 bool PH::runOnMachineFunction(MachineFunction &MF) {
   bool Changed = false;
@@ -134,4 +133,3 @@ bool PH::PeepholeOptimize(MachineBasicBlock &MBB,
   }
 }
 
-} // End llvm namespace
diff --git a/lib/Target/X86/X86PeepholeOpt.cpp b/lib/Target/X86/X86PeepholeOpt.cpp
index 2f3280a4bbb..488dc891459 100644
--- a/lib/Target/X86/X86PeepholeOpt.cpp
+++ b/lib/Target/X86/X86PeepholeOpt.cpp
@@ -14,8 +14,7 @@
 #include "X86.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
-
-namespace llvm {
+using namespace llvm;
 
 namespace {
   struct PH : public MachineFunctionPass {
@@ -28,7 +27,7 @@ namespace {
   };
 }
 
-FunctionPass *createX86PeepholeOptimizerPass() { return new PH(); }
+FunctionPass *llvm::createX86PeepholeOptimizerPass() { return new PH(); }
 
 bool PH::runOnMachineFunction(MachineFunction &MF) {
   bool Changed = false;
@@ -134,4 +133,3 @@ bool PH::PeepholeOptimize(MachineBasicBlock &MBB,
   }
 }
 
-} // End llvm namespace