Header cleaning

(bzr r10963)

110 files changed, 162 insertions, 47 deletions

diff --git a/src/arc-context.cpp b/src/arc-context.cpp
index b2a7fe7a3..b4e8f0522 100644
--- a/src/arc-context.cpp
+++ b/src/arc-context.cpp
@@ -26,6 +26,7 @@
 #include "display/sp-canvas.h"
 #include "sp-ellipse.h"
 #include "document.h"
+#include "document-undo.h"
 #include "sp-namedview.h"
 #include "selection.h"
 #include "desktop-handles.h"
diff --git a/src/attributes.h b/src/attributes.h
index 1c1d092cf..8c7955a77 100644
--- a/src/attributes.h
+++ b/src/attributes.h
@@ -13,7 +13,7 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-#include <glib.h>
+#include <glibmm/value.h>
 
 unsigned int sp_attribute_lookup(gchar const *key);
 unsigned char const *sp_attribute_name(unsigned int id);
diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp
index 528b9b67b..8091fd60b 100644
--- a/src/box3d-context.cpp
+++ b/src/box3d-context.cpp
@@ -22,6 +22,7 @@
 #include "macros.h"
 #include "display/sp-canvas.h"
 #include "document.h"
+#include "document-undo.h"
 #include "sp-namedview.h"
 #include "selection.h"
 #include "selection-chemistry.h"
diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
index 331865254..d6f02e875 100644
--- a/src/conn-avoid-ref.cpp
+++ b/src/conn-avoid-ref.cpp
@@ -34,9 +34,11 @@
 #include "document.h"
 #include "desktop.h"
 #include "desktop-handles.h"
+#include "document-undo.h"
 #include "sp-namedview.h"
 #include "sp-item-group.h"
 #include "inkscape.h"
+#include "verbs.h"
 #include <glibmm/i18n.h>
 
 using Inkscape::DocumentUndo;
diff --git a/src/connector-context.cpp b/src/connector-context.cpp
index 34210bbcd..1c631c446 100644
--- a/src/connector-context.cpp
+++ b/src/connector-context.cpp
@@ -159,8 +159,6 @@
 #include "connector-context.h"
 #include "pixmaps/cursor-connector.xpm"
 #include "pixmaps/cursor-node.xpm"
-//#include "pixmaps/cursor-node-m.xpm"
-//#include "pixmaps/cursor-node-d.xpm"
 #include "xml/node-event-vector.h"
 #include "xml/repr.h"
 #include "svg/svg.h"
@@ -168,6 +166,7 @@
 #include "desktop-style.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "message-context.h"
 #include "message-stack.h"
 #include "selection.h"
@@ -191,6 +190,7 @@
 #include "sp-text.h"
 #include "sp-flowtext.h"
 #include "display/curve.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 36294f824..923b15a88 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -21,6 +21,7 @@
 #include <2geom/angle.h>
 #include <glibmm/i18n.h>
 
+#include "ui/dialog/guides.h"
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "dialogs/dialog-events.h"
@@ -29,6 +30,7 @@
 #include "display/guideline.h"
 #include "display/snap-indicator.h"
 #include "document.h"
+#include "document-undo.h"
 #include "event-context.h"
 #include "helper/action.h"
 #include "helper/unit-menu.h"
@@ -40,7 +42,7 @@
 #include "sp-metrics.h"
 #include "sp-namedview.h"
 #include "tools-switch.h"
-#include "ui/dialog/guides.h"
+#include "verbs.h"
 #include "widgets/desktop-widget.h"
 #include "xml/repr.h"
 
diff --git a/src/desktop.cpp b/src/desktop.cpp
index 13022fc62..98791064e 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -32,6 +32,8 @@
 #include <2geom/transforms.h>
 #include <2geom/rect.h>
 
+#include "ui/dialog/dialog-manager.h"
+
 #include "box3d-context.h"
 #include "color.h"
 #include "desktop-events.h"
@@ -68,7 +70,6 @@
 #include "sp-item-group.h"
 #include "sp-namedview.h"
 #include "sp-root.h"
-#include "ui/dialog/dialog-manager.h"
 #include "widgets/desktop-widget.h"
 #include "xml/repr.h"
 
diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 5f59ddfcf..f3621bbdd 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -31,6 +31,7 @@
 #include "display/drawing-context.h"
 #include "display/drawing-item.h"
 #include "document.h"
+#include "document-undo.h"
 #include "filter-chemistry.h"
 #include "helper/unit-menu.h"
 #include "helper/units.h"
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 759745cbf..b52616d1a 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -43,6 +43,7 @@
 #include "helper/window.h"
 #include "inkscape-private.h"
 #include "document.h"
+#include "document-undo.h"
 #include "desktop-handles.h"
 #include "sp-item.h"
 #include "selection.h"
diff --git a/src/dialogs/spellcheck.cpp b/src/dialogs/spellcheck.cpp
index a239837ba..399d6ce81 100644
--- a/src/dialogs/spellcheck.cpp
+++ b/src/dialogs/spellcheck.cpp
@@ -42,6 +42,7 @@
 #include "display/curve.h"
 #include "document-undo.h"
 #include "sp-root.h"
+#include "verbs.h"
 
 #ifdef HAVE_ASPELL
 #include <aspell.h>
diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp
index 307ab1fd1..a9a7d7a31 100644
--- a/src/dialogs/text-edit.cpp
+++ b/src/dialogs/text-edit.cpp
@@ -33,6 +33,7 @@ extern "C" {
 #include "../widgets/font-selector.h"
 #include "../inkscape.h"
 #include "../document.h"
+#include "../document-undo.h"
 #include "../desktop-style.h"
 #include "../desktop-handles.h"
 #include "../selection.h"
diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp
index 17d1a83b0..608e7e121 100644
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
@@ -23,6 +23,7 @@
 #include "../desktop-handles.h"
 #include "dialog-events.h"
 #include "../document.h"
+#include "../document-undo.h"
 #include "../event-context.h"
 #include "helper/window.h"
 #include "../inkscape.h"
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index b847b7854..3517e5b47 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -33,6 +33,7 @@
 #include "ui/widget/registered-widget.h"
 #include "util/mathfns.h"
 #include "xml/node-event-vector.h"
+#include "verbs.h"
 
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
diff --git a/src/document.cpp b/src/document.cpp
index ce8e6d125..26d281b90 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -46,6 +46,7 @@
 #include "dir-util.h"
 #include "display/drawing-item.h"
 #include "document-private.h"
+#include "document-undo.h"
 #include "helper/units.h"
 #include "inkscape-private.h"
 #include "inkscape-version.h"
diff --git a/src/document.h b/src/document.h
index b799cb832..bf1644d0f 100644
--- a/src/document.h
+++ b/src/document.h
@@ -17,7 +17,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib-object.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <sigc++/class_slot.h>
@@ -29,10 +28,7 @@
 #include "gc-finalized.h"
 #include "gc-anchored.h"
 #include <glibmm/ustring.h>
-#include "verbs.h"
-#include "document-undo.h"
 #include <vector>
-#include <set>
 
 namespace Avoid {
 class Router;
diff --git a/src/draw-context.cpp b/src/draw-context.cpp
index 9525aae49..e24a6704a 100644
--- a/src/draw-context.cpp
+++ b/src/draw-context.cpp
@@ -18,8 +18,8 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <gdk/gdkkeysyms.h>
 
+#include "live_effects/lpe-patternalongpath.h"
 #include "display/canvas-bpath.h"
 #include "xml/repr.h"
 #include "svg/svg.h"
@@ -40,10 +40,11 @@
 #include "snap.h"
 #include "sp-path.h"
 #include "sp-namedview.h"
-#include "live_effects/lpe-patternalongpath.h"
 #include "live_effects/lpe-powerstroke.h"
 #include "style.h"
 
+#include <gdk/gdkkeysyms.h>
+
 using Inkscape::DocumentUndo;
 
 static void sp_draw_context_class_init(SPDrawContextClass *klass);
diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp
index 22f71372b..1dbd38432 100644
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
@@ -35,11 +35,13 @@
 #include "desktop-handles.h"
 #include "selection.h"
 #include "document.h"
+#include "document-undo.h"
 
 #include "pixmaps/cursor-dropper.xpm"
 
 #include "dropper-context.h"
 #include "message-context.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index 5c70426d5..f48db0a99 100644
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -42,6 +42,7 @@
 #include <glib.h>
 #include "macros.h"
 #include "document.h"
+#include "document-undo.h"
 #include "selection.h"
 #include "desktop.h"
 #include "desktop-events.h"
@@ -64,6 +65,7 @@
 #include "display/canvas-bpath.h"
 #include "display/canvas-arena.h"
 #include "livarot/Shape.h"
+#include "verbs.h"
 
 #include "dyna-draw-context.h"
 
diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp
index 257a6c5ec..e77f31b85 100644
--- a/src/eraser-context.cpp
+++ b/src/eraser-context.cpp
@@ -62,6 +62,8 @@
 #include "display/canvas-bpath.h"
 #include "display/canvas-arena.h"
 #include "livarot/Shape.h"
+#include "document-undo.h"
+#include "verbs.h"
 #include <2geom/math-utils.h>
 #include <2geom/pathvector.h>
 
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index b5b91f383..6d1ddbbbd 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -12,6 +12,7 @@
 #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/effect.h b/src/extension/effect.h
index 83b5cc036..bb36b9238 100644
--- a/src/extension/effect.h
+++ b/src/extension/effect.h
@@ -12,21 +12,21 @@
 #define INKSCAPE_EXTENSION_EFFECT_H__
 
 #include <config.h>
-
 #include <glibmm/i18n.h>
-#include <gtkmm/dialog.h>
-#include <gtk/gtk.h>
 #include "verbs.h"
-
-#include "prefdialog.h"
 #include "extension.h"
 
+namespace Gtk {
+	class VBox;
+}
+
 struct SPDocument;
 
 namespace Inkscape {
 
 
 namespace Extension {
+class PrefDialog;
 
 /** \brief  Effects are extensions that take a document and do something
             to it in place.  This class adds the extra functions required
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 646caa36a..4058fd787 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -19,6 +19,7 @@
 #include "selection.h"
 #include "effect.h"
 #include "document.h"
+#include "document-undo.h"
 #include "desktop.h"
 #include "ui/view/view.h"
 #include "sp-namedview.h"
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index 8b4c8805b..deb354d00 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -10,6 +10,8 @@
 #include "gdkpixbuf-input.h"
 #include "selection-chemistry.h"
 #include "sp-image.h"
+#include "document-undo.h"
+#include <set>
 
 namespace Inkscape {
 
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index ab609186a..e5d535d3b 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -37,6 +37,7 @@
 #include "pdf-parser.h"
 
 #include "document-private.h"
+#include "document-undo.h"
 #include "inkscape.h"
 
 #include "dialogs/dialog-events.h"
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index 4f8d2ebe6..82d0a726f 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -36,8 +36,8 @@
 #include "xml/rebase-hrefs.h"
 #include "io/sys.h"
 #include "inkscape.h"
+#include "document-undo.h"
 
-/* #include "implementation/plugin.h" */
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/file.cpp b/src/file.cpp
index 189e1d261..e6a744d1b 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -39,6 +39,7 @@
 #include "dialogs/export.h"
 #include "dir-util.h"
 #include "document-private.h"
+#include "document-undo.h"
 #include "extension/db.h"
 #include "extension/input.h"
 #include "extension/output.h"
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index 4b16a5e10..6515e37a0 100644
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
@@ -39,6 +39,7 @@
 #include "display/drawing.h"
 #include "display/sp-canvas.h"
 #include "document.h"
+#include "document-undo.h"
 #include "flood-context.h"
 #include "livarot/Path.h"
 #include "livarot/Shape.h"
@@ -65,6 +66,7 @@
 #include "trace/trace.h"
 #include "xml/node-event-vector.h"
 #include "xml/repr.h"
+#include "verbs.h"
 
 #include "pixmaps/cursor-paintbucket.xpm"
 
diff --git a/src/gradient-context.cpp b/src/gradient-context.cpp
index 0cb000003..ec18c1273 100644
--- a/src/gradient-context.cpp
+++ b/src/gradient-context.cpp
@@ -45,6 +45,8 @@
 #include "snap.h"
 #include "sp-namedview.h"
 #include "rubberband.h"
+#include "document-undo.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index d5f922ce5..7ab10f84d 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -28,6 +28,7 @@
 #include "desktop-style.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "display/sp-ctrlline.h"
 #include "display/sp-canvas-util.h"
 #include "xml/repr.h"
@@ -45,6 +46,7 @@
 #include "snap.h"
 #include "sp-namedview.h"
 #include "selection-chemistry.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index d0cc73081..b97c0eb83 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -50,7 +50,6 @@
 #include "extension/init.h"
 #include "extension/output.h"
 #include "extension/system.h"
-//#include "helper/sp-marshal.h"
 #include "inkscape-private.h"
 #include "io/sys.h"
 #include "message-stack.h"
diff --git a/src/inkview.cpp b/src/inkview.cpp
index 11643af6d..c188827ce 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -34,7 +34,7 @@
 #include <getopt.h>
 #endif
 
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <locale.h>
 
diff --git a/src/interface.cpp b/src/interface.cpp
index 929f19634..d0074c676 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -66,6 +66,7 @@
 #include "event-context.h"
 #include "gradient-drag.h"
 #include "widgets/ege-paint-def.h"
+#include "document-undo.h"
 
 #include <gdk/gdkkeysyms.h>
 
diff --git a/src/knot.cpp b/src/knot.cpp
index 4dfccc18a..26b75d660 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -23,6 +23,7 @@
 #include "desktop-handles.h"
 #include "knot.h"
 #include "document.h"
+#include "document-undo.h"
 #include "preferences.h"
 #include "message-stack.h"
 #include "message-context.h"
diff --git a/src/knotholder.cpp b/src/knotholder.cpp
index 10d03982c..91013ad2e 100644
--- a/src/knotholder.cpp
+++ b/src/knotholder.cpp
@@ -15,6 +15,7 @@
 #include <glibmm/i18n.h>
 
 #include "document.h"
+#include "document-undo.h"
 #include "sp-shape.h"
 #include "knot.h"
 #include "knotholder.h"
@@ -34,6 +35,7 @@
 #include "live_effects/effect.h"
 #include "desktop.h"
 #include "display/sp-canvas.h"
+#include "verbs.h"
 
 #include "xml/repr.h" // for debugging only
 
diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp
index 58dc4bd75..d8c13a515 100644
--- a/src/live_effects/lpe-knot.cpp
+++ b/src/live_effects/lpe-knot.cpp
@@ -24,7 +24,6 @@
 #include <2geom/d2.h>
 #include <2geom/d2-sbasis.h>
 #include <2geom/path.h>
-//#include <2geom/crossing.h>
 #include <2geom/bezier-to-sbasis.h>
 #include <2geom/basic-intersection.h>
 #include <2geom/exception.h>
@@ -32,6 +31,7 @@
 // for change crossing undo
 #include "verbs.h"
 #include "document.h"
+#include "document-undo.h"
 
 #include <exception>
 
diff --git a/src/live_effects/lpe-patternalongpath.h b/src/live_effects/lpe-patternalongpath.h
index f48281090..be2197ddb 100644
--- a/src/live_effects/lpe-patternalongpath.h
+++ b/src/live_effects/lpe-patternalongpath.h
@@ -9,9 +9,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/path.h"
-#include "live_effects/parameter/enum.h"
 #include "live_effects/parameter/bool.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h
index 40d29b7a7..2a1b07b47 100644
--- a/src/live_effects/parameter/enum.h
+++ b/src/live_effects/parameter/enum.h
@@ -9,10 +9,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
-
 #include "ui/widget/registered-enums.h"
-
+#include <glibmm/ustring.h>
 #include "live_effects/effect.h"
 #include "live_effects/parameter/parameter.h"
 #include "verbs.h"
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 5adba9aac..16883deda 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -23,6 +23,7 @@
 #include "message-stack.h"
 #include "verbs.h"
 #include "document.h"
+#include "document-undo.h"
 
 // needed for on-canvas editting:
 #include "tools-switch.h"
diff --git a/src/live_effects/parameter/unit.cpp b/src/live_effects/parameter/unit.cpp
index 2fba6412a..2f2d71679 100644
--- a/src/live_effects/parameter/unit.cpp
+++ b/src/live_effects/parameter/unit.cpp
@@ -9,6 +9,7 @@
 #include "live_effects/parameter/unit.h"
 #include "live_effects/effect.h"
 #include "ui/widget/registered-widget.h"
+#include "verbs.h"
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index c81a5b032..e9ddc756c 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -15,6 +15,7 @@
 #include "ui/widget/registered-widget.h"
 #include "live_effects/effect.h"
 #include "desktop.h"
+#include "verbs.h"
 
 namespace Inkscape {
 
diff --git a/src/main.cpp b/src/main.cpp
index 2d8e35871..29aeb58b3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,8 +31,6 @@
 // This has to be included prior to anything that includes setjmp.h, it croaks otherwise
 #include <png.h>
 
-#include <gtk/gtk.h>
-
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
@@ -114,6 +112,7 @@
 #include "ui/widget/panel.h"
 
 #include <errno.h>
+#include "verbs.h"
 
 enum {
     SP_ARG_NONE,
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index 5f089476e..67c097067 100644
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -31,6 +31,7 @@
 #include "style.h"
 #include "desktop.h"
 #include "document.h"
+#include "document-undo.h"
 #include "message-stack.h"
 #include "selection.h"
 #include "desktop-handles.h"
@@ -38,6 +39,7 @@
 #include <2geom/pathvector.h>
 #include "selection-chemistry.h"
 #include "path-chemistry.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/persp3d.cpp b/src/persp3d.cpp
index 0b346622a..4e15a4de4 100644
--- a/src/persp3d.cpp
+++ b/src/persp3d.cpp
@@ -15,6 +15,7 @@
 #include "perspective-line.h"
 #include "attributes.h"
 #include "document-private.h"
+#include "document-undo.h"
 #include "vanishing-point.h"
 #include "box3d-context.h"
 #include "box3d.h"
diff --git a/src/profile-manager.cpp b/src/profile-manager.cpp
index 27ab75497..e2a3e736d 100644
--- a/src/profile-manager.cpp
+++ b/src/profile-manager.cpp
@@ -13,6 +13,8 @@
 #include "document.h"
 #include "color-profile.h"
 
+#include <cstring>
+
 namespace Inkscape {
 
 ProfileManager::ProfileManager(SPDocument *document) :
diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index e24e4fc20..9e2ae0be0 100644
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
@@ -24,6 +24,7 @@
 #include "display/sp-canvas.h"
 #include "sp-rect.h"
 #include "document.h"
+#include "document-undo.h"
 #include "sp-namedview.h"
 #include "selection.h"
 #include "selection-chemistry.h"
@@ -42,6 +43,7 @@
 #include "preferences.h"
 #include "context-fns.h"
 #include "shape-editor.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp
index b5cf67f91..c42ce6feb 100644
--- a/src/resource-manager.cpp
+++ b/src/resource-manager.cpp
@@ -22,6 +22,9 @@
 #include "sp-object.h"
 #include "xml/node.h"
 #include "document-undo.h"
+#include "verbs.h"
+
+#include <set>
 
 namespace Inkscape {
 
diff --git a/src/select-context.cpp b/src/select-context.cpp
index 2dec3269b..ad50edb71 100644
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
@@ -23,6 +23,7 @@
 #include "macros.h"
 #include "rubberband.h"
 #include "document.h"
+#include "document-undo.h"
 #include "selection.h"
 #include "seltrans-handles.h"
 #include "sp-cursor.h"
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index bc4b7ca98..1cded04c8 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -58,6 +58,7 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 #include "xml/rebase-hrefs.h"
 #include "style.h"
 #include "document-private.h"
+#include "document-undo.h"
 #include "sp-gradient.h"
 #include "sp-gradient-reference.h"
 #include "sp-linear-gradient-fns.h"
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index 922d13a72..e474ae232 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -23,6 +23,7 @@
 #include <2geom/transforms.h>
 #include <gdk/gdkkeysyms.h>
 #include "document.h"
+#include "document-undo.h"
 #include "sp-namedview.h"
 #include "desktop.h"
 #include "desktop-handles.h"
diff --git a/src/sp-filter.h b/src/sp-filter.h
index 229e56ae0..d0529e542 100644
--- a/src/sp-filter.h
+++ b/src/sp-filter.h
@@ -19,6 +19,8 @@
 #include "sp-filter-units.h"
 #include "svg/svg-length.h"
 
+#include <glibmm/ustring.h>
+
 #define SP_TYPE_FILTER (sp_filter_get_type())
 #define SP_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_FILTER, SPFilter))
 #define SP_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SP_TYPE_FILTER, SPFilterClass))
diff --git a/src/sp-font-face.cpp b/src/sp-font-face.cpp
index 520eee855..05f71cbf6 100644
--- a/src/sp-font-face.cpp
+++ b/src/sp-font-face.cpp
@@ -25,6 +25,8 @@
 #include "sp-font-face.h"
 #include "document.h"
 
+#include <cstring>
+
 //TODO: apparently unused. Maybe should be removed.
 class ObjectContainer
 {
diff --git a/src/sp-glyph-kerning.cpp b/src/sp-glyph-kerning.cpp
index 61a2ac531..652d965bb 100644
--- a/src/sp-glyph-kerning.cpp
+++ b/src/sp-glyph-kerning.cpp
@@ -24,6 +24,7 @@
 
 #include "document.h"
 #include <string>
+#include <cstring>
 
 static void sp_glyph_kerning_class_init(SPGlyphKerningClass *gc);
 static void sp_glyph_kerning_init(SPGlyphKerning *glyph);
diff --git a/src/sp-glyph.cpp b/src/sp-glyph.cpp
index 709a33be2..719375688 100644
--- a/src/sp-glyph.cpp
+++ b/src/sp-glyph.cpp
@@ -21,6 +21,7 @@
 #include "attributes.h"
 #include "sp-glyph.h"
 #include "document.h"
+#include <cstring>
 
 static void sp_glyph_class_init(SPGlyphClass *gc);
 static void sp_glyph_init(SPGlyph *glyph);
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 5d30800d6..6cdc75c41 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -41,6 +41,8 @@
 #include "sp-namedview.h"
 #include <2geom/angle.h>
 #include "document.h"
+#include "document-undo.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 using std::vector;
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 476564b8a..9b8bf71de 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -27,6 +27,7 @@
 #include "xml/repr.h"
 #include "svg/svg.h"
 #include "document.h"
+#include "document-undo.h"
 #include "style.h"
 #include "attributes.h"
 #include "sp-item-transform.h"
@@ -48,6 +49,7 @@
 #include "sp-desc.h"
 #include "sp-switch.h"
 #include "sp-defs.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index c2640911e..ab525d368 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -26,6 +26,7 @@
 #include "xml/repr.h"
 #include "attributes.h"
 #include "document.h"
+#include "document-undo.h"
 #include "desktop-events.h"
 #include "desktop-handles.h"
 #include "event-log.h"
diff --git a/src/sp-object.h b/src/sp-object.h
index 110deb262..b16927979 100644
--- a/src/sp-object.h
+++ b/src/sp-object.h
@@ -49,7 +49,7 @@ class SPObjectClass;
 #define SP_OBJECT_WRITE_EXT (1 << 1)
 #define SP_OBJECT_WRITE_ALL (1 << 2)
 
-#include <glib-object.h>
+#include <glibmm/object.h>
 #include <stddef.h>
 #include <sigc++/connection.h>
 #include <sigc++/functors/slot.h>
@@ -57,7 +57,11 @@ class SPObjectClass;
 
 #include "version.h"
 #include "util/forward-pointer-iterator.h"
-#include "desktop-style.h"
+
+
+class  SPDesktop;
+struct SPCSSAttr;
+struct SPStyle;
 
 namespace Inkscape {
 namespace XML {
diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp
index b6d846f77..c78394714 100644
--- a/src/spiral-context.cpp
+++ b/src/spiral-context.cpp
@@ -24,6 +24,7 @@
 #include "display/sp-canvas.h"
 #include "sp-spiral.h"
 #include "document.h"
+#include "document-undo.h"
 #include "sp-namedview.h"
 #include "selection.h"
 #include "desktop-handles.h"
@@ -41,6 +42,7 @@
 #include "preferences.h"
 #include "context-fns.h"
 #include "shape-editor.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index cf4e63ffa..8b06e8ae4 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -33,6 +33,7 @@
 #include "sp-item-group.h"
 #include "style.h"
 #include "document.h"
+#include "document-undo.h"
 #include "message-stack.h"
 #include "selection.h"
 #include "desktop-handles.h"
@@ -51,6 +52,7 @@
 #include "livarot/Shape.h"
 
 #include "splivarot.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/spray-context.cpp b/src/spray-context.cpp
index e865e4621..a94a92157 100644
--- a/src/spray-context.cpp
+++ b/src/spray-context.cpp
@@ -31,6 +31,7 @@
 #include <glib.h>
 #include "macros.h"
 #include "document.h"
+#include "document-undo.h"
 #include "selection.h"
 #include "desktop.h"
 #include "desktop-events.h"
@@ -66,6 +67,7 @@
 #include "spray-context.h"
 #include "ui/dialog/dialog-manager.h"
 #include "helper/action.h"
+#include "verbs.h"
 
 #include <iostream>
 
diff --git a/src/spray-context.h b/src/spray-context.h
index f3564ac67..64368c7a6 100644
--- a/src/spray-context.h
+++ b/src/spray-context.h
@@ -20,8 +20,6 @@
 
 #include <2geom/point.h>
 #include "event-context.h"
-//#include "ui/widget/spray-option.h"
-#include "ui/dialog/dialog.h"
 
 #define SP_TYPE_SPRAY_CONTEXT (sp_spray_context_get_type())
 #define SP_SPRAY_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_SPRAY_CONTEXT, SPSprayContext))
diff --git a/src/star-context.cpp b/src/star-context.cpp
index f1080afcb..39bce8ea5 100644
--- a/src/star-context.cpp
+++ b/src/star-context.cpp
@@ -27,6 +27,7 @@
 #include "display/sp-canvas.h"
 #include "sp-star.h"
 #include "document.h"
+#include "document-undo.h"
 #include "sp-namedview.h"
 #include "selection.h"
 #include "desktop-handles.h"
@@ -43,6 +44,7 @@
 #include "object-edit.h"
 #include "context-fns.h"
 #include "shape-editor.h"
+#include "verbs.h"
 
 #include "star-context.h"
 
diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp
index a4a6b231a..3446795ed 100644
--- a/src/text-chemistry.cpp
+++ b/src/text-chemistry.cpp
@@ -25,6 +25,7 @@
 #include "inkscape.h"
 #include "desktop.h"
 #include "document.h"
+#include "document-undo.h"
 #include "message-stack.h"
 #include "selection.h"
 #include "style.h"
@@ -35,6 +36,7 @@
 #include "sp-flowregion.h"
 #include "sp-flowdiv.h"
 #include "sp-tspan.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/text-context.cpp b/src/text-context.cpp
index 99b78aee5..bcc5398b0 100644
--- a/src/text-context.cpp
+++ b/src/text-context.cpp
@@ -31,6 +31,7 @@
 #include "desktop-style.h"
 #include "desktop.h"
 #include "document.h"
+#include "document-undo.h"
 #include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index 636b2c1e3..cad8ea9be 100644
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -18,6 +18,7 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "message-stack.h"
 #include <glibmm/i18n.h>
 #include <gtkmm/main.h>
@@ -28,6 +29,7 @@
 #include "sp-shape.h"
 #include "sp-image.h"
 #include <2geom/transforms.h>
+#include "verbs.h"
 
 #include "display/drawing.h"
 #include "display/drawing-shape.h"
diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
index c95657fcb..3d4bde2ac 100644
--- a/src/tweak-context.cpp
+++ b/src/tweak-context.cpp
@@ -24,6 +24,7 @@
 #include <glib.h>
 #include "macros.h"
 #include "document.h"
+#include "document-undo.h"
 #include "selection.h"
 #include "desktop.h"
 #include "desktop-events.h"
@@ -70,6 +71,7 @@
 #include "sp-item-transform.h"
 #include "filter-chemistry.h"
 #include "filters/gaussian-blur.h"
+#include "verbs.h"
 
 #include "tweak-context.h"
 
diff --git a/src/ui/context-menu.cpp b/src/ui/context-menu.cpp
index e99a19e11..8824ad914 100644
--- a/src/ui/context-menu.cpp
+++ b/src/ui/context-menu.cpp
@@ -17,9 +17,11 @@
 #include "../xml/repr.h"
 #include "desktop.h"
 #include "document.h"
+#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/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 714a0d9d5..b3fcf268c 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -45,6 +45,7 @@
 #include "verbs.h"
 #include "widgets/icon.h"
 #include "sp-root.h"
+#include "document-undo.h"
 
 #include "align-and-distribute.h"
 
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index c63044174..25f055f08 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -24,6 +24,7 @@
 #include "desktop-style.h"
 #include "display/cairo-utils.h"
 #include "document.h"
+#include "document-undo.h"
 #include "inkscape.h" // for SP_ACTIVE_DESKTOP
 #include "io/resource.h"
 #include "io/sys.h"
@@ -33,6 +34,7 @@
 #include "svg/svg-color.h"
 #include "xml/node.h"
 #include "xml/repr.h"
+#include "verbs.h"
 
 #include "color.h" // for SP_RGBA32_U_COMPOSE
 
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index d7c46323d..7e83069cc 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -27,6 +27,7 @@
 #include "dialog-manager.h"
 #include "dir-util.h"
 #include "document.h"
+#include "document-undo.h"
 #include "filter-chemistry.h"
 #include "filter-effects-dialog.h"
 #include "filter-enums.h"
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index b6182eaff..ab89bdb97 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -25,6 +25,7 @@
 
 #include "desktop.h"
 #include "document.h" // for SPDocumentUndo::done()
+#include "document-undo.h"
 #include "libnrtype/font-instance.h"
 #include "sp-flowtext.h"
 #include "sp-text.h"
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 521510e1e..61b4fe389 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -21,6 +21,7 @@
 #include "display/guideline.h"
 #include "desktop.h"
 #include "document.h"
+#include "document-undo.h"
 #include "sp-guide.h"
 #include "sp-namedview.h"
 #include "desktop-handles.h"
@@ -30,6 +31,7 @@
 #include "dialogs/dialog-events.h"
 #include "message-context.h"
 #include "xml/repr.h"
+#include "verbs.h"
 
 #include <2geom/point.h>
 #include <2geom/angle.h>
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 3a49a267c..51ade2756 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -36,6 +36,7 @@
 #include "selection.h"
 #include "sp-root.h"
 #include "xml/repr.h"
+#include "verbs.h"
 
 #include "icon-preview.h"
 
diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp
index cc9a4fb42..b674e990b 100644
--- a/src/ui/dialog/layer-properties.cpp
+++ b/src/ui/dialog/layer-properties.cpp
@@ -18,11 +18,13 @@
 #include "inkscape.h"
 #include "desktop.h"
 #include "document.h"
+#include "document-undo.h"
 #include "layer-manager.h"
 #include "message-stack.h"
 #include "desktop-handles.h"
 #include "sp-object.h"
 #include "sp-item.h"
+#include "verbs.h"
 
 #include "layer-properties.h"
 
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 28a1e939c..9dc3a18f5 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -21,6 +21,7 @@
 #include "desktop.h"
 #include "desktop-style.h"
 #include "document.h"
+#include "document-undo.h"
 #include "helper/action.h"
 #include "inkscape.h"
 #include "layer-fns.h"
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 4ddacb1b3..92d28f184 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -24,6 +24,7 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "gtkmm/widget.h"
 #include "inkscape.h"
 #include "live_effects/effect.h"
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index 26d8e6f24..eaf34c66d 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -20,6 +20,8 @@
 
 #include "../../desktop-handles.h"
 #include "../../document.h"
+#include "../../document-undo.h"
+#include "verbs.h"
 #include "object-properties.h"
 
 
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index 40fc42969..a91ccf196 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -31,6 +31,7 @@
 #include "svg/svg-color.h"
 #include "io/sys.h"
 
+#include <glibmm/i18n.h>
 
 
 static void draw_page(
diff --git a/src/ui/dialog/print.h b/src/ui/dialog/print.h
index 0184bc783..bfa6bbe97 100644
--- a/src/ui/dialog/print.h
+++ b/src/ui/dialog/print.h
@@ -11,12 +11,10 @@
 #ifndef INKSCAPE_UI_DIALOG_PRINT_H
 #define INKSCAPE_UI_DIALOG_PRINT_H
 
-#include <glibmm/i18n.h>
 #include <gtkmm/printoperation.h> // GtkMM
-#include <gtk/gtk.h> // Gtk
 
-#include "desktop.h"
-#include "sp-item.h"
+class SPItem;
+class SPDocument;
 
 #include "ui/widget/rendering-options.h"
 
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 1a55b9e00..7210ab3a6 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -18,6 +18,7 @@
 #ifdef ENABLE_SVG_FONTS
 
 #include "document-private.h"
+#include "document-undo.h"
 #include <gtkmm/notebook.h>
 #include <gtkmm/stock.h>
 #include <glibmm/i18n.h>
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 50f8a90aa..c215cf129 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <map>
 #include <algorithm>
+#include <set>
 
 #include <gtk/gtk.h> //for GTK_RESPONSE* types
 #include <glibmm/i18n.h>
@@ -28,6 +29,7 @@
 #include "desktop-style.h"
 #include "document.h"
 #include "document-private.h"
+#include "document-undo.h"
 #include "extension/db.h"
 #include "inkscape.h"
 #include "inkscape.h"
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index 8ca0ba348..929f91346 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -29,6 +29,7 @@
 #include "desktop-handles.h"
 #include "selection.h"
 #include "document.h"
+#include "document-undo.h"
 #include "sp-item.h"
 #include "widgets/icon.h"
 #include "tile.h"
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 996aaf19e..4b4e99da0 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -20,6 +20,7 @@
 #include <2geom/transforms.h>
 
 #include "document.h"
+#include "document-undo.h"
 #include "desktop-handles.h"
 #include "transformation.h"
 #include "align-and-distribute.h"
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index 74de33b27..75dfcd16e 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -21,6 +21,7 @@
 
 
 #include "document.h"
+#include "document-undo.h"
 #include "inkscape.h"
 #include "verbs.h"
 #include "desktop-handles.h"
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index d5e2bf4ec..62710031f 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -16,6 +16,7 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "live_effects/lpeobject.h"
 #include "message-stack.h"
 #include "preferences.h"
@@ -26,6 +27,7 @@
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
 #include "util/unordered-containers.h"
+#include "verbs.h"
 
 #include <gdk/gdkkeysyms.h>
 
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index 2bcb5a157..08141ac71 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -13,9 +13,11 @@
 #include "inkscape.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "dialogs/dialog-events.h"
 
 #include "widgets/sp-color-notebook.h"
+#include "verbs.h"
 
 #include "color-picker.h"
 
diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h
index 9dad40031..cece8a361 100644
--- a/src/ui/widget/color-picker.h
+++ b/src/ui/widget/color-picker.h
@@ -17,11 +17,9 @@
 #include <gtkmm/button.h>
 #include <gtkmm/dialog.h>
 #include <sigc++/sigc++.h>
-#include "widgets/sp-color-selector.h"
 #include "ui/widget/color-preview.h"
-//#include "ui/dialog/dialog.h"
-
 
+struct SPColorSelector;
 
 namespace Inkscape
 {
diff --git a/src/ui/widget/combo-enums.h b/src/ui/widget/combo-enums.h
index 9dfb920a5..d2f6fc43b 100644
--- a/src/ui/widget/combo-enums.h
+++ b/src/ui/widget/combo-enums.h
@@ -13,9 +13,11 @@
 
 #include <gtkmm/combobox.h>
 #include <gtkmm/liststore.h>
+#include "ui/widget/labelled.h"
 #include "attr-widget.h"
 #include "util/enums.h"
-#include "ui/widget/labelled.h"
+
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index 9605571d1..6655b045b 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -25,6 +25,8 @@
 #include "rdf.h"
 #include "ui/widget/registry.h"
 #include "sp-root.h"
+#include "document-undo.h"
+#include "verbs.h"
 
 #include "entity-entry.h"
 
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 08534059b..59317435c 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -21,6 +21,7 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "layer-manager.h"
 #include "sp-item.h"
 #include "ui/dialog/layer-properties.h"
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 28b140036..8a9d84e36 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -22,6 +22,8 @@
 #include "ui/widget/registry.h"
 #include "rdf.h"
 #include "inkscape.h"
+#include "document-undo.h"
+#include "verbs.h"
 
 #include "licensor.h"
 
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 75170971e..06095fb13 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -17,6 +17,7 @@
 #include "desktop-handles.h"
 #include "desktop-style.h"
 #include "document.h"
+#include "document-undo.h"
 #include "filter-chemistry.h"
 #include "inkscape.h"
 #include "selection.h"
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index 80acb98e6..52a44114d 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -26,6 +26,7 @@
 #include "inkscape.h"
 
 #include "document.h"
+#include "document-undo.h"
 #include "desktop-handles.h"
 #include "sp-namedview.h"
 
diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index c6ac3a381..cf0241fd1 100644
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -31,6 +31,7 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "sp-namedview.h"
 #include "verbs.h"
 
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 3d3cd4bb8..3931256cb 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -32,6 +32,7 @@
 #include "ui/dialog/panel-dialog.h"
 #include "xml/repr.h"
 #include "document.h"
+#include "document-undo.h"
 #include "widgets/widget-sizes.h"
 #include "widgets/spinbutton-events.h"
 #include "widgets/gradient-image.h"
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index 72fd48344..be710f5e5 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -23,6 +23,7 @@
 
 #include "inkscape.h"
 #include "document.h"
+#include "document-undo.h"
 #include "desktop-handles.h"
 #include "sp-namedview.h"
 
diff --git a/src/vanishing-point.cpp b/src/vanishing-point.cpp
index f8e991623..fb48fb2d9 100644
--- a/src/vanishing-point.cpp
+++ b/src/vanishing-point.cpp
@@ -23,6 +23,8 @@
 #include "shape-editor.h"
 #include "snap.h"
 #include "sp-namedview.h"
+#include "document-undo.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/verbs.h b/src/verbs.h
index 2c1d761f3..61eedbd2f 100644
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -15,7 +15,6 @@
 
 #include <cstring>
 #include <string>
-#include <string.h>
 #include "config.h"
 #include "require-config.h"   /* HAVE_GTK_WINDOW_FULLSCREEN */
 #include <glibmm/ustring.h>
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 725277a55..e5058680f 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -67,6 +67,8 @@
 #include "toolbox.h"
 #include "widget-sizes.h"
 
+#include "verbs.h"
+
 #if defined (SOLARIS) && (SOLARIS == 8)
 #include "round.h"
 using Inkscape::round;
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index 425ee1f5e..d5c796776 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -32,6 +32,7 @@
 #include "desktop-style.h"
 #include "display/sp-canvas.h"
 #include "document-private.h"
+#include "document-undo.h"
 #include "gradient-chemistry.h"
 #include "inkscape.h"
 #include "selection.h"
diff --git a/src/widgets/font-selector.h b/src/widgets/font-selector.h
index 340a76f7f..da32b3640 100644
--- a/src/widgets/font-selector.h
+++ b/src/widgets/font-selector.h
@@ -19,10 +19,8 @@
 struct SPFontSelector;
 
 #define SP_TYPE_FONT_SELECTOR (sp_font_selector_get_type ())
-#define SP_FONT_SELECTOR(o) (GTK_CHECK_CAST ((o), SP_TYPE_FONT_SELECTOR, SPFontSelector))
-#define SP_IS_FONT_SELECTOR(o) (GTK_CHECK_TYPE ((o), SP_TYPE_FONT_SELECTOR))
-
-#include <gtk/gtkwidget.h>
+#define SP_FONT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_FONT_SELECTOR, SPFontSelector))
+#define SP_IS_FONT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_FONT_SELECTOR))
 
 class font_instance;
 
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index 0f19fbc01..78af985a1 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -29,6 +29,7 @@
 
 #include "preferences.h"
 #include "document-private.h"
+#include "document-undo.h"
 #include "desktop.h"
 #include "desktop-handles.h"
 #include <glibmm/i18n.h>
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 37b9483f2..a5440bba0 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -43,6 +43,7 @@
 
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
+#include "document-undo.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index ea9f5e5cd..7c6b8e9af 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -29,6 +29,7 @@
 #include "preferences.h"
 #include "selection-chemistry.h"
 #include "document.h"
+#include "document-undo.h"
 #include "inkscape.h"
 #include "desktop-style.h"
 #include "desktop.h"
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index 07bc19fab..989712b0b 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -20,6 +20,8 @@
 #include "xml/repr.h"
 #include "macros.h"
 #include "document.h"
+#include "document-undo.h"
+#include "verbs.h"
 #include "sp-attribute-widget.h"
 
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/sp-color-selector.h b/src/widgets/sp-color-selector.h
index c27cad45f..616d5a9e7 100644
--- a/src/widgets/sp-color-selector.h
+++ b/src/widgets/sp-color-selector.h
@@ -6,9 +6,6 @@
 
 #include <glib.h>
 
-
-
-
 struct SPColorSelector;
 
 class ColorSelector
diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index 1f35f2373..d6ff5276d 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -17,6 +17,7 @@
 #include "sp-xmlview-content.h"
 #include "desktop-handles.h"
 #include "document-private.h"
+#include "document-undo.h"
 #include "inkscape.h"
 
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 12bfc20e1..6d64ff25c 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -27,6 +27,7 @@
 #include "display/canvas-bpath.h" // for SP_STROKE_LINEJOIN_*
 #include "display/drawing.h"
 #include "document-private.h"
+#include "document-undo.h"
 #include "gradient-chemistry.h"
 #include "helper/stock-items.h"
 #include "helper/unit-menu.h"
diff --git a/src/widgets/swatch-selector.cpp b/src/widgets/swatch-selector.cpp
index cd624630b..5de71c95e 100644
--- a/src/widgets/swatch-selector.cpp
+++ b/src/widgets/swatch-selector.cpp
@@ -5,6 +5,7 @@
 #include "swatch-selector.h"
 
 #include "document.h"
+#include "document-undo.h"
 #include "gradient-chemistry.h"
 #include "gradient-selector.h"
 #include "sp-color-notebook.h"
diff --git a/src/xml/node.h b/src/xml/node.h
index c11f2fbdf..e83d8a7b7 100644
--- a/src/xml/node.h
+++ b/src/xml/node.h
@@ -18,7 +18,7 @@
 #ifndef SEEN_INKSCAPE_XML_NODE_H
 #define SEEN_INKSCAPE_XML_NODE_H
 
-#include <glib.h>
+#include <glibmm/value.h>
 #include "gc-anchored.h"
 #include "util/list.h"