diff --git a/include/llvm/Assembly/AsmAnnotationWriter.h b/include/llvm/Assembly/AsmAnnotationWriter.h
index b2549407221..6c3ddaf7d0a 100644
--- a/include/llvm/Assembly/AsmAnnotationWriter.h
+++ b/include/llvm/Assembly/AsmAnnotationWriter.h
@@ -24,7 +24,8 @@ class BasicBlock;
 class Instruction;
 class raw_ostream;
 
-struct AssemblyAnnotationWriter {
+class AssemblyAnnotationWriter {
+public:
 
   virtual ~AssemblyAnnotationWriter();
 
diff --git a/include/llvm/Value.h b/include/llvm/Value.h
index b86d1374ebc..ceb1ad246d5 100644
--- a/include/llvm/Value.h
+++ b/include/llvm/Value.h
@@ -36,7 +36,7 @@ class TypeSymbolTable;
 template<typename ValueTy> class StringMapEntry;
 typedef StringMapEntry<Value*> ValueName;
 class raw_ostream;
-struct AssemblyAnnotationWriter;
+class AssemblyAnnotationWriter;
 
 //===----------------------------------------------------------------------===//
 //                                 Value Class