6 files changed, 8 insertions, 7 deletions
diff --git a/lib/Archive/ArchiveInternals.h b/lib/Archive/ArchiveInternals.h
index 98f9c896c59..d187ed91d72 100644
--- a/lib/Archive/ArchiveInternals.h
+++ b/lib/Archive/ArchiveInternals.h
@@ -31,7 +31,7 @@
 
 namespace llvm {
 
-  struct LLVMContext;
+  class LLVMContext;
 
   /// The ArchiveMemberHeader structure is used internally for bitcode
   /// archives.
diff --git a/lib/AsmParser/LLLexer.h b/lib/AsmParser/LLLexer.h
index 667ab2c2ede..de39272f45e 100644
--- a/lib/AsmParser/LLLexer.h
+++ b/lib/AsmParser/LLLexer.h
@@ -24,7 +24,7 @@ namespace llvm {
   class MemoryBuffer;
   class Type;
   class SMDiagnostic;
-  struct LLVMContext;
+  class LLVMContext;
 
   class LLLexer {
     const char *CurPtr;
diff --git a/lib/Bitcode/Reader/BitcodeReader.h b/lib/Bitcode/Reader/BitcodeReader.h
index a1f91133ea1..bd048885a65 100644
--- a/lib/Bitcode/Reader/BitcodeReader.h
+++ b/lib/Bitcode/Reader/BitcodeReader.h
@@ -26,7 +26,7 @@
 
 namespace llvm {
   class MemoryBuffer;
-  struct LLVMContext;
+  class LLVMContext;
   
 //===----------------------------------------------------------------------===//
 //                          BitcodeReaderValueList Class
diff --git a/lib/VMCore/ConstantFold.h b/lib/VMCore/ConstantFold.h
index c70a04b7fc6..afa99787672 100644
--- a/lib/VMCore/ConstantFold.h
+++ b/lib/VMCore/ConstantFold.h
@@ -23,7 +23,7 @@ namespace llvm {
   class Value;
   class Constant;
   class Type;
-  struct LLVMContext;
+  class LLVMContext;
 
   // Constant fold various types of instruction...
   Constant *ConstantFoldCastInstruction(
diff --git a/lib/VMCore/LLVMContext.cpp b/lib/VMCore/LLVMContext.cpp
index 56a429dd390..aa9dc3671a0 100644
--- a/lib/VMCore/LLVMContext.cpp
+++ b/lib/VMCore/LLVMContext.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 //
 //  This file implements LLVMContext, as a wrapper around the opaque
-// struct LLVMContextImpl.
+//  class LLVMContextImpl.
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lib/VMCore/LLVMContextImpl.h b/lib/VMCore/LLVMContextImpl.h
index 245aa4a7043..30a7fc4af93 100644
--- a/lib/VMCore/LLVMContextImpl.h
+++ b/lib/VMCore/LLVMContextImpl.h
@@ -34,7 +34,7 @@ class ConstantInt;
 class ConstantFP;
 class MDString;
 class MDNode;
-struct LLVMContext;
+class LLVMContext;
 class Type;
 class Value;
 
@@ -90,7 +90,8 @@ struct DenseMapAPFloatKeyInfo {
   static bool isPod() { return false; }
 };
 
-struct LLVMContextImpl {
+class LLVMContextImpl {
+public:
   sys::SmartRWMutex<true> ConstantsLock;
   
   typedef DenseMap<DenseMapAPIntKeyInfo::KeyTy, ConstantInt*,