Clean up all remaining false warnings from Gtkmm

(bzr r11018)

102 files changed, 236 insertions, 275 deletions

diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h
index 57b3798a2..6af951726 100644
--- a/src/libnrtype/font-lister.h
+++ b/src/libnrtype/font-lister.h
@@ -14,8 +14,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glibmm.h>
 #include <gtkmm.h>
+#include <glibmm.h>
 #include "nr-type-primitives.h"
 
 namespace Inkscape
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index e851571ef..0b1fe1160 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -13,33 +13,6 @@
 # include "config.h"
 #endif
 
-#include "xml/node-event-vector.h"
-#include "sp-object.h"
-#include "attributes.h"
-#include "message-stack.h"
-#include "desktop.h"
-#include "inkscape.h"
-#include "document.h"
-#include "document-private.h"
-#include "xml/document.h"
-#include <glibmm/i18n.h>
-#include "pen-context.h"
-#include "tools-switch.h"
-#include "message-stack.h"
-#include "desktop.h"
-#include "knotholder.h"
-#include "sp-lpe-item.h"
-#include "live_effects/lpeobject.h"
-#include "live_effects/parameter/parameter.h"
-#include <glibmm/ustring.h>
-#include "display/curve.h"
-
-#include <exception>
-
-#include <2geom/sbasis-to-bezier.h>
-#include <2geom/affine.h>
-#include <2geom/pathvector.h>
-
 // include effects:
 #include "live_effects/lpe-patternalongpath.h"
 #include "live_effects/lpe-bendpath.h"
@@ -76,6 +49,33 @@
 #include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-clone-original.h"
 
+#include "xml/node-event-vector.h"
+#include "sp-object.h"
+#include "attributes.h"
+#include "message-stack.h"
+#include "desktop.h"
+#include "inkscape.h"
+#include "document.h"
+#include "document-private.h"
+#include "xml/document.h"
+#include <glibmm/i18n.h>
+#include "pen-context.h"
+#include "tools-switch.h"
+#include "message-stack.h"
+#include "desktop.h"
+#include "knotholder.h"
+#include "sp-lpe-item.h"
+#include "live_effects/lpeobject.h"
+#include "live_effects/parameter/parameter.h"
+#include <glibmm/ustring.h>
+#include "display/curve.h"
+
+#include <exception>
+
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/affine.h>
+#include <2geom/pathvector.h>
+
 
 namespace Inkscape {
 
diff --git a/src/live_effects/lpe-lattice.h b/src/live_effects/lpe-lattice.h
index 636b5e20b..f95e33b0b 100644
--- a/src/live_effects/lpe-lattice.h
+++ b/src/live_effects/lpe-lattice.h
@@ -17,11 +17,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "live_effects/parameter/enum.h"
 #include "live_effects/effect.h"
 #include "live_effects/parameter/point.h"
-#include "live_effects/parameter/enum.h"
-#include "live_effects/parameter/bool.h"
-
 #include "live_effects/lpegroupbbox.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-powerstroke.h b/src/live_effects/lpe-powerstroke.h
index feac395b7..d154ab165 100644
--- a/src/live_effects/lpe-powerstroke.h
+++ b/src/live_effects/lpe-powerstroke.h
@@ -12,10 +12,10 @@
 #ifndef INKSCAPE_LPE_POWERSTROKE_H
 #define INKSCAPE_LPE_POWERSTROKE_H
 
+#include "live_effects/parameter/enum.h"
 #include "live_effects/effect.h"
 #include "live_effects/parameter/bool.h"
 #include "live_effects/parameter/powerstrokepointarray.h"
-#include "live_effects/parameter/enum.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index 50f50d0ae..a6fdde02a 100644
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -13,6 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/scalar.h"
 #include "live_effects/lpe-rough-hatches.h"
 
 #include "sp-item.h"
@@ -30,7 +31,6 @@
 #include <2geom/d2.h>
 #include <2geom/affine.h>
 
-#include "ui/widget/scalar.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-ruler.h b/src/live_effects/lpe-ruler.h
index 0c72f1637..497398e22 100644
--- a/src/live_effects/lpe-ruler.h
+++ b/src/live_effects/lpe-ruler.h
@@ -16,9 +16,7 @@
  */
 
 #include "live_effects/effect.h"
-#include "live_effects/parameter/text.h"
 #include "live_effects/parameter/enum.h"
-#include "live_effects/parameter/bool.h"
 #include "live_effects/parameter/unit.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-spiro.h b/src/live_effects/lpe-spiro.h
index 4fcd9eaaa..f3cdbda79 100644
--- a/src/live_effects/lpe-spiro.h
+++ b/src/live_effects/lpe-spiro.h
@@ -8,10 +8,6 @@
  */
 
 #include "live_effects/effect.h"
-#include "live_effects/parameter/parameter.h"
-#include "live_effects/parameter/point.h"
-#include "ui/widget/registered-widget.h"
-
 
 
 namespace Inkscape {
diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp
index 93a836b90..6dbe2918f 100644
--- a/src/live_effects/parameter/bool.cpp
+++ b/src/live_effects/parameter/bool.cpp
@@ -6,12 +6,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/bool.h"
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 #include "widgets/icon.h"
-#include "ui/widget/registered-widget.h"
 #include "inkscape.h"
 #include "verbs.h"
 #include "helper-fns.h"
diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp
index 4a8bfb78a..e5c16943c 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -4,11 +4,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <gtkmm/box.h>
 #include "live_effects/parameter/originalpath.h"
 
 #include "widgets/icon.h"
 #include <glibmm/i18n.h>
-#include <gtkmm/box.h>
 #include <gtkmm/button.h>
 #include <gtkmm/label.h>
 
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 16883deda..186cfff9a 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -42,6 +42,8 @@
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/shape-record.h"
 
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp
index 7f387fe24..e3731fdcf 100644
--- a/src/live_effects/parameter/point.cpp
+++ b/src/live_effects/parameter/point.cpp
@@ -6,13 +6,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/point.h"
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 #include "ui/widget/point.h"
 #include "widgets/icon.h"
-#include "ui/widget/registered-widget.h"
 #include "inkscape.h"
 #include "verbs.h"
 #include "knotholder.h"
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 4e70a1ad0..13440798b 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -10,12 +10,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/text.h"
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 #include "widgets/icon.h"
-#include "ui/widget/registered-widget.h"
 #include "inkscape.h"
 #include "verbs.h"
 #include "display/canvas-text.h"
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index e9ddc756c..e8725c4b2 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -6,13 +6,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/vector.h"
 #include "sp-lpe-item.h"
 #include "knotholder.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 
-#include "ui/widget/registered-widget.h"
 #include "live_effects/effect.h"
 #include "desktop.h"
 #include "verbs.h"
diff --git a/src/main.cpp b/src/main.cpp
index d4a75f5ae..4bf327284 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,6 +31,8 @@
 // This has to be included prior to anything that includes setjmp.h, it croaks otherwise
 #include <png.h>
 
+#include "ui/widget/panel.h"
+
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
@@ -109,7 +111,6 @@
 
 #include "main-cmdlineact.h"
 #include "widgets/icon.h"
-#include "ui/widget/panel.h"
 
 #include <errno.h>
 #include "verbs.h"
diff --git a/src/ui/context-menu.cpp b/src/ui/context-menu.cpp
index 5bc9af2bc..3655d990d 100644
--- a/src/ui/context-menu.cpp
+++ b/src/ui/context-menu.cpp
@@ -13,6 +13,7 @@
 # include "config.h"
 #endif
 
+#include "ui/dialog/dialog-manager.h"
 #include "context-menu.h"
 #include "../xml/repr.h"
 #include "desktop.h"
@@ -20,7 +21,6 @@
 #include "document-undo.h"
 #include "message-stack.h"
 #include "preferences.h"
-#include "ui/dialog/dialog-manager.h"
 #include "verbs.h"
 
 using Inkscape::DocumentUndo;
diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index 3ac81eaaf..f6adc71c0 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -21,6 +21,7 @@
 # include <config.h>
 #endif
 
+#include "ui/dialog/aboutbox.h"
 #include <glibmm/i18n.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/scrolledwindow.h>
@@ -33,7 +34,6 @@
 #include "svg-view-widget.h"
 #include "sp-text.h"
 #include "text-editing.h"
-#include "ui/dialog/aboutbox.h"
 
 #include "inkscape-version.h"
 
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 2ee5fd353..062384b52 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -21,6 +21,7 @@
 # include <config.h>
 #endif
 
+#include "align-and-distribute.h"
 #include <2geom/transforms.h>
 #include "ui/widget/spinbutton.h"
 #include "desktop-handles.h"
@@ -47,7 +48,7 @@
 #include "sp-root.h"
 #include "document-undo.h"
 
-#include "align-and-distribute.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h
index 2e33822e7..8cbd48f28 100644
--- a/src/ui/dialog/align-and-distribute.h
+++ b/src/ui/dialog/align-and-distribute.h
@@ -15,18 +15,13 @@
 #ifndef INKSCAPE_UI_DIALOG_ALIGN_AND_DISTRIBUTE_H
 #define INKSCAPE_UI_DIALOG_ALIGN_AND_DISTRIBUTE_H
 
-#include <gtkmm/notebook.h>
-#include <glibmm/i18n.h>
-
 #include <list>
+#include "ui/widget/panel.h"
 #include <gtkmm/frame.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/table.h>
-#include <gtkmm/buttonbox.h>
 #include <gtkmm/label.h>
 
-#include "ui/widget/panel.h"
-#include "ui/widget/notebook-page.h"
 #include "2geom/rect.h"
 
 
diff --git a/src/ui/dialog/calligraphic-profile-rename.cpp b/src/ui/dialog/calligraphic-profile-rename.cpp
index 33996161d..da3b5a802 100644
--- a/src/ui/dialog/calligraphic-profile-rename.cpp
+++ b/src/ui/dialog/calligraphic-profile-rename.cpp
@@ -17,11 +17,11 @@
 # include <config.h>
 #endif
 
+#include "calligraphic-profile-rename.h"
 #include <glibmm/i18n.h>
 #include <gtkmm/stock.h>
 
 #include "desktop.h"
-#include "calligraphic-profile-rename.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 3e53dcb53..cdb087c9b 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -17,21 +17,23 @@
 # include <config.h>
 #endif
 
+#include "dialog-manager.h"
+#include <gtkmm/dialog.h>
 #include <gtkmm/stock.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "inkscape.h"
 #include "event-context.h"
 #include "desktop.h"
 #include "desktop-handles.h"
-#include "dialog-manager.h"
 #include "modifier-fns.h"
 #include "shortcuts.h"
 #include "preferences.h"
 #include "interface.h"
 #include "verbs.h"
 
+#include <gtk/gtk.h>
+
 #define MIN_ONSCREEN_DISTANCE 50
 
 
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index 2b2661bfe..6318ffbbb 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -18,6 +18,7 @@
 # include <config.h>
 #endif
 
+#include "document-metadata.h"
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "inkscape.h"
@@ -27,9 +28,6 @@
 #include "verbs.h"
 #include "xml/node-event-vector.h"
 
-#include "document-metadata.h"
-
-//using std::pair;
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/document-metadata.h b/src/ui/dialog/document-metadata.h
index e9e1789af..f201679b5 100644
--- a/src/ui/dialog/document-metadata.h
+++ b/src/ui/dialog/document-metadata.h
@@ -15,11 +15,8 @@
 
 #include <list>
 #include <stddef.h>
-#include <sigc++/sigc++.h>
-#include <gtkmm/notebook.h>
-#include <glibmm/i18n.h>
-
 #include "ui/widget/panel.h"
+#include <gtkmm/notebook.h>
 #include "ui/widget/licensor.h"
 #include "ui/widget/notebook-page.h"
 #include "ui/widget/registry.h"
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 9e76a4534..f45b52f5b 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -22,8 +22,8 @@
 # include <config.h>
 #endif
 
-#include "display/canvas-grid.h"
 #include "document-properties.h"
+#include "display/canvas-grid.h"
 #include "document.h"
 #include "desktop-handles.h"
 #include "desktop.h"
diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index d4065f4ab..21453141a 100644
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -14,16 +14,14 @@
 #ifndef INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H
 #define INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H
 
-#include <list>
 #include <stddef.h>
 #include <sigc++/sigc++.h>//
+#include "ui/widget/notebook-page.h"
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/textview.h>
-#include <glibmm/i18n.h>
 
-#include "ui/widget/notebook-page.h"
 #include "ui/widget/page-sizer.h"
 #include "ui/widget/registered-widget.h"
 #include "ui/widget/registry.h"
diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp
index 282f43a25..cd5491c24 100644
--- a/src/ui/dialog/extension-editor.cpp
+++ b/src/ui/dialog/extension-editor.cpp
@@ -15,6 +15,7 @@
 # include <config.h>
 #endif
 
+#include "extension-editor.h"
 #include <glibmm/i18n.h>
 
 #include <gtkmm/frame.h>
@@ -22,7 +23,6 @@
 #include <gtkmm/alignment.h>
 #include <gtkmm/notebook.h>
 
-#include "extension-editor.h"
 #include "verbs.h"
 #include "preferences.h"
 #include "interface.h"
diff --git a/src/ui/dialog/extension-editor.h b/src/ui/dialog/extension-editor.h
index c209eb883..1fc9b5730 100644
--- a/src/ui/dialog/extension-editor.h
+++ b/src/ui/dialog/extension-editor.h
@@ -15,12 +15,8 @@
 
 #include "ui/widget/panel.h"
 
-#include <glibmm/i18n.h>
-
 #include <gtkmm/treestore.h>
 #include <gtkmm/treeview.h>
-#include <gtkmm/label.h>
-#include <gtkmm/frame.h>
 #include <gtkmm/scrolledwindow.h>
 
 #include "extension/extension.h"
diff --git a/src/ui/dialog/extensions.cpp b/src/ui/dialog/extensions.cpp
index bdb5b8f62..ffea6395f 100644
--- a/src/ui/dialog/extensions.cpp
+++ b/src/ui/dialog/extensions.cpp
@@ -10,12 +10,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h> //for GTK_RESPONSE* types
+#include "extensions.h"
+#include "extension/extension.h"
 #include <gtkmm/scrolledwindow.h>
 
 #include "extension/db.h"
-#include "extensions.h"
-#include "extension/extension.h"
 
 
 namespace Inkscape {
diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp
index c31f7cf15..cff2f2488 100644
--- a/src/ui/dialog/filedialog.cpp
+++ b/src/ui/dialog/filedialog.cpp
@@ -15,12 +15,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "filedialog.h"
 #include "filedialogimpl-gtkmm.h"
+#include "filedialog.h"
 #include "filedialogimpl-win32.h"
 
 #include "gc-core.h"
 #include <dialogs/dialog-events.h>
+#include "extension/output.h"
 
 namespace Inkscape
 {
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 3de84be84..ab936c941 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -32,7 +32,14 @@
 # include <libgnomevfs/gnome-vfs.h>
 #endif
 
+#include <gtkmm/expander.h>
 #include <gtkmm/stock.h>
+#include <glibmm/i18n.h>
+#include "extension/input.h"
+#include "extension/output.h"
+#include "extension/db.h"
+#include "svg-view-widget.h"
+#include "inkscape.h"
 
 //Routines from file.cpp
 #undef INK_DUMP_FILENAME_CONV
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h
index 5b6a12ca0..d40edd67d 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.h
+++ b/src/ui/dialog/filedialogimpl-gtkmm.h
@@ -17,38 +17,22 @@
 #ifndef __FILE_DIALOGIMPL_H__
 #define __FILE_DIALOGIMPL_H__
 
-#include "filedialog.h"
-#include "extension/system.h"
+//Gtk includes
+#include <gtkmm/filechooserdialog.h>
+#include <glib/gstdio.h>
+#include <gtkmm/comboboxtext.h>
 
 //General includes
 #include <unistd.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
 
-//Gtk includes
-#include <glibmm/i18n.h>
-#include <glib/gstdio.h>
-#include <gtkmm/comboboxtext.h>
-#include <gtkmm/expander.h>
-#include <gtkmm/filechooserdialog.h>
-
-//Temporary ugly hack
-//Remove this after the get_filter() calls in
-//show() on both classes are fixed
-#include <gtk/gtk.h>
+#include "filedialog.h"
 
-//Inkscape includes
-#include "extension/input.h"
-#include "extension/output.h"
-#include "extension/db.h"
-#include "inkscape.h"
-#include "svg-view-widget.h"
 
-//For export dialog
-#include "ui/widget/scalar-unit.h"
+namespace Gtk {
+class Expander;
+}
 
 namespace Inkscape
 {
diff --git a/src/ui/dialog/fill-and-stroke.h b/src/ui/dialog/fill-and-stroke.h
index b4be9ce59..f388d2873 100644
--- a/src/ui/dialog/fill-and-stroke.h
+++ b/src/ui/dialog/fill-and-stroke.h
@@ -15,16 +15,14 @@
 #ifndef INKSCAPE_UI_DIALOG_FILL_AND_STROKE_H
 #define INKSCAPE_UI_DIALOG_FILL_AND_STROKE_H
 
-#include <gtkmm/alignment.h>
-#include <gtkmm/notebook.h>
-#include <gtkmm/scale.h>
-#include <glibmm/i18n.h>
-
 #include "ui/widget/panel.h"
 #include "ui/widget/notebook-page.h"
 #include "ui/widget/object-composite-settings.h"
 #include "ui/dialog/desktop-tracker.h"
 
+#include <gtkmm/notebook.h>
+#include "ui/widget/style-subject.h"
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 7e83069cc..829813d91 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -18,13 +18,12 @@
 # include <config.h>
 #endif
 
-#include <gtk/gtk.h>
+#include "dialog-manager.h"
 #include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
 #include "desktop-handles.h"
-#include "dialog-manager.h"
 #include "dir-util.h"
 #include "document.h"
 #include "document-undo.h"
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index d134ae1a9..9d3508c53 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -14,8 +14,8 @@
 # include <config.h>
 #endif
 
-#include <gtkmm/widget.h>
 #include "find.h"
+#include <gtkmm/widget.h>
 #include "verbs.h"
 
 #include "message-stack.h"
@@ -51,6 +51,7 @@
 #include "sp-root.h"
 #include "xml/repr.h"
 
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h
index d672bc658..15263caac 100644
--- a/src/ui/dialog/find.h
+++ b/src/ui/dialog/find.h
@@ -12,12 +12,9 @@
 #ifndef INKSCAPE_UI_DIALOG_FIND_H
 #define INKSCAPE_UI_DIALOG_FIND_H
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/panel.h"
 #include "ui/widget/button.h"
 #include "ui/widget/entry.h" 
-#include <gtkmm/separator.h>
 #include <glib.h>
 
 class SPItem;
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index 6e3bd0b57..6748665ad 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -10,6 +10,7 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
+#include <gtkmm/dialog.h>
 #include <gtkmm/stock.h>
 #include <gtk/gtk.h>
 
diff --git a/src/ui/dialog/floating-behavior.h b/src/ui/dialog/floating-behavior.h
index 6ad316457..c6b6a93e9 100644
--- a/src/ui/dialog/floating-behavior.h
+++ b/src/ui/dialog/floating-behavior.h
@@ -13,10 +13,13 @@
 #ifndef INKSCAPE_UI_DIALOG_FLOATING_BEHAVIOR_H
 #define INKSCAPE_UI_DIALOG_FLOATING_BEHAVIOR_H
 
-#include <gtkmm/dialog.h>
 #include <glibmm/property.h>
 #include "behavior.h"
 
+namespace Gtk {
+class Dialog;
+}
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index e3cc4b74b..b2ded6495 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -8,8 +8,11 @@
 
 #include <vector>
 
+#include "glyphs.h"
+
 #include <glibmm/i18n.h>
 #include <gtkmm/alignment.h>
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/iconview.h>
 #include <gtkmm/label.h>
@@ -19,10 +22,6 @@
 #include <gtkmm/treemodelcolumn.h>
 #include <gtkmm/widget.h>
 
-#include <gtk/gtk.h>
-
-#include "glyphs.h"
-
 #include "desktop.h"
 #include "document.h" // for SPDocumentUndo::done()
 #include "document-undo.h"
diff --git a/src/ui/dialog/glyphs.h b/src/ui/dialog/glyphs.h
index e0021ce28..162c7b296 100644
--- a/src/ui/dialog/glyphs.h
+++ b/src/ui/dialog/glyphs.h
@@ -7,9 +7,8 @@
 #ifndef SEEN_DIALOGS_GLYPHS_H
 #define SEEN_DIALOGS_GLYPHS_H
 
-#include <gtkmm/comboboxtext.h>
-#include <gtkmm/treemodel.h>
 #include "ui/widget/panel.h"
+#include <gtkmm/treemodel.h>
 #include "ui/dialog/desktop-tracker.h"
 
 
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 51ade2756..d102e5779 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -17,12 +17,11 @@
 # include <config.h>
 #endif
 
+#include <gtkmm/buttonbox.h>
 #include <boost/scoped_ptr.hpp>
-#include <gtk/gtk.h>
 #include <glib.h>
 #include <glibmm/i18n.h>
 #include <gtkmm/alignment.h>
-#include <gtkmm/buttonbox.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/stock.h>
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 98a14ddf3..23e0784f0 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -17,21 +17,18 @@
 # include <config.h>
 #endif
 
+#include "inkscape-preferences.h"
 #include <gtkmm/main.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/alignment.h>
 
-#include <gtk/gtk.h>
-
 #include "preferences.h"
-#include "inkscape-preferences.h"
 #include "verbs.h"
 #include "selcue.h"
 #include "unit-constants.h"
 #include <iostream>
 #include "enums.h"
-// #include "inkscape.h"
 #include "desktop-handles.h"
 #include "message-stack.h"
 #include "style.h"
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 6a46ef83c..5b5fe9822 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -17,20 +17,14 @@
 
 #include <iostream>
 #include <vector>
-#include <gtkmm/base.h>
-#include <gtkmm/table.h>
+#include "ui/widget/preferences-widget.h"
 #include <gtkmm/colorbutton.h>
 #include <gtkmm/comboboxtext.h>
-#include <gtkmm/spinbutton.h>
 #include <gtkmm/treestore.h>
 #include <gtkmm/treeview.h>
-#include <gtkmm/radiobutton.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/notebook.h>
-#include "ui/widget/preferences-widget.h"
 #include <stddef.h>
-#include <sigc++/sigc++.h>
-#include <glibmm/i18n.h>
 #include <gtkmm/textview.h>
 #include <gtkmm/scrolledwindow.h>
 
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index 171057991..1e60d7f8a 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -12,6 +12,7 @@
 #include <map>
 #include <set>
 #include <list>
+#include "ui/widget/panel.h"
 #include <glib/gprintf.h>
 #include <glibmm/i18n.h>
 #include <gtkmm/alignment.h>
@@ -36,7 +37,6 @@
 
 #include "device-manager.h"
 #include "preferences.h"
-#include "ui/widget/panel.h"
 
 #include "input.h"
 
diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp
index b674e990b..f292ad565 100644
--- a/src/ui/dialog/layer-properties.cpp
+++ b/src/ui/dialog/layer-properties.cpp
@@ -13,6 +13,7 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information
  */
 
+#include "layer-properties.h"
 #include <gtkmm/stock.h>
 #include <glibmm/i18n.h>
 #include "inkscape.h"
@@ -25,8 +26,8 @@
 #include "sp-object.h"
 #include "sp-item.h"
 #include "verbs.h"
+#include "selection.h"
 
-#include "layer-properties.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/layer-properties.h b/src/ui/dialog/layer-properties.h
index 4172c284d..c7d7de130 100644
--- a/src/ui/dialog/layer-properties.h
+++ b/src/ui/dialog/layer-properties.h
@@ -13,18 +13,16 @@
 #define INKSCAPE_DIALOG_LAYER_PROPERTIES_H
 
 #include <gtkmm/dialog.h>
-#include <gtkmm/notebook.h>
-#include <gtkmm/separator.h>
-#include <gtkmm/frame.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
 #include <gtkmm/table.h>
 #include <gtkmm/combobox.h>
 #include <gtkmm/liststore.h>
 
-#include "selection.h"
 #include "layer-fns.h"
 
+class SPDesktop;
+
 namespace Inkscape {
 namespace UI {
 namespace Dialogs {
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 9dc3a18f5..66f0167aa 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -13,7 +13,7 @@
 # include <config.h>
 #endif
 
-#include <gtk/gtk.h>
+#include "layers.h"
 #include <gtkmm/widget.h>
 #include <gtkmm/icontheme.h>
 #include <glibmm/i18n.h>
@@ -37,7 +37,6 @@
 #include "xml/repr.h"
 #include "sp-root.h"
 
-#include "layers.h"
 
 //#define DUMP_LAYERS 1
 
diff --git a/src/ui/dialog/layers.h b/src/ui/dialog/layers.h
index 7de1df520..0a6f683dd 100644
--- a/src/ui/dialog/layers.h
+++ b/src/ui/dialog/layers.h
@@ -12,19 +12,16 @@
 #ifndef SEEN_LAYERS_PANEL_H
 #define SEEN_LAYERS_PANEL_H
 
+#include <gtkmm/box.h>
+#include <gtkmm/buttonbox.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/treestore.h>
-#include <gtkmm/scale.h>
 #include <gtkmm/scrolledwindow.h>
-#include <gtkmm/box.h>
-#include <gtkmm/buttonbox.h>
 #include "ui/widget/spinbutton.h"
-#include <gtkmm/notebook.h>
-
-//#include "ui/previewholder.h"
 #include "ui/widget/panel.h"
 #include "ui/widget/object-composite-settings.h"
 #include "desktop-tracker.h"
+#include "ui/widget/style-subject.h"
 
 class SPObject;
 
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 92d28f184..ecc7d4137 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -16,6 +16,7 @@
 # include <config.h>
 #endif
 
+#include "livepatheffect-editor.h"
 #include <glibmm/i18n.h>
 #include <gtkmm/stock.h>
 #include <gtkmm/toolbar.h>
@@ -42,7 +43,6 @@
 #include "verbs.h"
 #include "xml/node.h"
 
-#include "livepatheffect-editor.h"
 
 namespace Inkscape {
 class Application;
diff --git a/src/ui/dialog/livepatheffect-editor.h b/src/ui/dialog/livepatheffect-editor.h
index 42d217387..a2672da6d 100644
--- a/src/ui/dialog/livepatheffect-editor.h
+++ b/src/ui/dialog/livepatheffect-editor.h
@@ -12,17 +12,14 @@
 #define INKSCAPE_UI_DIALOG_LIVE_PATH_EFFECT_H
 
 #include "ui/widget/panel.h"
-#include "ui/widget/button.h"
 
 #include <gtkmm/label.h>
-#include <gtkmm/comboboxtext.h>
 #include <gtkmm/frame.h>
 #include "ui/widget/combo-enums.h"
 #include "live_effects/effect-enum.h"
 #include <gtkmm/liststore.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/scrolledwindow.h>
-#include <gtkmm/buttonbox.h>
 #include <gtkmm/toolbar.h>
 
 
diff --git a/src/ui/dialog/memory.cpp b/src/ui/dialog/memory.cpp
index 8229929e5..97a3dc93c 100644
--- a/src/ui/dialog/memory.cpp
+++ b/src/ui/dialog/memory.cpp
@@ -14,12 +14,12 @@
 # include <config.h>
 #endif
 
+#include "ui/dialog/memory.h"
 #include <glibmm/i18n.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/treeview.h>
 
 #include "gc-core.h"
-#include "ui/dialog/memory.h"
 #include "debug/heap.h"
 #include "verbs.h"
 
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index c82b3a20f..58e39d522 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -18,13 +18,16 @@
 # include "config.h"
 #endif
 
+#include "object-properties.h"
 #include "../../desktop-handles.h"
 #include "../../document.h"
 #include "../../document-undo.h"
 #include "verbs.h"
-#include "object-properties.h"
 #include "inkscape.h"
 #include "selection.h"
+#include "desktop.h"
+#include "sp-item.h"
+#include <glibmm/i18n.h>
 
 
 namespace Inkscape {
diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h
index 7d96a4df9..1b76133b6 100644
--- a/src/ui/dialog/object-properties.h
+++ b/src/ui/dialog/object-properties.h
@@ -13,16 +13,16 @@
 #ifndef SEEN_DIALOGS_ITEM_PROPERTIES_H
 #define SEEN_DIALOGS_ITEM_PROPERTIES_H
 
-#include <gtk/gtk.h>
-#include <glibmm/i18n.h>
+#include "ui/widget/panel.h"
+#include "ui/dialog/desktop-tracker.h"
+#include "widgets/sp-attribute-widget.h"
+
 #include <gtkmm/expander.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/textview.h>
 
-#include "desktop.h"
-#include "ui/dialog/desktop-tracker.h"
-#include "ui/widget/panel.h"
-#include "widgets/sp-attribute-widget.h"
+class SPDesktop;
+class SPItem;
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index c72f55862..2a386b003 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -29,6 +29,7 @@
 #include "preferences.h"
 
 #include <gtkmm/stock.h>
+#include <glibmm/i18n.h>
 
 namespace Inkscape
 {
diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h
index 73df1d0ff..1e44e23a1 100644
--- a/src/ui/dialog/panel-dialog.h
+++ b/src/ui/dialog/panel-dialog.h
@@ -15,6 +15,7 @@
 # include <config.h>
 #endif
 
+#include <gtkmm/dialog.h>
 #include <gtkmm/stock.h>
 
 #include "verbs.h"
@@ -24,6 +25,7 @@
 #include "ui/dialog/dock-behavior.h"
 #include "preferences.h"
 #include "inkscape.h"
+#include "desktop.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/scriptdialog.cpp b/src/ui/dialog/scriptdialog.cpp
index 5c4e729b7..55bbb7929 100644
--- a/src/ui/dialog/scriptdialog.cpp
+++ b/src/ui/dialog/scriptdialog.cpp
@@ -13,13 +13,13 @@
 # include <config.h>
 #endif
 
+#include "scriptdialog.h"
 #include <glibmm/i18n.h>
 #include <gtkmm/menubar.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/textview.h>
 
-#include "scriptdialog.h"
 #include <extension/script/InkscapeScript.h>
 
 
diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp
index 881b90b0b..85320618b 100644
--- a/src/ui/dialog/spellcheck.cpp
+++ b/src/ui/dialog/spellcheck.cpp
@@ -12,16 +12,16 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "spellcheck.h"
 #include "widgets/icon.h"
 #include "message-stack.h"
 
-#include <gtk/gtk.h>
-
 #include "helper/window.h"
 #include "macros.h"
 #include "inkscape.h"
 #include "document.h"
 #include "selection.h"
+#include "desktop.h"
 #include "desktop-handles.h"
 #include "tools-switch.h"
 #include "text-context.h"
@@ -40,7 +40,7 @@
 #include "document-undo.h"
 #include "sp-root.h"
 #include "verbs.h"
-#include "spellcheck.h"
+#include <glibmm/i18n.h>
 
 #ifdef WIN32
 #include <windows.h>
diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h
index 65ff3a1c0..74d5b76e6 100644
--- a/src/ui/dialog/spellcheck.h
+++ b/src/ui/dialog/spellcheck.h
@@ -12,31 +12,27 @@
 #ifndef SEEN_SPELLCHECK_H
 #define SEEN_SPELLCHECK_H
 
-#include <gtk/gtk.h>
-
 #include <gtkmm/box.h>
-#include <gtkmm/textview.h>
 #include <gtkmm/button.h>
 #include <gtkmm/buttonbox.h>
-#include <gtkmm/frame.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/separator.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/treeview.h>
 
-#include <glibmm/i18n.h>
-
-#include "desktop.h"
 #include "ui/dialog/desktop-tracker.h"
 #include "ui/widget/panel.h"
-#include "preferences.h"
 #include "sp-text.h"
 
 #ifdef HAVE_ASPELL
 #include <aspell.h>
 #endif  /* HAVE_ASPELL */
 
+class SPDesktop;
+
 namespace Inkscape {
+class Preferences;
+
 namespace UI {
 namespace Dialog {
 
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 7210ab3a6..1b43d36c5 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -17,6 +17,7 @@
 
 #ifdef ENABLE_SVG_FONTS
 
+#include "svg-fonts-dialog.h"
 #include "document-private.h"
 #include "document-undo.h"
 #include <gtkmm/notebook.h>
@@ -26,9 +27,11 @@
 #include "selection.h"
 #include <string.h>
 #include "svg/svg.h"
-#include "svg-fonts-dialog.h"
 #include "xml/node.h"
 #include "xml/repr.h"
+#include "sp-font-face.h"
+#include "desktop-handles.h"
+#include "display/nr-svgfonts.h"
 
 SvgFontDrawingArea::SvgFontDrawingArea():
     _x(0),
diff --git a/src/ui/dialog/svg-fonts-dialog.h b/src/ui/dialog/svg-fonts-dialog.h
index 0b6f94e3c..910f79d4c 100644
--- a/src/ui/dialog/svg-fonts-dialog.h
+++ b/src/ui/dialog/svg-fonts-dialog.h
@@ -11,15 +11,9 @@
 #ifndef INKSCAPE_UI_DIALOG_SVG_FONTS_H
 #define INKSCAPE_UI_DIALOG_SVG_FONTS_H
 
-#include <2geom/pathvector.h>
 #include "ui/widget/panel.h"
+#include <2geom/pathvector.h>
 #include "ui/widget/spinbutton.h"
-#include "sp-font.h"
-#include "sp-font-face.h"
-#include "verbs.h"
-#include "document.h"
-#include "desktop.h"
-#include "desktop-handles.h"
 
 #include <gtkmm/box.h>
 #include <gtkmm/comboboxtext.h>
@@ -30,10 +24,13 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/treeview.h>
 
-#include "display/nr-svgfonts.h"
 #include "attributes.h"
 #include "xml/helper-observer.h"
 
+class SPGlyph;
+class SPGlyphKerning;
+class SvgFont;
+
 class SvgFontDrawingArea : Gtk::DrawingArea{
 public:
     SvgFontDrawingArea();
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index c136a0147..ab4209e22 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <set>
 
-#include <gtk/gtk.h> //for GTK_RESPONSE* types
+#include "swatches.h"
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
 #include <gdkmm/pixbuf.h>
@@ -42,7 +42,6 @@
 #include "sp-gradient-fns.h"
 #include "sp-gradient.h"
 #include "sp-gradient-vector.h"
-#include "swatches.h"
 #include "style.h"
 #include "ui/previewholder.h"
 #include "widgets/desktop-widget.h"
diff --git a/src/ui/dialog/swatches.h b/src/ui/dialog/swatches.h
index 95d7acb00..0ff795ac3 100644
--- a/src/ui/dialog/swatches.h
+++ b/src/ui/dialog/swatches.h
@@ -10,8 +10,6 @@
 #ifndef SEEN_DIALOGS_SWATCHES_H
 #define SEEN_DIALOGS_SWATCHES_H
 
-#include <gtkmm/textview.h>
-
 #include "ui/widget/panel.h"
 
 namespace Inkscape {
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 3eaad85a8..bb634197c 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -19,6 +19,7 @@
 # include "config.h"
 #endif
 
+#include "text-edit.h"
 #include <libnrtype/font-instance.h>
 #include <gtk/gtk.h>
 
@@ -33,7 +34,6 @@ extern "C" {
 #include <libnrtype/font-style-to-pos.h>
 #include <xml/repr.h>
 
-#include "text-edit.h"
 #include "macros.h"
 #include "helper/window.h"
 #include "inkscape.h"
@@ -53,6 +53,8 @@ extern "C" {
 #include "interface.h"
 #include "svg/css-ostringstream.h"
 #include "widgets/icon.h"
+#include "widgets/font-selector.h"
+#include <glibmm/i18n.h>
 
 
 namespace Inkscape {
diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h
index 4d00538a9..e750677c8 100644
--- a/src/ui/dialog/text-edit.h
+++ b/src/ui/dialog/text-edit.h
@@ -17,24 +17,20 @@
 #ifndef INKSCAPE_UI_DIALOG_TEXT_EDIT_H
 #define INKSCAPE_UI_DIALOG_TEXT_EDIT_H
 
-#include <gtk/gtk.h>
-
 #include <gtkmm/box.h>
-#include <gtkmm/textview.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/button.h>
 #include <gtkmm/frame.h>
+#include <gtkmm/radiobutton.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/separator.h>
-
-#include <glibmm/i18n.h>
-
 #include "ui/widget/panel.h"
-#include "dialogs/dialog-events.h"
-#include "widgets/font-selector.h"
 #include "ui/dialog/desktop-tracker.h"
 
 class SPItem;
+class SPFontSelector;
+class font_instance;
+class SPCSSAttr;
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index 929f91346..77dae056f 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -18,6 +18,7 @@
 # include <config.h>
 #endif
 
+#include "tile.h"
 #include <gtk/gtk.h> //for GTK_RESPONSE* types
 #include <glibmm/i18n.h>
 #include <gtkmm/stock.h>
@@ -32,7 +33,6 @@
 #include "document-undo.h"
 #include "sp-item.h"
 #include "widgets/icon.h"
-#include "tile.h"
 #include "desktop.h"
 
 /*
diff --git a/src/ui/dialog/tile.h b/src/ui/dialog/tile.h
index 650239232..f9e9d9842 100644
--- a/src/ui/dialog/tile.h
+++ b/src/ui/dialog/tile.h
@@ -17,8 +17,6 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/notebook.h>
-#include <gtkmm/button.h>
-#include <gtkmm/spinbutton.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/radiobutton.h>
 
@@ -26,6 +24,10 @@
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/scalar-unit.h"
 
+namespace Gtk {
+class Button;
+}
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index 39c3d6cf6..2751a9953 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -15,6 +15,7 @@
 # include <config.h>
 #endif
 
+#include "tracedialog.h"
 #include <gtkmm/notebook.h>
 #include <gtkmm/frame.h>
 #include "ui/widget/spinbutton.h"
@@ -25,7 +26,6 @@
 
 #include "desktop.h"
 
-#include "tracedialog.h"
 #include "trace/potrace/inkscape-potrace.h"
 #include "inkscape.h"
 
diff --git a/src/ui/dialog/tracedialog.h b/src/ui/dialog/tracedialog.h
index b52162aba..f4b9f6f10 100644
--- a/src/ui/dialog/tracedialog.h
+++ b/src/ui/dialog/tracedialog.h
@@ -12,8 +12,8 @@
 #ifndef __TRACEDIALOG_H__
 #define __TRACEDIALOG_H__
 
-#include "verbs.h"
 #include "ui/widget/panel.h"
+#include "verbs.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 4b4e99da0..9b65c1f68 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -15,8 +15,8 @@
 # include <config.h>
 #endif
 
-#include <gtkmm/stock.h>
 #include <gtkmm/dialog.h>
+#include <gtkmm/stock.h>
 #include <2geom/transforms.h>
 
 #include "document.h"
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index 75dfcd16e..9cc4b39cd 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -15,18 +15,18 @@
 #endif
 
 #include <glibmm/i18n.h>
-#include <gtk/gtk.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 
-
+#include "undo-history.h"
 #include "document.h"
 #include "document-undo.h"
 #include "inkscape.h"
 #include "verbs.h"
 #include "desktop-handles.h"
 
-#include "undo-history.h"
+#include "desktop.h"
+#include <gtkmm/invisible.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/undo-history.h b/src/ui/dialog/undo-history.h
index 1a4d2e486..d94464517 100644
--- a/src/ui/dialog/undo-history.h
+++ b/src/ui/dialog/undo-history.h
@@ -11,24 +11,21 @@
 #ifndef INKSCAPE_UI_DIALOG_UNDO_HISTORY_H
 #define INKSCAPE_UI_DIALOG_UNDO_HISTORY_H
 
-#include <glibmm/refptr.h>
+#include "ui/widget/panel.h"
 #include <gtkmm/cellrendererpixbuf.h>
-#include <gtkmm/image.h>
-#include <gtkmm/invisible.h>
 #include <gtkmm/scrolledwindow.h>
-#include <gtkmm/stock.h>
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treeselection.h>
 
 #include <functional>
 #include <sstream>
 
-#include "desktop.h"
 #include "event-log.h"
 
-#include "ui/widget/panel.h"
 #include "widgets/icon.h"
 
+class SPDesktop;
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 0063833ee..cded702b4 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -10,6 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "live_effects/lpe-powerstroke.h"
 #include <string>
 #include <sstream>
 #include <deque>
@@ -32,7 +33,6 @@
 #include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
 #include "live_effects/parameter/path.h"
-#include "live_effects/lpe-powerstroke.h"
 #include "sp-path.h"
 #include "helper/geom.h"
 #include "preferences.h"
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index 08141ac71..e5c542a7c 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -10,6 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "color-picker.h"
 #include "inkscape.h"
 #include "desktop-handles.h"
 #include "document.h"
@@ -19,7 +20,6 @@
 #include "widgets/sp-color-notebook.h"
 #include "verbs.h"
 
-#include "color-picker.h"
 
 static bool _in_use = false;
 
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 07098fa11..238e93b0b 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -7,13 +7,12 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#include <gtk/gtk.h>
+#include "ui/widget/dock.h"
 
 #include "dock-item.h"
 #include "desktop.h"
 #include "inkscape.h"
 #include "preferences.h"
-#include "ui/widget/dock.h"
 #include "ui/icon-names.h"
 #include "widgets/icon.h"
 
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index a6e983304..ab3a8adca 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -10,13 +10,14 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
+#include "dock.h"
 #include "inkscape.h"
 #include "preferences.h"
 #include "desktop.h"
 
-#include "dock.h"
-
 #include <gtkmm/adjustment.h>
+#include <gtkmm/paned.h>
+#include <gtkmm/scrolledwindow.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/dock.h b/src/ui/widget/dock.h
index bd5685348..28ab42740 100644
--- a/src/ui/widget/dock.h
+++ b/src/ui/widget/dock.h
@@ -12,15 +12,19 @@
 #ifndef INKSCAPE_UI_WIDGET_DOCK_H
 #define INKSCAPE_UI_WIDGET_DOCK_H
 
-#include <gtkmm/scrolledwindow.h>
 #include <gtkmm/box.h>
-#include <gtkmm/paned.h>
-
 #include <list>
-
 #include "ui/widget/dock-item.h"
 
-#include "libgdl/gdl.h"
+struct _GdlDock;
+typedef _GdlDock GdlDock;
+struct _GdlDockBar;
+typedef _GdlDockBar GdlDockBar;
+
+namespace Gtk {
+class Paned;
+class ScrolledWindow;
+}
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index cdafa529c..6fe21319d 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -9,12 +9,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "filter-effect-chooser.h"
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
-#include "filter-effect-chooser.h"
 #include "inkscape.h"
 
 namespace Inkscape {
diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h
index e91d786cd..3c3da6c2d 100644
--- a/src/ui/widget/filter-effect-chooser.h
+++ b/src/ui/widget/filter-effect-chooser.h
@@ -14,14 +14,10 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/combobox.h>
-#include <gtkmm/liststore.h>
-#include <gtkmm/treeview.h>
 
 #include "combo-enums.h"
 #include "filter-enums.h"
-#include "labelled.h"
 #include "spin-slider.h"
-#include "sp-filter.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/labelled.cpp b/src/ui/widget/labelled.cpp
index ae3a4c744..df800545a 100644
--- a/src/ui/widget/labelled.cpp
+++ b/src/ui/widget/labelled.cpp
@@ -12,10 +12,11 @@
 # include <config.h>
 #endif
 
+#include "labelled.h"
+
 /* For getting the Gtkmmified Icon manager */
 #include "widgets/icon.h"
-
-#include "labelled.h"
+#include <gtkmm/label.h>
 
 namespace Inkscape {
 namespace UI {
@@ -64,7 +65,11 @@ Labelled::getLabel() const
     return _label;
 }
 
-
+void
+Labelled::setLabelText(const Glib::ustring &str)
+{
+    _label->set_text(str);
+}
 
 
 } // namespace Widget
diff --git a/src/ui/widget/labelled.h b/src/ui/widget/labelled.h
index 9f6f855cb..e49b289fe 100644
--- a/src/ui/widget/labelled.h
+++ b/src/ui/widget/labelled.h
@@ -12,7 +12,10 @@
 #define INKSCAPE_UI_WIDGET_LABELLED_H
 
 #include <gtkmm/box.h>
-#include <gtkmm/label.h>
+
+namespace Gtk {
+class Label;
+}
 
 namespace Inkscape {
 namespace UI {
@@ -50,7 +53,7 @@ public:
     Gtk::Widget const *getWidget() const;
     Gtk::Label const *getLabel() const;
 
-    void setLabelText(const Glib::ustring &str) { _label->set_text(str); };
+    void setLabelText(const Glib::ustring &str);
 
 protected:
     Gtk::Widget  *_widget;
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 59317435c..c6622627b 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -16,6 +16,8 @@
 
 #include <cstring>
 #include <string>
+
+#include "ui/dialog/layer-properties.h"
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
@@ -24,7 +26,6 @@
 #include "document-undo.h"
 #include "layer-manager.h"
 #include "sp-item.h"
-#include "ui/dialog/layer-properties.h"
 #include "ui/icon-names.h"
 #include "ui/widget/layer-selector.h"
 #include "util/filter-list.h"
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 8a9d84e36..4a4a67bf3 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -16,6 +16,8 @@
 # include <config.h>
 #endif
 
+#include "licensor.h"
+
 #include <gtkmm/entry.h>
 
 #include "ui/widget/entity-entry.h"
@@ -25,7 +27,6 @@
 #include "document-undo.h"
 #include "verbs.h"
 
-#include "licensor.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/notebook-page.h b/src/ui/widget/notebook-page.h
index a541f3ba0..140b7cb33 100644
--- a/src/ui/widget/notebook-page.h
+++ b/src/ui/widget/notebook-page.h
@@ -11,7 +11,6 @@
 #define INKSCAPE_UI_WIDGET_NOTEBOOK_PAGE_H
 
 #include <gtkmm/box.h>
-#include <gtkmm/frame.h>
 #include <gtkmm/table.h>
 
 namespace Inkscape {
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 06095fb13..afeec5492 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -12,6 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/object-composite-settings.h"
+
 #include <glibmm/i18n.h>
 
 #include "desktop-handles.h"
@@ -28,8 +30,8 @@
 #include "xml/repr.h"
 #include "widgets/icon.h"
 #include "ui/icon-names.h"
-#include "ui/widget/object-composite-settings.h"
 #include "display/sp-canvas.h"
+#include "ui/widget/style-subject.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h
index 75c2fa76a..7b0e9b994 100644
--- a/src/ui/widget/object-composite-settings.h
+++ b/src/ui/widget/object-composite-settings.h
@@ -20,12 +20,15 @@
 
 #include "ui/widget/filter-effect-chooser.h"
 #include "ui/widget/spinbutton.h"
-#include "ui/widget/style-subject.h"
 
 namespace Inkscape {
+class Application;
+
 namespace UI {
 namespace Widget {
 
+class StyleSubject;
+
 /*
  * A widget for controlling object compositing (filter, opacity, etc.)
  */
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index a14a23253..83d923c15 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -21,6 +21,8 @@
 # include <config.h>
 #endif
 
+#include "page-sizer.h"
+
 #include <cmath>
 #include <string>
 #include <string.h>
@@ -33,7 +35,6 @@
 #include "helper/action.h"
 #include "helper/units.h"
 #include "inkscape.h"
-#include "page-sizer.h"
 #include "sp-namedview.h"
 #include "sp-root.h"
 #include "ui/widget/button.h"
diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h
index 4040bb483..e52303254 100644
--- a/src/ui/widget/page-sizer.h
+++ b/src/ui/widget/page-sizer.h
@@ -11,12 +11,10 @@
 #define INKSCAPE_UI_WIDGET_PAGE_SIZER_H
 
 #include <stddef.h>
+#include "ui/widget/registered-widget.h"
 #include <sigc++/sigc++.h>
 
 #include "helper/units.h"
-#include "ui/widget/registry.h"
-#include "ui/widget/registered-widget.h"
-#include "xml/node.h"
 
 #include <gtkmm/alignment.h>
 #include <gtkmm/expander.h>
@@ -26,9 +24,15 @@
 #include <gtkmm/table.h>
 
 namespace Inkscape {    
+namespace XML {
+class Node;
+}
+
 namespace UI {
 namespace Widget {
 
+class Registry;
+
 /**
  * Data class used to store common paper dimensions.  Used to make
  * PageSizer's _paperSizeTable. 
diff --git a/src/ui/widget/point.h b/src/ui/widget/point.h
index ced43c47a..1d91549d6 100644
--- a/src/ui/widget/point.h
+++ b/src/ui/widget/point.h
@@ -13,12 +13,14 @@
 #ifndef INKSCAPE_UI_WIDGET_POINT_H
 #define INKSCAPE_UI_WIDGET_POINT_H
 
-#include <gtkmm/adjustment.h>
-#include <gtkmm/spinbutton.h>
 #include <2geom/point.h>
 #include "ui/widget/labelled.h"
 #include "ui/widget/scalar.h"
 
+namespace Gtk {
+class Adjustment;
+}
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index df5bc0e16..fec351ab0 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -18,9 +18,9 @@
 #include <windows.h>
 #endif
 
+#include <gtkmm/box.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/alignment.h>
-#include <gtkmm/box.h>
 #include <gtkmm/stock.h>
 
 #include "preferences.h"
@@ -39,6 +39,7 @@
 #include "selection-chemistry.h"
 #include "ui/dialog/filedialog.h"
 #include "xml/repr.h"
+#include <glibmm/i18n.h>
 
 using namespace Inkscape::UI::Widget;
 
diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index 6d4b5c553..aad880ec7 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -17,13 +17,12 @@
 
 #include <iostream>
 #include <vector>
+#include <gtkmm/filechooserbutton.h>
 #include "ui/widget/spinbutton.h"
 #include <stddef.h>
 #include <sigc++/sigc++.h>
-#include <glibmm/i18n.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/drawingarea.h>
-#include <gtkmm/filechooserbutton.h>
 #include <gtkmm/scale.h>
 #include <gtkmm/table.h>
 
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 3931256cb..9ae853aaf 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -13,8 +13,6 @@
 # include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-
 #include "selected-style.h"
 
 #include "widgets/spw-utilities.h"
diff --git a/src/ui/widget/selected-style.h b/src/ui/widget/selected-style.h
index 07f457e9d..0fe516321 100644
--- a/src/ui/widget/selected-style.h
+++ b/src/ui/widget/selected-style.h
@@ -11,9 +11,9 @@
 #ifndef INKSCAPE_UI_CURRENT_STYLE_H
 #define INKSCAPE_UI_CURRENT_STYLE_H
 
+#include <gtkmm/box.h>
 #include <gtkmm/table.h>
 #include <gtkmm/label.h>
-#include <gtkmm/box.h>
 #include <gtkmm/eventbox.h>
 #include <gtkmm/enums.h>
 #include <gtkmm/menu.h>
@@ -24,13 +24,9 @@
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 
-#include <glibmm/i18n.h>
-
-#include <desktop.h>
-
-#include "button.h"
 #include "rotateable.h"
 
+class SPDesktop;
 class SPUnit;
 
 namespace Inkscape {
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index 73c92914e..0ecf2dd5e 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -33,6 +33,8 @@
 #include "helper/action.h"
 #include "preferences.h"
 #include "inkscape.h"
+#include "verbs.h"
+#include <glibmm/i18n.h>
 
 enum {
     SS_FILL,
diff --git a/src/ui/widget/style-swatch.h b/src/ui/widget/style-swatch.h
index a3c115c19..999bbd4ca 100644
--- a/src/ui/widget/style-swatch.h
+++ b/src/ui/widget/style-swatch.h
@@ -13,16 +13,13 @@
 #ifndef INKSCAPE_UI_CURRENT_STYLE_H
 #define INKSCAPE_UI_CURRENT_STYLE_H
 
+#include <gtkmm/box.h>
 #include <gtkmm/table.h>
 #include <gtkmm/label.h>
-#include <gtkmm/box.h>
 #include <gtkmm/eventbox.h>
 #include <gtkmm/enums.h>
 
-#include <glibmm/i18n.h>
-
 #include "desktop.h"
-#include "verbs.h"
 #include "button.h"
 #include "preferences.h"
 
diff --git a/src/ui/widget/text.cpp b/src/ui/widget/text.cpp
index b79bea067..ec58d5bb4 100644
--- a/src/ui/widget/text.cpp
+++ b/src/ui/widget/text.cpp
@@ -12,8 +12,8 @@
 # include <config.h>
 #endif
 
-
 #include "text.h"
+#include <gtkmm/entry.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/text.h b/src/ui/widget/text.h
index 0f6efd01f..b90788940 100644
--- a/src/ui/widget/text.h
+++ b/src/ui/widget/text.h
@@ -11,11 +11,9 @@
 #ifndef INKSCAPE_UI_WIDGET_TEXT_H
 #define INKSCAPE_UI_WIDGET_TEXT_H
 
-#include <gtkmm/adjustment.h>
-#include <gtkmm/spinbutton.h>
-
 #include "labelled.h"
 
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 1a17391b6..0b0ae90cb 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -81,6 +81,7 @@
 #include "ui/dialog/spellcheck.h"
 #include "ui/icon-names.h"
 #include "ui/tool/node-tool.h"
+#include "selection.h"
 
 #include <gtk/gtk.h>
 
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