2 files changed, 9 insertions, 6 deletions
diff --git a/include/llvm/Assembly/AsmAnnotationWriter.h b/include/llvm/Assembly/AsmAnnotationWriter.h
index 62926bb007..b254940722 100644
--- a/include/llvm/Assembly/AsmAnnotationWriter.h
+++ b/include/llvm/Assembly/AsmAnnotationWriter.h
@@ -17,13 +17,12 @@
 #ifndef LLVM_ASSEMBLY_ASMANNOTATIONWRITER_H
 #define LLVM_ASSEMBLY_ASMANNOTATIONWRITER_H
 
-#include <iosfwd>
-
 namespace llvm {
 
 class Function;
 class BasicBlock;
 class Instruction;
+class raw_ostream;
 
 struct AssemblyAnnotationWriter {
 
@@ -31,21 +30,21 @@ struct AssemblyAnnotationWriter {
 
   // emitFunctionAnnot - This may be implemented to emit a string right before
   // the start of a function.
-  virtual void emitFunctionAnnot(const Function *F, std::ostream &OS) {}
+  virtual void emitFunctionAnnot(const Function *F, raw_ostream &OS) {}
 
   // emitBasicBlockStartAnnot - This may be implemented to emit a string right
   // after the basic block label, but before the first instruction in the block.
-  virtual void emitBasicBlockStartAnnot(const BasicBlock *BB, std::ostream &OS){
+  virtual void emitBasicBlockStartAnnot(const BasicBlock *BB, raw_ostream &OS){
   }
 
   // emitBasicBlockEndAnnot - This may be implemented to emit a string right
   // after the basic block.
-  virtual void emitBasicBlockEndAnnot(const BasicBlock *BB, std::ostream &OS){
+  virtual void emitBasicBlockEndAnnot(const BasicBlock *BB, raw_ostream &OS){
   }
 
   // emitInstructionAnnot - This may be implemented to emit a string right
   // before an instruction is emitted.
-  virtual void emitInstructionAnnot(const Instruction *I, std::ostream &OS) {}
+  virtual void emitInstructionAnnot(const Instruction *I, raw_ostream &OS) {}
 };
 
 } // End llvm namespace
diff --git a/include/llvm/Assembly/Writer.h b/include/llvm/Assembly/Writer.h
index b4765df7a5..c9f8edb352 100644
--- a/include/llvm/Assembly/Writer.h
+++ b/include/llvm/Assembly/Writer.h
@@ -24,12 +24,14 @@ namespace llvm {
 class Type;
 class Module;
 class Value;
+class raw_ostream;
 
 // WriteTypeSymbolic - This attempts to write the specified type as a symbolic
 // type, iff there is an entry in the Module's symbol table for the specified
 // type or one of its component types.  This is slower than a simple x << Type;
 //
 void WriteTypeSymbolic(std::ostream &, const Type *, const Module *M);
+void WriteTypeSymbolic(raw_ostream &, const Type *, const Module *M);
 
 // WriteAsOperand - Write the name of the specified value out to the specified
 // ostream.  This can be useful when you just want to print int %reg126, not the
@@ -39,6 +41,8 @@ void WriteTypeSymbolic(std::ostream &, const Type *, const Module *M);
 //
 void WriteAsOperand(std::ostream &, const Value *, bool PrintTy = true,
                     const Module *Context = 0);
+void WriteAsOperand(raw_ostream &, const Value *, bool PrintTy = true,
+                    const Module *Context = 0);
 
 } // End llvm namespace