diff --git a/src/frontends/controllers/ButtonController.C b/src/frontends/controllers/ButtonController.C
index 93125e789c..2eadabf6d5 100644
--- a/src/frontends/controllers/ButtonController.C
+++ b/src/frontends/controllers/ButtonController.C
@@ -13,7 +13,6 @@
 #include "ButtonController.h"
 #include "BCView.h"
 #include "support/LAssert.h"
-#include "debug.h"
 
 using namespace lyx::support;
 
diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 34536819bd..fea3de36d4 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,6 +1,7 @@
 2003-09-05  Angus Leeming  <leeming@lyx.org>
 
 	* GUI.h: ensure that the header file can be compiled stand-alone.
+	* *.C: strip out redundant #includes. (49 in total.)
 
 2003-08-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
diff --git a/src/frontends/controllers/ControlAboutlyx.C b/src/frontends/controllers/ControlAboutlyx.C
index 642892bcb1..b75e724064 100644
--- a/src/frontends/controllers/ControlAboutlyx.C
+++ b/src/frontends/controllers/ControlAboutlyx.C
@@ -17,7 +17,6 @@
 #include "version.h"
 #include "Lsstream.h"
 
-#include "support/LOstream.h"
 #include "support/filetools.h" // FileSearch
 #include "support/path_defines.h"
 
diff --git a/src/frontends/controllers/ControlBibtex.C b/src/frontends/controllers/ControlBibtex.C
index feb5a15cfc..29f4994ee6 100644
--- a/src/frontends/controllers/ControlBibtex.C
+++ b/src/frontends/controllers/ControlBibtex.C
@@ -13,7 +13,6 @@
 #include <config.h>
 
 #include "ControlBibtex.h"
-#include "Kernel.h"
 
 #include "lyxrc.h"
 #include "helper_funcs.h"
diff --git a/src/frontends/controllers/ControlBranch.C b/src/frontends/controllers/ControlBranch.C
index ef0ed85970..2b66b77bba 100644
--- a/src/frontends/controllers/ControlBranch.C
+++ b/src/frontends/controllers/ControlBranch.C
@@ -14,7 +14,6 @@
 #include "ControlBranch.h"
 #include "funcrequest.h"
 #include "insets/insetbranch.h"
-#include "debug.h"
 
 ControlBranch::ControlBranch(Dialog & parent)
 	: Dialog::Controller(parent)
diff --git a/src/frontends/controllers/ControlButtons.C b/src/frontends/controllers/ControlButtons.C
index e33eabfe5e..b5205a2af5 100644
--- a/src/frontends/controllers/ControlButtons.C
+++ b/src/frontends/controllers/ControlButtons.C
@@ -14,7 +14,6 @@
 #include "ControlButtons.h"
 #include "ButtonController.h"
 #include "BCView.h"
-#include "ViewBase.h"
 #include "lyxrc.h"
 #include "support/LAssert.h"
 
diff --git a/src/frontends/controllers/ControlChanges.C b/src/frontends/controllers/ControlChanges.C
index 5690ad30ae..e289ace329 100644
--- a/src/frontends/controllers/ControlChanges.C
+++ b/src/frontends/controllers/ControlChanges.C
@@ -15,7 +15,6 @@
 #include "BufferView.h"
 #include "funcrequest.h"
 #include "lyxfind.h"
-#include "author.h"
 #include "support/lstrings.h"
 
 using namespace lyx::support;
diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C
index 718d67d0b7..f0ab82cbae 100644
--- a/src/frontends/controllers/ControlCharacter.C
+++ b/src/frontends/controllers/ControlCharacter.C
@@ -16,7 +16,6 @@
 #include "buffer.h"
 #include "bufferview_funcs.h"
 #include "funcrequest.h"
-#include "gettext.h"
 #include "language.h"
 
 using namespace bv_funcs;
diff --git a/src/frontends/controllers/ControlCitation.C b/src/frontends/controllers/ControlCitation.C
index 9a741df9a3..f7faddd2a4 100644
--- a/src/frontends/controllers/ControlCitation.C
+++ b/src/frontends/controllers/ControlCitation.C
@@ -11,7 +11,6 @@
 #include <config.h>
 
 #include "ControlCitation.h"
-#include "Kernel.h"
 
 #include "buffer.h"
 
diff --git a/src/frontends/controllers/ControlCommand.C b/src/frontends/controllers/ControlCommand.C
index 07a0408e93..8290fda9ce 100644
--- a/src/frontends/controllers/ControlCommand.C
+++ b/src/frontends/controllers/ControlCommand.C
@@ -11,7 +11,6 @@
 #include <config.h>
 
 #include "ControlCommand.h"
-#include "Kernel.h"
 
 #include "funcrequest.h"
 #include "insets/insetcommand.h"
diff --git a/src/frontends/controllers/ControlCommandBuffer.C b/src/frontends/controllers/ControlCommandBuffer.C
index c43b9c88c2..6d937ab92e 100644
--- a/src/frontends/controllers/ControlCommandBuffer.C
+++ b/src/frontends/controllers/ControlCommandBuffer.C
@@ -14,7 +14,6 @@
 
 #include "ControlCommandBuffer.h"
 #include "bufferview_funcs.h"
-#include "debug.h"
 #include "lyxfunc.h"
 #include "LyXAction.h"
 #include "frontends/LyXView.h"
diff --git a/src/frontends/controllers/ControlDocument.C b/src/frontends/controllers/ControlDocument.C
index bb39333e48..f4bbd8c347 100644
--- a/src/frontends/controllers/ControlDocument.C
+++ b/src/frontends/controllers/ControlDocument.C
@@ -15,15 +15,11 @@
 #include "ViewBase.h"
 
 #include "gettext.h"
-#include "lyxfind.h"
 
 #include "buffer.h"
 #include "buffer_funcs.h"
-#include "errorlist.h"
 #include "iterators.h"
 #include "language.h"
-#include "lyx_main.h"
-#include "lyxtextclass.h"
 #include "lyxtextclasslist.h"
 #include "CutAndPaste.h"
 
@@ -31,7 +27,6 @@
 #include "frontends/Alert.h"
 
 #include "support/LAssert.h"
-#include "support/lstrings.h"
 #include "support/filetools.h"
 #include "support/path_defines.h"
 
diff --git a/src/frontends/controllers/ControlErrorList.C b/src/frontends/controllers/ControlErrorList.C
index 248006169e..b63d0d0ad7 100644
--- a/src/frontends/controllers/ControlErrorList.C
+++ b/src/frontends/controllers/ControlErrorList.C
@@ -14,10 +14,8 @@
 #include "buffer.h"
 #include "BufferView.h"
 #include "debug.h"
-#include "errorlist.h"
 #include "iterators.h"
 #include "lyxtext.h"
-#include "support/lstrings.h" // tostr
 
 
 using std::endl;
diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C
index 5097b18d25..9e0c27f1e7 100644
--- a/src/frontends/controllers/ControlExternal.C
+++ b/src/frontends/controllers/ControlExternal.C
@@ -13,7 +13,6 @@
 #include <config.h>
 
 #include "ControlExternal.h"
-#include "buffer.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "helper_funcs.h"
@@ -22,7 +21,6 @@
 #include "insets/ExternalTemplate.h"
 
 #include "support/LAssert.h"
-#include <vector>
 
 using namespace lyx::support;
 using std::vector;
diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C
index 4133c5b958..66eb79e5b4 100644
--- a/src/frontends/controllers/ControlGraphics.C
+++ b/src/frontends/controllers/ControlGraphics.C
@@ -15,7 +15,6 @@
 
 #include "helper_funcs.h"
 
-#include "BufferView.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "lyxrc.h"
@@ -25,7 +24,6 @@
 #include "graphics/GraphicsImage.h"
 
 #include "insets/insetgraphics.h"
-#include "insets/insetgraphicsParams.h"
 
 #include "support/tostr.h"
 #include "support/filetools.h"
diff --git a/src/frontends/controllers/ControlMath.C b/src/frontends/controllers/ControlMath.C
index a3921e1da7..bcd4d2575b 100644
--- a/src/frontends/controllers/ControlMath.C
+++ b/src/frontends/controllers/ControlMath.C
@@ -11,7 +11,6 @@
 #include <config.h>
 
 #include "ControlMath.h"
-#include "Kernel.h"
 #include "debug.h"
 #include "funcrequest.h"
 
diff --git a/src/frontends/controllers/ControlNote.C b/src/frontends/controllers/ControlNote.C
index a7daab33ec..21247d8557 100644
--- a/src/frontends/controllers/ControlNote.C
+++ b/src/frontends/controllers/ControlNote.C
@@ -13,7 +13,6 @@
 #include "ControlNote.h"
 #include "funcrequest.h"
 #include "insets/insetnote.h"
-#include "debug.h"
 #include "gettext.h"
 
 
diff --git a/src/frontends/controllers/ControlPrefs.C b/src/frontends/controllers/ControlPrefs.C
index 8a0b6d593a..a784dcb930 100644
--- a/src/frontends/controllers/ControlPrefs.C
+++ b/src/frontends/controllers/ControlPrefs.C
@@ -10,30 +10,32 @@
 
 #include <config.h>
 
-
-#include <utility>
-
 #include "ControlPrefs.h"
+
+#include "helper_funcs.h"
 #include "ViewBase.h"
 
-#include "frontends/LyXView.h"
 #include "bufferlist.h"
-#include "helper_funcs.h"
-#include "gettext.h"
-#include "support/filetools.h"
-#include "support/path_defines.h"
-#include "frontends/Dialogs.h"
 #include "converter.h"
 #include "format.h"
-#include "debug.h"
+#include "gettext.h"
 
-extern BufferList bufferlist;
+#include "frontends/Dialogs.h"
+#include "frontends/LyXView.h"
+
+#include "support/filetools.h"
+#include "support/path_defines.h"
+
+#include <utility>
 
 using namespace lyx::support;
 
 using std::endl;
 using std::pair;
 
+
+extern BufferList bufferlist;
+
 ControlPrefs::ControlPrefs(LyXView & lv, Dialogs & d)
 	: ControlDialogBI(lv, d)
 {}
diff --git a/src/frontends/controllers/ControlPrint.C b/src/frontends/controllers/ControlPrint.C
index 456998b2a3..f848c79df4 100644
--- a/src/frontends/controllers/ControlPrint.C
+++ b/src/frontends/controllers/ControlPrint.C
@@ -16,7 +16,6 @@
 #include "ButtonController.h"
 
 #include "buffer.h"
-#include "bufferparams.h"
 #include "gettext.h"
 #include "helper_funcs.h"
 #include "PrinterParams.h"
@@ -25,7 +24,6 @@
 #include "frontends/Alert.h"
 
 #include "support/tostr.h"
-#include "support/LAssert.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/systemcall.h"
diff --git a/src/frontends/controllers/ControlRef.C b/src/frontends/controllers/ControlRef.C
index 23c57b569a..53b0806f33 100644
--- a/src/frontends/controllers/ControlRef.C
+++ b/src/frontends/controllers/ControlRef.C
@@ -12,7 +12,6 @@
 
 
 #include "ControlRef.h"
-#include "lyxfunc.h"
 #include "buffer.h"
 #include "bufferlist.h"
 #include "funcrequest.h"
diff --git a/src/frontends/controllers/ControlSendto.C b/src/frontends/controllers/ControlSendto.C
index f39e2ab04e..e23e78bb9b 100644
--- a/src/frontends/controllers/ControlSendto.C
+++ b/src/frontends/controllers/ControlSendto.C
@@ -17,7 +17,6 @@
 #include "converter.h"
 #include "format.h"
 #include "exporter.h"
-#include "gettext.h"
 #include "lyxrc.h"
 
 #include "support/filetools.h"
diff --git a/src/frontends/controllers/ControlSpellchecker.C b/src/frontends/controllers/ControlSpellchecker.C
index eee37433f1..0281739638 100644
--- a/src/frontends/controllers/ControlSpellchecker.C
+++ b/src/frontends/controllers/ControlSpellchecker.C
@@ -17,7 +17,6 @@
 #include "gettext.h"
 #include "language.h"
 #include "lyxrc.h"
-#include "lyxtext.h"
 #include "debug.h"
 
 #include "ispell.h"
diff --git a/src/frontends/controllers/ControlToc.C b/src/frontends/controllers/ControlToc.C
index 9cb83315fc..2cc312980d 100644
--- a/src/frontends/controllers/ControlToc.C
+++ b/src/frontends/controllers/ControlToc.C
@@ -11,7 +11,6 @@
 #include <config.h>
 
 #include "ControlToc.h"
-#include "support/lstrings.h" // tostr
 
 using std::vector;
 
diff --git a/src/frontends/controllers/ControlWrap.C b/src/frontends/controllers/ControlWrap.C
index 89a5b0625c..8e3e562a8e 100644
--- a/src/frontends/controllers/ControlWrap.C
+++ b/src/frontends/controllers/ControlWrap.C
@@ -12,7 +12,6 @@
 
 #include "ControlWrap.h"
 #include "funcrequest.h"
-#include "lyxlength.h"
 #include "insets/insetwrap.h"
 
 
diff --git a/src/frontends/controllers/Dialog.C b/src/frontends/controllers/Dialog.C
index 075bc79703..a97386b45a 100644
--- a/src/frontends/controllers/Dialog.C
+++ b/src/frontends/controllers/Dialog.C
@@ -14,7 +14,6 @@
 
 #include "ButtonController.h"
 #include "BCView.h"
-#include "debug.h"
 #include "support/LAssert.h"
 
 using namespace lyx::support;
diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C
index 74b1a293ec..b700805e5b 100644
--- a/src/frontends/controllers/biblio.C
+++ b/src/frontends/controllers/biblio.C
@@ -15,17 +15,12 @@
 
 #include "Lsstream.h"
 #include "gettext.h" // for _()
-#include "helper_funcs.h"
-#include "Lsstream.h"
-#include "LString.h"
 
 #include "support/lstrings.h"
 #include "support/LAssert.h"
 
 #include <boost/regex.hpp>
 
-#include <algorithm>
-
 using namespace lyx::support;
 
 using std::vector;
diff --git a/src/frontends/controllers/character.C b/src/frontends/controllers/character.C
index 9e5ead897d..1d32dfa406 100644
--- a/src/frontends/controllers/character.C
+++ b/src/frontends/controllers/character.C
@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <vector>
 
 
 #include "gettext.h"
diff --git a/src/frontends/controllers/frnt_lang.C b/src/frontends/controllers/frnt_lang.C
index 575918e154..4be8a20cd7 100644
--- a/src/frontends/controllers/frnt_lang.C
+++ b/src/frontends/controllers/frnt_lang.C
@@ -14,8 +14,6 @@
 #include "frnt_lang.h"
 #include "gettext.h"
 #include "language.h"
-#include <iostream>
-#include <algorithm>
 
 using std::vector;
 
diff --git a/src/frontends/controllers/helper_funcs.C b/src/frontends/controllers/helper_funcs.C
index 23c4295e85..14b3aa278f 100644
--- a/src/frontends/controllers/helper_funcs.C
+++ b/src/frontends/controllers/helper_funcs.C
@@ -8,24 +8,23 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#include <vector>
-
 
 #include <config.h>
-#include "LString.h"
+
 #include "helper_funcs.h"
 
-#include "frontends/FileDialog.h"
-#include "support/filetools.h" // OnlyPath, OnlyFilename
-#include "support/lstrings.h"
-#include "gettext.h" // _()
+#include "gettext.h"
+
 #include "frontends/Alert.h"
+#include "frontends/FileDialog.h"
+
+#include "support/filetools.h" // OnlyPath, OnlyFilename
 
 using namespace lyx::support;
 
+using std::make_pair;
 using std::pair;
 using std::vector;
-using std::make_pair;
 
 
 string const browseFile(string const & filename,
diff --git a/src/frontends/controllers/tex_helpers.C b/src/frontends/controllers/tex_helpers.C
index a9e4614c45..e9e106bf0c 100644
--- a/src/frontends/controllers/tex_helpers.C
+++ b/src/frontends/controllers/tex_helpers.C
@@ -13,7 +13,6 @@
 #include "tex_helpers.h"
 
 #include "debug.h"
-#include "gettext.h"
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
@@ -23,9 +22,7 @@
 #include "support/path_defines.h"
 
 #include <boost/cregex.hpp>
-#include <vector>
 #include <fstream>
-#include <algorithm>
 
 using namespace lyx::support;