diff --git a/lib/Target/TargetMachine.cpp b/lib/Target/TargetMachine.cpp
index 8e114fc..d71bd3f 100644
--- a/lib/Target/TargetMachine.cpp
+++ b/lib/Target/TargetMachine.cpp
@@ -21,9 +21,10 @@
 // Command-line options that tend to be useful on more than one back-end.
 //
 
-bool llvm::PrintMachineCode;
-bool llvm::NoFramePointerElim;
-
+namespace llvm {
+  bool PrintMachineCode;
+  bool NoFramePointerElim;
+};
 namespace {
   cl::opt<bool, true> PrintCode("print-machineinstrs",
     cl::desc("Print generated machine code"),