3 files changed, 8 insertions, 8 deletions
diff --git a/include/clang/AST/CFG.h b/include/clang/AST/CFG.h
index b9ceee0836..1d82ee2da5 100644
--- a/include/clang/AST/CFG.h
+++ b/include/clang/AST/CFG.h
@@ -17,9 +17,9 @@
 
 #include "llvm/ADT/GraphTraits.h"
 #include "llvm/Support/Allocator.h"
+#include "llvm/Support/raw_ostream.h"
 #include <list>
 #include <vector>
-#include <iosfwd>
 #include <cassert>
 
 namespace clang {
@@ -174,8 +174,8 @@ public:
   unsigned getBlockID() const { return BlockID; }
   
   void dump(const CFG* cfg) const;
-  void print(std::ostream& OS, const CFG* cfg) const;
-  void printTerminator(std::ostream& OS) const;
+  void print(llvm::raw_ostream& OS, const CFG* cfg) const;
+  void printTerminator(llvm::raw_ostream& OS) const;
 };
   
 
@@ -276,7 +276,7 @@ public:
   //===--------------------------------------------------------------------===//
 
   void viewCFG() const;
-  void print(std::ostream& OS) const;
+  void print(llvm::raw_ostream& OS) const;
   void dump() const;
 
   //===--------------------------------------------------------------------===//
diff --git a/include/clang/AST/PrettyPrinter.h b/include/clang/AST/PrettyPrinter.h
index 9de8331e7f..f43b59f693 100644
--- a/include/clang/AST/PrettyPrinter.h
+++ b/include/clang/AST/PrettyPrinter.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_CLANG_AST_PRETTY_PRINTER_H
 #define LLVM_CLANG_AST_PRETTY_PRINTER_H
 
-#include <iosfwd>
+#include "llvm/Support/raw_ostream.h"
 
 namespace clang {
 
@@ -23,7 +23,7 @@ class Stmt;
 class PrinterHelper {
 public:
   virtual ~PrinterHelper();
-  virtual bool handledStmt(Stmt* E, std::ostream& OS) = 0;
+  virtual bool handledStmt(Stmt* E, llvm::raw_ostream& OS) = 0;
 };
 
 } // end namespace clang
diff --git a/include/clang/AST/Stmt.h b/include/clang/AST/Stmt.h
index 0461dab890..d8cf087ea1 100644
--- a/include/clang/AST/Stmt.h
+++ b/include/clang/AST/Stmt.h
@@ -15,12 +15,12 @@
 #define LLVM_CLANG_AST_STMT_H
 
 #include "llvm/Support/Casting.h"
+#include "llvm/Support/raw_ostream.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/AST/StmtIterator.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/iterator.h"
 #include "llvm/Bitcode/SerializationFwd.h"
-#include <iosfwd>
 #include <string>
 
 using llvm::dyn_cast_or_null;
@@ -92,7 +92,7 @@ public:
   /// dumpPretty/printPretty - These two methods do a "pretty print" of the AST
   /// back to its original source language syntax.
   void dumpPretty() const;
-  void printPretty(std::ostream &OS, PrinterHelper* = NULL) const;
+  void printPretty(llvm::raw_ostream &OS, PrinterHelper* = NULL) const;
   
   /// viewAST - Visualize an AST rooted at this Stmt* using GraphViz.  Only
   ///   works on systems with GraphViz (Mac OS X) or dot+gv installed.