diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 09cf681..7ee6e22 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -1884,7 +1884,6 @@
                                    IdentifierInfo &Comp, SourceLocation CmpLoc);
   
   /// type checking declaration initializers (C99 6.7.8)
-  friend class InitListChecker;
   bool CheckInitializerTypes(Expr *&simpleInit_or_initList, QualType &declType,
                              SourceLocation InitLoc,DeclarationName InitEntity,
                              bool DirectInit);
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index cb2fdd2..4b08e28 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -11,8 +11,7 @@
 // point is Sema::CheckInitList(), but all of the work is performed
 // within the InitListChecker class.
 //
-// This file also includes some miscellaneous other initialization checking
-// code that is part of Sema.
+// This file also implements Sema::CheckInitializerTypes.
 //
 //===----------------------------------------------------------------------===//
 
@@ -202,7 +201,7 @@
 /// point. CheckDesignatedInitializer() recursively steps into the
 /// designated subobject and manages backing out the recursion to
 /// initialize the subobjects after the one designated.
-namespace clang {
+namespace {
 class InitListChecker {
   Sema *SemaRef;
   bool hadError;
@@ -279,7 +278,7 @@
   // semantic analysis and code generation.
   InitListExpr *getFullyStructuredList() const { return FullyStructuredList; }
 };
-}
+} // end anonymous namespace
 
 /// Recursively replaces NULL values within the given initializer list
 /// with expressions that perform value-initialization of the