diff --git a/lib/VMCore/DebugInfoBuilder.cpp b/lib/VMCore/DebugInfoBuilder.cpp
index c3eba771d03..82b4b6f9b0a 100644
--- a/lib/VMCore/DebugInfoBuilder.cpp
+++ b/lib/VMCore/DebugInfoBuilder.cpp
@@ -20,7 +20,9 @@
 #include <llvm/Support/Dwarf.h>
 #include <llvm/System/Path.h>
 
-namespace llvm {
+using namespace llvm;
+
+namespace {
     
 //===----------------------------------------------------------------------===//
 // Debug version -- copied from MachineModuleInfo (for now), in order to avoid
@@ -44,6 +46,8 @@ const char SUBPROGRAM_NAME[] = "llvm.dbg.subprogram";
 const char BASICTYPE_NAME[] = "llvm.dbg.basictype";
 const char DERIVEDTYPE_NAME[] = "llvm.dbg.derivedtype";
 
+} // end anonymous namespace
+
 DebugInfoBuilder::DebugInfoBuilder() {
     anyPtrType = PointerType::getUnqual(StructType::get(NULL, NULL));
     anchorType = StructType::get(Type::Int32Ty, Type::Int32Ty, NULL);
@@ -268,5 +272,3 @@ GlobalVariable * DebugInfoBuilder::createPointerTypeDescriptor(
     return new GlobalVariable(structVal->getType(), true,
         GlobalValue::InternalLinkage, structVal, DERIVEDTYPE_NAME, module);
 }
-
-}