From: Angus Leeming <leeming@lyx.org>
Date: Fri, 5 Sep 2003 16:31:30 +0000 (+0000)
Subject: Strip 320 #includes from the files in src.
X-Git-Tag: 1.6.10~16154
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=91de22ef340abbf1e9ba7d422bcd9024fa90d63f;p=features.git

Strip 320 #includes from the files in src.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7684 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/BranchList.C b/src/BranchList.C
index 2198a7cc70..b1183c7312 100644
--- a/src/BranchList.C
+++ b/src/BranchList.C
@@ -13,7 +13,6 @@
 #include "BranchList.h"
 #include "support/LAssert.h"
 
-#include <functional>
 
 using std::bind2nd;
 using std::remove_if;
diff --git a/src/BufferView.C b/src/BufferView.C
index 81a59e3e05..4b502ffa93 100644
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -17,22 +17,15 @@
 #include "BufferView.h"
 #include "BufferView_pimpl.h"
 
-#include "LaTeX.h"
-#include "ParagraphParameters.h"
 #include "WordLangTuple.h"
 #include "buffer.h"
 #include "bufferlist.h"
-#include "debug.h"
 #include "gettext.h"
-#include "errorlist.h"
 #include "funcrequest.h"
 #include "iterators.h"
 #include "language.h"
-#include "lyxcursor.h"
-#include "lyxlex.h"
 #include "lyxtext.h"
 #include "undo_funcs.h"
-#include "changes.h"
 #include "paragraph_funcs.h"
 
 #include "frontends/Alert.h"
@@ -44,13 +37,10 @@
 #include "insets/insetcommand.h" // ChangeRefs
 #include "insets/updatableinset.h"
 
-#include "support/FileInfo.h"
 #include "support/filetools.h"
-#include "support/types.h"
 #include "support/lyxalgo.h" // lyx_count
 #include "support/LAssert.h"
 
-#include <fstream>
 
 extern BufferList bufferlist;
 
diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 296b9d61d1..f5a5cb5e66 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -22,8 +22,6 @@
 #include "bufferlist.h"
 #include "buffer.h"
 #include "buffer_funcs.h"
-#include "bufferview_funcs.h"
-#include "lfuns.h"
 #include "debug.h"
 #include "factory.h"
 #include "FloatList.h"
@@ -31,7 +29,6 @@
 #include "gettext.h"
 #include "intl.h"
 #include "iterators.h"
-#include "Lsstream.h"
 #include "lyx_cb.h" // added for Dispatch functions
 #include "lyx_main.h"
 #include "lyxfind.h"
@@ -39,24 +36,19 @@
 #include "lyxtext.h"
 #include "lyxrc.h"
 #include "lastfiles.h"
-#include "paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "TextCache.h"
 #include "undo_funcs.h"
 
 #include "insets/insetfloatlist.h"
-#include "insets/insetgraphics.h"
-#include "insets/insetinclude.h"
 #include "insets/insetref.h"
-#include "insets/insettext.h"
 
 #include "frontends/Alert.h"
 #include "frontends/Dialogs.h"
 #include "frontends/FileDialog.h"
 #include "frontends/LyXView.h"
 #include "frontends/LyXScreenFactory.h"
-#include "frontends/mouse_state.h"
 #include "frontends/screen.h"
 #include "frontends/WorkArea.h"
 #include "frontends/WorkAreaFactory.h"
@@ -65,16 +57,12 @@
 
 #include "graphics/Previews.h"
 
-#include "support/LAssert.h"
 #include "support/tostr.h"
 #include "support/filetools.h"
 #include "support/path_defines.h"
 
 #include <boost/bind.hpp>
-#include <boost/signals/connection.hpp>
 
-#include <unistd.h>
-#include <sys/wait.h>
 
 
 using std::vector;
diff --git a/src/ChangeLog b/src/ChangeLog
index 9eaffcc2b2..7ebb157245 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-05  Angus Leeming  <leeming@lyx.org>
+
+	* sgml.h: ensure that the header file can be compiled stand-alone.
+	* *.C: strip out redundant #includes. (320 in total.)
+
 2003-09-04  Angus Leeming  <leeming@lyx.org>
 
 	* LaTeXFeatures.C (getMacros): move the output of the preamble_snippets
diff --git a/src/Chktex.C b/src/Chktex.C
index 33e9d2e683..0651672ded 100644
--- a/src/Chktex.C
+++ b/src/Chktex.C
@@ -12,15 +12,11 @@
 
 #include "Chktex.h"
 #include "LaTeX.h" // TeXErrors
-#include "lyxlex.h"
-#include "debug.h"
 #include "gettext.h"
 
-#include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/path.h"
 #include "support/systemcall.h"
 
 #include "support/BoostFormat.h"
diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 627067bcee..9805f1374d 100644
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -13,25 +13,17 @@
 #include <config.h>
 
 #include "CutAndPaste.h"
-#include "BufferView.h"
 #include "buffer.h"
-#include "errorlist.h"
-#include "paragraph.h"
 #include "ParagraphParameters.h"
-#include "lyxtext.h"
-#include "lyxcursor.h"
 #include "iterators.h"
 #include "lyxtextclasslist.h"
-#include "undo_funcs.h"
 #include "gettext.h"
 #include "paragraph_funcs.h"
-#include "debug.h"
 #include "insets/insetinclude.h"
 #include "insets/insettabular.h"
 
 #include "support/LAssert.h"
 #include "support/lstrings.h"
-#include "support/limited_stack.h"
 
 using std::endl;
 using std::pair;
diff --git a/src/DepTable.C b/src/DepTable.C
index ea087b5e5b..adbf627e1f 100644
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -20,12 +20,9 @@
 #include "support/lstrings.h"
 #include "support/lyxtime.h"
 
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include <fstream>
-#include <ctime>
 
 #ifndef CXX_GLOBAL_CSTD
 using std::time;
diff --git a/src/FloatList.C b/src/FloatList.C
index b6d4ba87a5..c48c12d388 100644
--- a/src/FloatList.C
+++ b/src/FloatList.C
@@ -12,7 +12,6 @@
 
 #include "FloatList.h"
 #include "Floating.h"
-#include "gettext.h"
 
 // This class is now mostly finished, except one thing, it is a global
 // object. This will not do. The user (and layout files) are free to
diff --git a/src/InsetList.C b/src/InsetList.C
index abe2d6577e..0ab77397e2 100644
--- a/src/InsetList.C
+++ b/src/InsetList.C
@@ -16,10 +16,8 @@
 #include "buffer.h"
 #include "debug.h"
 
-#include "insets/updatableinset.h"
 #include "insets/insetbranch.h"
 
-#include <algorithm>
 
 using lyx::pos_type;
 
diff --git a/src/LaTeX.C b/src/LaTeX.C
index 3f6b97d119..09137f2276 100644
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -26,12 +26,10 @@
 #include "support/lyxlib.h"
 #include "support/systemcall.h"
 #include "support/os.h"
-#include "support/path.h"
 
 #include <boost/regex.hpp>
 
 #include <fstream>
-#include <cstdio>  // sscanf
 
 using namespace lyx::support;
 
diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 9f6e599206..5cb855eb7e 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -17,17 +17,14 @@
 #include "LaTeXFeatures.h"
 #include "debug.h"
 #include "lyx_sty.h"
-#include "lyxrc.h"
 #include "bufferparams.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "language.h"
 #include "encoding.h"
-#include "LString.h"
 #include "Lsstream.h"
 
 #include "support/filetools.h"
-#include "support/lstrings.h"
 
 using namespace lyx::support;
 
diff --git a/src/LyXAction.C b/src/LyXAction.C
index 57790a4568..6d5ffdbf6b 100644
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -17,7 +17,6 @@
 
 #include "debug.h"
 #include "funcrequest.h"
-#include "gettext.h"
 #include "support/lstrings.h"
 
 using namespace lyx::support;
diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index 2557a743fc..fef6980389 100644
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -15,7 +15,6 @@
 #include <config.h>
 
 #include "ParagraphParameters.h"
-#include "ParameterStruct.h"
 #include "tex-strings.h"
 #include "lyxlex.h"
 
@@ -23,15 +22,12 @@
 #include "BufferView.h"
 #include "Lsstream.h"
 #include "gettext.h"
-#include "paragraph.h"
 #include "lyxtext.h"
-#include "Lsstream.h"
 
 #include "frontends/LyXView.h"
 
 #include "support/lstrings.h"
 
-#include <iostream>
 
 using namespace lyx::support;
 
diff --git a/src/Spacing.C b/src/Spacing.C
index 6bb0170d60..10d45e1382 100644
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -13,7 +13,6 @@
 
 #include "Lsstream.h"
 #include "Spacing.h"
-#include "LString.h"
 
 using std::ios;
 using std::ostream;
diff --git a/src/TextCache.C b/src/TextCache.C
index 509fd1e60a..b6aac445d1 100644
--- a/src/TextCache.C
+++ b/src/TextCache.C
@@ -11,7 +11,6 @@
 #include <config.h>
 
 #include "TextCache.h"
-#include "buffer.h"
 #include "lyxtext.h"
 #include "bufferlist.h"
 #include "debug.h"
diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C
index c605f27b8d..4fc07de1fb 100644
--- a/src/ToolbarBackend.C
+++ b/src/ToolbarBackend.C
@@ -16,7 +16,6 @@
 #include "LyXAction.h"
 #include "lyxlex.h"
 #include "debug.h"
-#include "lyxlex.h"
 #include "gettext.h"
 
 #include "support/lstrings.h"
@@ -24,7 +23,6 @@
 
 #include "frontends/controllers/ControlMath.h"
 
-#include <vector>
 
 using namespace lyx::support;
 
diff --git a/src/aspell.C b/src/aspell.C
index ca5ff77c93..a16b7025e4 100644
--- a/src/aspell.C
+++ b/src/aspell.C
@@ -21,6 +21,7 @@
 #include "aspell_local.h"
 #include "WordLangTuple.h"
 
+
 using namespace lyx::support;
 
 using std::endl;
diff --git a/src/author.C b/src/author.C
index de80ae6b79..41dbd65770 100644
--- a/src/author.C
+++ b/src/author.C
@@ -13,7 +13,6 @@
 #include "author.h"
 
 #include "support/LAssert.h"
-#include "support/LOstream.h"
 #include "support/LIstream.h"
 #include "support/lstrings.h"
 
diff --git a/src/buffer.C b/src/buffer.C
index 39528ce6b2..3fc6db9729 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -16,41 +16,29 @@
 #include "LyXAction.h"
 #include "lyxrc.h"
 #include "lyxlex.h"
-#include "tex-strings.h"
-#include "layout.h"
-#include "bufferview_funcs.h"
-#include "lyxfont.h"
 #include "version.h"
 #include "LaTeX.h"
 #include "Chktex.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
-#include "lyxtext.h"
 #include "gettext.h"
 #include "language.h"
 #include "exporter.h"
-#include "errorlist.h"
 #include "Lsstream.h"
 #include "format.h"
 #include "ParagraphParameters.h"
 #include "iterators.h"
-#include "lyxtextclasslist.h"
 #include "sgml.h"
 #include "paragraph_funcs.h"
 #include "messages.h"
-#include "author.h"
 
-#include "frontends/LyXView.h"
 
-#include "mathed/formulamacro.h"
-#include "mathed/formula.h"
 
 #include "insets/insetbibitem.h"
 #include "insets/insetbibtex.h"
 #include "insets/insetinclude.h"
 #include "insets/insettext.h"
 
-#include "frontends/Dialogs.h"
 #include "frontends/Alert.h"
 
 #include "graphics/Previews.h"
@@ -63,28 +51,17 @@
 #include "support/tostr.h"
 #include "support/lyxlib.h"
 #include "support/FileInfo.h"
-#include "support/lyxmanip.h"
-#include "support/lyxtime.h"
 #include "support/gzstream.h"
 
 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
 
-#include <fstream>
 #include <iomanip>
-#include <map>
 #include <stack>
-#include <list>
-#include <algorithm>
 
-#include <cstdlib>
-#include <cmath>
-#include <unistd.h>
-#include <sys/types.h>
 #include <utime.h>
 
 #ifdef HAVE_LOCALE
-#include <locale>
 #endif
 
 using namespace lyx::support;
diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index 43935fcf51..5cf8a28b24 100644
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -15,12 +15,9 @@
 #include "buffer_funcs.h"
 #include "bufferlist.h"
 #include "buffer.h"
-#include "errorlist.h"
 #include "gettext.h"
 #include "vc-backend.h"
 #include "LaTeX.h"
-#include "ParagraphList.h"
-#include "paragraph.h"
 
 #include "frontends/Alert.h"
 
diff --git a/src/bufferlist.C b/src/bufferlist.C
index de6b49f5bc..894b014120 100644
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -15,30 +15,18 @@
 #include "lastfiles.h"
 #include "buffer.h"
 #include "debug.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
 #include "lyx_cb.h"
-#include "bufferview_funcs.h"
-#include "BufferView.h"
 #include "gettext.h"
-#include "frontends/LyXView.h"
-#include "vc-backend.h"
 #include "TextCache.h"
-#include "lyxlex.h"
 
 #include "frontends/Alert.h"
 
-#include "support/FileInfo.h"
 #include "support/filetools.h"
-#include "support/lyxmanip.h"
 #include "support/lyxfunctional.h"
 #include "support/LAssert.h"
 
 #include <boost/bind.hpp>
 
-#include <cassert>
-#include <algorithm>
-#include <functional>
 
 
 using namespace lyx::support;
diff --git a/src/bufferparams.C b/src/bufferparams.C
index ac250f11a2..12414719e8 100644
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -15,32 +15,22 @@
 
 #include <config.h>
 
-#include "author.h"
 #include "bufferparams.h"
 #include "debug.h"
 #include "encoding.h"
 #include "gettext.h"
-#include "layout.h"
 #include "language.h"
 #include "LaTeXFeatures.h"
-#include "LColor.h"
 #include "Lsstream.h"
-#include "lyxrc.h"
 #include "lyxlex.h"
 #include "lyxtextclasslist.h"
 #include "tex-strings.h"
 #include "texrow.h"
-#include "vspace.h"
 
 #include "frontends/Alert.h"
 
 #include "support/lyxalgo.h" // for lyx::count
-#include "support/lyxlib.h"
-#include "support/lstrings.h"
-#include "support/types.h"
 
-#include <cstdlib>
-#include <algorithm>
 
 using namespace lyx::support;
 
diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 8896f345b6..bda1550be6 100644
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -15,17 +15,11 @@
 
 #include "bufferview_funcs.h"
 #include "BufferView.h"
-#include "paragraph.h"
-#include "lyxfont.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
 #include "buffer.h"
-#include "lyx_cb.h"
 #include "language.h"
 #include "gettext.h"
 #include "ParagraphParameters.h"
-#include "author.h"
-#include "changes.h"
 
 #include "frontends/LyXView.h"
 #include "frontends/Alert.h"
@@ -34,10 +28,7 @@
 #include "support/tostr.h"
 #include "Lsstream.h"
 
-#include "insets/updatableinset.h"
 #include "insets/insettext.h"
-#include <boost/bind.hpp>
-#include <algorithm>
 
 using namespace lyx::support;
 
diff --git a/src/changes.C b/src/changes.C
index 100dbc2233..e7a82c8658 100644
--- a/src/changes.C
+++ b/src/changes.C
@@ -14,10 +14,8 @@
 
 #include "changes.h"
 #include "debug.h"
-#include "author.h"
 
 #include "support/LAssert.h"
-#include "support/LOstream.h"
 
 using namespace lyx::support;
 
diff --git a/src/converter.C b/src/converter.C
index a3e5c6518e..7da9ed0a86 100644
--- a/src/converter.C
+++ b/src/converter.C
@@ -11,32 +11,21 @@
 #include <config.h>
 
 #include "converter.h"
-#include "graph.h"
 #include "format.h"
-#include "lyxrc.h"
 #include "buffer.h"
-#include "bufferparams.h"
 #include "buffer_funcs.h"
-#include "bufferview_funcs.h"
-#include "errorlist.h"
 #include "LaTeX.h"
 #include "gettext.h"
 #include "debug.h"
 
 #include "frontends/Alert.h"
-#include "frontends/LyXView.h"
 
 #include "support/filetools.h"
-#include "support/lyxfunctional.h"
 #include "support/lyxlib.h"
 #include "support/path.h"
-#include "support/tostr.h"
 #include "support/systemcall.h"
 
-#include <boost/signals/signal1.hpp>
-#include <boost/signals/trackable.hpp>
 
-#include <cctype>
 
 using namespace lyx::support;
 
diff --git a/src/errorlist.C b/src/errorlist.C
index 50013690a0..1b4d7914a5 100644
--- a/src/errorlist.C
+++ b/src/errorlist.C
@@ -11,7 +11,6 @@
 #include <config.h>
 
 #include "errorlist.h"
-#include "buffer.h"
 
 
 ErrorItem::ErrorItem(string const & error, string const & description,
diff --git a/src/exporter.C b/src/exporter.C
index 2f3ee40683..b204da466d 100644
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -26,7 +26,6 @@
 #include "frontends/Alert.h"
 #include "gettext.h"
 
-#include <algorithm>
 
 using namespace lyx::support;
 
diff --git a/src/factory.C b/src/factory.C
index 18bbb04dc2..e7fbcee7f5 100644
--- a/src/factory.C
+++ b/src/factory.C
@@ -10,13 +10,12 @@
 
 #include <config.h>
 
+#include "factory.h"
 #include "funcrequest.h"
-#include "bufferparams.h"
 #include "buffer.h"
 #include "FloatList.h"
 #include "debug.h"
 #include "BufferView.h"
-#include "lyxtext.h"
 #include "lyxlex.h"
 
 #include "insets/insetbibitem.h"
@@ -42,7 +41,6 @@
 #include "insets/insetref.h"
 #include "insets/insetspace.h"
 #include "insets/insettabular.h"
-#include "insets/insettext.h"
 #include "insets/insettoc.h"
 #include "insets/inseturl.h"
 #include "insets/insetwrap.h"
@@ -53,7 +51,6 @@
 #include "frontends/LyXView.h"
 #include "support/lstrings.h"
 
-#include <cstdio>
 
 using namespace lyx::support;
 
diff --git a/src/format.C b/src/format.C
index d69d4ecb12..c944453b9c 100644
--- a/src/format.C
+++ b/src/format.C
@@ -12,15 +12,12 @@
 
 #include "format.h"
 #include "buffer.h"
-#include "buffer_funcs.h"
 #include "lyxrc.h"
 #include "debug.h"
 #include "gettext.h"
-#include "LString.h"
 
 #include "frontends/Alert.h" //to be removed?
 
-#include "support/lstrings.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/systemcall.h"
diff --git a/src/gettext.C b/src/gettext.C
index a27c579b42..47d4303fe9 100644
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -11,11 +11,9 @@
 
 #include <config.h>
 
+#include "gettext.h"
 #include "messages.h"
-#include "LString.h"
-#include "support/LAssert.h"
 
-#include <boost/scoped_ptr.hpp>
 
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
diff --git a/src/graph.C b/src/graph.C
index de07b2f2c5..b7db6c5633 100644
--- a/src/graph.C
+++ b/src/graph.C
@@ -8,13 +8,9 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#include "config.h"
 #include "graph.h"
 #include "format.h"
 
-#include <queue>
-#include <vector>
-#include <algorithm>
 
 using std::queue;
 using std::vector;
diff --git a/src/importer.C b/src/importer.C
index 68d20454d4..02b25500fd 100644
--- a/src/importer.C
+++ b/src/importer.C
@@ -19,13 +19,11 @@
 #include "funcrequest.h"
 
 #include "bufferlist.h"
-#include "buffer_funcs.h"
 #include "support/filetools.h"
 #include "frontends/Alert.h"
 #include "gettext.h"
 #include "BufferView.h"
 
-#include <algorithm>
 
 using namespace lyx::support;
 
diff --git a/src/intl.C b/src/intl.C
index 52f72f8676..ce237ed1a2 100644
--- a/src/intl.C
+++ b/src/intl.C
@@ -17,8 +17,6 @@
 #include "debug.h"
 #include "lyxrc.h"
 
-#include "support/lstrings.h"
-#include "language.h"
 
 using std::endl;
 
diff --git a/src/ispell.C b/src/ispell.C
index 096e7b7444..365522f8a4 100644
--- a/src/ispell.C
+++ b/src/ispell.C
@@ -12,8 +12,6 @@
 
 #include <config.h>
 
-#include "LString.h"
-#include "lyxrc.h"
 #include "language.h"
 #include "debug.h"
 #include "encoding.h"
@@ -23,13 +21,10 @@
 #include "bufferparams.h"
 
 #include "support/forkedcall.h"
-#include "support/lstrings.h"
 
 // HP-UX 11.x doesn't have this header
 #ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
 #endif
-#include <sys/time.h>
 
 using namespace lyx::support;
 
diff --git a/src/iterators.C b/src/iterators.C
index 920c66ab7c..ce8e753e02 100644
--- a/src/iterators.C
+++ b/src/iterators.C
@@ -12,14 +12,12 @@
 #include <config.h>
 
 #include "iterators.h"
-#include "paragraph.h"
 
 #include <boost/next_prior.hpp>
 #include <boost/optional.hpp>
 
 // it's conceptionally a stack, but undo needs random access...
 //#include <stack>
-#include <vector>
 
 using boost::next;
 using boost::optional;
diff --git a/src/kbmap.C b/src/kbmap.C
index 595b6d3372..c6ef06ed3e 100644
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -14,7 +14,6 @@
 #include <config.h>
 
 #include "kbmap.h"
-#include "lfuns.h"
 #include "kbsequence.h"
 #include "LyXAction.h"
 #include "support/filetools.h"
diff --git a/src/kbsequence.C b/src/kbsequence.C
index c8b236a917..7a3b0b6edc 100644
--- a/src/kbsequence.C
+++ b/src/kbsequence.C
@@ -14,12 +14,10 @@
 
 #include "gettext.h"
 
-#include "frontends/mouse_state.h"
 #include "frontends/LyXKeySymFactory.h"
 #include "kbsequence.h"
 #include "kbmap.h"
 #include "lfuns.h"
-#include "debug.h"
 
 using std::make_pair;
 
diff --git a/src/language.C b/src/language.C
index ec53f130a4..9a81295ba8 100644
--- a/src/language.C
+++ b/src/language.C
@@ -13,9 +13,7 @@
 #include <config.h>
 
 #include "language.h"
-#include "gettext.h"
 #include "encoding.h"
-#include "lyxrc.h"
 #include "lyxlex.h"
 #include "debug.h"
 
diff --git a/src/lastfiles.C b/src/lastfiles.C
index 1691253373..2011a7fb6c 100644
--- a/src/lastfiles.C
+++ b/src/lastfiles.C
@@ -16,7 +16,6 @@
 #include "support/FileInfo.h"
 
 #include <fstream>
-#include <algorithm>
 #include <iterator>
 
 
diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index a58ed4ff6e..ac77cea6c9 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -17,18 +17,14 @@
 #include "lyx_cb.h"
 #include "lyx_main.h"
 #include "buffer.h"
-#include "buffer_funcs.h"
 #include "bufferlist.h"
-#include "bufferview_funcs.h"
 #include "debug.h"
 #include "lastfiles.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
 #include "gettext.h"
 #include "BufferView.h"
-#include "Lsstream.h"
 
-#include "insets/insetlabel.h"
 
 #include "frontends/lyx_gui.h"
 #include "frontends/LyXView.h"
@@ -38,7 +34,6 @@
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/forkedcall.h"
-#include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/path.h"
 #include "support/path_defines.h"
@@ -46,9 +41,6 @@
 #include "support/systemcall.h"
 
 #include <fstream>
-#include <algorithm>
-#include <utility>
-#include <cerrno>
 
 using namespace lyx::support;
 
diff --git a/src/lyx_main.C b/src/lyx_main.C
index 250b74681c..6a99ee0b61 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -38,7 +38,6 @@
 #include "frontends/Alert.h"
 #include "frontends/lyx_gui.h"
 
-#include "graphics/GraphicsTypes.h"
 
 #include "support/FileInfo.h"
 #include "support/filetools.h"
@@ -47,12 +46,8 @@
 #include "support/path.h"
 #include "support/path_defines.h"
 
-#include <boost/function.hpp>
 #include <boost/bind.hpp>
-#include <boost/signals/signal1.hpp>
 
-#include <cstdlib>
-#include <csignal>
 #include <iostream>
 
 using namespace lyx::support;
diff --git a/src/lyxfind.C b/src/lyxfind.C
index fe37598adb..60e1d4e76d 100644
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -14,17 +14,12 @@
 
 #include "lyxtext.h"
 #include "lyxfind.h"
-#include "paragraph.h"
-#include "frontends/LyXView.h"
 #include "frontends/Alert.h"
 #include "support/textutils.h"
-#include "support/lstrings.h"
 #include "BufferView.h"
 #include "buffer.h"
-#include "debug.h"
 #include "gettext.h"
 #include "insets/insettext.h"
-#include "changes.h"
 
 using namespace lyx::support;
 
diff --git a/src/lyxfont.C b/src/lyxfont.C
index ed2ff8516b..cb7dfc930a 100644
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -13,11 +13,9 @@
  */
 
 #include <config.h>
-#include <clocale>
-#include <cctype>
 
-#include "gettext.h"
 #include "lyxfont.h"
+#include "gettext.h"
 #include "debug.h"
 #include "lyxrc.h"
 #include "lyxlex.h"
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index e2eb5b683d..60a5be79ae 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -20,7 +20,6 @@
 #include <config.h>
 
 #include "lyxfunc.h"
-#include "version.h"
 #include "kbmap.h"
 #include "bufferlist.h"
 #include "buffer.h"
@@ -30,22 +29,14 @@
 #include "iterators.h"
 #include "lyxserver.h"
 #include "intl.h"
-#include "lyx_main.h"
 #include "lyx_cb.h"
 #include "LyXAction.h"
 #include "debug.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
 #include "gettext.h"
 #include "Lsstream.h"
-#include "trans_mgr.h"
 #include "encoding.h"
-#include "layout.h"
-#include "bufferview_funcs.h"
 #include "frontends/LyXView.h"
 #include "frontends/lyx_gui.h"
-#include "vspace.h"
-#include "FloatList.h"
 #include "format.h"
 #include "exporter.h"
 #include "importer.h"
@@ -58,9 +49,7 @@
 #include "insets/insetexternal.h"
 #include "insets/insettabular.h"
 
-#include "mathed/formulamacro.h"
 #include "mathed/math_cursor.h"
-#include "mathed/math_inset.h"
 
 #include "frontends/FileDialog.h"
 #include "frontends/Dialogs.h"
@@ -68,26 +57,16 @@
 #include "frontends/Menubar.h"
 #include "frontends/Alert.h"
 
-#include "graphics/GraphicsCache.h"
 
-#include "support/lyxalgo.h"
 #include "support/LAssert.h"
 #include "support/filetools.h"
 #include "support/FileInfo.h"
 #include "support/forkedcontr.h"
-#include "support/lstrings.h"
 #include "support/tostr.h"
 #include "support/path.h"
 #include "support/path_defines.h"
-#include "support/lyxfunctional.h"
 
-#include <ctime>
-#include <clocale>
-#include <cstdlib>
-#include <cctype>
 
-#include <utility>
-#include <algorithm>
 
 using namespace lyx::support;
 
diff --git a/src/lyxlength.C b/src/lyxlength.C
index d6bbbe3a43..e9c0cf880e 100644
--- a/src/lyxlength.C
+++ b/src/lyxlength.C
@@ -19,11 +19,9 @@
 #include "lengthcommon.h"
 #include "lyxrc.h"
 
-#include "support/lstrings.h"
 
 #include "Lsstream.h"
 
-#include <cstdlib>
 
 using std::abs;
 
diff --git a/src/lyxlex.C b/src/lyxlex.C
index 8c8eeaa1a0..8d1b30b60c 100644
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -16,7 +16,6 @@
 #include "lyxlex.h"
 #include "lyxlex_pimpl.h"
 #include "debug.h"
-#include "support/filetools.h"
 #include "support/lstrings.h"
 
 using namespace lyx::support;
@@ -154,8 +153,7 @@ string const LyXLex::getLongString(string const & endtoken)
 		lyxerr[Debug::PARSER] << "LongString: `"
 				      << getString() << '\'' << endl;
 
-		// We do a case independent comparison, like search_kw
-		// does.
+		// We do a case independent comparison, like search_kw does.
 		if (compare_ascii_no_case(token, endtoken) == 0)
 			break;
 
@@ -191,7 +189,8 @@ bool LyXLex::getBool() const
 	if (pimpl_->getString() == "true") {
 		return true;
 	} else if (pimpl_->getString() != "false") {
-		pimpl_->printError("Bad boolean `$$Token'. Use \"false\" or \"true\"");
+		pimpl_->printError("Bad boolean `$$Token'. "
+				   "Use \"false\" or \"true\"");
 	}
 	return false;
 }
diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 0f7d57a673..45141c6b3d 100644
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -19,7 +19,6 @@
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
-#include <algorithm>
 
 using namespace lyx::support;
 
diff --git a/src/lyxrc.C b/src/lyxrc.C
index a3749628c8..320f04b623 100644
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -17,24 +17,19 @@
 #include <config.h>
 
 #include <fstream>
-#include <iomanip>
 #include <iostream>
-#include <boost/scoped_ptr.hpp>
 
 #include "lyxrc.h"
 
 #include "debug.h"
-#include "intl.h"
 #include "converter.h"
 #include "format.h"
 #include "gettext.h"
 #include "lyxlex.h"
 #include "lyxfont.h"
 
-#include "support/path.h"
 #include "support/tostr.h"
 #include "support/filetools.h"
-#include "support/LAssert.h"
 #include "support/lstrings.h"
 #include "support/userinfo.h"
 #include "support/translator.h"
diff --git a/src/lyxrow_funcs.C b/src/lyxrow_funcs.C
index 54cbdc3251..cfec4ef432 100644
--- a/src/lyxrow_funcs.C
+++ b/src/lyxrow_funcs.C
@@ -13,14 +13,12 @@
 
 #include "lyxrow_funcs.h"
 #include "lyxtext.h"
-#include "paragraph.h"
 #include "lyxlayout.h"
 #include "debug.h"
 
 #include "support/LAssert.h"
 
 #include <boost/next_prior.hpp>
-#include <algorithm>
 
 using lyx::pos_type;
 using lyx::support::Assert;
diff --git a/src/lyxserver.C b/src/lyxserver.C
index ce70c08217..0f38a45204 100644
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -39,14 +39,9 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
-#include <cerrno>
 
 #include "lyxserver.h"
-#include "lyx_main.h"
 #include "debug.h"
 #include "lyxfunc.h"
 #include "support/lstrings.h"
@@ -54,13 +49,9 @@
 #include "frontends/lyx_gui.h"
 
 #ifdef __EMX__
-#include <cstdlib>
-#include <io.h>
 #define OS2EMX_PLAIN_CHAR
 #define INCL_DOSNMPIPES
 #define INCL_DOSERRORS
-#include <os2.h>
-#include "support/os2_errortable.h"
 #endif
 
 
diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index b2a604bbbc..b7f96056cb 100644
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -23,10 +23,8 @@
 
 #include "support/lstrings.h"
 #include "support/LAssert.h"
-#include "support/lyxfunctional.h"
 #include "support/filetools.h"
 
-#include <algorithm>
 
 using namespace lyx::support;
 
diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index 8d4a7639cc..8fb1c10983 100644
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -15,14 +15,10 @@
 #include "lyxtextclass.h"
 #include "debug.h"
 #include "lyxlex.h"
-#include "gettext.h"
-#include "frontends/Alert.h"
 
 #include "support/lyxfunctional.h"
-#include "support/LAssert.h"
 #include "support/filetools.h"
 
-#include <utility>
 
 using namespace lyx::support;
 
diff --git a/src/lyxvc.C b/src/lyxvc.C
index 7291f0f3cb..9bc0208310 100644
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -20,15 +20,12 @@
 #include "debug.h"
 #include "buffer.h"
 #include "gettext.h"
-#include "funcrequest.h"
 
 #include "frontends/Alert.h"
-#include "frontends/LyXView.h"
 
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 
-#include <unistd.h>
 
 using namespace lyx::support;
 
diff --git a/src/messages.C b/src/messages.C
index a933fbacdc..2dc56ae049 100644
--- a/src/messages.C
+++ b/src/messages.C
@@ -10,7 +10,6 @@
 #include <config.h>
 
 #include "messages.h"
-#include "debug.h"
 #include "support/filetools.h"
 #include "support/path_defines.h"
 
@@ -37,7 +36,7 @@ string const & getLocaleDir()
 
 #if 0
 
-#include <locale>
+-#include <locale>
 
 // This version of the Pimpl utilizes the message capability of
 // libstdc++ that is distributed with GNU G++.
diff --git a/src/metricsinfo.C b/src/metricsinfo.C
index 85ee9edb63..aad69f7834 100644
--- a/src/metricsinfo.C
+++ b/src/metricsinfo.C
@@ -13,7 +13,6 @@
 #include "metricsinfo.h"
 #include "mathed/math_support.h"
 #include "frontends/Painter.h"
-#include "debug.h"
 #include "BufferView.h"
 
 
diff --git a/src/paragraph.C b/src/paragraph.C
index ccd07dab81..307f65188e 100644
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -21,37 +21,21 @@
 #include "paragraph_pimpl.h"
 
 #include "buffer.h"
-#include "bufferparams.h"
-#include "BufferView.h"
-#include "changes.h"
 #include "encoding.h"
 #include "debug.h"
 #include "gettext.h"
 #include "language.h"
 #include "latexrunparams.h"
-#include "layout.h"
-#include "lyxrc.h"
-#include "paragraph_funcs.h"
-#include "ParameterStruct.h"
-#include "texrow.h"
 
 #include "Lsstream.h"
 
 #include "insets/insetbibitem.h"
 #include "insets/insetoptarg.h"
-#include "insets/insetenv.h"
 
-#include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/lyxmanip.h"
-#include "support/FileInfo.h"
 #include "support/LAssert.h"
 #include "support/textutils.h"
 
-#include <algorithm>
-#include <fstream>
-#include <csignal>
-#include <ctime>
 
 using namespace lyx::support;
 
diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index f2218b8c57..af9feebf7d 100644
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -13,14 +13,11 @@
 #include "paragraph_funcs.h"
 #include "paragraph_pimpl.h"
 #include "buffer.h"
-#include "ParagraphParameters.h"
-#include "lyxtextclasslist.h"
 #include "debug.h"
 #include "gettext.h"
 #include "iterators.h"
 #include "language.h"
 #include "encoding.h"
-#include "lyxrc.h"
 #include "lyxlex.h"
 #include "factory.h"
 #include "Lsstream.h"
@@ -29,7 +26,6 @@
 #include "support/LAssert.h"
 
 #include "insets/insetoptarg.h"
-#include "insets/insetcommandparams.h"
 #include "insets/insetbibitem.h"
 #include "insets/insetspace.h"
 #include "insets/insetspecialchar.h"
diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 8c0573d7ee..d451254629 100644
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -21,8 +21,6 @@
 #include "language.h"
 #include "LaTeXFeatures.h"
 #include "latexrunparams.h"
-#include "lyxrc.h"
-#include "paragraph_funcs.h"
 #include "texrow.h"
 
 #include "support/LAssert.h"
diff --git a/src/rowpainter.C b/src/rowpainter.C
index 7801f9115b..75ee4ee865 100644
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -12,28 +12,22 @@
 #include <config.h>
 
 #include "frontends/Painter.h"
-#include "frontends/screen.h"
 #include "frontends/font_metrics.h"
 #include "support/LAssert.h"
-#include "paragraph.h"
 #include "paragraph_funcs.h"
 #include "support/textutils.h"
 
 #include "insets/insettext.h"
 #include "ParagraphParameters.h"
-#include "debug.h"
 #include "BufferView.h"
 #include "buffer.h"
 #include "gettext.h"
 #include "language.h"
 #include "encoding.h"
-#include "lyxtext.h"
 #include "rowpainter.h"
-#include "lyxrc.h"
 #include "lyxrow_funcs.h"
 #include "metricsinfo.h"
 
-#include <algorithm>
 
 using namespace lyx::support;
 
diff --git a/src/sgml.h b/src/sgml.h
index 7c34f5965b..d3377e77df 100644
--- a/src/sgml.h
+++ b/src/sgml.h
@@ -13,8 +13,9 @@
 #ifndef SGML_H
 #define SGML_H
 
-#include "LString.h"
+#include "paragraph.h"
 
+#include "LString.h"
 #include <algorithm>
 #include <iosfwd>
 
diff --git a/src/tabular.C b/src/tabular.C
index 10e0b797ae..ddc87639bf 100644
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -22,24 +22,15 @@
 #include "Lsstream.h"
 #include "buffer.h"
 #include "debug.h"
-#include "gettext.h"
 #include "lyxlex.h"
-#include "vspace.h"
 
 #include "insets/insettabular.h"
-#include "insets/insettext.h"
 
 #include "support/LAssert.h"
-#include "support/LIstream.h"
 #include "support/lstrings.h"
-#include "support/lyxmanip.h"
 #include "support/tostr.h"
 
-#include "frontends/Alert.h"
-#include "frontends/Painter.h"
 
-#include <algorithm>
-#include <cstdlib>
 
 using namespace lyx::support;
 
diff --git a/src/tex-accent.C b/src/tex-accent.C
index f1fd6eb9ab..7ff220d6f2 100644
--- a/src/tex-accent.C
+++ b/src/tex-accent.C
@@ -11,9 +11,7 @@
 
 #include <config.h>
 
-#include <cstdlib>
 #include "tex-accent.h"
-#include "lfuns.h"
 #include "support/tostr.h"
 
 /* the names used by TeX and XWindows for deadkeys/accents are not the same
diff --git a/src/tex-strings.C b/src/tex-strings.C
index 00e9e1d197..bc47fec4b6 100644
--- a/src/tex-strings.C
+++ b/src/tex-strings.C
@@ -13,6 +13,7 @@
 
 #include "tex-strings.h"
 
+
 // this file should perhaps be split into even smaller parts
 
 char const * string_paragraph_separation[3] = {
diff --git a/src/texrow.C b/src/texrow.C
index de53933d2d..9b760772e2 100644
--- a/src/texrow.C
+++ b/src/texrow.C
@@ -15,7 +15,6 @@
 #include "texrow.h"
 #include "debug.h"
 
-#include <algorithm>
 
 using std::find_if;
 using std::endl;
diff --git a/src/text.C b/src/text.C
index 26460846e8..dc4974a288 100644
--- a/src/text.C
+++ b/src/text.C
@@ -17,21 +17,13 @@
 #include <config.h>
 
 #include "lyxtext.h"
-#include "paragraph.h"
 #include "gettext.h"
-#include "bufferparams.h"
 #include "buffer.h"
 #include "debug.h"
-#include "intl.h"
-#include "lyxrc.h"
 #include "encoding.h"
 #include "funcrequest.h"
 #include "frontends/LyXView.h"
-#include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
-#include "frontends/screen.h"
-#include "frontends/WorkArea.h"
-#include "bufferview_funcs.h"
 #include "BufferView.h"
 #include "language.h"
 #include "ParagraphParameters.h"
@@ -41,7 +33,6 @@
 #include "paragraph_funcs.h"
 #include "rowpainter.h"
 #include "lyxrow_funcs.h"
-#include "metricsinfo.h"
 
 #include "insets/insettext.h"
 
@@ -49,7 +40,6 @@
 #include "support/LAssert.h"
 #include "support/lstrings.h"
 
-#include <algorithm>
 
 using namespace lyx::support;
 
diff --git a/src/text2.C b/src/text2.C
index b1318017c1..c90856b8d6 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -20,20 +20,15 @@
 #include <config.h>
 
 #include "lyxtext.h"
-#include "LString.h"
 #include "Lsstream.h"
-#include "paragraph.h"
 #include "funcrequest.h"
 #include "frontends/LyXView.h"
 #include "undo_funcs.h"
 #include "buffer.h"
 #include "buffer_funcs.h"
-#include "bufferparams.h"
-#include "errorlist.h"
 #include "gettext.h"
 #include "BufferView.h"
 #include "CutAndPaste.h"
-#include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
 #include "debug.h"
 #include "lyxrc.h"
@@ -57,7 +52,6 @@
 
 #include <boost/tuple/tuple.hpp>
 
-#include <algorithm>
 
 using namespace lyx::support;
 
diff --git a/src/text3.C b/src/text3.C
index 14c40bd71f..5f6b325f1a 100644
--- a/src/text3.C
+++ b/src/text3.C
@@ -16,38 +16,29 @@
 #include <config.h>
 
 #include "lyxtext.h"
-#include "paragraph.h"
 #include "BufferView.h"
 #include "funcrequest.h"
 #include "lyxrc.h"
 #include "Lsstream.h"
 #include "debug.h"
-#include "bufferparams.h"
 #include "buffer.h"
-#include "bufferview_funcs.h"
 #include "ParagraphParameters.h"
 #include "gettext.h"
 #include "factory.h"
 #include "intl.h"
-#include "box.h"
 #include "language.h"
 #include "support/tostr.h"
 #include "support/lstrings.h"
 #include "support/LAssert.h"
 #include "frontends/LyXView.h"
-#include "frontends/screen.h"
 #include "frontends/Dialogs.h"
 #include "insets/insetspecialchar.h"
 #include "insets/insettext.h"
-#include "insets/insetquotes.h"
 #include "insets/insetcommand.h"
 #include "insets/insetnewline.h"
 #include "undo_funcs.h"
 #include "text_funcs.h"
-#include "Lsstream.h"
 
-#include <ctime>
-#include <clocale>
 
 using namespace lyx::support;
 using namespace bv_funcs;
diff --git a/src/text_funcs.C b/src/text_funcs.C
index 5640f9e324..81c3c2e62d 100644
--- a/src/text_funcs.C
+++ b/src/text_funcs.C
@@ -14,11 +14,9 @@
 
 #include <config.h>
 
+#include "text_funcs.h"
 #include "debug.h"
 #include "lyxcursor.h"
-#include "ParagraphList.h"
-
-#include "support/types.h"
 
 #include <boost/next_prior.hpp>
 
diff --git a/src/toc.C b/src/toc.C
index 5131554009..52d435d9a3 100644
--- a/src/toc.C
+++ b/src/toc.C
@@ -15,8 +15,6 @@
 #include "buffer.h"
 #include "funcrequest.h"
 #include "LyXAction.h"
-#include "paragraph.h"
-#include "debug.h"
 #include "iterators.h"
 
 #include "insets/insetfloat.h"
diff --git a/src/trans.C b/src/trans.C
index cbc0bc1a9e..0ee9434956 100644
--- a/src/trans.C
+++ b/src/trans.C
@@ -14,7 +14,6 @@
 #include "trans.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "tex-strings.h"
 #include "lyxlex.h"
 #include "debug.h"
 #include "trans_mgr.h"
diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index e8930f9235..6a9abf437d 100644
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -14,12 +14,8 @@
 #include "trans_mgr.h"
 #include "trans.h"
 #include "lyxtext.h"
-#include "LString.h"
 #include "debug.h"
-#include "chset.h"
 #include "insets/insetlatexaccent.h"
-#include "BufferView.h"
-#include "buffer.h"
 #include "lyxrc.h"
 #include "support/lstrings.h"
 
diff --git a/src/undo_funcs.C b/src/undo_funcs.C
index 9fbef8b6bc..9ee335d59a 100644
--- a/src/undo_funcs.C
+++ b/src/undo_funcs.C
@@ -20,9 +20,6 @@
 #include "BufferView.h"
 #include "buffer.h"
 #include "insets/updatableinset.h"
-#include "insets/insettext.h"
-#include "debug.h"
-#include "support/LAssert.h"
 #include "iterators.h"
 
 
diff --git a/src/vc-backend.C b/src/vc-backend.C
index de5b6d93d6..9e227b58ce 100644
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -13,8 +13,6 @@
 #include "vc-backend.h"
 #include "debug.h"
 #include "buffer.h"
-#include "frontends/LyXView.h"
-#include "funcrequest.h"
 
 #include "support/FileInfo.h"
 #include "support/path.h"
diff --git a/src/vspace.C b/src/vspace.C
index 89b18dd6e3..2fe08c4e1b 100644
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -13,14 +13,11 @@
 #include "vspace.h"
 #include "lengthcommon.h"
 #include "buffer.h"
-#include "lyxrc.h"
 #include "BufferView.h"
 #include "lyxtext.h"
-#include "support/LAssert.h"
 
 #include "support/lstrings.h"
 
-#include <cstdio>
 
 using namespace lyx::support;