diff --git a/lib/Debugger/ProgramInfo.cpp b/lib/Debugger/ProgramInfo.cpp
index 6e584bd..f649ebe 100644
--- a/lib/Debugger/ProgramInfo.cpp
+++ b/lib/Debugger/ProgramInfo.cpp
@@ -23,7 +23,6 @@
 #include "llvm/Debugger/SourceFile.h"
 #include "llvm/Debugger/SourceLanguage.h"
 #include "llvm/Support/SlowOperationInformer.h"
-#include "llvm/Support/Streams.h"
 #include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
@@ -184,7 +183,7 @@
             if (SD) {             // We found the first stop point!
               // This is just a sanity check.
               if (getSourceFile().getDescriptor() != SD)
-                cout << "WARNING: first line of function is not in the"
+                outs() << "WARNING: first line of function is not in the"
                      << " file that the function descriptor claims it is in.\n";
               break;
             }
diff --git a/lib/Debugger/SourceLanguage-Unknown.cpp b/lib/Debugger/SourceLanguage-Unknown.cpp
index b806fc7..d408866 100644
--- a/lib/Debugger/SourceLanguage-Unknown.cpp
+++ b/lib/Debugger/SourceLanguage-Unknown.cpp
@@ -15,9 +15,8 @@
 
 #include "llvm/Debugger/SourceLanguage.h"
 #include "llvm/Debugger/ProgramInfo.h"
-#include "llvm/Support/Streams.h"
+#include "llvm/Support/raw_ostream.h"
 #include <cassert>
-#include <ostream>
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//
@@ -132,7 +131,7 @@
   SourceFunctionInfo *Found = IP.first->second;
   ++IP.first;
   if (IP.first != IP.second)
-    cout << "Whoa, found multiple functions with the same name.  I should"
+    outs() << "Whoa, found multiple functions with the same name.  I should"
          << " ask the user which one to use: FIXME!\n";
   return Found;
 }