diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp
index 4669515..57a8287 100644
--- a/clang/lib/CodeGen/CGVtable.cpp
+++ b/clang/lib/CodeGen/CGVtable.cpp
@@ -22,7 +22,9 @@
 using namespace clang;
 using namespace CodeGen;
 
-class VtableBuilder {
+namespace {
+
+class VISIBILITY_HIDDEN VtableBuilder {
 public:
   /// Index_t - Vtable index type.
   typedef uint64_t Index_t;
@@ -782,6 +784,8 @@
   return CGM.getVtableInfo().getVirtualBaseOffsetIndex(D, B);
 }
 
+}
+
 /// TypeConversionRequiresAdjustment - Returns whether conversion from a 
 /// derived type to a base type requires adjustment.
 static bool