diff --git a/include/llvm/Analysis/Writer.h b/include/llvm/Analysis/Writer.h
index 7f767759efe..1b8ebe8d6ac 100644
--- a/include/llvm/Analysis/Writer.h
+++ b/include/llvm/Analysis/Writer.h
@@ -8,7 +8,7 @@
 #ifndef LLVM_ANALYSIS_WRITER_H
 #define LLVM_ANALYSIS_WRITER_H
 
-#include "llvm/Assembly/Writer.h"
+#include <iosfwd>
 
 namespace cfg {
 
diff --git a/include/llvm/Assembly/CachedWriter.h b/include/llvm/Assembly/CachedWriter.h
index 20b4c05ffbf..2d4741b7f0d 100644
--- a/include/llvm/Assembly/CachedWriter.h
+++ b/include/llvm/Assembly/CachedWriter.h
@@ -10,12 +10,21 @@
 #ifndef LLVM_ASSEMBLY_CACHED_WRITER_H
 #define LLVM_ASSEMBLY_CACHED_WRITER_H
 
-#include "llvm/Assembly/Writer.h"
+#include "llvm/Value.h"
 #include <iostream>
 
-class AssemblyWriter;  // Internal private class
+class GlobalVariable;
+class Function;
+class FunctionArgument;
+class BasicBlock;
+class Instruction;
+class Constant;
+class PointerType;
 class SlotCalculator;
 
+
+class AssemblyWriter;  // Internal private class
+
 class CachedWriter {
   AssemblyWriter *AW;
   SlotCalculator *SC;