diff --git a/include/llvm/Support/Streams.h b/include/llvm/Support/Streams.h
index c4afc86..82ffeeb 100644
--- a/include/llvm/Support/Streams.h
+++ b/include/llvm/Support/Streams.h
@@ -15,7 +15,7 @@
 #ifndef LLVM_SUPPORT_STREAMS_H
 #define LLVM_SUPPORT_STREAMS_H
 
-#include <sstream>
+#include <iosfwd>
 
 namespace llvm {
 
diff --git a/lib/Debugger/SourceLanguage-Unknown.cpp b/lib/Debugger/SourceLanguage-Unknown.cpp
index 276ae9f..c5d912a 100644
--- a/lib/Debugger/SourceLanguage-Unknown.cpp
+++ b/lib/Debugger/SourceLanguage-Unknown.cpp
@@ -17,6 +17,7 @@
 #include "llvm/Debugger/ProgramInfo.h"
 #include "llvm/Support/Streams.h"
 #include <cassert>
+#include <ostream>
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index 71239f7..8f8aec1 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -25,6 +25,7 @@
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/Streams.h"
 #include "llvm/System/Path.h"
+#include <sstream>
 using namespace llvm;
 
 // Error - Simple wrapper function to conditionally assign to E and return true.
diff --git a/lib/Support/Allocator.cpp b/lib/Support/Allocator.cpp
index 632b5f7..a31b80f 100644
--- a/lib/Support/Allocator.cpp
+++ b/lib/Support/Allocator.cpp
@@ -14,6 +14,7 @@
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/DataTypes.h"
 #include "llvm/Support/Streams.h"
+#include <ostream>
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//
diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
index 920811a..012f759 100644
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -24,6 +24,7 @@
 #include <algorithm>
 #include <functional>
 #include <map>
+#include <ostream>
 #include <set>
 #include <cstdlib>
 #include <cerrno>
diff --git a/lib/Support/PluginLoader.cpp b/lib/Support/PluginLoader.cpp
index 97b253e..3c9de89 100644
--- a/lib/Support/PluginLoader.cpp
+++ b/lib/Support/PluginLoader.cpp
@@ -15,6 +15,7 @@
 #include "llvm/Support/PluginLoader.h"
 #include "llvm/Support/Streams.h"
 #include "llvm/System/DynamicLibrary.h"
+#include <ostream>
 #include <vector>
 using namespace llvm;
 
diff --git a/lib/Support/Statistic.cpp b/lib/Support/Statistic.cpp
index 8c08271..1b28eed 100644
--- a/lib/Support/Statistic.cpp
+++ b/lib/Support/Statistic.cpp
@@ -26,6 +26,7 @@
 #include "llvm/Support/Streams.h"
 #include "llvm/ADT/StringExtras.h"
 #include <algorithm>
+#include <ostream>
 using namespace llvm;
 
 // GetLibSupportInfoOutputFile - Return a file stream to print our output on...
diff --git a/lib/Support/SystemUtils.cpp b/lib/Support/SystemUtils.cpp
index 1d2c108..30b9f8d 100644
--- a/lib/Support/SystemUtils.cpp
+++ b/lib/Support/SystemUtils.cpp
@@ -16,6 +16,7 @@
 #include "llvm/Support/SystemUtils.h"
 #include "llvm/System/Process.h"
 #include "llvm/System/Program.h"
+#include <ostream>
 using namespace llvm;
 
 bool llvm::CheckBytecodeOutputToConsole(std::ostream* stream_to_check,
diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp
index 7c0d433..3cfd6d0 100644
--- a/lib/Target/CBackend/CBackend.cpp
+++ b/lib/Target/CBackend/CBackend.cpp
@@ -42,7 +42,7 @@
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Config/config.h"
 #include <algorithm>
-#include <ios>
+#include <sstream>
 using namespace llvm;
 
 namespace {
diff --git a/lib/Target/CBackend/Writer.cpp b/lib/Target/CBackend/Writer.cpp
index 7c0d433..3cfd6d0 100644
--- a/lib/Target/CBackend/Writer.cpp
+++ b/lib/Target/CBackend/Writer.cpp
@@ -42,7 +42,7 @@
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Config/config.h"
 #include <algorithm>
-#include <ios>
+#include <sstream>
 using namespace llvm;
 
 namespace {
diff --git a/lib/Target/SubtargetFeature.cpp b/lib/Target/SubtargetFeature.cpp
index 8062123..4669e0f 100644
--- a/lib/Target/SubtargetFeature.cpp
+++ b/lib/Target/SubtargetFeature.cpp
@@ -15,6 +15,7 @@
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Streams.h"
 #include <algorithm>
+#include <ostream>
 #include <cassert>
 #include <cctype>
 using namespace llvm;
diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index cf812a8..2b9bb6b 100644
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -60,6 +60,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/Compiler.h"
 #include <algorithm>
+#include <sstream>
 #include <cstdarg>
 using namespace llvm;