diff --git a/sourcedoc/Doxyfile.in b/sourcedoc/Doxyfile.in
index fa87892325..119f4fe2a3 100644
--- a/sourcedoc/Doxyfile.in
+++ b/sourcedoc/Doxyfile.in
@@ -45,7 +45,7 @@ OUTPUT_LANGUAGE        = English
 # Private class members and static file members will be hidden unless 
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES 
 
-EXTRACT_ALL            = NO
+EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
 # will be included in the documentation. 
@@ -121,12 +121,12 @@ CLASS_DIAGRAMS         = YES
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will 
 # be generated. Documented entities will be cross-referenced with these sources. 
 
-SOURCE_BROWSER         = NO
+SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body 
 # of functions and classes directly in the documentation. 
 
-INLINE_SOURCES         = NO
+INLINE_SOURCES         = YES
 
 # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
 # doxygen to hide any special comment blocks from generated source code 
@@ -307,7 +307,7 @@ INPUT_FILTER           =
 # of all compounds will be generated. Enable this if the project 
 # contains a lot of classes, structs, unions or interfaces. 
 
-ALPHABETICAL_INDEX     = NO
+ALPHABETICAL_INDEX     = YES
 
 # If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
@@ -591,7 +591,7 @@ PERL_PATH              = /usr/bin/perl
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section 
 # have no effect if this option is set to NO (the default) 
 
-HAVE_DOT               = NO
+HAVE_DOT               = YES
 
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
@@ -636,7 +636,7 @@ DOT_PATH               =
 # the specified constraint. Beware that most browsers cannot cope with very 
 # large images. 
 
-MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_WIDTH    = 1280
 
 # The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
 # (in pixels) of the graphs generated by dot. If a graph becomes larger than 
@@ -644,7 +644,7 @@ MAX_DOT_GRAPH_WIDTH    = 1024
 # the specified constraint. Beware that most browsers cannot cope with very 
 # large images. 
 
-MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_HEIGHT   = 2000
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to the search engine   
diff --git a/src/BufferView2.C b/src/BufferView2.C
index 6af288a3ab..6509b06845 100644
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -31,6 +31,7 @@
 #include "language.h"
 #include "gettext.h"
 #include "undo_funcs.h"
+#include "debug.h"
 
 extern BufferList bufferlist;
 
diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 814579da78..79205be07d 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -17,6 +17,7 @@
 #include "LyXView.h"
 #include "commandtags.h"
 #include "lyxfunc.h"
+#include "debug.h"
 #include "font.h"
 #include "bufferview_funcs.h"
 #include "TextCache.h"
@@ -25,6 +26,7 @@
 #include "lyxrc.h"
 #include "intl.h"
 #include "support/LAssert.h"
+#include "support/lstrings.h"
 #include "frontends/Dialogs.h"
 #include "insets/insetbib.h"
 #include "insets/insettext.h"
diff --git a/src/Bullet.C b/src/Bullet.C
index b244035321..9e4c5389c0 100644
--- a/src/Bullet.C
+++ b/src/Bullet.C
@@ -19,6 +19,7 @@
 #endif
 
 #include "Bullet.h"
+#include "support/LAssert.h"
 
 /** The four LaTeX itemize environment default bullets
  */
@@ -52,6 +53,104 @@ Bullet::Bullet(int f, int c, int s)
 }
 
 
+
+Bullet::Bullet(string const & t) 
+	:  font(MIN), character(MIN), size(MIN), user_text(1), text(t)
+{
+#ifdef ENABLE_ASSERTIONS
+	testInvariant();
+#endif
+}
+
+
+void Bullet::setCharacter(int c)
+{
+	if (c < MIN || c >= CHARMAX) {
+		character = MIN;
+	} else {
+		character = c;
+	}
+	user_text = 0;
+#ifdef ENABLE_ASSERTIONS
+	testInvariant();
+#endif
+}
+
+
+void Bullet::setFont(int f)
+{
+	if (f < MIN || f >= FONTMAX) {
+		font = MIN;
+	} else {
+		font = f;
+	}
+	user_text = 0;
+#ifdef ENABLE_ASSERTIONS
+	testInvariant();
+#endif
+}
+
+
+void Bullet::setSize(int s)
+{
+	if (s < MIN || s >= SIZEMAX) {
+		size = MIN;
+	} else {
+		size = s;
+	}
+	user_text = 0;
+#ifdef ENABLE_ASSERTIONS
+	testInvariant();
+#endif
+}
+
+
+void Bullet::setText(string const & t)
+{
+	font = character = size = MIN;
+	user_text = 1;
+	text = t;
+#ifdef ENABLE_ASSERTIONS
+	testInvariant();
+#endif
+}
+
+
+int Bullet::getCharacter() const
+{
+	return character;
+}
+
+
+int Bullet::getFont() const
+{
+	return font;
+}
+
+
+int Bullet::getSize() const
+{
+	return size;
+}
+
+
+Bullet & Bullet::operator=(Bullet const & b)
+{
+#ifdef ENABLE_ASSERTIONS
+	b.testInvariant();
+#endif
+	font = b.font;
+	character = b.character;
+	size = b.size;
+	user_text = b.user_text;
+	text = b.text;
+#ifdef ENABLE_ASSERTIONS
+	this->testInvariant();
+#endif
+	return *this;
+}
+
+
 string const & Bullet::getText() const
 {
 	if (user_text == 0) {
@@ -267,3 +366,28 @@ string const Bullet::bulletEntry(short int f, short int c)
 
 	return BulletPanels[f][c];
 }
+
+#ifdef ENABLE_ASSERTIONS
+void Bullet::testInvariant() const {
+	lyx::Assert(font >= MIN);
+	lyx::Assert(font < FONTMAX);
+	lyx::Assert(character >= MIN);
+	lyx::Assert(character < CHARMAX);
+	lyx::Assert(size >= MIN);
+	lyx::Assert(size < SIZEMAX);
+	lyx::Assert(user_text >= -1);
+	lyx::Assert(user_text <= 1);
+	// now some relational/operational tests
+	if (user_text == 1) {
+		lyx::Assert(font == -1 && (character == -1 && size == -1));
+		//        Assert(!text.empty()); // this isn't necessarily an error
+	}
+	//      else if (user_text == -1) {
+	//        Assert(!text.empty()); // this also isn't necessarily an error
+	//      }
+	//      else {
+	//        // user_text == 0
+	//        Assert(text.empty()); // not usually true
+	//      }
+}
+#endif
diff --git a/src/Bullet.h b/src/Bullet.h
index 455809973e..547d7d1989 100644
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -21,8 +21,6 @@
 
 #include "LString.h"
 
-#include "support/LAssert.h"
-
 ///
 class Bullet {
 public:
@@ -55,28 +53,7 @@ public:
 protected:
 #ifdef ENABLE_ASSERTIONS
 	///
-	void testInvariant() const {
-		lyx::Assert(font >= MIN);
-		lyx::Assert(font < FONTMAX);
-		lyx::Assert(character >= MIN);
-		lyx::Assert(character < CHARMAX);
-		lyx::Assert(size >= MIN);
-		lyx::Assert(size < SIZEMAX);
-		lyx::Assert(user_text >= -1);
-		lyx::Assert(user_text <= 1);
-		// now some relational/operational tests
-		if (user_text == 1) {
-			lyx::Assert(font == -1 && (character == -1 && size == -1));
-		       	//        Assert(!text.empty()); // this isn't necessarily an error
-		}
-		//      else if (user_text == -1) {
-		//        Assert(!text.empty()); // this also isn't necessarily an error
-		//      }
-		//      else {
-		//        // user_text == 0
-		//        Assert(text.empty()); // not usually true
-		//      }
-	}
+	void testInvariant() const;
 #endif
 private:
 	/**
@@ -132,115 +109,6 @@ private:
 };
 
 
-/*----------------Inline Bullet Member Functions------------------*/
-
-inline
-Bullet::Bullet(string const & t) 
-	:  font(MIN), character(MIN), size(MIN), user_text(1), text(t)
-{
-#ifdef ENABLE_ASSERTIONS
-	testInvariant();
-#endif
-}
-
-
-inline
-void Bullet::setCharacter(int c)
-{
-	if (c < MIN || c >= CHARMAX) {
-		character = MIN;
-	} else {
-		character = c;
-	}
-	user_text = 0;
-#ifdef ENABLE_ASSERTIONS
-	testInvariant();
-#endif
-}
-
-
-inline
-void Bullet::setFont(int f)
-{
-	if (f < MIN || f >= FONTMAX) {
-		font = MIN;
-	} else {
-		font = f;
-	}
-	user_text = 0;
-#ifdef ENABLE_ASSERTIONS
-	testInvariant();
-#endif
-}
-
-
-inline
-void Bullet::setSize(int s)
-{
-	if (s < MIN || s >= SIZEMAX) {
-		size = MIN;
-	} else {
-		size = s;
-	}
-	user_text = 0;
-#ifdef ENABLE_ASSERTIONS
-	testInvariant();
-#endif
-}
-
-
-inline
-void Bullet::setText(string const & t)
-{
-	font = character = size = MIN;
-	user_text = 1;
-	text = t;
-#ifdef ENABLE_ASSERTIONS
-	testInvariant();
-#endif
-}
-
-
-inline
-int Bullet::getCharacter() const
-{
-	return character;
-}
-
-
-inline
-int Bullet::getFont() const
-{
-	return font;
-}
-
-
-inline
-int Bullet::getSize() const
-{
-	return size;
-}
-
-
-inline
-Bullet & Bullet::operator=(Bullet const & b)
-{
-#ifdef ENABLE_ASSERTIONS
-	b.testInvariant();
-#endif
-	font = b.font;
-	character = b.character;
-	size = b.size;
-	user_text = b.user_text;
-	text = b.text;
-#ifdef ENABLE_ASSERTIONS
-	this->testInvariant();
-#endif
-	return *this;
-}
-
-/*-----------------End Bullet Member Functions-----------------*/
-
 inline
 bool operator!=(Bullet const & b1, Bullet const & b2)
 {
diff --git a/src/ChangeLog b/src/ChangeLog
index 7a3cf1e25a..6eebafc324 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-29  Asger Alstrup Nielsen  <alstrup@alstrup>
+
+	* *: Reduced header file dependencies all over.
+
 2001-07-30  Baruch Even  <baruch@lyx.org>
 
 	* buffer.C (readInset): Stop auto-converting InsetFig to InsetGraphics.
diff --git a/src/DepTable.C b/src/DepTable.C
index 906b1f236e..7426d1eb4d 100644
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -21,6 +21,7 @@
 #include "support/lyxlib.h"
 #include "support/filetools.h"
 #include <fstream>
+#include "debug.h"
 
 using std::make_pair;
 using std::ofstream;
diff --git a/src/FontInfo.C b/src/FontInfo.C
index 43aa03c577..b27ed69246 100644
--- a/src/FontInfo.C
+++ b/src/FontInfo.C
@@ -19,6 +19,7 @@
 #include "debug.h"
 #include "lyxrc.h"	// lyxrc.use_scalable_fonts
 #include "support/lstrings.h"
+#include "support/lyxlib.h"
 #include "frontends/GUIRunTime.h"
 
 using std::endl;
diff --git a/src/LColor.h b/src/LColor.h
index 1799d3f4c9..a0fbe0d42f 100644
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -18,7 +18,6 @@
 #include <map>
 
 #include "LString.h"
-#include <boost/utility.hpp>
 
 /**
   This is a stateless class. 
diff --git a/src/LyXSendto.C b/src/LyXSendto.C
index e548bd26f6..f0d71077eb 100644
--- a/src/LyXSendto.C
+++ b/src/LyXSendto.C
@@ -10,6 +10,7 @@
 #include "buffer.h"
 #include "lyx_gui_misc.h"
 #include "support/syscall.h"
+#include "support/lstrings.h"
 #include "gettext.h"
 #include "bufferview_funcs.h"
 #include "exporter.h"
diff --git a/src/LyXView.h b/src/LyXView.h
index 71cb180007..40f44074ad 100644
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -12,7 +12,7 @@
 
 #include "LString.h"
 #include "frontends/Timeout.h"
-#include "layout.h"
+#include "layout.h" // Just for LyXTextClass::size_type (sic)
 
 class Buffer;
 class Toolbar;
diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 98f1539175..068f15f9f0 100644
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -15,6 +15,7 @@
 #pragma implementation
 #endif
 
+#include <algorithm>
 #include "MenuBackend.h"
 #include "lyxlex.h"
 #include "LyXAction.h"
diff --git a/src/TextCache.C b/src/TextCache.C
index d7bb5c54a2..6b3d9b4b83 100644
--- a/src/TextCache.C
+++ b/src/TextCache.C
@@ -21,6 +21,7 @@
 #include "TextCache.h"
 #include "buffer.h"
 #include "bufferlist.h"
+#include "debug.h"
 
 using std::ostream;
 using std::for_each;
diff --git a/src/bufferlist.C b/src/bufferlist.C
index 57f704e1cd..7cefba0ba0 100644
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -28,6 +28,7 @@
 #include "support/filetools.h"
 #include "support/lyxmanip.h"
 #include "support/lyxfunctional.h"
+#include "support/LAssert.h"
 #include "lyx_gui_misc.h"
 #include "lastfiles.h"
 #include "debug.h"
diff --git a/src/bufferlist.h b/src/bufferlist.h
index 198f46e552..8d1c31645c 100644
--- a/src/bufferlist.h
+++ b/src/bufferlist.h
@@ -18,8 +18,9 @@
 #pragma interface
 #endif
 
-#include "buffer.h"
-#include "debug.h"
+class Buffer;
+class UpdatableInset;
+#include <vector>
 #include <boost/utility.hpp>
 
 /** A class to hold all the buffers in a structure
diff --git a/src/commandtags.h b/src/commandtags.h
index b30196a406..2088b5e589 100644
--- a/src/commandtags.h
+++ b/src/commandtags.h
@@ -12,11 +12,6 @@
 
 #include <iosfwd>
 
-#if 1
-// For NO_LATEX
-#include "lyxfont.h"
-#endif
-
 /** These are all the lyxfunctions (as enums).
     Please add new functions at the end of the enum, right
     before LFUN_LASTACTION.
diff --git a/src/converter.C b/src/converter.C
index aa3fbe8d6b..f8bd6f4ba2 100644
--- a/src/converter.C
+++ b/src/converter.C
@@ -30,6 +30,7 @@
 #include "support/lyxfunctional.h"
 #include "gettext.h"
 #include "BufferView.h"
+#include "debug.h"
 
 using std::vector;
 using std::queue;
diff --git a/src/frontends/controllers/ControlDialogs.h b/src/frontends/controllers/ControlDialogs.h
index d749676ac5..2335eb2db8 100644
--- a/src/frontends/controllers/ControlDialogs.h
+++ b/src/frontends/controllers/ControlDialogs.h
@@ -49,7 +49,6 @@ protected:
 
 
 #include "LyXView.h"
-#include "BufferView.h"
 
 template <class Base>
 ControlDialog<Base>::ControlDialog(LyXView & lv, Dialogs & d)
diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C
index e1c0b2b8bf..73e5433df1 100644
--- a/src/frontends/controllers/ControlExternal.C
+++ b/src/frontends/controllers/ControlExternal.C
@@ -30,6 +30,7 @@
 #include "Liason.h"
 #include "LyXView.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 #include "frontends/FileDialog.h"
 #include "lyx_gui_misc.h" // WriteAlert
 #include "gettext.h"
diff --git a/src/frontends/controllers/ControlPreamble.C b/src/frontends/controllers/ControlPreamble.C
index b0f313c970..38b808f29e 100644
--- a/src/frontends/controllers/ControlPreamble.C
+++ b/src/frontends/controllers/ControlPreamble.C
@@ -22,6 +22,7 @@
 #include "Liason.h"
 #include "gettext.h"
 #include "BufferView.h"
+#include "support/LAssert.h"
 
 ControlPreamble::ControlPreamble(LyXView & lv, Dialogs & d)
 	: ControlDialog<ControlConnectBD>(lv, d),
diff --git a/src/frontends/controllers/ControlVCLog.C b/src/frontends/controllers/ControlVCLog.C
index ae24ffabcd..cc0ad7f779 100644
--- a/src/frontends/controllers/ControlVCLog.C
+++ b/src/frontends/controllers/ControlVCLog.C
@@ -28,6 +28,7 @@
 #include "LyXView.h"
 #include "Dialogs.h"
 #include "lyxrc.h"
+#include "support/lyxlib.h"
 
 using SigC::slot;
 using std::endl;
diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C
index de101ef053..5f427f8ac3 100644
--- a/src/frontends/xforms/Dialogs.C
+++ b/src/frontends/xforms/Dialogs.C
@@ -16,6 +16,7 @@
 #endif
 
 #include "Dialogs.h"
+#include "BufferView.h"
 
 #include "xformsBC.h"
 
diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index bc179e124c..7e865f23a2 100644
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -39,6 +39,7 @@
 #include "CutAndPaste.h"
 #include "bufferview_funcs.h"
 #include "xforms_helpers.h" 
+#include "debug.h"
 
 using Liason::setMinibuffer;
 using SigC::slot;
diff --git a/src/frontends/xforms/FormFiledialog.C b/src/frontends/xforms/FormFiledialog.C
index c43a2f049c..bcf77da0a0 100644
--- a/src/frontends/xforms/FormFiledialog.C
+++ b/src/frontends/xforms/FormFiledialog.C
@@ -24,6 +24,7 @@ using std::sort;
 #include "lyx_gui_misc.h" // for WriteFSAlert
 #include "support/FileInfo.h"
 #include "support/lyxlib.h"
+#include "support/lstrings.h"
 #include "gettext.h"
 #include "frontends/Dialogs.h"
 
diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 0f2a087a56..effd05d925 100644
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -37,6 +37,7 @@
 #include "combox.h"
 #include "debug.h"
 #include "support/filetools.h"
+#include "support/LAssert.h"
 #include "lyx_gui_misc.h" // idex, scex
 #include "lyxlex.h"
 #include "input_validators.h"
diff --git a/src/graphics/ImageLoader.C b/src/graphics/ImageLoader.C
index 5a75a3f14f..ab7450dd83 100644
--- a/src/graphics/ImageLoader.C
+++ b/src/graphics/ImageLoader.C
@@ -12,6 +12,7 @@
 #endif
 
 #include <config.h>
+#include "debug.h"
 #include "ImageLoader.h"
 #include "frontends/support/LyXImage.h"
 
diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index ece18587a1..56c9c8e189 100644
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -43,6 +43,7 @@
 #include <cstdlib>
 #include <cctype>
 #include <cmath>
+#include <cerrno>
 
 #include "figinset.h"
 #include "lyx_main.h"
diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 197c782f4c..6d6df151e7 100644
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -25,6 +25,7 @@
 #include "debug.h"
 #include "lyxtext.h"
 #include "font.h"
+#include "lyxlex.h"
 
 class LyXText;
 
diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index 47a7afdce1..cfa91cfe3f 100644
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -30,6 +30,7 @@
 #include "support/path.h"
 #include "support/syscall.h"
 #include "gettext.h"
+#include "debug.h"
 
 using std::endl;
 
diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index b8afb1cd24..9ebb7cc0fe 100644
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -25,6 +25,7 @@
 #include "support/lstrings.h"
 #include "debug.h"
 #include "gettext.h"
+#include "lyxlex.h"
 
 using std::ostream;
 using std::endl;
diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index fd4181bc6c..7d322c1bc2 100644
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -19,6 +19,7 @@
 #include "BufferView.h"
 #include "Painter.h"
 #include "font.h"
+#include "lyxlex.h"
 
 using std::ostream;
 using std::max;
diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index f720e670bd..09fe240b8e 100644
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -40,6 +40,7 @@
 #include "language.h"
 #include "BufferView.h"
 #include "undo_funcs.h"
+#include "support/LAssert.h"
 
 using std::ostream;
 using std::ifstream;
diff --git a/src/layout.h b/src/layout.h
index 55c15a8fd5..4b66dbbfcf 100644
--- a/src/layout.h
+++ b/src/layout.h
@@ -18,7 +18,7 @@
 #pragma interface
 #endif
 
-#include "lyxlex.h"
+class LyXLeX;
 #include "lyxfont.h"
 #include "Spacing.h"
 #include <boost/utility.hpp>
diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index c8b5566d2a..ff2c876a59 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -18,8 +18,10 @@
 #include "lyx_cb.h"
 #include "lyx_gui_misc.h"
 #include "lyx_main.h"
+#include "buffer.h"
 #include "bufferlist.h"
 #include "bufferview_funcs.h"
+#include "debug.h"
 #include "lastfiles.h"
 #include "LyXView.h"
 #include "lyxrc.h"
diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 27526090cb..6afd11fb58 100644
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -10,6 +10,7 @@
 
 #include <config.h>
 #include <cstdlib>
+#include <fcntl.h>
 
 #ifdef __GNUG__
 #pragma implementation
@@ -19,6 +20,7 @@
 #include FORMS_H_LOCATION
 #include "support/filetools.h"
 #include "support/os.h"
+#include "support/lyxlib.h"
 #include "figure_form.h"
 #include "print_form.h"
 #include "tex-strings.h"
diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C
index 479c2c394e..54adb94fe2 100644
--- a/src/lyx_gui_misc.C
+++ b/src/lyx_gui_misc.C
@@ -27,6 +27,7 @@
 #include "bufferview_funcs.h"
 #include "support/filetools.h"
 #include "lyxrc.h"
+#include "debug.h"
 
 using std::pair;
 using std::make_pair;
diff --git a/src/lyx_main.C b/src/lyx_main.C
index 8b2b75bf7d..ece5ba4fc8 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -26,6 +26,7 @@
 #include "lyxrc.h"
 #include "support/path.h"
 #include "support/filetools.h"
+#include "buffer.h"
 #include "bufferlist.h"
 #include "debug.h"
 #include "support/FileInfo.h"
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index bc964a50ca..e348b45eff 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -31,6 +31,7 @@
 #endif
 
 #include "support/lyxalgo.h"
+#include "support/LAssert.h"
 #include "version.h"
 #include "kbmap.h"
 #include "lyxfunc.h"
diff --git a/src/lyxlex.C b/src/lyxlex.C
index 3512d48449..793b5c10d9 100644
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -19,6 +19,7 @@
 
 #include "lyxlex.h"
 #include "lyxlex_pimpl.h"
+#include "debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
diff --git a/src/lyxrc.h b/src/lyxrc.h
index d4f053a978..d477b2a33f 100644
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -16,8 +16,9 @@
 #pragma interface
 #endif
 
-#include "bufferparams.h"
-#include <boost/utility.hpp>
+#include "bufferparams.h" // Just to get the enum BufferParams::PAPER_SIZE (sic)
+
+// #include <boost/utility.hpp>
 
 /// This contains the runtime configuration of LyX
 class LyXRC //: public noncopyable {
diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 1751096c30..3b261aa63e 100644
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -36,6 +36,7 @@
 #include "support/LOstream.h"
 #include "debug.h"
 #include "lyxlex.h"
+#include "lyxfont.h"
 
 using std::ostream;
 
diff --git a/src/minibuffer.C b/src/minibuffer.C
index a347acec8e..68614d0910 100644
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -22,6 +22,7 @@
 
 #include "support/lyxalgo.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 #include "LyXView.h"
 #include "XFormsView.h"
 #include "gettext.h"
diff --git a/src/paragraph.h b/src/paragraph.h
index 318fea8cae..102f685b7d 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -20,7 +20,7 @@
 
 #include <vector>
 
-#include "insets/inset.h"
+#include "insets/inset.h" // Just for Inset::Code
 #include "layout.h"
 
 class ParagraphParameters;
@@ -139,7 +139,7 @@ public:
 				      std::ostream &, TexRow & texrow);
 	///
 	bool hasSameLayout(Paragraph const * par) const;
-	
+
 	///
 	void makeSameLayout(Paragraph const * par);
 
diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 182d1165d8..ff4a2972f8 100644
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -20,6 +20,7 @@
 #include "encoding.h"
 #include "lyxrc.h"
 #include "debug.h"
+#include "support/LAssert.h"
 
 extern int tex_code_break_column;
 
diff --git a/src/support/filetools.C b/src/support/filetools.C
index d4bccefe31..69dab110f7 100644
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -27,6 +27,12 @@
 #pragma implementation "filetools.h"
 #endif
 
+#include <cstdlib>
+#include <fcntl.h>
+#include <cerrno>
+#include "debug.h"
+#include "support/lstrings.h"
+
 #include "filetools.h"
 #include "LSubstring.h"
 #include "lyx_gui_misc.h"
diff --git a/src/support/filetools.h b/src/support/filetools.h
index deef30d05c..7242c108f8 100644
--- a/src/support/filetools.h
+++ b/src/support/filetools.h
@@ -11,15 +11,8 @@
 #pragma interface
 #endif
 
-#include <cstdlib>
-#include <fcntl.h>
-#include <cerrno>
-
 #include <vector>
-
-#include "debug.h"
 #include "LString.h"
-#include "support/lstrings.h"
 
 
 ///
diff --git a/src/support/os_unix.C b/src/support/os_unix.C
index fd02ab9934..19b8fa88ae 100644
--- a/src/support/os_unix.C
+++ b/src/support/os_unix.C
@@ -5,6 +5,7 @@
 
 #include "os.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 
 string os::binpath_ = string();
 string os::binname_ = string();
diff --git a/src/tabular.C b/src/tabular.C
index 2202e3367b..903cb7b377 100644
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -30,6 +30,7 @@
 #include "LaTeXFeatures.h"
 #include "support/lstrings.h"
 #include "support/lyxmanip.h"
+#include "support/LAssert.h"
 #include "insets/insettabular.h"
 #include "insets/insettext.h"
 #include "gettext.h"
diff --git a/src/text.C b/src/text.C
index bda7eb5ce3..06309f74de 100644
--- a/src/text.C
+++ b/src/text.C
@@ -17,6 +17,7 @@
 #include "layout.h"
 #include "paragraph.h"
 #include "support/textutils.h"
+#include "support/LAssert.h"
 #include "insets/insetbib.h"
 #include "insets/insettext.h"
 #include "insets/insetspecialchar.h"
diff --git a/src/undo_funcs.C b/src/undo_funcs.C
index 70095c3424..64afb1ac19 100644
--- a/src/undo_funcs.C
+++ b/src/undo_funcs.C
@@ -19,6 +19,7 @@
 #include "buffer.h"
 #include "insets/inset.h"
 #include "debug.h"
+#include "support/LAssert.h"
 
 /// the flag used by FinishUndo();
 bool undo_finished;