diff --git a/src/CmdDef.cpp b/src/CmdDef.cpp
index a5ac6cf2d4..b0b03350c7 100644
--- a/src/CmdDef.cpp
+++ b/src/CmdDef.cpp
@@ -20,7 +20,6 @@
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
-#include <ostream>
 #include <string>
 
 using namespace std;
diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp
index 2623f2ea23..41956a5ae9 100644
--- a/src/FontInfo.cpp
+++ b/src/FontInfo.cpp
@@ -18,8 +18,6 @@
 
 #include "support/debug.h"
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {
diff --git a/src/Language.cpp b/src/Language.cpp
index 0c734d56cd..04de993ebd 100644
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -21,8 +21,6 @@
 #include "support/debug.h"
 #include "support/FileName.h"
 
-#include <ostream>
-
 using namespace std;
 using namespace lyx::support;
 
diff --git a/src/Layout.cpp b/src/Layout.cpp
index f052f53aed..f712e6234a 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -20,8 +20,6 @@
 #include "support/debug.h"
 #include "support/lstrings.h"
 
-#include <ostream>
-
 using namespace std;
 using namespace lyx::support;
 
diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index b22f48d8e6..90e23c493b 100644
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -22,7 +22,6 @@
 #include "support/lstrings.h"
 
 #include <algorithm>
-#include <ostream>
 	
 using namespace std;
 using namespace lyx::support;
diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index 47e800a8eb..deaee5c14a 100644
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -30,7 +30,6 @@
 #include <boost/bind.hpp>
 
 #include <cerrno>
-#include <ostream>
 
 #if defined (_WIN32)
 # include <io.h>
diff --git a/src/Undo.cpp b/src/Undo.cpp
index 4f9634bccd..f7d31eb0a4 100644
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -35,7 +35,6 @@
 
 #include <algorithm>
 #include <deque>
-#include <ostream>
 
 using namespace std;
 using namespace lyx::support;
@@ -193,16 +192,6 @@ bool Undo::hasRedoStack() const
 }
 
 
-#if 0
-static ostream & operator<<(ostream & os, UndoElement const & undo)
-{
-	return os << " from: " << undo.from << " end: " << undo.end
-		<< " cell:\n" << undo.cell
-		<< " cursor:\n" << undo.cursor;
-}
-#endif
-
-
 static bool samePar(StableDocIterator const & i1, StableDocIterator const & i2)
 {
 	StableDocIterator tmpi2 = i2;
diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 9a36095df2..c45a8e3aab 100644
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -66,7 +66,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include <algorithm>
-#include <ostream>
 #include <vector>
 
 using namespace std;
diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index 93015395e0..8f235819df 100644
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -35,8 +35,6 @@
 #include "support/gettext.h"
 #include "support/convert.h"
 
-#include <ostream>
-
 using namespace std;
 using namespace lyx::support;
 
diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index d4e862c4e5..2785c51a68 100644
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -29,8 +29,6 @@
 #include "support/docstream.h"
 #include "support/lstrings.h"
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {
diff --git a/src/insets/InsetMarginal.cpp b/src/insets/InsetMarginal.cpp
index 2b5090561e..46485e4394 100644
--- a/src/insets/InsetMarginal.cpp
+++ b/src/insets/InsetMarginal.cpp
@@ -21,9 +21,6 @@
 #include "support/docstream.h"
 #include "support/gettext.h"
 
-#include <ostream>
-
-
 namespace lyx {
 
 
diff --git a/src/insets/InsetTOC.cpp b/src/insets/InsetTOC.cpp
index 80abdf9163..ae65f1be9e 100644
--- a/src/insets/InsetTOC.cpp
+++ b/src/insets/InsetTOC.cpp
@@ -20,8 +20,6 @@
 #include "OutputParams.h"
 #include "TocBackend.h"
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {
diff --git a/src/mathed/InsetMathPar.cpp b/src/mathed/InsetMathPar.cpp
index f06ac89dc0..6859a33f91 100644
--- a/src/mathed/InsetMathPar.cpp
+++ b/src/mathed/InsetMathPar.cpp
@@ -15,8 +15,6 @@
 #include "MathData.h"
 #include "MathStream.h"
 
-#include <ostream>
-
 
 namespace lyx {
 
diff --git a/src/mathed/InsetMathPhantom.cpp b/src/mathed/InsetMathPhantom.cpp
index 079098094a..07c4bc08c7 100644
--- a/src/mathed/InsetMathPhantom.cpp
+++ b/src/mathed/InsetMathPhantom.cpp
@@ -15,9 +15,6 @@
 #include "MathStream.h"
 #include "frontends/Painter.h"
 
-#include <ostream>
-
-
 namespace lyx {
 
 
diff --git a/src/mathed/InsetMathRef.cpp b/src/mathed/InsetMathRef.cpp
index 998653b38b..aa93b220db 100644
--- a/src/mathed/InsetMathRef.cpp
+++ b/src/mathed/InsetMathRef.cpp
@@ -29,8 +29,6 @@
 #include "support/debug.h"
 #include "support/gettext.h"
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {
diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index 482315f28c..01c42d0a99 100644
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -25,8 +25,6 @@
 
 #include "support/lassert.h"
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {
diff --git a/src/mathed/InsetMathSize.cpp b/src/mathed/InsetMathSize.cpp
index c014d90adf..f90a76c1fa 100644
--- a/src/mathed/InsetMathSize.cpp
+++ b/src/mathed/InsetMathSize.cpp
@@ -18,8 +18,6 @@
 
 #include "support/convert.h"
 
-#include <ostream>
-
 
 namespace lyx {
 
diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 01b5bcfe68..daa6919176 100644
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -23,8 +23,6 @@
 
 #include "support/lstrings.h"
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {
diff --git a/src/mathed/InsetMathSubstack.cpp b/src/mathed/InsetMathSubstack.cpp
index 1ecf2b04e7..9b48b77eac 100644
--- a/src/mathed/InsetMathSubstack.cpp
+++ b/src/mathed/InsetMathSubstack.cpp
@@ -22,8 +22,6 @@
 
 #include "support/lstrings.h"
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {
diff --git a/src/mathed/InsetMathTabular.cpp b/src/mathed/InsetMathTabular.cpp
index 636c2c29f1..01d8c9cb65 100644
--- a/src/mathed/InsetMathTabular.cpp
+++ b/src/mathed/InsetMathTabular.cpp
@@ -18,9 +18,6 @@
 
 #include "support/lstrings.h"
 
-#include <ostream>
-
-
 namespace lyx {
 
 InsetMathTabular::InsetMathTabular(docstring const & name, int m, int n)
diff --git a/src/mathed/InsetMathXYMatrix.cpp b/src/mathed/InsetMathXYMatrix.cpp
index 7c6781104a..545ffafebb 100644
--- a/src/mathed/InsetMathXYMatrix.cpp
+++ b/src/mathed/InsetMathXYMatrix.cpp
@@ -15,9 +15,6 @@
 #include "LaTeXFeatures.h"
 #include "MathStream.h"
 
-#include <ostream>
-
-
 namespace lyx {
 
 
diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index bf6132630a..bcd0aa074c 100644
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -35,7 +35,6 @@
 #include "support/lassert.h"
 #include "support/debug.h"
 
-#include <ostream>
 #include <vector>
 
 using namespace std;
diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index 295b1d77d5..c0e3ac1067 100644
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -21,7 +21,6 @@
 
 #include <algorithm>
 #include <cstring>
-#include <ostream>
 
 using namespace std;
 
diff --git a/src/mathed/TextPainter.cpp b/src/mathed/TextPainter.cpp
index 6811c40af2..e7600b5348 100644
--- a/src/mathed/TextPainter.cpp
+++ b/src/mathed/TextPainter.cpp
@@ -12,8 +12,6 @@
 
 #include "TextPainter.h"
 
-#include <ostream>
-
 
 namespace lyx {
 
diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 665e98c863..ccb3364a69 100644
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -46,8 +46,6 @@
 #include "support/lassert.h"
 #include <boost/crc.hpp>
 
-#include <ostream>
-
 using namespace std;
 
 namespace lyx {
diff --git a/src/sgml.cpp b/src/sgml.cpp
index 068a831f8b..d41806d6df 100644
--- a/src/sgml.cpp
+++ b/src/sgml.cpp
@@ -28,7 +28,6 @@
 #include "support/textutils.h"
 
 #include <map>
-#include <ostream>
 
 using namespace std;
 using namespace lyx::support;