From: Angus Leeming <leeming@lyx.org>
Date: Thu, 20 May 2004 09:36:28 +0000 (+0000)
Subject: Sane ordering of the files #included in the Qt frontend.
X-Git-Tag: 1.6.10~15209
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0ac4f65ad79bc47b4610784b25728cac6565a8e7;p=features.git

Sane ordering of the files #included in the Qt frontend.


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

diff --git a/src/frontends/controllers/ControlCitation.C b/src/frontends/controllers/ControlCitation.C
index b7f755dbe2..d00cf7bb26 100644
--- a/src/frontends/controllers/ControlCitation.C
+++ b/src/frontends/controllers/ControlCitation.C
@@ -14,6 +14,7 @@
 
 #include "buffer.h"
 #include "bufferparams.h"
+#include "debug.h" // temporary
 
 
 using std::string;
@@ -33,6 +34,7 @@ ControlCitation::ControlCitation(Dialog & d)
 
 bool ControlCitation::initialiseParams(string const & data)
 {
+	lyxerr << "ControlCitation::initialiseParams\n\t" << data << std::endl;
 	ControlCommand::initialiseParams(data);
 
 	vector<pair<string, string> > blist;
diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt2/Alert_pimpl.C
index 41c7570cb8..06cb159226 100644
--- a/src/frontends/qt2/Alert_pimpl.C
+++ b/src/frontends/qt2/Alert_pimpl.C
@@ -13,13 +13,15 @@
 #include "Alert_pimpl.h"
 #include "Alert.h"
 
-#include <qmessagebox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
 #include "ui/QAskForTextDialog.h"
 #include "qt_helpers.h"
+
 #include "gettext.h"
 
+#include <qmessagebox.h>
+#include <qlabel.h>
+#include <qlineedit.h>
+
 #include <algorithm>
 
 using lyx::support::bformat;
diff --git a/src/frontends/qt2/BulletsModule.C b/src/frontends/qt2/BulletsModule.C
index 3f50ac5892..5c237aaef1 100644
--- a/src/frontends/qt2/BulletsModule.C
+++ b/src/frontends/qt2/BulletsModule.C
@@ -11,13 +11,12 @@
 
 #include <config.h>
 
+#include "BulletsModule.h"
+#include "QBrowseBox.h"
 #include "qt_helpers.h"
 
 #include "support/filetools.h"
 
-#include "QBrowseBox.h"
-#include "BulletsModule.h"
-
 #include <qinputdialog.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 0167d56ae8..5497bf8566 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-20  Angus Leeming  <leeming@lyx.org>
+
+	* Most .C files: bring some sort of sanity to the order
+	of inclusion of header files.
+
 2004-05-19  Angus Leeming  <leeming@lyx.org>
 
 	* Most files: wrap code up inside namespace lyx::frontend.
diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C
index 8622ae6dd9..cf766cee99 100644
--- a/src/frontends/qt2/FileDialog.C
+++ b/src/frontends/qt2/FileDialog.C
@@ -8,19 +8,18 @@
  * Full author contact details are available in file CREDITS.
  */
 
-
 #include <config.h>
 
 #include "frontends/FileDialog.h"
 
+#include "FileDialog_private.h"
+#include "qt_helpers.h"
+
 #include "debug.h"
 #include "gettext.h"
 
 #include "support/globbing.h"
 
-#include "FileDialog_private.h"
-#include "qt_helpers.h"
-
 
 using lyx::support::FileFilterList;
 
diff --git a/src/frontends/qt2/FileDialog_private.C b/src/frontends/qt2/FileDialog_private.C
index bada6eff9c..be328bbe14 100644
--- a/src/frontends/qt2/FileDialog_private.C
+++ b/src/frontends/qt2/FileDialog_private.C
@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "FileDialog_private.h"
 #include "qt_helpers.h"
 
diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C
index 258f0f6ce2..bfe0e5bf5e 100644
--- a/src/frontends/qt2/QAbout.C
+++ b/src/frontends/qt2/QAbout.C
@@ -10,21 +10,21 @@
 
 #include <config.h>
 
-#include "debug.h"
+#include "QAbout.h"
+#include "QAboutDialog.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "controllers/ButtonController.h"
+#include "controllers/ControlAboutlyx.h"
+
 #include "support/lstrings.h"
 #include "support/std_sstream.h"
-#include "qt_helpers.h"
-#include "ButtonController.h"
-#include "ControlAboutlyx.h"
 
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qtextview.h>
 
-#include "QAboutDialog.h"
-#include "Qt2BC.h"
-#include "QAbout.h"
-
 using lyx::support::prefixIs;
 
 using std::getline;
diff --git a/src/frontends/qt2/QBibitem.C b/src/frontends/qt2/QBibitem.C
index 5f18836adf..f221df5775 100644
--- a/src/frontends/qt2/QBibitem.C
+++ b/src/frontends/qt2/QBibitem.C
@@ -10,16 +10,16 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlCommand.h"
+#include "QBibitem.h"
+#include "QBibitemDialog.h"
+#include "Qt2BC.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlCommand.h"
+
 #include <qlineedit.h>
 #include <qpushbutton.h>
 
-#include "QBibitemDialog.h"
-#include "QBibitem.h"
-#include "Qt2BC.h"
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/qt2/QBibitemDialog.C b/src/frontends/qt2/QBibitemDialog.C
index 0871160d3a..d9fba1b1ab 100644
--- a/src/frontends/qt2/QBibitemDialog.C
+++ b/src/frontends/qt2/QBibitemDialog.C
@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include <qpushbutton.h>
-
 #include "QBibitemDialog.h"
 #include "QBibitem.h"
 
+#include <qpushbutton.h>
+
 namespace lyx {
 namespace frontend {
 
diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C
index bd7ac30f9d..2a9e38e5ef 100644
--- a/src/frontends/qt2/QBibtex.C
+++ b/src/frontends/qt2/QBibtex.C
@@ -12,23 +12,22 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "support/lstrings.h"
-
-#include "ControlBibtex.h"
+#include "QBibtex.h"
+#include "QBibtexDialog.h"
+#include "ui/QBibtexAddDialogBase.h"
+#include "Qt2BC.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlBibtex.h"
+
 #include "support/filetools.h" // ChangeExtension
+#include "support/lstrings.h"
 
 #include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qcheckbox.h>
 
-#include "ui/QBibtexAddDialogBase.h"
-#include "QBibtexDialog.h"
-#include "QBibtex.h"
-#include "Qt2BC.h"
 
 using lyx::support::ChangeExtension;
 using lyx::support::contains;
diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt2/QBibtexDialog.C
index 867487f408..5acd3f8ee2 100644
--- a/src/frontends/qt2/QBibtexDialog.C
+++ b/src/frontends/qt2/QBibtexDialog.C
@@ -10,6 +10,9 @@
 
 #include <config.h>
 
+#include "QBibtexDialog.h"
+#include "ui/QBibtexAddDialogBase.h"
+#include "QBibtex.h"
 #include "qt_helpers.h"
 
 #include "support/filetools.h"
@@ -20,9 +23,6 @@
 #include <qlistbox.h>
 #include <qfiledialog.h>
 
-#include "ui/QBibtexAddDialogBase.h"
-#include "QBibtexDialog.h"
-#include "QBibtex.h"
 
 using lyx::support::ChangeExtension;
 
diff --git a/src/frontends/qt2/QBox.C b/src/frontends/qt2/QBox.C
index 1915423576..627058f48f 100644
--- a/src/frontends/qt2/QBox.C
+++ b/src/frontends/qt2/QBox.C
@@ -12,21 +12,24 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "QBox.h"
-#include "ControlBox.h"
+
+#include "lengthcombo.h"
 #include "QBoxDialog.h"
 #include "qt_helpers.h"
-#include "controllers/helper_funcs.h"
-#include "support/lstrings.h"
-#include "support/tostr.h"
-
 #include "Qt2BC.h"
+
+#include "lengthcommon.h"
 #include "lyxrc.h" // to set the default length values
+
+#include "controllers/ControlBox.h"
+#include "controllers/helper_funcs.h"
+
 #include "insets/insetbox.h"
 
-#include "lengthcombo.h"
-#include "lengthcommon.h"
+#include "support/lstrings.h"
+#include "support/tostr.h"
+
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
diff --git a/src/frontends/qt2/QBoxDialog.C b/src/frontends/qt2/QBoxDialog.C
index 69ccfc9b4a..690ba81770 100644
--- a/src/frontends/qt2/QBoxDialog.C
+++ b/src/frontends/qt2/QBoxDialog.C
@@ -10,14 +10,15 @@
 
 #include <config.h>
 
-#include "QBox.h"
 #include "QBoxDialog.h"
-#include "qt_helpers.h"
 
 #include "lengthcombo.h"
+#include "QBox.h"
+#include "qt_helpers.h"
+
 #include <qcombobox.h>
-#include <qpushbutton.h>
 #include <qlineedit.h>
+#include <qpushbutton.h>
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/qt2/QBranch.C b/src/frontends/qt2/QBranch.C
index 8459aa75fb..e1c2ef8ac1 100644
--- a/src/frontends/qt2/QBranch.C
+++ b/src/frontends/qt2/QBranch.C
@@ -10,18 +10,17 @@
 
 #include <config.h>
 
-#include "debug.h"
+#include "QBranch.h"
+#include "QBranchDialog.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
 #include "BranchList.h"
 
 #include "controllers/ControlBranch.h"
 
 #include "insets/insetbranch.h"
 
-#include "QBranch.h"
-#include "QBranchDialog.h"
-#include "Qt2BC.h"
-#include "qt_helpers.h"
-
 #include <qcombobox.h>
 #include <qpushbutton.h>
 
diff --git a/src/frontends/qt2/QBranchDialog.C b/src/frontends/qt2/QBranchDialog.C
index 66ccf2d6e6..22d5d259d5 100644
--- a/src/frontends/qt2/QBranchDialog.C
+++ b/src/frontends/qt2/QBranchDialog.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QBranch.h"
 #include "QBranchDialog.h"
+#include "QBranch.h"
 
 #include <qpushbutton.h>
 
diff --git a/src/frontends/qt2/QBrowseBox.C b/src/frontends/qt2/QBrowseBox.C
index 49d041d258..c910abad49 100644
--- a/src/frontends/qt2/QBrowseBox.C
+++ b/src/frontends/qt2/QBrowseBox.C
@@ -10,14 +10,14 @@
 
 #include <config.h>
 
+#include "QBrowseBox.h"
+
 #include <qpixmap.h>
 #include <qpainter.h>
 #include <qapplication.h>
 #include <qdrawutil.h>
 #include <qstyle.h>
 
-#include "QBrowseBox.h"
-
 #include <cmath>
 
 
diff --git a/src/frontends/qt2/QChanges.C b/src/frontends/qt2/QChanges.C
index 1fcaf873cf..5380535e04 100644
--- a/src/frontends/qt2/QChanges.C
+++ b/src/frontends/qt2/QChanges.C
@@ -10,17 +10,16 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlChanges.h"
+#include "QChanges.h"
+#include "QChangesDialog.h"
+#include "Qt2BC.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlChanges.h"
+
 #include <qpushbutton.h>
 #include <qtextview.h>
 
-#include "QChangesDialog.h"
-#include "QChanges.h"
-#include "Qt2BC.h"
-
 
 using std::string;
 
diff --git a/src/frontends/qt2/QChangesDialog.C b/src/frontends/qt2/QChangesDialog.C
index b2be2b6855..4f21582e6a 100644
--- a/src/frontends/qt2/QChangesDialog.C
+++ b/src/frontends/qt2/QChangesDialog.C
@@ -10,11 +10,12 @@
 
 #include <config.h>
 
-#include <qpushbutton.h>
-
 #include "QChangesDialog.h"
 #include "QChanges.h"
 
+#include <qpushbutton.h>
+
+
 namespace lyx {
 namespace frontend {
 
diff --git a/src/frontends/qt2/QCharacter.C b/src/frontends/qt2/QCharacter.C
index a640c7282a..46d1114715 100644
--- a/src/frontends/qt2/QCharacter.C
+++ b/src/frontends/qt2/QCharacter.C
@@ -11,20 +11,18 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "QCharacter.h"
 #include "ControlCharacter.h"
 #include "QCharacterDialog.h"
 #include "Qt2BC.h"
-
 #include "qt_helpers.h"
 
+#include "LColor.h"
+
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 
-#include "LColor.h"
-
 using std::vector;
 
 namespace lyx {
diff --git a/src/frontends/qt2/QCharacterDialog.C b/src/frontends/qt2/QCharacterDialog.C
index 9f563dff27..2635beb94c 100644
--- a/src/frontends/qt2/QCharacterDialog.C
+++ b/src/frontends/qt2/QCharacterDialog.C
@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "QCharacterDialog.h"
 
 #include <qcheckbox.h>
diff --git a/src/frontends/qt2/QCitation.C b/src/frontends/qt2/QCitation.C
index 6d75f68483..aefedb6c31 100644
--- a/src/frontends/qt2/QCitation.C
+++ b/src/frontends/qt2/QCitation.C
@@ -11,11 +11,17 @@
 
 #include <config.h>
 
-#include "bufferparams.h"
-#include "debug.h"
-#include "ui/QCitationFindDialogBase.h"
-#include "QCitationDialog.h"
 #include "QCitation.h"
+#include "QCitationDialog.h"
+#include "ui/QCitationFindDialogBase.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "bufferparams.h"
+
+#include "controllers/ControlCitation.h"
+
+#include "support/lstrings.h"
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
@@ -25,11 +31,6 @@
 #include <qpushbutton.h>
 #include <qlabel.h>
 
-#include "Qt2BC.h"
-#include "ControlCitation.h"
-#include "qt_helpers.h"
-#include "support/lstrings.h"
-
 using std::find;
 using std::string;
 using std::vector;
diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C
index 863ab10af5..fd1bc23d39 100644
--- a/src/frontends/qt2/QCitationDialog.C
+++ b/src/frontends/qt2/QCitationDialog.C
@@ -12,9 +12,13 @@
 
 #include <config.h>
 
+#include "QCitationDialog.h"
+#include "ui/QCitationFindDialogBase.h"
+#include "QCitation.h"
 #include "qt_helpers.h"
+
 #include "controllers/ControlCitation.h"
-#include "ButtonController.h"
+#include "controllers/ButtonController.h"
 
 #include <qcheckbox.h>
 #include <qlineedit.h>
@@ -22,9 +26,6 @@
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 
-#include "ui/QCitationFindDialogBase.h"
-#include "QCitationDialog.h"
-#include "QCitation.h"
 
 using std::vector;
 using std::string;
diff --git a/src/frontends/qt2/QCommandBuffer.C b/src/frontends/qt2/QCommandBuffer.C
index 40f7408717..7ec5bb27a4 100644
--- a/src/frontends/qt2/QCommandBuffer.C
+++ b/src/frontends/qt2/QCommandBuffer.C
@@ -10,13 +10,17 @@
 
 #include <config.h>
 
-#include "support/filetools.h"
-#include "controllers/ControlCommandBuffer.h"
-#include "qt_helpers.h"
-
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "QtView.h"
+
 #include "QCommandBuffer.h"
 #include "QCommandEdit.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlCommandBuffer.h"
+
+#include "support/filetools.h"
 
 #include <qlistbox.h>
 #include <qlayout.h>
diff --git a/src/frontends/qt2/QContentPane.C b/src/frontends/qt2/QContentPane.C
index c169dedab3..e9cf7a48b9 100644
--- a/src/frontends/qt2/QContentPane.C
+++ b/src/frontends/qt2/QContentPane.C
@@ -10,15 +10,18 @@
 
 #include <config.h>
 
-#include <boost/bind.hpp>
-
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "QWorkArea.h"
+
 #include "QContentPane.h"
 #include "QLyXKeySym.h"
 
+#include <qapplication.h>
 #include <qpainter.h>
 #include <qtimer.h>
-#include <qapplication.h>
+
+#include <boost/bind.hpp>
 
 namespace {
 
diff --git a/src/frontends/qt2/QDelimiterDialog.C b/src/frontends/qt2/QDelimiterDialog.C
index c1a4c5b386..c3e7fd27fa 100644
--- a/src/frontends/qt2/QDelimiterDialog.C
+++ b/src/frontends/qt2/QDelimiterDialog.C
@@ -10,19 +10,19 @@
 
 #include <config.h>
 
-
-#include "qt_helpers.h"
-
-#include "ControlMath.h"
-#include "QMath.h"
 #include "QDelimiterDialog.h"
 
 #include "iconpalette.h"
+#include "QMath.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlMath.h"
 
 #include <qlabel.h>
 #include <qpixmap.h>
 #include <qcheckbox.h>
 
+
 using std::string;
 
 namespace lyx {
diff --git a/src/frontends/qt2/QDialogView.C b/src/frontends/qt2/QDialogView.C
index 997a6d8306..91fc42009b 100644
--- a/src/frontends/qt2/QDialogView.C
+++ b/src/frontends/qt2/QDialogView.C
@@ -10,10 +10,11 @@
 
 #include <config.h>
 
+#include "QDialogView.h"
 #include "Qt2BC.h"
-#include "ButtonController.h"
 #include "qt_helpers.h"
-#include "QDialogView.h"
+
+#include "controllers/ButtonController.h"
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C
index 86d9d8c76f..ab5972e00c 100644
--- a/src/frontends/qt2/QDocument.C
+++ b/src/frontends/qt2/QDocument.C
@@ -10,26 +10,25 @@
 
 #include <config.h>
 
-#include "controllers/ControlDocument.h"
+#include "QDocument.h"
+#include "QDocumentDialog.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
 
 #include "bufferparams.h"
-#include "debug.h"
-#include "language.h"
-#include "helper_funcs.h" // getSecond()
-#include "frnt_lang.h"
+#include "floatplacement.h"
 #include "gettext.h"
+#include "helper_funcs.h" // getSecond()
+#include "language.h"
 #include "lyxrc.h" // defaultUnit
+#include "lyxtextclasslist.h"
 #include "tex-strings.h" // tex_graphics
+
 #include "support/tostr.h"
 #include "support/lstrings.h"
-#include "lyxtextclasslist.h"
-#include "floatplacement.h"
-
-#include "QDocument.h"
-#include "QDocumentDialog.h"
-#include "Qt2BC.h"
 
-#include "qt_helpers.h"
+#include "controllers/ControlDocument.h"
+#include "controllers/frnt_lang.h"
 
 #include <qpushbutton.h>
 #include <qmultilineedit.h>
diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C
index a5d7bd9a31..006d06b1a9 100644
--- a/src/frontends/qt2/QDocumentDialog.C
+++ b/src/frontends/qt2/QDocumentDialog.C
@@ -10,15 +10,6 @@
 
 #include <config.h>
 
-#include "bufferparams.h"
-#include "debug.h"
-#include "gettext.h"
-#include "lyxrc.h"
-
-#include "controllers/ControlDocument.h"
-
-#include "support/lstrings.h"
-
 #include "QDocument.h"
 #include "QDocumentDialog.h"
 
@@ -27,6 +18,14 @@
 #include "panelstack.h"
 #include "qt_helpers.h"
 
+#include "bufferparams.h"
+#include "gettext.h"
+#include "lyxrc.h"
+
+#include "controllers/ControlDocument.h"
+
+#include "support/lstrings.h"
+
 #include <qlabel.h>
 #include <qmultilineedit.h>
 #include <qlineedit.h>
diff --git a/src/frontends/qt2/QERT.C b/src/frontends/qt2/QERT.C
index c50558d8c8..6972eab2c4 100644
--- a/src/frontends/qt2/QERT.C
+++ b/src/frontends/qt2/QERT.C
@@ -10,15 +10,15 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlERT.h"
+#include "QERT.h"
+#include "QERTDialog.h"
+#include "Qt2BC.h"
+
+#include "controllers/ControlERT.h"
 
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 
-#include "QERTDialog.h"
-#include "QERT.h"
-#include "Qt2BC.h"
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/qt2/QERTDialog.C b/src/frontends/qt2/QERTDialog.C
index cea0345bed..6432143133 100644
--- a/src/frontends/qt2/QERTDialog.C
+++ b/src/frontends/qt2/QERTDialog.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QERT.h"
 #include "QERTDialog.h"
+#include "QERT.h"
 
 #include <qpushbutton.h>
 
diff --git a/src/frontends/qt2/QErrorList.C b/src/frontends/qt2/QErrorList.C
index 7e2dc17726..639510f733 100644
--- a/src/frontends/qt2/QErrorList.C
+++ b/src/frontends/qt2/QErrorList.C
@@ -10,13 +10,12 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "qt_helpers.h"
-
-#include "ControlErrorList.h"
 #include "QErrorList.h"
 #include "QErrorListDialog.h"
 #include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlErrorList.h"
 
 #include <qlistbox.h>
 #include <qtextbrowser.h>
diff --git a/src/frontends/qt2/QErrorListDialog.C b/src/frontends/qt2/QErrorListDialog.C
index 0c6bc65659..b981bb1bc9 100644
--- a/src/frontends/qt2/QErrorListDialog.C
+++ b/src/frontends/qt2/QErrorListDialog.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QErrorList.h"
 #include "QErrorListDialog.h"
+#include "QErrorList.h"
 
 #include <qlistbox.h>
 #include <qpushbutton.h>
diff --git a/src/frontends/qt2/QExternal.C b/src/frontends/qt2/QExternal.C
index 8c082dca7c..992f6933a5 100644
--- a/src/frontends/qt2/QExternal.C
+++ b/src/frontends/qt2/QExternal.C
@@ -11,7 +11,8 @@
 
 #include <config.h>
 
-#include "debug.h"
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "lengthcommon.h"
 #include "lyxrc.h"
 
diff --git a/src/frontends/qt2/QExternalDialog.C b/src/frontends/qt2/QExternalDialog.C
index 39b14dde78..6e8825f473 100644
--- a/src/frontends/qt2/QExternalDialog.C
+++ b/src/frontends/qt2/QExternalDialog.C
@@ -11,6 +11,8 @@
 
 #include <config.h>
 
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "insets/ExternalTemplate.h"
 
 #include "controllers/ButtonController.h"
diff --git a/src/frontends/qt2/QFloat.C b/src/frontends/qt2/QFloat.C
index 4c0d1c95c1..6bf478b770 100644
--- a/src/frontends/qt2/QFloat.C
+++ b/src/frontends/qt2/QFloat.C
@@ -10,13 +10,13 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlFloat.h"
-#include "QFloatDialog.h"
 #include "QFloat.h"
+#include "QFloatDialog.h"
 #include "Qt2BC.h"
 #include "floatplacement.h"
 
+#include "controllers/ControlFloat.h"
+
 #include "insets/insetfloat.h"
 
 #include <qpushbutton.h>
diff --git a/src/frontends/qt2/QFloatDialog.C b/src/frontends/qt2/QFloatDialog.C
index de55390115..7eb01a11ca 100644
--- a/src/frontends/qt2/QFloatDialog.C
+++ b/src/frontends/qt2/QFloatDialog.C
@@ -10,12 +10,12 @@
 
 #include <config.h>
 
+#include "QFloatDialog.h"
+#include "QFloat.h"
 #include "floatplacement.h"
 
 #include <qpushbutton.h>
 
-#include "QFloatDialog.h"
-#include "QFloat.h"
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C
index b9734654d4..2f6f0fd084 100644
--- a/src/frontends/qt2/QGraphics.C
+++ b/src/frontends/qt2/QGraphics.C
@@ -12,18 +12,24 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlGraphics.h"
-#include "controllers/helper_funcs.h"
-#include "support/lstrings.h"
-#include "support/tostr.h"
-#include "support/lyxlib.h"
-#include "insets/insetgraphicsParams.h"
+#include "QGraphics.h"
 
-#include "lyxrc.h"
 #include "lengthcombo.h"
+#include "QGraphicsDialog.h"
+#include "Qt2BC.h"
 #include "qt_helpers.h"
+
 #include "lengthcommon.h"
+#include "lyxrc.h"
+
+#include "controllers/ControlGraphics.h"
+#include "controllers/helper_funcs.h"
+
+#include "insets/insetgraphicsParams.h"
+
+#include "support/lstrings.h"
+#include "support/tostr.h"
+#include "support/lyxlib.h"
 
 #include <qlineedit.h>
 #include <qpushbutton.h>
@@ -31,10 +37,6 @@
 #include <qgroupbox.h>
 #include <qlabel.h>
 
-#include "QGraphicsDialog.h"
-#include "QGraphics.h"
-#include "Qt2BC.h"
-
 #include <cmath>
 
 using lyx::support::float_equal;
diff --git a/src/frontends/qt2/QGraphicsDialog.C b/src/frontends/qt2/QGraphicsDialog.C
index 2d234e5798..cf801d2162 100644
--- a/src/frontends/qt2/QGraphicsDialog.C
+++ b/src/frontends/qt2/QGraphicsDialog.C
@@ -11,17 +11,19 @@
 
 #include <config.h>
 
-#include "ControlGraphics.h"
-#include "debug.h"
+#include "QGraphicsDialog.h"
+#include "QGraphics.h"
+
+#include "lengthcombo.h"
 #include "qt_helpers.h"
 
+#include "debug.h"
+
+#include "controllers/ControlGraphics.h"
+
 #include <qpushbutton.h>
 #include <qlineedit.h>
 
-#include "lengthcombo.h"
-
-#include "QGraphicsDialog.h"
-#include "QGraphics.h"
 
 using std::string;
 
diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C
index d8beb5f6ae..8526073ada 100644
--- a/src/frontends/qt2/QInclude.C
+++ b/src/frontends/qt2/QInclude.C
@@ -10,13 +10,12 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlInclude.h"
-#include "qt_helpers.h"
-
 #include "QIncludeDialog.h"
 #include "QInclude.h"
 #include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlInclude.h"
 
 #include <qlineedit.h>
 #include <qpushbutton.h>
diff --git a/src/frontends/qt2/QIncludeDialog.C b/src/frontends/qt2/QIncludeDialog.C
index 8c3883e859..5e998a76b3 100644
--- a/src/frontends/qt2/QIncludeDialog.C
+++ b/src/frontends/qt2/QIncludeDialog.C
@@ -10,12 +10,13 @@
 
 #include <config.h>
 
+#include "QIncludeDialog.h"
+#include "QInclude.h"
+
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 
-#include "QIncludeDialog.h"
-#include "QInclude.h"
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/qt2/QLImage.C b/src/frontends/qt2/QLImage.C
index 359c19a33c..8065fcd3de 100644
--- a/src/frontends/qt2/QLImage.C
+++ b/src/frontends/qt2/QLImage.C
@@ -11,13 +11,16 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "QLImage.h"
-#include "graphics/GraphicsParams.h"
+#include "qt_helpers.h"
+
+#include "debug.h"
 #include "format.h"
+
+#include "graphics/GraphicsParams.h"
+
 #include "support/lstrings.h"       // lowercase
 #include "support/lyxfunctional.h"  // compare_memfun
-#include "qt_helpers.h"
 
 #include <qimage.h>
 #include <qpainter.h>
diff --git a/src/frontends/qt2/QLMenubar.C b/src/frontends/qt2/QLMenubar.C
index 27d1de1070..ca16d63c7f 100644
--- a/src/frontends/qt2/QLMenubar.C
+++ b/src/frontends/qt2/QLMenubar.C
@@ -10,12 +10,15 @@
 
 #include <config.h>
 
-#include "MenuBackend.h"
-
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "QtView.h"
+
 #include "QLMenubar.h"
 #include "QLPopupMenu.h"
 
+#include "MenuBackend.h"
+
 #include <qmenubar.h>
 #include <qcursor.h>
 
diff --git a/src/frontends/qt2/QLPainter.C b/src/frontends/qt2/QLPainter.C
index 7d9a7d7f54..9f5b8a1031 100644
--- a/src/frontends/qt2/QLPainter.C
+++ b/src/frontends/qt2/QLPainter.C
@@ -11,16 +11,17 @@
 #include <config.h>
 
 #include "QLPainter.h"
-#include "font_metrics.h"
-#include "debug.h"
-#include "language.h"
-#include "LColor.h"
 
 #include "QWorkArea.h"
-#include "qfont_loader.h"
 #include "QLImage.h"
 #include "lcolorcache.h"
+#include "qfont_loader.h"
+
+#include "debug.h"
+#include "language.h"
+#include "LColor.h"
 
+#include "frontends/font_metrics.h"
 
 #include <qpainter.h>
 
diff --git a/src/frontends/qt2/QLPopupMenu.C b/src/frontends/qt2/QLPopupMenu.C
index 76bf2a7a7d..6a72c22184 100644
--- a/src/frontends/qt2/QLPopupMenu.C
+++ b/src/frontends/qt2/QLPopupMenu.C
@@ -10,16 +10,18 @@
 
 #include <config.h>
 
-
-#include "support/lstrings.h"
-#include "MenuBackend.h"
-
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include "QtView.h"
 
-#include "QLMenubar.h"
 #include "QLPopupMenu.h"
+#include "QLMenubar.h"
 #include "qt_helpers.h"
 
+#include "MenuBackend.h"
+
+#include "support/lstrings.h"
+
 using std::distance;
 using std::make_pair;
 using std::string;
diff --git a/src/frontends/qt2/QLPrintDialog.C b/src/frontends/qt2/QLPrintDialog.C
index 7a31172666..e06b9e9f95 100644
--- a/src/frontends/qt2/QLPrintDialog.C
+++ b/src/frontends/qt2/QLPrintDialog.C
@@ -11,10 +11,9 @@
 
 #include <config.h>
 
-#include "qt_helpers.h"
-
-#include "QPrint.h"
 #include "QLPrintDialog.h"
+#include "QPrint.h"
+#include "qt_helpers.h"
 
 #include <qfiledialog.h>
 #include <qcheckbox.h>
diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C
index cc3dedfda8..7e9e3086af 100644
--- a/src/frontends/qt2/QLog.C
+++ b/src/frontends/qt2/QLog.C
@@ -10,15 +10,14 @@
 
 #include <config.h>
 
-#include "controllers/ControlLog.h"
-
-#include "support/std_sstream.h"
-
 #include "QLog.h"
 #include "QLogDialog.h"
-
 #include "qt_helpers.h"
 
+#include "controllers/ControlLog.h"
+
+#include "support/std_sstream.h"
+
 #include <qtextview.h>
 #include <qpushbutton.h>
 
diff --git a/src/frontends/qt2/QLogDialog.C b/src/frontends/qt2/QLogDialog.C
index 516b52c247..56f0c34d51 100644
--- a/src/frontends/qt2/QLogDialog.C
+++ b/src/frontends/qt2/QLogDialog.C
@@ -10,11 +10,12 @@
 
 #include <config.h>
 
-#include <qpushbutton.h>
-
 #include "QLogDialog.h"
 #include "QLog.h"
 
+#include <qpushbutton.h>
+
+
 namespace lyx {
 namespace frontend {
 
diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt2/QLyXKeySym.C
index a7de8ed629..e904c16ef1 100644
--- a/src/frontends/qt2/QLyXKeySym.C
+++ b/src/frontends/qt2/QLyXKeySym.C
@@ -11,11 +11,12 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "QLyXKeySym.h"
 #include "qlkey.h"
 #include "qt_helpers.h"
 
+#include "debug.h"
+
 #include <qaccel.h>
 #include <qevent.h>
 #include <qtextcodec.h>
diff --git a/src/frontends/qt2/QMath.C b/src/frontends/qt2/QMath.C
index 98543a7278..0161dad9f1 100644
--- a/src/frontends/qt2/QMath.C
+++ b/src/frontends/qt2/QMath.C
@@ -10,11 +10,12 @@
 
 #include <config.h>
 
-#include "gettext.h"
+#include "QMath.h"
 #include "QMathDialog.h"
 #include "QMathMatrixDialog.h"
 #include "QDelimiterDialog.h"
-#include "QMath.h"
+
+#include "gettext.h"
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt2/QMathDialog.C
index 9613605ccf..0c43674acc 100644
--- a/src/frontends/qt2/QMathDialog.C
+++ b/src/frontends/qt2/QMathDialog.C
@@ -10,15 +10,13 @@
 
 #include <config.h>
 
-
-#include "qt_helpers.h"
-
-#include "ControlMath.h"
-
 #include "QMathDialog.h"
 #include "QMath.h"
 
 #include "iconpalette.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlMath.h"
 
 #include <qwidgetstack.h>
 #include <qcombobox.h>
diff --git a/src/frontends/qt2/QMathMatrixDialog.C b/src/frontends/qt2/QMathMatrixDialog.C
index 765d2816e7..f9815edddb 100644
--- a/src/frontends/qt2/QMathMatrixDialog.C
+++ b/src/frontends/qt2/QMathMatrixDialog.C
@@ -10,19 +10,20 @@
 
 #include <config.h>
 
+#include "QMathMatrixDialog.h"
+#include "QMath.h"
+
+#include "emptytable.h"
 #include "qt_helpers.h"
 
-#include "support/std_sstream.h"
-#include "ControlMath.h"
+#include "controllers/ControlMath.h"
 
-#include "QMath.h"
-#include "QMathMatrixDialog.h"
+#include "support/std_sstream.h"
 
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
-#include "emptytable.h"
 
 using std::ostringstream;
 using std::string;
diff --git a/src/frontends/qt2/QNote.C b/src/frontends/qt2/QNote.C
index 9bca052eb5..7fe36603f6 100644
--- a/src/frontends/qt2/QNote.C
+++ b/src/frontends/qt2/QNote.C
@@ -10,16 +10,17 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlNote.h"
+#include "QNote.h"
+#include "QNoteDialog.h"
+#include "Qt2BC.h"
+
+#include "controllers/ControlNote.h"
+
 #include "insets/insetnote.h"
 
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 
-#include "QNoteDialog.h"
-#include "QNote.h"
-#include "Qt2BC.h"
 
 using std::string;
 
diff --git a/src/frontends/qt2/QNoteDialog.C b/src/frontends/qt2/QNoteDialog.C
index 6130cd2e03..b03afdbc45 100644
--- a/src/frontends/qt2/QNoteDialog.C
+++ b/src/frontends/qt2/QNoteDialog.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QNote.h"
 #include "QNoteDialog.h"
+#include "QNote.h"
 
 #include <qpushbutton.h>
 
diff --git a/src/frontends/qt2/QParagraph.C b/src/frontends/qt2/QParagraph.C
index 98ed3a7fb6..6cb268f65f 100644
--- a/src/frontends/qt2/QParagraph.C
+++ b/src/frontends/qt2/QParagraph.C
@@ -10,23 +10,24 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlParagraph.h"
 #include "QParagraph.h"
 #include "QParagraphDialog.h"
 #include "Qt2BC.h"
-#include "ParagraphParameters.h"
 #include "qt_helpers.h"
-#include "helper_funcs.h"
 
+#include "ParagraphParameters.h"
 #include "Spacing.h"
+
+#include "controllers/ControlParagraph.h"
+#include "controllers/helper_funcs.h"
+
 #include "support/tostr.h"
 
+#include <qbuttongroup.h>
+#include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
-#include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qbuttongroup.h>
 
 
 using std::string;
diff --git a/src/frontends/qt2/QParagraphDialog.C b/src/frontends/qt2/QParagraphDialog.C
index 89d884bb00..9db5aae51c 100644
--- a/src/frontends/qt2/QParagraphDialog.C
+++ b/src/frontends/qt2/QParagraphDialog.C
@@ -14,8 +14,8 @@
 #include "QParagraphDialog.h"
 #include "QParagraph.h"
 
-#include <qlineedit.h>
 #include <qcombobox.h>
+#include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qvalidator.h>
 #include <qwhatsthis.h>
diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C
index f803549bb2..3e345c7134 100644
--- a/src/frontends/qt2/QPrefs.C
+++ b/src/frontends/qt2/QPrefs.C
@@ -10,14 +10,13 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "support/lstrings.h"
-#include "support/tostr.h"
-#include "support/std_sstream.h"
-#include <iomanip>
-
-#include "ControlPrefs.h"
+#include "QPrefs.h"
 #include "QPrefsDialog.h"
+
+#include "lcolorcache.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
 #include "ui/QPrefAsciiModule.h"
 #include "ui/QPrefDateModule.h"
 #include "ui/QPrefKeyboardModule.h"
@@ -31,26 +30,32 @@
 #include "ui/QPrefPrinterModule.h"
 #include "ui/QPrefUIModule.h"
 #include "ui/QPrefIdentityModule.h"
-#include "lyx_gui.h"
-#include "QPrefs.h"
-#include "Qt2BC.h"
+
+#include "debug.h"
+#include "LColor.h"
 #include "lyxfont.h"
-#include "frnt_lang.h"
-#include "helper_funcs.h"
-#include "qt_helpers.h"
-#include "lcolorcache.h"
 
-#include <boost/tuple/tuple.hpp>
+#include "support/lstrings.h"
+#include "support/tostr.h"
+#include "support/std_sstream.h"
+
+#include "controllers/ControlPrefs.h"
+#include "controllers/frnt_lang.h"
+#include "controllers/helper_funcs.h"
+
+#include "frontends/lyx_gui.h"
 
-#include <qpushbutton.h>
 #include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
+#include "qcoloritem.h"
 #include <qcombobox.h>
 #include <qlabel.h>
-#include "qcoloritem.h"
+#include <qlineedit.h>
+#include <qpushbutton.h>
+#include <qspinbox.h>
 
-#include "LColor.h"
+#include <boost/tuple/tuple.hpp>
+
+#include <iomanip>
 
 using lyx::support::compare_no_case;
 using lyx::support::strToDbl;
diff --git a/src/frontends/qt2/QPrefs.h b/src/frontends/qt2/QPrefs.h
index ae188acaeb..f27076e608 100644
--- a/src/frontends/qt2/QPrefs.h
+++ b/src/frontends/qt2/QPrefs.h
@@ -15,13 +15,14 @@
 #include "QDialogView.h"
 #include <vector>
 
+class Converters;
 class Formats;
 
 namespace lyx {
 namespace frontend {
 
 class QPrefsDialog;
-class Controllers;
+class ControlPrefs;
 
 class QPrefs
 	: public QController<ControlPrefs, QView<QPrefsDialog> >
diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C
index cd8389e8c7..50fae356d9 100644
--- a/src/frontends/qt2/QPrefsDialog.C
+++ b/src/frontends/qt2/QPrefsDialog.C
@@ -11,10 +11,12 @@
 #include <config.h>
 #include "qt_helpers.h"
 
-#include "ControlPrefs.h"
+#include "QPrefsDialog.h"
 #include "QPrefs.h"
 
-#include "QPrefsDialog.h"
+#include "panelstack.h"
+#include "qcoloritem.h"
+#include "qfontexample.h"
 
 #include "ui/QPrefAsciiModule.h"
 #include "ui/QPrefDateModule.h"
@@ -35,16 +37,15 @@
 #include "gettext.h"
 #include "LColor.h"
 
-#include "panelstack.h"
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlineedit.h>
+#include "controllers/ControlPrefs.h"
+
 #include <qcheckbox.h>
+#include <qcolordialog.h>
 #include <qcombobox.h>
 #include <qfontdatabase.h>
-#include <qcolordialog.h>
-#include "qcoloritem.h"
-#include "qfontexample.h"
+#include <qlineedit.h>
+#include <qpushbutton.h>
+#include <qspinbox.h>
 
 using std::string;
 
diff --git a/src/frontends/qt2/QPrint.C b/src/frontends/qt2/QPrint.C
index 3642a58308..1da3b0f4d3 100644
--- a/src/frontends/qt2/QPrint.C
+++ b/src/frontends/qt2/QPrint.C
@@ -11,14 +11,14 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "PrinterParams.h"
-#include "ControlPrint.h"
-#include "qt_helpers.h"
-
 #include "QPrint.h"
 #include "QLPrintDialog.h"
 #include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "PrinterParams.h"
+
+#include "controllers/ControlPrint.h"
 
 #include <qlineedit.h>
 #include <qcheckbox.h>
diff --git a/src/frontends/qt2/QRef.C b/src/frontends/qt2/QRef.C
index ea575b42f0..0093a49822 100644
--- a/src/frontends/qt2/QRef.C
+++ b/src/frontends/qt2/QRef.C
@@ -11,13 +11,14 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlRef.h"
-#include "insets/insetref.h"
-
 #include "QRef.h"
 #include "QRefDialog.h"
 #include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlRef.h"
+
+#include "insets/insetref.h"
 
 #include <qlineedit.h>
 #include <qcheckbox.h>
@@ -26,7 +27,6 @@
 #include <qpushbutton.h>
 #include <qtooltip.h>
 
-#include "qt_helpers.h"
 
 using std::vector;
 using std::string;
diff --git a/src/frontends/qt2/QRefDialog.C b/src/frontends/qt2/QRefDialog.C
index 10fae38502..9114a9ac00 100644
--- a/src/frontends/qt2/QRefDialog.C
+++ b/src/frontends/qt2/QRefDialog.C
@@ -11,13 +11,13 @@
 
 #include <config.h>
 
-#include "QRef.h"
 #include "QRefDialog.h"
+#include "QRef.h"
 
-#include <qpushbutton.h>
-#include <qlineedit.h>
 #include <qcombobox.h>
+#include <qlineedit.h>
 #include <qlistbox.h>
+#include <qpushbutton.h>
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/qt2/QSearch.C b/src/frontends/qt2/QSearch.C
index 39e9885630..684e47eafb 100644
--- a/src/frontends/qt2/QSearch.C
+++ b/src/frontends/qt2/QSearch.C
@@ -10,15 +10,14 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlSearch.h"
-
 #include "QSearch.h"
 #include "QSearchDialog.h"
 #include "Qt2BC.h"
 
-#include <qpushbutton.h>
+#include "controllers/ControlSearch.h"
+
 #include <qcombobox.h>
+#include <qpushbutton.h>
 
 using std::string;
 
diff --git a/src/frontends/qt2/QSearchDialog.C b/src/frontends/qt2/QSearchDialog.C
index adc8b24069..f4e8c11a7a 100644
--- a/src/frontends/qt2/QSearchDialog.C
+++ b/src/frontends/qt2/QSearchDialog.C
@@ -10,15 +10,16 @@
 
 #include <config.h>
 
-#include "ControlSearch.h"
 #include "QSearchDialog.h"
 #include "QSearch.h"
 #include "qt_helpers.h"
 
-#include <qpushbutton.h>
-#include <qcombobox.h>
+#include "controllers/ControlSearch.h"
+
 #include <qcheckbox.h>
+#include <qcombobox.h>
 #include <qlineedit.h>
+#include <qpushbutton.h>
 
 using std::string;
 
diff --git a/src/frontends/qt2/QSendto.C b/src/frontends/qt2/QSendto.C
index 5092142abb..3d4a9e492b 100644
--- a/src/frontends/qt2/QSendto.C
+++ b/src/frontends/qt2/QSendto.C
@@ -10,18 +10,19 @@
 
 #include <config.h>
 
-#include "Qt2BC.h"
-#include "ControlSendto.h"
-#include "QSendtoDialog.h"
 #include "QSendto.h"
+#include "QSendtoDialog.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "format.h"
+
+#include "controllers/ControlSendto.h"
 
 #include <qcombobox.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 
-#include "qt_helpers.h"
-#include "format.h"
-
 using std::vector;
 using std::string;
 
diff --git a/src/frontends/qt2/QSendtoDialog.C b/src/frontends/qt2/QSendtoDialog.C
index 32bb4c1a30..5d7296233c 100644
--- a/src/frontends/qt2/QSendtoDialog.C
+++ b/src/frontends/qt2/QSendtoDialog.C
@@ -10,11 +10,12 @@
 
 #include <config.h>
 
-#include <qpushbutton.h>
-
 #include "QSendtoDialog.h"
 #include "QSendto.h"
 
+#include <qpushbutton.h>
+
+
 namespace lyx {
 namespace frontend {
 
diff --git a/src/frontends/qt2/QShowFile.C b/src/frontends/qt2/QShowFile.C
index 06d5004bff..0dfb15b76b 100644
--- a/src/frontends/qt2/QShowFile.C
+++ b/src/frontends/qt2/QShowFile.C
@@ -10,13 +10,12 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlShowFile.h"
-#include "qt_helpers.h"
-
 #include "QShowFile.h"
 #include "QShowFileDialog.h"
 #include "Qt2BC.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlShowFile.h"
 
 #include <qtextview.h>
 #include <qpushbutton.h>
diff --git a/src/frontends/qt2/QShowFileDialog.C b/src/frontends/qt2/QShowFileDialog.C
index 0514530669..f83bc9c4c2 100644
--- a/src/frontends/qt2/QShowFileDialog.C
+++ b/src/frontends/qt2/QShowFileDialog.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QShowFile.h"
 #include "QShowFileDialog.h"
+#include "QShowFile.h"
 
 #include <qpushbutton.h>
 
diff --git a/src/frontends/qt2/QSpellchecker.C b/src/frontends/qt2/QSpellchecker.C
index 572cf7953a..b9615c9a7f 100644
--- a/src/frontends/qt2/QSpellchecker.C
+++ b/src/frontends/qt2/QSpellchecker.C
@@ -10,15 +10,13 @@
 
 #include <config.h>
 
-#include "debug.h"
-
-#include "controllers/ControlSpellchecker.h"
-
-#include "QSpellcheckerDialog.h"
 #include "QSpellchecker.h"
+#include "QSpellcheckerDialog.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlSpellchecker.h"
+
 #include <qprogressbar.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
diff --git a/src/frontends/qt2/QSpellcheckerDialog.C b/src/frontends/qt2/QSpellcheckerDialog.C
index 35fa29bddd..cb3ed9ebc4 100644
--- a/src/frontends/qt2/QSpellcheckerDialog.C
+++ b/src/frontends/qt2/QSpellcheckerDialog.C
@@ -13,9 +13,9 @@
 #include "QSpellcheckerDialog.h"
 #include "QSpellchecker.h"
 
-#include <qpushbutton.h>
-#include <qlistbox.h>
 #include <qcombobox.h>
+#include <qlistbox.h>
+#include <qpushbutton.h>
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/qt2/QTabular.C b/src/frontends/qt2/QTabular.C
index b12715b136..bac34940af 100644
--- a/src/frontends/qt2/QTabular.C
+++ b/src/frontends/qt2/QTabular.C
@@ -12,20 +12,21 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlTabular.h"
-#include "qt_helpers.h"
-#include "support/tostr.h"
-
-#include "QTabularDialog.h"
 #include "QTabular.h"
+#include "QTabularDialog.h"
 #include "Qt2BC.h"
-#include "ButtonController.h"
 
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
 #include "lengthcombo.h"
+#include "qt_helpers.h"
+
+#include "controllers/ButtonController.h"
+#include "controllers/ControlTabular.h"
+
+#include "support/tostr.h"
+
+#include <qcheckbox.h>
+#include <qlineedit.h>
+#include <qpushbutton.h>
 #include "qsetborder.h"
 
 using std::string;
diff --git a/src/frontends/qt2/QTabularCreate.C b/src/frontends/qt2/QTabularCreate.C
index 843766768d..b6103b9506 100644
--- a/src/frontends/qt2/QTabularCreate.C
+++ b/src/frontends/qt2/QTabularCreate.C
@@ -10,12 +10,12 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlTabularCreate.h"
 #include "QTabularCreateDialog.h"
 #include "QTabularCreate.h"
 #include "Qt2BC.h"
 
+#include "controllers/ControlTabularCreate.h"
+
 #include <qspinbox.h>
 #include <qpushbutton.h>
 
diff --git a/src/frontends/qt2/QTabularCreateDialog.C b/src/frontends/qt2/QTabularCreateDialog.C
index ef862dc6e5..d53998659e 100644
--- a/src/frontends/qt2/QTabularCreateDialog.C
+++ b/src/frontends/qt2/QTabularCreateDialog.C
@@ -11,8 +11,8 @@
 
 #include <config.h>
 
-#include "QTabularCreate.h"
 #include "QTabularCreateDialog.h"
+#include "QTabularCreate.h"
 
 #include <qpushbutton.h>
 #include <qspinbox.h>
diff --git a/src/frontends/qt2/QTabularDialog.C b/src/frontends/qt2/QTabularDialog.C
index eebdfdc601..4d7b4ab159 100644
--- a/src/frontends/qt2/QTabularDialog.C
+++ b/src/frontends/qt2/QTabularDialog.C
@@ -12,13 +12,12 @@
 
 #include <config.h>
 
-
-#include "ControlTabular.h"
-
-#include "QTabular.h"
 #include "QTabularDialog.h"
+#include "QTabular.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlTabular.h"
+
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt2/QTexinfo.C
index 3507585357..ef7467cf41 100644
--- a/src/frontends/qt2/QTexinfo.C
+++ b/src/frontends/qt2/QTexinfo.C
@@ -10,17 +10,16 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "QTexinfoDialog.h"
 #include "QTexinfo.h"
+#include "QTexinfoDialog.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 
 #include "support/filetools.h"
 
+#include <qcheckbox.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
-#include <qcheckbox.h>
 
 using lyx::support::OnlyFilename;
 
diff --git a/src/frontends/qt2/QTexinfoDialog.C b/src/frontends/qt2/QTexinfoDialog.C
index 34da483d06..b9f15db0e2 100644
--- a/src/frontends/qt2/QTexinfoDialog.C
+++ b/src/frontends/qt2/QTexinfoDialog.C
@@ -13,9 +13,9 @@
 #include "QTexinfoDialog.h"
 #include "QTexinfo.h"
 
+#include <qcombobox.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
-#include <qcombobox.h>
 
 using std::vector;
 using std::string;
diff --git a/src/frontends/qt2/QThesaurus.C b/src/frontends/qt2/QThesaurus.C
index ed5b191c15..31994d85fc 100644
--- a/src/frontends/qt2/QThesaurus.C
+++ b/src/frontends/qt2/QThesaurus.C
@@ -10,13 +10,13 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlThesaurus.h"
-#include "QThesaurusDialog.h"
 #include "QThesaurus.h"
+#include "QThesaurusDialog.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlThesaurus.h"
+
 #include <qlineedit.h>
 #include <qpushbutton.h>
 
diff --git a/src/frontends/qt2/QThesaurusDialog.C b/src/frontends/qt2/QThesaurusDialog.C
index db7a85215c..44e97ccb65 100644
--- a/src/frontends/qt2/QThesaurusDialog.C
+++ b/src/frontends/qt2/QThesaurusDialog.C
@@ -10,11 +10,12 @@
 
 #include <config.h>
 
-#include "ControlThesaurus.h"
 #include "QThesaurusDialog.h"
 #include "QThesaurus.h"
 #include "qt_helpers.h"
 
+#include "controllers/ControlThesaurus.h"
+
 #include <qpushbutton.h>
 #include <qlistview.h>
 #include <qlineedit.h>
diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt2/QToc.C
index 88e51740db..0ee8780710 100644
--- a/src/frontends/qt2/QToc.C
+++ b/src/frontends/qt2/QToc.C
@@ -10,19 +10,20 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include <stack>
-
-#include "qt_helpers.h"
-
-#include "ControlToc.h"
 #include "QToc.h"
 #include "QTocDialog.h"
 #include "Qt2BC.h"
+#include "qt_helpers.h"
 
+#include "debug.h"
+
+#include "controllers/ControlToc.h"
+
+#include <qcombobox.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
-#include <qcombobox.h>
+
+#include <stack>
 
 using std::endl;
 
diff --git a/src/frontends/qt2/QTocDialog.C b/src/frontends/qt2/QTocDialog.C
index a873d217e8..0e92d89378 100644
--- a/src/frontends/qt2/QTocDialog.C
+++ b/src/frontends/qt2/QTocDialog.C
@@ -10,9 +10,8 @@
 
 #include <config.h>
 
-
-#include "QToc.h"
 #include "QTocDialog.h"
+#include "QToc.h"
 #include "qt_helpers.h"
 
 #include <qlistview.h>
diff --git a/src/frontends/qt2/QURL.C b/src/frontends/qt2/QURL.C
index 48470c9556..68cf3ec5eb 100644
--- a/src/frontends/qt2/QURL.C
+++ b/src/frontends/qt2/QURL.C
@@ -10,18 +10,17 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlCommand.h"
-#include "qt_helpers.h"
-
 #include "QURL.h"
 #include "QURLDialog.h"
 #include "Qt2BC.h"
-#include "ButtonController.h"
+#include "qt_helpers.h"
+
+#include "controllers/ButtonController.h"
+#include "controllers/ControlCommand.h"
 
 #include <qcheckbox.h>
-#include <qpushbutton.h>
 #include <qlineedit.h>
+#include <qpushbutton.h>
 
 using std::string;
 
diff --git a/src/frontends/qt2/QURLDialog.C b/src/frontends/qt2/QURLDialog.C
index 08ae4bb064..c1600365b9 100644
--- a/src/frontends/qt2/QURLDialog.C
+++ b/src/frontends/qt2/QURLDialog.C
@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include "QURL.h"
 #include "QURLDialog.h"
+#include "QURL.h"
 
-#include <qpushbutton.h>
 #include <qlineedit.h>
+#include <qpushbutton.h>
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/qt2/QVSpace.C b/src/frontends/qt2/QVSpace.C
index e3cc6be868..d7d7f25218 100644
--- a/src/frontends/qt2/QVSpace.C
+++ b/src/frontends/qt2/QVSpace.C
@@ -15,18 +15,20 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "ControlVSpace.h"
 #include "QVSpace.h"
 #include "QVSpaceDialog.h"
 #include "Qt2BC.h"
-#include "lyxrc.h" // to set the default length values
+
+#include "lengthcombo.h"
 #include "qt_helpers.h"
-#include "helper_funcs.h"
 
+#include "lyxrc.h" // to set the default length values
 #include "Spacing.h"
 #include "vspace.h"
 
+#include "controllers/ControlVSpace.h"
+#include "controllers/helper_funcs.h"
+
 #include "support/lstrings.h"
 #include "support/tostr.h"
 
@@ -34,7 +36,6 @@
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include "lengthcombo.h"
 
 
 using std::string;
diff --git a/src/frontends/qt2/QVSpaceDialog.C b/src/frontends/qt2/QVSpaceDialog.C
index 6dfe544a18..133f0b8409 100644
--- a/src/frontends/qt2/QVSpaceDialog.C
+++ b/src/frontends/qt2/QVSpaceDialog.C
@@ -15,13 +15,14 @@
 #include "QVSpaceDialog.h"
 #include "QVSpace.h"
 
-#include <qlineedit.h>
+#include "lengthcombo.h"
+#include "qt_helpers.h"
+
 #include <qcombobox.h>
+#include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qvalidator.h>
-#include "lengthcombo.h"
 
-#include "qt_helpers.h"
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/qt2/QWorkArea.C b/src/frontends/qt2/QWorkArea.C
index 5e105e1d44..40a1f90d30 100644
--- a/src/frontends/qt2/QWorkArea.C
+++ b/src/frontends/qt2/QWorkArea.C
@@ -10,19 +10,21 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "QWorkArea.h"
-#include "LColor.h"
-#include "qt_helpers.h"
+
 #include "lcolorcache.h"
+#include "qt_helpers.h"
+
+#include "debug.h"
 #include "funcrequest.h"
+#include "LColor.h"
 
 #include <qapplication.h>
+#include <qclipboard.h>
 #include <qdragobject.h>
-#include <qpainter.h>
-#include <qmainwindow.h>
 #include <qlayout.h>
-#include <qclipboard.h>
+#include <qmainwindow.h>
+#include <qpainter.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
diff --git a/src/frontends/qt2/QWrap.C b/src/frontends/qt2/QWrap.C
index e501b4609e..967c125ad1 100644
--- a/src/frontends/qt2/QWrap.C
+++ b/src/frontends/qt2/QWrap.C
@@ -10,21 +10,22 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "qt_helpers.h"
-#include "support/tostr.h"
-#include "support/lstrings.h"
-#include "ControlWrap.h"
-
 #include "QWrap.h"
 #include "QWrapDialog.h"
 #include "Qt2BC.h"
+
 #include "lengthcombo.h"
+#include "qt_helpers.h"
+
+#include "controllers/ControlWrap.h"
 
 #include "insets/insetwrap.h"
 
-#include <qpushbutton.h>
+#include "support/tostr.h"
+#include "support/lstrings.h"
+
 #include <qlineedit.h>
+#include <qpushbutton.h>
 
 using lyx::support::strToDbl;
 
diff --git a/src/frontends/qt2/QWrapDialog.C b/src/frontends/qt2/QWrapDialog.C
index 7ea2817c23..3e9783c5d0 100644
--- a/src/frontends/qt2/QWrapDialog.C
+++ b/src/frontends/qt2/QWrapDialog.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "QWrap.h"
 #include "QWrapDialog.h"
+#include "QWrap.h"
 
 #include <qpushbutton.h>
 
diff --git a/src/frontends/qt2/emptytable.C b/src/frontends/qt2/emptytable.C
index d6e61667dc..ce64cde1d1 100644
--- a/src/frontends/qt2/emptytable.C
+++ b/src/frontends/qt2/emptytable.C
@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "emptytable.h"
 #include <qpainter.h>
 
diff --git a/src/frontends/qt2/iconpalette.C b/src/frontends/qt2/iconpalette.C
index 61297d4318..4ed8a936bd 100644
--- a/src/frontends/qt2/iconpalette.C
+++ b/src/frontends/qt2/iconpalette.C
@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include "debug.h"
-
 #include "iconpalette.h"
 #include "qt_helpers.h"
 
+#include "debug.h"
+
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qtooltip.h>
diff --git a/src/frontends/qt2/io_callback.C b/src/frontends/qt2/io_callback.C
index 2d88e658d3..643516ae81 100644
--- a/src/frontends/qt2/io_callback.C
+++ b/src/frontends/qt2/io_callback.C
@@ -11,10 +11,10 @@
 
 #include <config.h>
 
-
+// Qt defines a macro 'signals' that clashes with a boost namespace.
 #include "lyxserver.h"
-#include "io_callback.h"
 
+#include "io_callback.h"
 
 io_callback::io_callback(int fd, LyXComm * comm)
 	: comm_(comm)
diff --git a/src/frontends/qt2/lengthcombo.C b/src/frontends/qt2/lengthcombo.C
index 09261a8074..4fc1a9fe7a 100644
--- a/src/frontends/qt2/lengthcombo.C
+++ b/src/frontends/qt2/lengthcombo.C
@@ -11,7 +11,6 @@
 
 #include <config.h>
 
-
 #include "lengthcombo.h"
 
 #include "lengthcommon.h"
diff --git a/src/frontends/qt2/lengthvalidator.C b/src/frontends/qt2/lengthvalidator.C
index e08291b397..f346163d43 100644
--- a/src/frontends/qt2/lengthvalidator.C
+++ b/src/frontends/qt2/lengthvalidator.C
@@ -12,11 +12,10 @@
 #include <config.h>
 
 #include "lengthvalidator.h"
+#include "qt_helpers.h"
 
 #include "support/lstrings.h"
 
-#include "qt_helpers.h"
-
 #include <qwidget.h>
 
 
diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C
index dbfbd64e79..abb487fab0 100644
--- a/src/frontends/qt2/lyx_gui.C
+++ b/src/frontends/qt2/lyx_gui.C
@@ -11,37 +11,38 @@
 
 #include <config.h>
 
-
-#include "support/lstrings.h"
-#include "support/os.h"
-#include "qt_helpers.h"
-
 #include "lyx_gui.h"
-#include "funcrequest.h"
-#include "graphics/LoaderQueue.h"
 
 // FIXME: move this stuff out again
 #include "bufferlist.h"
+#include "BufferView.h"
+#include "funcrequest.h"
+#include "LColor.h"
 #include "lyx_main.h"
 #include "LyXAction.h"
 #include "lyxfunc.h"
 #include "lyxrc.h"
 #include "lyxserver.h"
 #include "lyxsocket.h"
-#include "BufferView.h"
-#include "LColor.h"
 
-// Dear Lord, deliver us from Evil,
-// aka the Qt headers
+#include "graphics/LoaderQueue.h"
+
+#include "support/lstrings.h"
+#include "support/os.h"
+
+// Dear Lord, deliver us from Evil, aka the Qt headers
+// Qt defines a macro 'signals' that clashes with a boost namespace.
+// All is well if the namespace is visible first.
 #include <boost/signals/signal1.hpp>
 #include <boost/bind.hpp>
 
 #include "QtView.h"
-#include "QLImage.h"
-#include "qfont_loader.h"
 #include "io_callback.h"
-#include "socket_callback.h"
 #include "lcolorcache.h"
+#include "qfont_loader.h"
+#include "QLImage.h"
+#include "qt_helpers.h"
+#include "socket_callback.h"
 
 #ifdef Q_WS_MACX
 #include <Carbon/Carbon.h>
diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C
index 3348a7b3c7..1c7e9ced3a 100644
--- a/src/frontends/qt2/qfont_loader.C
+++ b/src/frontends/qt2/qfont_loader.C
@@ -11,14 +11,18 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "qfont_loader.h"
 #include "qt_helpers.h"
+
+#include "debug.h"
 #include "lyxrc.h"
 
-#include "support/lstrings.h"
 #include "frontends/lyx_gui.h"
 
+#include "support/filetools.h"
+#include "support/lstrings.h"
+#include "support/systemcall.h"
+
 #include <qfontinfo.h>
 
 #include <boost/tuple/tuple.hpp>
@@ -28,8 +32,6 @@
 #include <X11/Xlib.h>
 #include <algorithm>
 #endif
-#include "support/systemcall.h"
-#include "support/filetools.h"
 
 using lyx::support::contains;
 using lyx::support::LibFileSearch;
diff --git a/src/frontends/qt2/qfont_metrics.C b/src/frontends/qt2/qfont_metrics.C
index 12e5045a82..6c5a7e9969 100644
--- a/src/frontends/qt2/qfont_metrics.C
+++ b/src/frontends/qt2/qfont_metrics.C
@@ -11,11 +11,14 @@
 
 #include <config.h>
 
-#include "font_metrics.h"
+#include "frontends/font_metrics.h"
 #include "frontends/lyx_gui.h"
+
 #include "qfont_loader.h"
+
 #include "language.h"
 
+
 using std::string;
 
 
diff --git a/src/frontends/qt2/qscreen.C b/src/frontends/qt2/qscreen.C
index 9419f6c361..e40a847ba5 100644
--- a/src/frontends/qt2/qscreen.C
+++ b/src/frontends/qt2/qscreen.C
@@ -10,9 +10,10 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "QWorkArea.h"
 #include "qscreen.h"
+
+#include "debug.h"
 #include "LColor.h"
 
 #include <qapplication.h>
diff --git a/src/frontends/qt2/qsetborder.C b/src/frontends/qt2/qsetborder.C
index 548512f4ab..7d7b9e34a4 100644
--- a/src/frontends/qt2/qsetborder.C
+++ b/src/frontends/qt2/qsetborder.C
@@ -11,8 +11,8 @@
 
 #include <config.h>
 
-#include <qpainter.h>
 #include "qsetborder.h"
+#include <qpainter.h>
 
 
 QSetBorder::QSetBorder(QWidget * parent, char const * name, WFlags fl)
diff --git a/src/frontends/qt2/qtTimeout.C b/src/frontends/qt2/qtTimeout.C
index b8768c792d..241932b4a0 100644
--- a/src/frontends/qt2/qtTimeout.C
+++ b/src/frontends/qt2/qtTimeout.C
@@ -10,9 +10,10 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "qtTimeout.h"
 
+#include "debug.h"
+
 
 Timeout::Timeout(unsigned int msec, Type t)
 	: pimpl_(new qtTimeout(*this)), type(t), timeout_ms(msec)
diff --git a/src/frontends/qt2/qt_helpers.C b/src/frontends/qt2/qt_helpers.C
index 109f083739..91a9077335 100644
--- a/src/frontends/qt2/qt_helpers.C
+++ b/src/frontends/qt2/qt_helpers.C
@@ -11,12 +11,13 @@
 
 #include <config.h>
 
-#include "support/tostr.h"
-#include "support/lstrings.h"
-#include "gettext.h"
+#include "lengthcombo.h"
 #include "qt_helpers.h"
 
-#include "lengthcombo.h"
+#include "gettext.h"
+
+#include "support/lstrings.h"
+#include "support/tostr.h"
 
 #include <qlineedit.h>
 #include <qtextcodec.h>
diff --git a/src/frontends/qt2/socket_callback.C b/src/frontends/qt2/socket_callback.C
index ab3f1611fc..55e7b306d7 100644
--- a/src/frontends/qt2/socket_callback.C
+++ b/src/frontends/qt2/socket_callback.C
@@ -12,7 +12,6 @@
 
 #include <config.h>
 
-
 #include "lyxsocket.h"
 #include "socket_callback.h"
 
@@ -37,6 +36,7 @@ void socket_callback::server_received()
 	server_->serverCallback();
 }
 
+
 void socket_callback::data_received()
 {
 	data_->server()->dataCallback(data_);