4 files changed, 5 insertions, 4 deletions
diff --git a/include/clang/Basic/FileManager.h b/include/clang/Basic/FileManager.h
index 5a1aaaa9f1..6aa88629ce 100644
--- a/include/clang/Basic/FileManager.h
+++ b/include/clang/Basic/FileManager.h
@@ -18,6 +18,7 @@
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/Bitcode/SerializationFwd.h"
 #include "llvm/Support/Allocator.h"
+#include "llvm/Config/config.h" // for mode_t
 #include <map>
 #include <set>
 #include <string>
diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h
index 27697df76c..c4022b6496 100644
--- a/include/clang/Basic/IdentifierTable.h
+++ b/include/clang/Basic/IdentifierTable.h
@@ -29,7 +29,7 @@ namespace llvm {
 }
 
 namespace clang {
-  struct LangOptions;
+  class LangOptions;
   class IdentifierInfo;
   class IdentifierTable;
   class SourceLocation;
diff --git a/include/clang/Basic/LangOptions.h b/include/clang/Basic/LangOptions.h
index b85a74bc4a..96c79aa8aa 100644
--- a/include/clang/Basic/LangOptions.h
+++ b/include/clang/Basic/LangOptions.h
@@ -20,8 +20,8 @@ namespace clang {
 
 /// LangOptions - This class keeps track of the various options that can be
 /// enabled, which controls the dialect of C that is accepted.
-struct LangOptions {
-  
+class LangOptions {
+public:
   unsigned Trigraphs         : 1;  // Trigraphs in source files.
   unsigned BCPLComment       : 1;  // BCPL-style '//' comments.
   unsigned DollarIdents      : 1;  // '$' allowed in identifiers.
diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h
index 565cb0e17e..77ad2b2086 100644
--- a/include/clang/Basic/SourceManager.h
+++ b/include/clang/Basic/SourceManager.h
@@ -571,7 +571,7 @@ public:
                                           FileManager &FMgr);
   
 private:
-  friend struct SrcMgr::ContentCache; // Used for deserialization.
+  friend class SrcMgr::ContentCache; // Used for deserialization.
   
   /// isOffsetInFileID - Return true if the specified FileID contains the
   /// specified SourceLocation offset.  This is a very hot method.