4 files changed, 6 insertions, 6 deletions
diff --git a/clang/include/clang/CodeGen/ModuleBuilder.h b/clang/include/clang/CodeGen/ModuleBuilder.h
index 4642e4eeeac..b9f9d145407 100644
--- a/clang/include/clang/CodeGen/ModuleBuilder.h
+++ b/clang/include/clang/CodeGen/ModuleBuilder.h
@@ -23,7 +23,7 @@ namespace llvm {
 
 namespace clang {
   class Diagnostic;
-  struct LangOptions;
+  class LangOptions;
   
   class CodeGenerator : public ASTConsumer {
   public:
diff --git a/clang/include/clang/Parse/DeclSpec.h b/clang/include/clang/Parse/DeclSpec.h
index 4c1bbdf6d76..09b6e5c5221 100644
--- a/clang/include/clang/Parse/DeclSpec.h
+++ b/clang/include/clang/Parse/DeclSpec.h
@@ -21,7 +21,7 @@
 #include "llvm/ADT/PointerIntPair.h"
 
 namespace clang {
-  struct LangOptions;
+  class LangOptions;
   class Diagnostic;
   class IdentifierInfo;
   
@@ -776,7 +776,7 @@ private:
   DeclaratorChunk::ParamInfo InlineParams[16];
   bool InlineParamsUsed;
 
-  friend class DeclaratorChunk;
+  friend struct DeclaratorChunk;
 
 public:
   Declarator(const DeclSpec &ds, TheContext C)
diff --git a/clang/lib/CodeGen/CodeGenModule.h b/clang/lib/CodeGen/CodeGenModule.h
index 76ab0f89378..c3a84af0c5b 100644
--- a/clang/lib/CodeGen/CodeGenModule.h
+++ b/clang/lib/CodeGen/CodeGenModule.h
@@ -51,7 +51,7 @@ namespace clang {
   class NamedDecl;
   class ValueDecl;
   class VarDecl;
-  struct LangOptions;
+  class LangOptions;
   class Diagnostic;
   class AnnotateAttr;
 
diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h
index 92bc0bc750e..28cb9bf7153 100644
--- a/clang/lib/Sema/Sema.h
+++ b/clang/lib/Sema/Sema.h
@@ -52,7 +52,7 @@ namespace clang {
   class TypedefDecl;
   class FunctionDecl;
   class QualType;
-  struct LangOptions;
+  class LangOptions;
   class Token;
   class IntegerLiteral;
   class StringLiteral;
@@ -79,7 +79,7 @@ namespace clang {
   class ObjCContainerDecl;
   struct BlockSemaInfo;
   class BasePaths;
-  class MemberLookupCriteria;
+  struct MemberLookupCriteria;
 
 /// Sema - This implements semantic analysis and AST building for C.
 class Sema : public Action {