Header tidying, suppress all gdk deprecation errors in gtkmm

(bzr r11030)

90 files changed, 230 insertions, 179 deletions

diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp
index 8091fd60b..12487d1a9 100644
--- a/src/box3d-context.cpp
+++ b/src/box3d-context.cpp
@@ -49,6 +49,7 @@
 #include "document-private.h"
 #include "line-geometry.h"
 #include "shape-editor.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/desktop.cpp b/src/desktop.cpp
index add940a3b..e97f8618b 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -682,6 +682,10 @@ SPDesktop::set_coordinate_status (Geom::Point p) {
     _widget->setCoordinateStatus(p);
 }
 
+Inkscape::UI::Widget::Dock* SPDesktop::getDock() {
+	return _widget->getDock();
+}
+
 /**
  * \see SPDocument::getItemFromListAtPointBottom()
  */
diff --git a/src/desktop.h b/src/desktop.h
index 75dfd7743..507aff8a6 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -32,8 +32,8 @@
 #include <2geom/rect.h>
 
 #include "ui/view/view.h"
-#include "ui/view/edit-widget-interface.h"
 #include "display/rendermode.h"
+#include <glibmm/ustring.h>
 
 class SPCSSAttr;
 struct SPCanvas;
@@ -73,6 +73,10 @@ namespace Inkscape {
       namespace Widget {
 	      class Dock;
       }
+
+      namespace View {
+	      class EditWidgetInterface;
+      }
   }
   namespace Whiteboard {
       class SessionManager;
@@ -264,7 +268,7 @@ public:
     Inkscape::ColorMode _display_color_mode;
     Inkscape::ColorMode getColorMode() const { return _display_color_mode; }
 
-    Inkscape::UI::Widget::Dock* getDock() { return _widget->getDock(); }
+    Inkscape::UI::Widget::Dock* getDock();
 
     void set_active (bool new_active);
 
diff --git a/src/device-manager.cpp b/src/device-manager.cpp
index dabf926eb..bca7eb323 100644
--- a/src/device-manager.cpp
+++ b/src/device-manager.cpp
@@ -10,10 +10,10 @@
 #include <glib.h>
 #include <map>
 #include <set>
-#include <gtk/gtk.h>
 
 #include "device-manager.h"
 #include "preferences.h"
+#include <gtk/gtk.h>
 
 #define noDEBUG_VERBOSE 1
 
diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp
index 89395ffd3..f8fce8bd7 100644
--- a/src/dialogs/dialog-events.cpp
+++ b/src/dialogs/dialog-events.cpp
@@ -15,6 +15,8 @@
 # include "config.h"
 #endif
 
+#include <gtkmm/entry.h>
+#include <gtkmm/window.h>
 #include <gdk/gdkkeysyms.h>
 #include "macros.h"
 #include <gtk/gtk.h>
@@ -26,10 +28,6 @@
 #include "dialog-events.h"
 
 
-#include <gtkmm/entry.h>
-
-
-
 /**
  * Remove focus from window to whoever it is transient for.
  */
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 706ece066..18928fcdb 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -31,6 +31,7 @@
 #include <gtkmm/image.h>
 #include <gtkmm/stockid.h>
 #include <gtkmm/stock.h>
+#include <gtkmm/table.h>
 #ifdef WITH_GNOME_VFS
 # include <libgnomevfs/gnome-vfs-init.h>  // gnome_vfs_initialized
 #endif
diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp
index 6cf130c2b..92ce03888 100644
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
@@ -15,9 +15,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "widgets/icon.h"
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
-#include <gtk/gtk.h>
 
 #include "desktop.h"
 #include "../desktop-handles.h"
@@ -39,7 +39,6 @@
 #include "../sp-tspan.h"
 #include "ui/icon-names.h"
 #include "../verbs.h"
-#include "widgets/icon.h"
 #include "../widgets/sp-xmlview-attr-list.h"
 #include "../widgets/sp-xmlview-content.h"
 #include "../widgets/sp-xmlview-tree.h"
diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index 8b2161425..5294a5ee0 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -18,6 +18,7 @@
 #include "display/drawing-item.h"
 #include "display/nr-filter.h"
 #include "display/nr-filter-image.h"
+#include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
 
 namespace Inkscape {
diff --git a/src/display/nr-filter-image.h b/src/display/nr-filter-image.h
index 0e0c9a823..c0b9d6e81 100644
--- a/src/display/nr-filter-image.h
+++ b/src/display/nr-filter-image.h
@@ -12,15 +12,16 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <gdkmm/pixbuf.h>
 #include "display/nr-filter-primitive.h"
-#include "display/nr-filter-slot.h"
-#include "display/nr-filter-units.h"
-#include "sp-item.h"
 #include <glibmm/refptr.h>
-#include <gdkmm/pixbuf.h>
+
+class SPDocument;
+class SPItem;
 
 namespace Inkscape {
 namespace Filters {
+class FilterSlot;
 
 class FilterImage : public FilterPrimitive {
 public:
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index 6e3eb91d5..f580a5044 100644
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -9,6 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "display/nr-filter-image.h"
 #include <glib.h>
 #include <cmath>
 #include <cstring>
@@ -30,7 +31,6 @@
 #include "display/nr-filter-displacement-map.h"
 #include "display/nr-filter-flood.h"
 #include "display/nr-filter-gaussian.h"
-#include "display/nr-filter-image.h"
 #include "display/nr-filter-merge.h"
 #include "display/nr-filter-morphology.h"
 #include "display/nr-filter-offset.h"
diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp
index 1ba158635..e095fb9a9 100644
--- a/src/display/nr-svgfonts.cpp
+++ b/src/display/nr-svgfonts.cpp
@@ -28,6 +28,10 @@
 #include "display/curve.h"
 #include "xml/repr.h"
 #include "sp-font-face.h"
+#include "sp-glyph.h"
+#include "sp-missing-glyph.h"
+#include "sp-font.h"
+#include "sp-glyph-kerning.h"
 
 //*************************//
 // UserFont Implementation //
diff --git a/src/display/nr-svgfonts.h b/src/display/nr-svgfonts.h
index 3cfcbaa72..6138e2fbb 100644
--- a/src/display/nr-svgfonts.h
+++ b/src/display/nr-svgfonts.h
@@ -14,15 +14,19 @@
  */
 
 #include "cairo.h"
-#include <gtkmm/widget.h>
-#include "../sp-glyph.h"
-#include "../sp-missing-glyph.h"
-#include "../sp-font.h"
-#include "../sp-glyph-kerning.h"
-#include <sigc++/sigc++.h>
+#include <sigc++/connection.h>
 
 class SvgFont;
 struct SPFont;
+class SPGlyph;
+class SPMissingGlyph;
+
+struct _GdkEventExpose;
+typedef _GdkEventExpose GdkEventExpose;
+
+namespace Gtk {
+class Widget;
+}
 
 class UserFont{
 public:
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index fd320927b..11836baa2 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -19,8 +19,7 @@
 # include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-
+#include <gdkmm/region.h>
 #include "helper/sp-marshal.h"
 #include <2geom/rect.h>
 #include <2geom/affine.h>
@@ -35,6 +34,7 @@
 #include "debug/gdk-event-latency-tracker.h"
 #include "desktop.h"
 #include "sp-namedview.h"
+#include <gdkmm/rectangle.h>
 
 using Inkscape::Debug::GdkEventLatencyTracker;
 
diff --git a/src/document-private.h b/src/document-private.h
index c851594c3..065101174 100644
--- a/src/document-private.h
+++ b/src/document-private.h
@@ -24,7 +24,6 @@
 
 #include "composite-undo-stack-observer.h"
 
-#include "event-log.h"
 
 // XXX only for testing!
 #include "console-output-undo-observer.h"
diff --git a/src/ege-adjustment-action.cpp b/src/ege-adjustment-action.cpp
index 02ed37d0a..49f899372 100644
--- a/src/ege-adjustment-action.cpp
+++ b/src/ege-adjustment-action.cpp
@@ -42,10 +42,9 @@
 #include <cmath>
 #include <string.h>
 
+#include "widgets/icon.h"
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
 
-#include "widgets/icon.h"
 #include "icon-size.h"
 #include "ege-adjustment-action.h"
 
diff --git a/src/event-log.cpp b/src/event-log.cpp
index 977d068f8..e2528ce0b 100644
--- a/src/event-log.cpp
+++ b/src/event-log.cpp
@@ -9,8 +9,8 @@
 
 #include <glibmm/i18n.h>
 
-#include "desktop.h"
 #include "event-log.h"
+#include "desktop.h"
 #include "inkscape.h"
 #include "util/ucompose.hpp"
 #include "document.h"
diff --git a/src/event-log.h b/src/event-log.h
index a429994c8..766979731 100644
--- a/src/event-log.h
+++ b/src/event-log.h
@@ -10,7 +10,6 @@
 #ifndef INKSCAPE_EVENT_LOG_H
 #define INKSCAPE_EVENT_LOG_H
 
-#include <gdkmm/pixbuf.h>
 #include <glibmm/refptr.h>
 #include <gtkmm/treestore.h>
 #include <gtkmm/treeselection.h>
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index 6d1ddbbbd..1df8002ad 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -8,11 +8,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "prefdialog.h"
 #include "inkscape-private.h"
 #include "helper/action.h"
 #include "ui/view/view.h"
 #include "desktop-handles.h"
-#include "prefdialog.h"
 #include "selection.h"
 #include "sp-namedview.h"
 #include "desktop.h"
diff --git a/src/extension/extension.h b/src/extension/extension.h
index 16c814d26..e0b643b6d 100644
--- a/src/extension/extension.h
+++ b/src/extension/extension.h
@@ -17,13 +17,13 @@
 #include <ostream>
 #include <fstream>
 #include <vector>
-#include <gtkmm/widget.h>
-#include <gtkmm/table.h>
 #include <glibmm/ustring.h>
 #include "xml/repr.h"
 
 namespace Gtk {
+	class Table;
 	class VBox;
+	class Widget;
 }
 
 /** The key that is used to identify that the I/O should be autodetected */
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index f2775f8f2..d7dd641b0 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -19,15 +19,15 @@
 # include <config.h>
 #endif
 
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/main.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/textview.h>
 #include <unistd.h>
 
 #include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <gtkmm/main.h>
-#include <gtkmm/messagedialog.h>
-#include <gtkmm/scrolledwindow.h>
-#include <gtkmm/textview.h>
 
 #include "ui/view/view.h"
 #include "desktop-handles.h"
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index b455bd2b2..8b1b3fbfd 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -20,6 +20,7 @@
 
 #ifdef HAVE_CAIRO_PDF
 
+#include "cairo-ps.h"
 #include "cairo-ps-out.h"
 #include "cairo-render-context.h"
 #include "cairo-renderer.h"
diff --git a/src/extension/internal/emf-win32-inout.cpp b/src/extension/internal/emf-win32-inout.cpp
index ceebc2727..e321f67f1 100644
--- a/src/extension/internal/emf-win32-inout.cpp
+++ b/src/extension/internal/emf-win32-inout.cpp
@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-//#include "inkscape.h"
 #include "sp-root.h"
 #include "sp-path.h"
 #include "style.h"
@@ -40,6 +39,7 @@
 #include "display/drawing-item.h"
 #include "unit-constants.h"
 #include "clear-n_.h"
+#include "document.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp
index d24761c53..d5e44e702 100644
--- a/src/extension/internal/emf-win32-print.cpp
+++ b/src/extension/internal/emf-win32-print.cpp
@@ -28,9 +28,6 @@
 # include "config.h"
 #endif
 
-//#include <string.h>
-//#include <signal.h>
-//#include <errno.h>
 
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
@@ -38,35 +35,20 @@
 #include <2geom/hvlinesegment.h>
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
-//#include "display/canvas-bpath.h"
 #include "sp-item.h"
 
-//#include "glib.h"
-//#include "gtk/gtk.h"
-
-//#include "glibmm/i18n.h"
-//#include "enums.h"
-//#include "document.h"
 #include "style.h"
-//#include "sp-paint-server.h"
 #include "inkscape-version.h"
 #include "sp-root.h"
 
-//#include "libnrtype/FontFactory.h"
-//#include "libnrtype/font-instance.h"
-//#include "libnrtype/font-style-to-pos.h"
-
 #include "emf-win32-print.h"
 
 #include "unit-constants.h"
 
-//#include "extension/extension.h"
 #include "extension/system.h"
 #include "extension/print.h"
+#include "document.h"
 
-//#include "io/sys.h"
-
-//#include "macros.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index d1b784251..bdf95f941 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -31,6 +31,7 @@
 #include "sp-item.h"
 #include "style.h"
 #include "document.h"
+#include <cstring>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index 0f2857570..8862c1d4a 100644
--- a/src/extension/internal/wpg-input.cpp
+++ b/src/extension/internal/wpg-input.cpp
@@ -48,6 +48,7 @@
 #include "extension/system.h"
 #include "extension/input.h"
 #include "document.h"
+#include <cstring>
 
 // Take a guess and fallback to 0.1.x if no configure has run
 #if !defined(WITH_LIBWPG01) && !defined(WITH_LIBWPG02)
diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp
index bcb5b6e5b..ef0a06222 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/bool.cpp
@@ -18,6 +18,7 @@
 #include "../extension.h"
 #include "bool.h"
 #include "preferences.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/bool.h b/src/extension/param/bool.h
index 11d06e1c0..5d190b9d3 100644
--- a/src/extension/param/bool.h
+++ b/src/extension/param/bool.h
@@ -8,12 +8,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-#include <xml/node.h>
-#include <document.h>
 #include "parameter.h"
 
+class SPDocument;
+
+namespace Gtk {
+class Widget;
+}
+
 namespace Inkscape {
+namespace XML {
+class Node;
+}
+
 namespace Extension {
 
 /**
diff --git a/src/extension/param/color.h b/src/extension/param/color.h
index f46e26286..9894965a9 100644
--- a/src/extension/param/color.h
+++ b/src/extension/param/color.h
@@ -8,13 +8,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-#include "xml/node.h"
-#include "document.h"
-#include <color.h>
-#include "extension/param/parameter.h"
+#include "parameter.h"
+
+class SPDocument;
+
+namespace Gtk {
+class Widget;
+}
 
 namespace Inkscape {
+namespace XML {
+class Node;
+}
+
 namespace Extension {
 
 class ParamColor : public Parameter {
diff --git a/src/extension/param/enum.h b/src/extension/param/enum.h
index a598458c5..ac7d72abd 100644
--- a/src/extension/param/enum.h
+++ b/src/extension/param/enum.h
@@ -15,12 +15,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-
-#include "xml/document.h"
-
 #include "parameter.h"
 
+namespace Gtk {
+class Widget;
+}
+
 namespace Inkscape {
 namespace Extension {
 
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index 7188025da..0e1d1c22a 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -19,6 +19,7 @@
 #include "extension/extension.h"
 #include "preferences.h"
 #include "float.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/float.h b/src/extension/param/float.h
index 24747b5f1..42b1698b1 100644
--- a/src/extension/param/float.h
+++ b/src/extension/param/float.h
@@ -9,12 +9,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-#include <xml/node.h>
-#include <document.h>
 #include "parameter.h"
 
+class SPDocument;
+
+namespace Gtk {
+class Widget;
+}
+
 namespace Inkscape {
+namespace XML {
+class Node;
+}
+
 namespace Extension {
 
 class ParamFloat : public Parameter {
diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index 461943a4c..440693eb1 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -19,6 +19,7 @@
 #include "extension/extension.h"
 #include "preferences.h"
 #include "int.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/int.h b/src/extension/param/int.h
index 83fc67be9..3fd6cea9b 100644
--- a/src/extension/param/int.h
+++ b/src/extension/param/int.h
@@ -9,12 +9,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-#include <xml/node.h>
-#include <document.h>
 #include "parameter.h"
 
+class SPDocument;
+
+namespace Gtk {
+class Widget;
+}
+
 namespace Inkscape {
+namespace XML {
+class Node;
+}
+
 namespace Extension {
 
 class ParamInt : public Parameter {
diff --git a/src/extension/param/notebook.h b/src/extension/param/notebook.h
index 23058f465..3c90964fd 100644
--- a/src/extension/param/notebook.h
+++ b/src/extension/param/notebook.h
@@ -15,12 +15,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-
-#include "xml/document.h"
-
 #include "parameter.h"
 
+namespace Gtk {
+class Widget;
+}
+
 namespace Inkscape {
 namespace Extension {
 
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index 063ec32be..97e4f9d8c 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -19,6 +19,7 @@
 # define ESCAPE_DOLLAR_COMMANDLINE
 #endif
 
+#include <cstring>
 #include <xml/node.h>
 
 #include <extension/extension.h>
diff --git a/src/extension/param/parameter.h b/src/extension/param/parameter.h
index 8d80e6c40..d08efc554 100644
--- a/src/extension/param/parameter.h
+++ b/src/extension/param/parameter.h
@@ -13,15 +13,17 @@
 #ifndef SEEN_INK_EXTENSION_PARAM_H__
 #define SEEN_INK_EXTENSION_PARAM_H__
 
-#include <gtkmm/widget.h>
-#include <glibmm/i18n.h>
+class SPDocument;
 
-#include "xml/document.h"
-#include "xml/node.h"
-#include "document.h"
-#include <color.h>
+namespace Gtk {
+class Widget;
+}
 
 namespace Inkscape {
+namespace XML {
+class Node;
+}
+
 namespace Extension {
 
 class Extension;
diff --git a/src/extension/param/radiobutton.h b/src/extension/param/radiobutton.h
index 957a5b9df..645faecaf 100644
--- a/src/extension/param/radiobutton.h
+++ b/src/extension/param/radiobutton.h
@@ -15,12 +15,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-
-#include "xml/document.h"
-
 #include "parameter.h"
 
+namespace Gtk {
+class Widget;
+}
+
 namespace Inkscape {
 namespace Extension {
 
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 3f8d176a5..c5304106c 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -18,6 +18,7 @@
 #include "extension/extension.h"
 #include "string.h"
 #include "preferences.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/string.h b/src/extension/param/string.h
index 8e7f093f7..3b137aeac 100644
--- a/src/extension/param/string.h
+++ b/src/extension/param/string.h
@@ -9,9 +9,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-#include <xml/node.h>
-#include <document.h>
 #include "parameter.h"
 
 namespace Inkscape {
diff --git a/src/file.cpp b/src/file.cpp
index 0f1182e67..f8672e20a 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -62,6 +62,8 @@
 #include "ui/view/view-widget.h"
 #include "uri.h"
 #include "xml/rebase-hrefs.h"
+#include "verbs.h"
+#include "event-log.h"
 
 #include <gtk/gtk.h>
 #include <glib.h>
diff --git a/src/filter-chemistry.cpp b/src/filter-chemistry.cpp
index b8c4cf901..81cbbf401 100644
--- a/src/filter-chemistry.cpp
+++ b/src/filter-chemistry.cpp
@@ -14,6 +14,7 @@
  */
 
 
+#include <cstring>
 #include "style.h"
 #include "document-private.h"
 #include "desktop-style.h"
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index 6515e37a0..a0f528973 100644
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
@@ -21,6 +21,7 @@
 #include "config.h"
 #endif
 
+#include "trace/potrace/inkscape-potrace.h"
 #include <2geom/pathvector.h>
 #include <gdk/gdkkeysyms.h>
 #include <queue>
@@ -62,7 +63,6 @@
 #include "sp-root.h"
 #include "svg/svg.h"
 #include "trace/imagemap.h"
-#include "trace/potrace/inkscape-potrace.h"
 #include "trace/trace.h"
 #include "xml/node-event-vector.h"
 #include "xml/repr.h"
diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp
index 96454cf3a..1de282ba2 100644
--- a/src/helper/stock-items.cpp
+++ b/src/helper/stock-items.cpp
@@ -19,8 +19,10 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include "path-prefix.h"
 
+#include <cstring>
+
+#include "path-prefix.h"
 
 #include <xml/repr.h>
 #include "sp-gradient.h"
diff --git a/src/helper/window.cpp b/src/helper/window.cpp
index f4640203d..444e1d8b0 100644
--- a/src/helper/window.cpp
+++ b/src/helper/window.cpp
@@ -12,7 +12,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include <gtk/gtk.h>
 #include <gtkmm/window.h>
 
 #include "inkscape.h"
@@ -20,6 +19,7 @@
 #include "desktop.h"
 #include "event-context.h"
 #include "window.h"
+#include <gtk/gtk.h>
 
 static bool on_window_key_press(GdkEventKey* event)
 {
diff --git a/src/helper/window.h b/src/helper/window.h
index dc2c48bc0..c6807f9e5 100644
--- a/src/helper/window.h
+++ b/src/helper/window.h
@@ -10,11 +10,15 @@
  * This code is in public domain
  */
 
-#include <gtk/gtk.h>
-#include <gtkmm/window.h>
+struct _GtkWidget;
+typedef _GtkWidget GtkWidget;
+
+namespace Gtk {
+class Window;
+}
 
 /*
- * This function is depreciated. Use Inkscape::UI::window_new instead.
+ * This function is deprecated. Use Inkscape::UI::window_new instead.
  */
 GtkWidget *sp_window_new (const gchar *title, unsigned int resizeable);
 
diff --git a/src/ink-action.cpp b/src/ink-action.cpp
index becf5971a..4c6008b01 100644
--- a/src/ink-action.cpp
+++ b/src/ink-action.cpp
@@ -1,14 +1,11 @@
-
-
-
+#include "widgets/icon.h"
+#include "icon-size.h"
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "icon-size.h"
 #include "ink-action.h"
 
 #include "widgets/button.h"
-#include "widgets/icon.h"
 
 static void ink_action_class_init( InkActionClass* klass );
 static void ink_action_init( InkAction* action );
@@ -178,8 +175,6 @@ void ink_action_set_property( GObject* obj, guint propId, const GValue *value, G
     }
 }
 
-#include <gtk/gtk.h>
-
 static GtkWidget* ink_action_create_menu_item( GtkAction* action )
 {
     InkAction* act = INK_ACTION( action );
diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp
index bbed89b55..710e0b84f 100644
--- a/src/libnrtype/font-lister.cpp
+++ b/src/libnrtype/font-lister.cpp
@@ -2,12 +2,12 @@
 # include <config.h>
 #endif
 
+#include <gtkmm.h>
 #include <libnrtype/font-instance.h>
 #include <libnrtype/TextWrapper.h>
 #include <libnrtype/one-glyph.h>
 
 #include <glibmm.h>
-#include <gtkmm.h>
 #include <gtkmm/treemodel.h>
 #include <gtkmm/liststore.h>
 
diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h
index 6af951726..117a2cad9 100644
--- a/src/libnrtype/font-lister.h
+++ b/src/libnrtype/font-lister.h
@@ -14,8 +14,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include <glibmm.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/treemodelcolumn.h>
+#include <gtkmm/treepath.h>
+#include <glibmm/ustring.h>
 #include "nr-type-primitives.h"
 
 namespace Inkscape
diff --git a/src/persp3d.cpp b/src/persp3d.cpp
index 4e15a4de4..a20537d95 100644
--- a/src/persp3d.cpp
+++ b/src/persp3d.cpp
@@ -23,6 +23,7 @@
 #include "xml/node-event-vector.h"
 #include "desktop-handles.h"
 #include <glibmm/i18n.h>
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/print.h b/src/print.h
index 6ea4ede26..bbf95b833 100644
--- a/src/print.h
+++ b/src/print.h
@@ -11,10 +11,11 @@
  * This code is in public domain
  */
 
-//#include <libnr/nr-path.h>
 #include <2geom/forward.h>
 
-#include <gtkmm/window.h>
+namespace Gtk {
+class Window;
+}
 
 class SPDocument;
 class SPStyle;
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 0d2d567de..9b39dab10 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -105,6 +105,7 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 #include "ui/tool/node-tool.h"
 
 #include "ui/clipboard.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 using Geom::X;
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index bd26a1b16..d9c68f7fb 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -17,6 +17,7 @@
 #include "config.h"
 #include <cstring>
 #include <string>
+#include "event-log.h"
 #include <2geom/transforms.h>
 
 #include "display/canvas-grid.h"
@@ -29,7 +30,6 @@
 #include "document-undo.h"
 #include "desktop-events.h"
 #include "desktop-handles.h"
-#include "event-log.h"
 #include "sp-guide.h"
 #include "sp-item-group.h"
 #include "sp-namedview.h"
@@ -37,6 +37,7 @@
 #include "desktop.h"
 #include "conn-avoid-ref.h" // for defaultConnSpacing.
 #include "sp-root.h"
+#include <gtkmm/window.h>
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/text-context.cpp b/src/text-context.cpp
index bcc5398b0..6bb153780 100644
--- a/src/text-context.cpp
+++ b/src/text-context.cpp
@@ -17,13 +17,12 @@
 # include <config.h>
 #endif
 
+#include <gtkmm/clipboard.h>
 #include <display/sp-ctrlline.h>
 #include <display/sodipodi-ctrlrect.h>
 #include <display/sp-ctrlquadr.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
-#include <gtk/gtk.h>
-#include <gtkmm/clipboard.h>
 #include <sstream>
 
 #include "context-fns.h"
@@ -53,6 +52,7 @@
 #include "verbs.h"
 #include "xml/node-event-vector.h"
 #include "xml/repr.h"
+#include <gtk/gtk.h>
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/trace/potrace/inkscape-potrace.h b/src/trace/potrace/inkscape-potrace.h
index c1ffc6e9a..88da56abb 100644
--- a/src/trace/potrace/inkscape-potrace.h
+++ b/src/trace/potrace/inkscape-potrace.h
@@ -18,10 +18,11 @@
 #define __INKSCAPE_POTRACE_H__
 
 #include <trace/trace.h>
-#include <trace/imagemap.h>
-
 #include "potracelib.h"
 
+struct GrayMap_def;
+typedef GrayMap_def GrayMap;
+
 namespace Inkscape {
 
 namespace Trace {
diff --git a/src/ui/dialog/desktop-tracker.cpp b/src/ui/dialog/desktop-tracker.cpp
index 42447a141..8a359dd2d 100644
--- a/src/ui/dialog/desktop-tracker.cpp
+++ b/src/ui/dialog/desktop-tracker.cpp
@@ -5,13 +5,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "widgets/desktop-widget.h"
 #include <glib-object.h>
 
 #include "desktop-tracker.h"
 
 #include "inkscape.h"
 #include "desktop.h"
-#include "widgets/desktop-widget.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h
index 1b76133b6..47cfae19a 100644
--- a/src/ui/dialog/object-properties.h
+++ b/src/ui/dialog/object-properties.h
@@ -13,14 +13,15 @@
 #ifndef SEEN_DIALOGS_ITEM_PROPERTIES_H
 #define SEEN_DIALOGS_ITEM_PROPERTIES_H
 
-#include "ui/widget/panel.h"
-#include "ui/dialog/desktop-tracker.h"
-#include "widgets/sp-attribute-widget.h"
-
+#include <gtkmm/entry.h>
 #include <gtkmm/expander.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/textview.h>
 
+#include "ui/widget/panel.h"
+#include "ui/dialog/desktop-tracker.h"
+#include "widgets/sp-attribute-widget.h"
+
 class SPDesktop;
 class SPItem;
 
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 1b43d36c5..56d209886 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -32,6 +32,11 @@
 #include "sp-font-face.h"
 #include "desktop-handles.h"
 #include "display/nr-svgfonts.h"
+#include "verbs.h"
+#include "sp-glyph.h"
+#include "sp-missing-glyph.h"
+#include "sp-font.h"
+#include "sp-glyph-kerning.h"
 
 SvgFontDrawingArea::SvgFontDrawingArea():
     _x(0),
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index ab4209e22..ba7646d28 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -18,6 +18,8 @@
 #include <algorithm>
 #include <set>
 
+#include <gtkmm/radiomenuitem.h>
+
 #include "swatches.h"
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
@@ -51,6 +53,7 @@
 #include "sp-gradient-reference.h"
 #include "dialog-manager.h"
 #include "selection.h"
+#include "verbs.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp
index 6233a1f70..b39a78979 100644
--- a/src/ui/tool/control-point-selection.cpp
+++ b/src/ui/tool/control-point-selection.cpp
@@ -10,12 +10,12 @@
  */
 
 #include <boost/none.hpp>
+#include "ui/tool/selectable-control-point.h"
 #include <2geom/transforms.h>
 #include "desktop.h"
 #include "preferences.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tool/selectable-control-point.h"
 #include "ui/tool/transform-handle-set.h"
 #include "ui/tool/node.h"
 
diff --git a/src/ui/tool/control-point.h b/src/ui/tool/control-point.h
index 4e1a1db3a..f37ff1451 100644
--- a/src/ui/tool/control-point.h
+++ b/src/ui/tool/control-point.h
@@ -11,18 +11,19 @@
 #ifndef SEEN_UI_TOOL_CONTROL_POINT_H
 #define SEEN_UI_TOOL_CONTROL_POINT_H
 
+#include <gdkmm/pixbuf.h>
 #include <boost/utility.hpp>
 #include <stddef.h>
-#include <sigc++/sigc++.h>
+#include <sigc++/signal.h>
+#include <sigc++/trackable.h>
 #include <2geom/point.h>
 #include "util/accumulators.h"
 #include "display/sodipodi-ctrl.h"
-#include "event-context.h"
 
 #include <gtkmm/enums.h>
-#include <gdkmm/pixbuf.h>
 
 class SPDesktop;
+class SPEventContext;
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp
index 3cc571585..e932c022d 100644
--- a/src/ui/tool/curve-drag-point.cpp
+++ b/src/ui/tool/curve-drag-point.cpp
@@ -8,11 +8,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/tool/curve-drag-point.h"
 #include <glib/gi18n.h>
 #include <2geom/bezier-curve.h>
 #include "desktop.h"
 #include "ui/tool/control-point-selection.h"
-#include "ui/tool/curve-drag-point.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
diff --git a/src/ui/tool/manipulator.cpp b/src/ui/tool/manipulator.cpp
index 49e601797..11dd220f4 100644
--- a/src/ui/tool/manipulator.cpp
+++ b/src/ui/tool/manipulator.cpp
@@ -8,8 +8,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "ui/tool/manipulator.h"
 #include "ui/tool/node.h"
+#include "ui/tool/manipulator.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index 62710031f..597a151c0 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -13,6 +13,7 @@
 #include <boost/shared_ptr.hpp>
 #include <glib.h>
 #include <glibmm/i18n.h>
+#include "node.h"
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
@@ -23,7 +24,6 @@
 #include "sp-path.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tool/node.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
 #include "util/unordered-containers.h"
diff --git a/src/ui/tool/multi-path-manipulator.h b/src/ui/tool/multi-path-manipulator.h
index 2e890ecb2..2c05a1252 100644
--- a/src/ui/tool/multi-path-manipulator.h
+++ b/src/ui/tool/multi-path-manipulator.h
@@ -13,12 +13,12 @@
 
 #include <stddef.h>
 #include <sigc++/connection.h>
-#include "ui/tool/commit-events.h"
-#include "ui/tool/manipulator.h"
-#include "ui/tool/modifier-tracker.h"
-#include "ui/tool/node.h"
-#include "ui/tool/node-types.h"
-#include "ui/tool/shape-record.h"
+#include "node.h"
+#include "commit-events.h"
+#include "manipulator.h"
+#include "modifier-tracker.h"
+#include "node-types.h"
+#include "shape-record.h"
 
 struct SPCanvasGroup;
 
diff --git a/src/ui/tool/node-tool.cpp b/src/ui/tool/node-tool.cpp
index 167b1c2ff..3c1e7de71 100644
--- a/src/ui/tool/node-tool.cpp
+++ b/src/ui/tool/node-tool.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
+#include "curve-drag-point.h"
 #include <glib/gi18n.h>
 #include "desktop.h"
 #include "desktop-handles.h"
@@ -31,7 +31,6 @@
 #include "sp-text.h"
 #include "ui/tool/node-tool.h"
 #include "ui/tool/control-point-selection.h"
-#include "ui/tool/curve-drag-point.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/manipulator.h"
 #include "ui/tool/multi-path-manipulator.h"
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 1285741ca..8e39ec05a 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -12,7 +12,7 @@
 #include <iostream>
 #include <stdexcept>
 #include <boost/utility.hpp>
-#include <glib.h>
+#include "multi-path-manipulator.h"
 #include <glib/gi18n.h>
 #include <2geom/bezier-utils.h>
 #include <2geom/transforms.h>
@@ -29,7 +29,6 @@
 #include "sp-namedview.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/node.h"
 #include "ui/tool/path-manipulator.h"
 #include <gdk/gdkkeysyms.h>
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h
index 88f5b8882..94b67da59 100644
--- a/src/ui/tool/node.h
+++ b/src/ui/tool/node.h
@@ -11,18 +11,15 @@
 #ifndef SEEN_UI_TOOL_NODE_H
 #define SEEN_UI_TOOL_NODE_H
 
-#include <glib.h>
 #include <iterator>
 #include <iosfwd>
 #include <stdexcept>
 #include <cstddef>
 #include <tr1/functional>
-#include <boost/utility.hpp>
+#include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
-#include <boost/operators.hpp>
-#include "snapped-point.h"
 #include "ui/tool/selectable-control-point.h"
+#include "snapped-point.h"
 #include "ui/tool/node-types.h"
 
 
diff --git a/src/ui/tool/selectable-control-point.cpp b/src/ui/tool/selectable-control-point.cpp
index e9a8bcbd6..c92dcaaae 100644
--- a/src/ui/tool/selectable-control-point.cpp
+++ b/src/ui/tool/selectable-control-point.cpp
@@ -8,9 +8,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/tool/selectable-control-point.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tool/selectable-control-point.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/selectable-control-point.h b/src/ui/tool/selectable-control-point.h
index 1b8bd46cc..9467aef74 100644
--- a/src/ui/tool/selectable-control-point.h
+++ b/src/ui/tool/selectable-control-point.h
@@ -11,7 +11,6 @@
 #ifndef SEEN_UI_TOOL_SELECTABLE_CONTROL_POINT_H
 #define SEEN_UI_TOOL_SELECTABLE_CONTROL_POINT_H
 
-#include <boost/enable_shared_from_this.hpp>
 #include "ui/tool/control-point.h"
 
 namespace Inkscape {
diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp
index a0051cdcc..25d22ecdc 100644
--- a/src/ui/tool/selector.cpp
+++ b/src/ui/tool/selector.cpp
@@ -8,12 +8,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "control-point.h"
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "display/sodipodi-ctrlrect.h"
 #include "event-context.h"
 #include "preferences.h"
-#include "ui/tool/control-point.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/selector.h"
 
diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp
index e44ae3f1b..2cf6fe55a 100644
--- a/src/ui/tool/transform-handle-set.cpp
+++ b/src/ui/tool/transform-handle-set.cpp
@@ -10,9 +10,8 @@
 
 #include <math.h>
 #include <algorithm>
-#include <glib.h>
+#include "control-point.h"
 #include <glib/gi18n.h>
-#include <gdk/gdk.h>
 #include <2geom/transforms.h>
 #include "desktop.h"
 #include "desktop-handles.h"
@@ -22,7 +21,6 @@
 #include "snap-candidate.h"
 #include "sp-namedview.h"
 #include "ui/tool/commit-events.h"
-#include "ui/tool/control-point.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/selectable-control-point.h"
 #include "ui/tool/event-utils.h"
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index 05a40bd42..051df691e 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -13,13 +13,13 @@
 # include "config.h"
 #endif
 
+#include "widgets/desktop-widget.h"
 #include <algorithm>
 
 #include "uxmanager.h"
 #include "desktop.h"
 #include "util/ege-tags.h"
 #include "widgets/toolbox.h"
-#include "widgets/desktop-widget.h"
 #include "preferences.h"
 #include "gdkmm/screen.h"
 
diff --git a/src/ui/view/edit-widget-interface.h b/src/ui/view/edit-widget-interface.h
index ba29d6225..2426fa5b1 100644
--- a/src/ui/view/edit-widget-interface.h
+++ b/src/ui/view/edit-widget-interface.h
@@ -13,9 +13,16 @@
 #define INKSCAPE_UI_VIEW_EDIT_WIDGET_IFACE_H
 
 #include "message.h"
-#include <gtkmm/window.h>
 #include <2geom/point.h>
 
+namespace Gtk {
+class Window;
+}
+
+namespace Glib {
+class ustring;
+}
+
 namespace Inkscape { namespace UI { namespace Widget { class Dock; } } }
 
 namespace Inkscape {
diff --git a/src/ui/widget/color-preview.h b/src/ui/widget/color-preview.h
index aa4c7e11d..f89e0ea42 100644
--- a/src/ui/widget/color-preview.h
+++ b/src/ui/widget/color-preview.h
@@ -11,7 +11,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/eventbox.h>
+#include <gtkmm/widget.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index a0ad3b391..0f734938e 100644
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -20,9 +20,9 @@
 
 #include <glibmm/i18n.h>
 
-#include "helper/units.h"
-#include "widgets/ruler.h"
 #include "ui/widget/ruler.h"
+#include "widgets/ruler.h"
+#include "helper/units.h"
 
 #include "xml/repr.h"
 #include "display/sp-canvas.h"
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index ecc9405d9..676cb9b59 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -17,19 +17,12 @@
 # include "config.h"
 #endif
 
-
-#if HAVE_STRING_H
-#endif
-
-
-
-
+#include "icon.h"
 #include "shortcuts.h"
 #include "interface.h"
 
 #include <gdk/gdkkeysyms.h>
 
-#include "icon.h"
 #include "button.h"
 
 static void sp_button_class_init (SPButtonClass *klass);
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 29af8bd75..798b65abd 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -12,9 +12,7 @@
  *      ? -2004
  */
 
-#include <gtk/gtk.h>
-
-#include "sp-object.h"
+#include <gtkmm/window.h>
 #include "message.h"
 #include "ui/view/view-widget.h"
 #include "ui/view/edit-widget-interface.h"
@@ -26,7 +24,9 @@
 // forward declaration
 typedef struct _EgeColorProfTracker EgeColorProfTracker;
 struct SPCanvas;
+class SPDesktop;
 class SPDesktopWidget;
+class SPObject;
 
 
 #define SP_TYPE_DESKTOP_WIDGET SPDesktopWidget::getType()
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index d5c796776..d9d818643 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -24,6 +24,9 @@
 
 #include <glibmm/i18n.h>
 #include <gtkmm/box.h>
+
+#include "verbs.h"
+
 #include <gtk/gtk.h>
 
 #include "desktop.h"
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index 08f98a49f..1644008d1 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -20,8 +20,8 @@
 # include "config.h"
 #endif
 
-#include <libnrtype/font-instance.h>
 #include <libnrtype/font-lister.h>
+#include <libnrtype/font-instance.h>
 
 #include <2geom/transforms.h>
 
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index c5f463121..6443e09cb 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -16,6 +16,7 @@
 # include "config.h"
 #endif
 
+#include "verbs.h"
 #include <gtk/gtk.h>
 
 #include "macros.h"
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 829f865ed..eb421ade6 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -24,6 +24,9 @@
 #endif
 #ifdef HAVE_STRING_H
 #endif
+#include "ui/widget/color-preview.h"
+#include "gradient-vector.h"
+#include "verbs.h"
 #include <gtk/gtk.h>
 #include "macros.h"
 #include <glibmm/i18n.h>
@@ -31,7 +34,6 @@
 #include "../inkscape.h"
 #include "../document-private.h"
 #include "../gradient-chemistry.h"
-#include "gradient-vector.h"
 #include "../helper/window.h"
 
 #include "xml/repr.h"
@@ -425,7 +427,6 @@ void SPGradientVectorSelector::setSwatched()
   ##################################################################*/
 
 #include "../widgets/sp-color-notebook.h"
-#include "ui/widget/color-preview.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
 #include "../svg/svg-color.h"
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 930412e55..7f027870d 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -16,11 +16,11 @@
 # include "config.h"
 #endif
 
+#include <gtkmm/icontheme.h>
 #include <cstring>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
-#include <gtkmm/icontheme.h>
 #include <gtkmm/image.h>
 #include <gdkmm/pixbuf.h>
 #include <glibmm/fileutils.h>
diff --git a/src/widgets/icon.h b/src/widgets/icon.h
index f04d2f8da..3f6aa2455 100644
--- a/src/widgets/icon.h
+++ b/src/widgets/icon.h
@@ -14,15 +14,16 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
-
+#include <gtkmm/widget.h>
 #include "icon-size.h"
 
 #define SP_TYPE_ICON SPIcon::getType()
 #define SP_ICON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_ICON, SPIcon))
 #define SP_IS_ICON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_ICON))
 
-#include <gtk/gtk.h>
+namespace Glib {
+class ustring;
+}
 
 struct SPIconClass {
     GtkWidgetClass parent_class;
@@ -45,8 +46,6 @@ struct SPIcon {
 
 GtkWidget *sp_icon_new( Inkscape::IconSize size, const gchar *name );
 
-#include <glibmm/ustring.h>
-#include <gtkmm/widget.h>
 
 // Might return a wrapped SPIcon, or Gtk::Image
 Gtk::Widget *sp_icon_get_icon( const Glib::ustring &oid, Inkscape::IconSize size = Inkscape::ICON_SIZE_BUTTON );
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index ecc3cc197..f8d0052db 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -16,13 +16,13 @@
 # include "config.h"
 #endif
 
+#include "ui/widget/spinbutton.h"
 #include <gtk/gtk.h>
 
 #include "widgets/button.h"
 #include "widgets/spw-utilities.h"
 #include "widgets/widget-sizes.h"
 #include "widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
 #include "widgets/icon.h"
 #include "widgets/sp-widget.h"
 
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index 8e3d16da5..a1702a864 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -13,6 +13,8 @@
  */
 
 #include <glibmm/i18n.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
 
diff --git a/src/widgets/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h
index 98f44b4f8..fb8a74632 100644
--- a/src/widgets/sp-attribute-widget.h
+++ b/src/widgets/sp-attribute-widget.h
@@ -15,14 +15,14 @@
 #ifndef SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H
 #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H
 
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <gtkmm/entry.h>
 #include <gtkmm/table.h>
 #include <gtkmm/widget.h>
 #include <stddef.h>
 #include <sigc++/connection.h>
 
+namespace Gtk {
+class Entry;
+}
 
 namespace Inkscape {
 namespace XML {
diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index d6ff5276d..d30f0bbe6 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -19,6 +19,7 @@
 #include "document-private.h"
 #include "document-undo.h"
 #include "inkscape.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/widgets/spw-utilities.h b/src/widgets/spw-utilities.h
index 334aa7ce1..263abbcaf 100644
--- a/src/widgets/spw-utilities.h
+++ b/src/widgets/spw-utilities.h
@@ -18,15 +18,11 @@
    SPObject, that reacts to modification.
 */
 
-#include <glib.h>
-#include <gtk/gtk.h>      /* GtkWidget */
-#include <gtkmm/widget.h>
-#include <gtkmm/table.h>
-
 namespace Gtk {
   class Label;
   class Table;
   class HBox;
+  class Widget;
 }
 
 Gtk::Label *
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 0f5fc0b97..5508d8cca 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -17,6 +17,7 @@
 
 #define noSP_SS_VERBOSE
 
+#include <gtkmm/table.h>
 #include <glib.h>
 #include <glibmm/i18n.h>
 #include "widgets/dash-selector.h"
@@ -59,6 +60,7 @@
 #include "fill-n-stroke-factory.h"
 
 #include <gtkmm/optionmenu.h>
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 4ea9c9344..5f8714324 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -31,6 +31,9 @@
 
 #include <cstring>
 #include <string>
+#include <gtkmm/action.h>
+#include <gtkmm/actiongroup.h>
+#include <gtkmm/toolitem.h>
 
 #include "../libnrtype/font-lister.h"
 #include <iostream>