7 files changed, 17 insertions, 17 deletions
diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index fcf66a33a..d30c0c328 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -19,9 +19,10 @@
 # include "config.h"
 #endif
 
+#include "dash-selector.h"
+
 #include <cstring>
 #include <string>
-#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 #include <2geom/coord.h>
 
@@ -34,8 +35,6 @@
 #include "ui/widget/spinbutton.h"
 
 
-#include "dash-selector.h"
-
 gchar const *const SPDashSelector::_prefs_path = "/palette/dashes";
 
 static double dash_0[] = {-1.0};
diff --git a/src/widgets/dash-selector.h b/src/widgets/dash-selector.h
index 1fadf4385..a8a1032d4 100644
--- a/src/widgets/dash-selector.h
+++ b/src/widgets/dash-selector.h
@@ -10,7 +10,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glibmm/ustring.h>
 #include <gtkmm/box.h>
 #include <sigc++/signal.h>
 
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 49979493c..cd7031dea 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -24,12 +24,13 @@
 # include "config.h"
 #endif
 
-#include <gtk/gtk.h>
 #include <2geom/rect.h>
 
+#include "ui/dialog/dialog-manager.h"
 #include "box3d-context.h"
 #include "cms-system.h"
 #include "conn-avoid-ref.h"
+#include "desktop.h"
 #include "desktop-events.h"
 #include "desktop-handles.h"
 #include "desktop-widget.h"
@@ -49,7 +50,6 @@
 #include "sp-image.h"
 #include "sp-item.h"
 #include "sp-namedview.h"
-#include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/swatches.h"
 #include "ui/icon-names.h"
 #include "ui/widget/dock.h"
@@ -68,6 +68,9 @@
 #include "widget-sizes.h"
 
 #include "verbs.h"
+#include <gtkmm/paned.h>
+
+#include <gtk/gtk.h>
 
 #if defined (SOLARIS) && (SOLARIS == 8)
 #include "round.h"
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index b231b4e38..d330e2bac 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -24,8 +24,8 @@
 #include <cstring>
 #include <string>
 
-#include <gtk/gtk.h>
 
+#include "widgets/swatch-selector.h"
 #include "../sp-pattern.h"
 #include <glibmm/i18n.h>
 #include "../widgets/icon.h"
@@ -47,7 +47,6 @@
 #include "io/sys.h"
 #include "helper/stock-items.h"
 #include "ui/icon-names.h"
-#include "widgets/swatch-selector.h"
 
 #include "paint-selector.h"
 
@@ -55,6 +54,7 @@
 #include "svg/svg-icc-color.h"
 #endif // SP_PS_VERBOSE
 
+#include <gtk/gtk.h>
 
 using Inkscape::Widgets::SwatchSelector;
 
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index ece329576..f9c94dc47 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -16,16 +16,16 @@
 
 #include <cstring>
 #include <string>
-#include <gtk/gtk.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
+#include <gtkmm/table.h>
 
 #include "selection.h"
 
 #include "helper/unit-menu.h"
 
-
-#include <gtkmm/label.h>
-#include <gtkmm/box.h>
-#include <gtkmm/table.h>
+#include <gtk/gtk.h>
 
 /**
  * Creates a label widget with the given text, at the given col, row
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 6d64ff25c..0f5fc0b97 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -18,8 +18,8 @@
 #define noSP_SS_VERBOSE
 
 #include <glib.h>
-#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
+#include "widgets/dash-selector.h"
 
 #include "desktop-handles.h"
 #include "desktop-style.h"
@@ -47,7 +47,6 @@
 #include "svg/css-ostringstream.h"
 #include "ui/cache/svg_preview_cache.h"
 #include "ui/icon-names.h"
-#include "widgets/dash-selector.h"
 #include "widgets/icon.h"
 #include "widgets/paint-selector.h"
 #include "widgets/sp-widget.h"
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 171fc8332..a75960fd9 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -32,7 +32,7 @@
 #include <cstring>
 #include <string>
 
-#include <gtk/gtk.h>
+#include "../libnrtype/font-lister.h"
 #include <iostream>
 #include <sstream>
 #include <glibmm/i18n.h>
@@ -62,7 +62,6 @@
 #include "../inkscape.h"
 #include "../interface.h"
 #include "../libnrtype/font-instance.h"
-#include "../libnrtype/font-lister.h"
 #include "../live_effects/effect.h"
 #include "../live_effects/lpe-angle_bisector.h"
 #include "../live_effects/lpe-line_segment.h"
@@ -109,6 +108,7 @@
 #include "ui/uxmanager.h"
 
 #include "toolbox.h"
+#include <gtk/gtk.h>
 
 //#define DEBUG_TEXT