diff --git a/include/llvm/LLVMContext.h b/include/llvm/LLVMContext.h
index 0aea6b89222..f5916c47a0a 100644
--- a/include/llvm/LLVMContext.h
+++ b/include/llvm/LLVMContext.h
@@ -21,31 +21,7 @@
 
 namespace llvm {
 
-class APFloat;
-class APInt;
-class ArrayType;
-class Constant;
-class ConstantAggregateZero;
-class ConstantArray;
-class ConstantFP;
-class ConstantInt;
-class ConstantPointerNull;
-class ConstantStruct;
-class ConstantVector;
-class FunctionType;
-class IntegerType;
 struct LLVMContextImpl;
-class MDNode;
-class MDString;
-class OpaqueType;
-class PointerType;
-class StringRef;
-class StructType;
-class Type;
-class UndefValue;
-class Use;
-class Value;
-class VectorType;
 
 /// This is an important class for using LLVM in a threaded context.  It
 /// (opaquely) owns and manages the core "global" data of LLVM's core 
diff --git a/include/llvm/TypeSymbolTable.h b/include/llvm/TypeSymbolTable.h
index d2d909587a8..d00c3b8d0b4 100644
--- a/include/llvm/TypeSymbolTable.h
+++ b/include/llvm/TypeSymbolTable.h
@@ -19,6 +19,8 @@
 
 namespace llvm {
 
+class StringRef;
+
 /// This class provides a symbol table of name/type pairs with operations to
 /// support constructing, searching and iterating over the symbol table. The
 /// class derives from AbstractTypeUser so that the contents of the symbol