Index: include/clang/CodeGen/ModuleBuilder.h
===================================================================
--- include/clang/CodeGen/ModuleBuilder.h	(revision 66278)
+++ include/clang/CodeGen/ModuleBuilder.h	(working copy)
@@ -23,7 +23,7 @@
 
 namespace clang {
   class Diagnostic;
-  struct LangOptions;
+  class LangOptions;
   
   class CodeGenerator : public ASTConsumer {
   public:
Index: include/clang/Parse/DeclSpec.h
===================================================================
--- include/clang/Parse/DeclSpec.h	(revision 66278)
+++ include/clang/Parse/DeclSpec.h	(working copy)
@@ -21,7 +21,7 @@
 #include "llvm/ADT/PointerIntPair.h"
 
 namespace clang {
-  struct LangOptions;
+  class LangOptions;
   class Diagnostic;
   class IdentifierInfo;
   
@@ -776,7 +776,7 @@
   DeclaratorChunk::ParamInfo InlineParams[16];
   bool InlineParamsUsed;
 
-  friend class DeclaratorChunk;
+  friend struct DeclaratorChunk;
 
 public:
   Declarator(const DeclSpec &ds, TheContext C)
Index: lib/CodeGen/CodeGenModule.h
===================================================================
--- lib/CodeGen/CodeGenModule.h	(revision 66278)
+++ lib/CodeGen/CodeGenModule.h	(working copy)
@@ -51,7 +51,7 @@
   class NamedDecl;
   class ValueDecl;
   class VarDecl;
-  struct LangOptions;
+  class LangOptions;
   class Diagnostic;
   class AnnotateAttr;
 
Index: lib/Sema/Sema.h
===================================================================
--- lib/Sema/Sema.h	(revision 66278)
+++ lib/Sema/Sema.h	(working copy)
@@ -52,7 +52,7 @@
   class TypedefDecl;
   class FunctionDecl;
   class QualType;
-  struct LangOptions;
+  class LangOptions;
   class Token;
   class IntegerLiteral;
   class StringLiteral;
@@ -79,7 +79,7 @@
   class ObjCContainerDecl;
   struct BlockSemaInfo;
   class BasePaths;
-  class MemberLookupCriteria;
+  struct MemberLookupCriteria;
 
 /// Sema - This implements semantic analysis and AST building for C.
 class Sema : public Action {
