update to trunk

(bzr r11950.1.268)

44 files changed, 334 insertions, 606 deletions

diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h
index 30b380eb7..ce364abf1 100644
--- a/src/conn-avoid-ref.h
+++ b/src/conn-avoid-ref.h
@@ -19,6 +19,7 @@
 #include <sigc++/connection.h>
 
 class  SPDesktop;
+class SPObject;
 class  SPItem;
 namespace Avoid { class ShapeRef; }
 
diff --git a/src/connection-pool.h b/src/connection-pool.h
index e4e8f5c5e..b1ac6f07a 100644
--- a/src/connection-pool.h
+++ b/src/connection-pool.h
@@ -1,8 +1,10 @@
 #ifndef CONNECTION_POOL_H
 #define CONNECTION_POOL_H
 
+#include <map>
 #include <glib-object.h>
 #include <stddef.h>
+#include <string>
 #include <sigc++/sigc++.h>
 
 namespace Inkscape
diff --git a/src/document-undo.h b/src/document-undo.h
index f19ba9bb2..38e575a34 100644
--- a/src/document-undo.h
+++ b/src/document-undo.h
@@ -1,9 +1,14 @@
 #ifndef SEEN_SP_DOCUMENT_UNDO_H
 #define SEEN_SP_DOCUMENT_UNDO_H
 
+namespace Glib {
+    class ustring;
+}
+
 typedef struct _GObject GObject;
 
 class SPDesktop;
+class SPDocument;
 
 namespace Inkscape {
 
diff --git a/src/widgets/arc-toolbar.cpp b/src/widgets/arc-toolbar.cpp
index 69b540762..ca6810c81 100644
--- a/src/widgets/arc-toolbar.cpp
+++ b/src/widgets/arc-toolbar.cpp
@@ -28,37 +28,27 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
 
-#include "toolbox.h"
 #include "arc-toolbar.h"
-
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "desktop-handles.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
+#include "ege-adjustment-action.h"
+#include "ege-output-action.h"
+#include "ege-select-one-action.h"
+#include "ink-action.h"
+#include "mod360.h"
+#include "preferences.h"
+#include "selection.h"
+#include "sp-ellipse.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
 #include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "ui/tools/pen-tool.h"
-#include "../sp-ellipse.h"
-#include "../mod360.h"
+#include "verbs.h"
+#include "widgets/spinbutton-events.h"
+#include "xml/node-event-vector.h"
+#include "xml/repr.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/arc-toolbar.h b/src/widgets/arc-toolbar.h
index dba2fcd5a..ca1319631 100644
--- a/src/widgets/arc-toolbar.h
+++ b/src/widgets/arc-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_arc_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_ARC_TOOLBAR_H */
diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp
index 32516bbfb..6d6b86c4d 100644
--- a/src/widgets/box3d-toolbar.cpp
+++ b/src/widgets/box3d-toolbar.cpp
@@ -28,40 +28,24 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
 
-#include "toolbox.h"
 #include "box3d-toolbar.h"
-
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "box3d.h"
+#include "desktop-handles.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
+#include "document.h"
+#include "ege-adjustment-action.h"
+#include "ink-action.h"
+#include "inkscape.h"
+#include "persp3d.h"
+#include "selection.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
 #include "ui/uxmanager.h"
-
-#include "../ui/icon-names.h"
-
-#include "ui/tools/pen-tool.h"
-
-#include "ui/tools/box3d-tool.h"
-#include "../box3d.h"
+#include "verbs.h"
+#include "xml/node-event-vector.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/box3d-toolbar.h b/src/widgets/box3d-toolbar.h
index d80934b01..cba9ca2d8 100644
--- a/src/widgets/box3d-toolbar.h
+++ b/src/widgets/box3d-toolbar.h
@@ -27,9 +27,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
+
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void box3d_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_BOX3D_TOOLBAR_H */
diff --git a/src/widgets/calligraphy-toolbar.cpp b/src/widgets/calligraphy-toolbar.cpp
index 73484d1b5..9c0393cd9 100644
--- a/src/widgets/calligraphy-toolbar.cpp
+++ b/src/widgets/calligraphy-toolbar.cpp
@@ -30,34 +30,17 @@
 
 #include "ui/dialog/calligraphic-profile-rename.h"
 #include <glibmm/i18n.h>
-
-#include "toolbox.h"
 #include "calligraphy-toolbar.h"
 
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-//#include "../xml/attribute-record.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
+#include "ege-adjustment-action.h"
+#include "ege-select-one-action.h"
+#include "ink-action.h"
+#include "preferences.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
 #include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-
-#include "ui/tools/pen-tool.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/calligraphy-toolbar.h b/src/widgets/calligraphy-toolbar.h
index 9650e03b1..e3caa19ee 100644
--- a/src/widgets/calligraphy-toolbar.h
+++ b/src/widgets/calligraphy-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void sp_calligraphy_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 void update_presets_list(GObject *tbl);
 
diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp
index 7230f521c..a0965721f 100644
--- a/src/widgets/connector-toolbar.cpp
+++ b/src/widgets/connector-toolbar.cpp
@@ -28,48 +28,33 @@
 # include "config.h"
 #endif
 
-
-#include "ui/widget/spinbutton.h"
-#include "toolbox.h"
 #include "connector-toolbar.h"
-
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "conn-avoid-ref.h"
+#include "desktop-handles.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
-#include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "ui/tools/pen-tool.h"
-#include "../sp-namedview.h"
-#include "../conn-avoid-ref.h"
+#include "ege-adjustment-action.h"
+#include "graphlayout.h"
+#include "ink-action.h"
+#include "inkscape.h"
+#include "preferences.h"
+#include "selection.h"
+#include "sp-namedview.h"
+#include "sp-path.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
 #include "ui/tools/connector-tool.h"
-#include "../graphlayout.h"
-#include "../sp-path.h"
-
+#include "ui/uxmanager.h"
+#include "verbs.h"
+#include "widgets/spinbutton-events.h"
+#include "xml/node-event-vector.h"
+#include "xml/repr.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
 using Inkscape::UI::PrefPusher;
 
-
-
 //#########################
 //##      Connector      ##
 //#########################
diff --git a/src/widgets/connector-toolbar.h b/src/widgets/connector-toolbar.h
index 2ab26e56c..180c11e0f 100644
--- a/src/widgets/connector-toolbar.h
+++ b/src/widgets/connector-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_connector_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_CONNECTOR_TOOLBAR_H */
diff --git a/src/widgets/dropper-toolbar.cpp b/src/widgets/dropper-toolbar.cpp
index 991489b86..478d0c1a4 100644
--- a/src/widgets/dropper-toolbar.cpp
+++ b/src/widgets/dropper-toolbar.cpp
@@ -28,40 +28,16 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
-#include "toolbox.h"
-#include "dropper-toolbar.h"
 
-#include "../desktop.h"
-#include "../document-private.h"
+#include "dropper-toolbar.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
+#include "ege-output-action.h"
+#include "ink-action.h"
+#include "preferences.h"
+#include "widgets/spinbutton-events.h"
 
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
-#include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "ui/tools/pen-tool.h"
-#include "../tools-switch.h"
-
-using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
-using Inkscape::UI::ToolboxFactory;
-using Inkscape::UI::PrefPusher;
-
 
 //########################
 //##      Dropper       ##
diff --git a/src/widgets/dropper-toolbar.h b/src/widgets/dropper-toolbar.h
index aa2116daf..8d5ea2d0a 100644
--- a/src/widgets/dropper-toolbar.h
+++ b/src/widgets/dropper-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_dropper_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_DROPPER_TOOLBAR_H */
diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp
index 5e09521c9..14e7cbf4e 100644
--- a/src/widgets/eraser-toolbar.cpp
+++ b/src/widgets/eraser-toolbar.cpp
@@ -28,37 +28,20 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
-#include "toolbox.h"
-#include "eraser-toolbar.h"
-#include "calligraphy-toolbar.h"
 
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "eraser-toolbar.h"
+#include "calligraphy-toolbar.h" // TODO: needed for update_presets_list
+#include "desktop-handles.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
-#include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "ui/tools/pen-tool.h"
-
-
-using Inkscape::UI::UXManager;
+#include "ege-adjustment-action.h"
+#include "ege-select-one-action.h"
+#include "ink-action.h"
+#include "preferences.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
+
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
 using Inkscape::UI::PrefPusher;
diff --git a/src/widgets/eraser-toolbar.h b/src/widgets/eraser-toolbar.h
index b1bb3a3fa..3c88d344e 100644
--- a/src/widgets/eraser-toolbar.h
+++ b/src/widgets/eraser-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_eraser_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_ERASOR_TOOLBAR_H */
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index 4bed3101d..4fda44c8d 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -17,47 +17,31 @@
 #endif
 
 #include "ui/widget/color-preview.h"
-#include "verbs.h"
-
-#include "macros.h"
-#include "widgets/button.h"
-#include "widgets/widget-sizes.h"
-#include "widgets/spw-utilities.h"
-#include "widgets/spinbutton-events.h"
-#include "widgets/gradient-vector.h"
-#include "widgets/gradient-image.h"
-#include "style.h"
-
-#include "preferences.h"
-#include "document-private.h"
-#include "document-undo.h"
-#include "desktop.h"
-#include "desktop-handles.h"
 #include <glibmm/i18n.h>
-
-#include "ui/tools/gradient-tool.h"
+#include "desktop-handles.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "ege-adjustment-action.h"
+#include "ege-select-one-action.h"
+#include "gradient-chemistry.h"
 #include "gradient-drag.h"
+#include "gradient-toolbar.h"
+#include "ink-action.h"
+#include "macros.h"
+#include "preferences.h"
+#include "selection.h"
+#include "sp-defs.h"
 #include "sp-linear-gradient.h"
 #include "sp-radial-gradient.h"
-#include "gradient-chemistry.h"
-#include "gradient-selector.h"
-#include "selection.h"
-#include "ui/icon-names.h"
-
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-
 #include "sp-stop.h"
-#include "svg/css-ostringstream.h"
-#include "svg/svg-color.h"
-#include "desktop-style.h"
-#include "ui/tools/gradient-tool.h"
-#include "gradient-toolbar.h"
-
+#include "style.h"
 #include "toolbox.h"
+#include "ui/icon-names.h"
+#include "ui/tools/gradient-tool.h"
+#include "verbs.h"
+#include "widgets/gradient-image.h"
+#include "widgets/gradient-vector.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
diff --git a/src/widgets/gradient-toolbar.h b/src/widgets/gradient-toolbar.h
index 74cfb2886..38afb743b 100644
--- a/src/widgets/gradient-toolbar.h
+++ b/src/widgets/gradient-toolbar.h
@@ -12,9 +12,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void sp_gradient_toolbox_prep(SPDesktop * /*desktop*/, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_GRADIENT_TOOLBAR_H */
diff --git a/src/widgets/lpe-toolbar.cpp b/src/widgets/lpe-toolbar.cpp
index 559f3fc3c..e9e5af912 100644
--- a/src/widgets/lpe-toolbar.cpp
+++ b/src/widgets/lpe-toolbar.cpp
@@ -29,50 +29,29 @@
 #endif
 
 #include "live_effects/lpe-line_segment.h"
-
-#include "toolbox.h"
 #include "lpe-toolbar.h"
-
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "connection-pool.h"
+#include "desktop-handles.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../connection-pool.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
-#include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "../helper/action.h"
-#include "../helper/action-context.h"
-#include "util/units.h"
-#include "ui/widget/unit-tracker.h"
-#include "ui/tools/pen-tool.h"
-#include "../sp-namedview.h"
-#include "../tools-switch.h"
-#include "../live_effects/effect.h"
-#include "../live_effects/lpe-angle_bisector.h"
+#include "ege-select-one-action.h"
+#include "helper/action-context.h"
+#include "helper/action.h"
+#include "ink-action.h"
+#include "live_effects/effect.h"
+#include "preferences.h"
+#include "selection.h"
+#include "sp-namedview.h"
+#include "tools-switch.h"
 #include "ui/tools/lpe-tool.h"
+#include "ui/widget/unit-tracker.h"
+#include "util/units.h"
+#include "verbs.h"
 
 using Inkscape::UI::Widget::UnitTracker;
 using Inkscape::Util::Unit;
 using Inkscape::Util::Quantity;
-using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
-using Inkscape::UI::ToolboxFactory;
-using Inkscape::UI::PrefPusher;
 using Inkscape::UI::Tools::ToolBase;
 using Inkscape::UI::Tools::LpeTool;
 
diff --git a/src/widgets/lpe-toolbar.h b/src/widgets/lpe-toolbar.h
index 1796f8027..3db2bcb65 100644
--- a/src/widgets/lpe-toolbar.h
+++ b/src/widgets/lpe-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_lpetool_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_LPE_TOOLBAR_H */
diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp
index a75dd7600..46d3bd4e0 100644
--- a/src/widgets/measure-toolbar.cpp
+++ b/src/widgets/measure-toolbar.cpp
@@ -28,37 +28,20 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
-#include "toolbox.h"
-#include "measure-toolbar.h"
 
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "measure-toolbar.h"
+#include "desktop-handles.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/repr.h"
-#include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "ui/tools/pen-tool.h"
-#include "../sp-namedview.h"
+#include "ege-adjustment-action.h"
+#include "ege-output-action.h"
+#include "preferences.h"
+#include "toolbox.h"
 #include "ui/widget/unit-tracker.h"
 
 using Inkscape::UI::Widget::UnitTracker;
 using Inkscape::Util::Unit;
-using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
 using Inkscape::UI::PrefPusher;
diff --git a/src/widgets/measure-toolbar.h b/src/widgets/measure-toolbar.h
index 4b90ccb9f..aff0a209b 100644
--- a/src/widgets/measure-toolbar.h
+++ b/src/widgets/measure-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_measure_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_MEASURE_TOOLBAR_H */
diff --git a/src/widgets/mesh-toolbar.h b/src/widgets/mesh-toolbar.h
index f84cff59b..fd3f4b4b7 100644
--- a/src/widgets/mesh-toolbar.h
+++ b/src/widgets/mesh-toolbar.h
@@ -14,9 +14,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void sp_mesh_toolbox_prep(    SPDesktop * /*desktop*/, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_MESH_TOOLBAR_H */
diff --git a/src/widgets/node-toolbar.cpp b/src/widgets/node-toolbar.cpp
index a4ea52287..53161857a 100644
--- a/src/widgets/node-toolbar.cpp
+++ b/src/widgets/node-toolbar.cpp
@@ -28,45 +28,32 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
+#include "ui/tool/multi-path-manipulator.h"
 #include <glibmm/i18n.h>
-#include "toolbox.h"
 #include "node-toolbar.h"
-
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "connection-pool.h"
+#include "desktop-handles.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../connection-pool.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/attribute-record.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
-#include "ui/uxmanager.h"
-#include "../ui/tool/control-point-selection.h"
+#include "ege-adjustment-action.h"
+#include "ink-action.h"
+#include "inkscape.h"
+#include "preferences.h"
+#include "selection-chemistry.h"
+#include "selection.h"
+#include "sp-namedview.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
+#include "ui/tool/control-point-selection.h"
 #include "ui/tools/node-tool.h"
-#include "../ui/tool/multi-path-manipulator.h"
-#include "../ui/icon-names.h"
-#include "util/units.h"
 #include "ui/widget/unit-tracker.h"
-#include "ui/tools/lpe-tool.h"
-#include "../sp-namedview.h"
+#include "util/units.h"
+#include "verbs.h"
+#include "widgets/widget-sizes.h"
 
 using Inkscape::UI::Widget::UnitTracker;
 using Inkscape::Util::Unit;
 using Inkscape::Util::Quantity;
-using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
 using Inkscape::UI::PrefPusher;
diff --git a/src/widgets/node-toolbar.h b/src/widgets/node-toolbar.h
index dcccf1712..1f2a3f6b7 100644
--- a/src/widgets/node-toolbar.h
+++ b/src/widgets/node-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_SELECT_TOOLBAR_H */
diff --git a/src/widgets/paintbucket-toolbar.cpp b/src/widgets/paintbucket-toolbar.cpp
index a9962b209..e20811de8 100644
--- a/src/widgets/paintbucket-toolbar.cpp
+++ b/src/widgets/paintbucket-toolbar.cpp
@@ -28,40 +28,20 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
-#include "toolbox.h"
-#include "paintbucket-toolbar.h"
 
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "paintbucket-toolbar.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../connection-pool.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
+#include "ege-adjustment-action.h"
+#include "ege-select-one-action.h"
+#include "preferences.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
+#include "ui/tools/flood-tool.h"
 #include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "util/units.h"
 #include "ui/widget/unit-tracker.h"
-#include "ui/tools/pen-tool.h"
-#include "../sp-namedview.h"
-#include "ui/tools/flood-tool.h"
-
-#include <gtk/gtk.h>
-
+#include "util/units.h"
 
 using Inkscape::UI::Widget::UnitTracker;
 using Inkscape::UI::UXManager;
@@ -71,7 +51,6 @@ using Inkscape::UI::PrefPusher;
 using Inkscape::Util::unit_table;
 
 
-
 //#########################
 //##     Paintbucket     ##
 //#########################
diff --git a/src/widgets/paintbucket-toolbar.h b/src/widgets/paintbucket-toolbar.h
index fe25c7fe2..9e6d6194a 100644
--- a/src/widgets/paintbucket-toolbar.h
+++ b/src/widgets/paintbucket-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_paintbucket_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_PAINTBUCKET_TOOLBAR_H */
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index 7fb12bf8e..20fb43e42 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -28,56 +28,27 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
-#include "toolbox.h"
-#include "pencil-toolbar.h"
 
-#include "../desktop.h"
-#include "../desktop-handles.h"
-#include "../desktop-style.h"
-#include "../document-private.h"
+#include "pencil-toolbar.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-//#include "../interface.h"
-//#include "../connection-pool.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-
-#include <gtk/gtk.h>
-
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-//#include "../xml/attribute-record.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
-#include "ui/uxmanager.h"
-
-//#include "../ui/tool/control-point-selection.h"
-//#include "ui/tools/node-tool.h"
-//#include "../ui/tool/multi-path-manipulator.h"
-#include "../ui/icon-names.h"
-
+#include "ege-adjustment-action.h"
+#include "ege-select-one-action.h"
+#include "ink-action.h"
+#include "preferences.h"
+#include "toolbox.h"
+#include "tools-switch.h"
+#include "ui/icon-names.h"
 #include "ui/tools/pen-tool.h"
-//#include "../sp-namedview.h"
-#include "../tools-switch.h"
+#include "ui/uxmanager.h"
+#include "widgets/spinbutton-events.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
 using Inkscape::UI::PrefPusher;
 
-
-
 //########################
 //##     Pen/Pencil     ##
 //########################
diff --git a/src/widgets/pencil-toolbar.h b/src/widgets/pencil-toolbar.h
index 14f1e8930..c01b7d591 100644
--- a/src/widgets/pencil-toolbar.h
+++ b/src/widgets/pencil-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void    sp_pencil_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 void    sp_pen_toolbox_prep(SPDesktop * /*desktop*/, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp
index f5a509db3..6996786e3 100644
--- a/src/widgets/rect-toolbar.cpp
+++ b/src/widgets/rect-toolbar.cpp
@@ -28,36 +28,29 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
-#include "toolbox.h"
-#include "rect-toolbar.h"
 
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "rect-toolbar.h"
+#include "desktop-handles.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
+#include "ege-adjustment-action.h"
+#include "ege-output-action.h"
+#include "ink-action.h"
+#include "inkscape.h"
+#include "preferences.h"
+#include "selection.h"
+#include "sp-namedview.h"
+#include "sp-rect.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
 #include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "util/units.h"
 #include "ui/widget/unit-tracker.h"
-#include "ui/tools/pen-tool.h"
-#include "../sp-namedview.h"
-#include "../sp-rect.h"
+#include "util/units.h"
+#include "verbs.h"
+#include "widgets/widget-sizes.h"
+#include "xml/node-event-vector.h"
+#include "xml/repr.h"
 
 using Inkscape::UI::Widget::UnitTracker;
 using Inkscape::UI::UXManager;
diff --git a/src/widgets/rect-toolbar.h b/src/widgets/rect-toolbar.h
index e123c095b..f89903c6c 100644
--- a/src/widgets/rect-toolbar.h
+++ b/src/widgets/rect-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_rect_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_RECT_TOOLBAR_H */
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 1cd4347d6..284e436bf 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -16,44 +16,36 @@
 # 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 "widgets/icon.h"
-#include "widgets/sp-widget.h"
+#include <2geom/rect.h>
 
-#include "preferences.h"
-#include "selection-chemistry.h"
-#include "document.h"
-#include "document-undo.h"
-#include "inkscape.h"
-#include "desktop-style.h"
-#include "desktop.h"
-#include "desktop-handles.h"
-#include "sp-namedview.h"
-#include "toolbox.h"
+#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
-#include "helper/action.h"
+#include "select-toolbar.h"
+#include "desktop-handles.h"
+#include "desktop.h"
+#include "display/sp-canvas.h"
+#include "document-undo.h"
+#include "document.h"
+#include "ege-adjustment-action.h"
 #include "helper/action-context.h"
-#include "util/units.h"
+#include "helper/action.h"
+#include "ink-action.h"
 #include "inkscape.h"
-#include "verbs.h"
-#include "selection.h"
+#include "message-stack.h"
+#include "preferences.h"
 #include "selection-chemistry.h"
+#include "selection.h"
 #include "sp-item-transform.h"
-#include "message-stack.h"
-#include "display/sp-canvas.h"
-#include "ui/widget/unit-tracker.h"
-#include "ege-adjustment-action.h"
-#include "ege-output-action.h"
-#include "ink-action.h"
-#include <2geom/rect.h>
+#include "sp-namedview.h"
+#include "toolbox.h"
 #include "ui/icon-names.h"
-#include "select-toolbar.h"
+#include "ui/widget/unit-tracker.h"
+#include "util/units.h"
+#include "verbs.h"
+#include "widgets/icon.h"
+#include "widgets/sp-widget.h"
+#include "widgets/spw-utilities.h"
+#include "widgets/widget-sizes.h"
 
 using Inkscape::UI::Widget::UnitTracker;
 using Inkscape::Util::Unit;
diff --git a/src/widgets/select-toolbar.h b/src/widgets/select-toolbar.h
index e3573da66..b900a0615 100644
--- a/src/widgets/select-toolbar.h
+++ b/src/widgets/select-toolbar.h
@@ -14,9 +14,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 
diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp
index b95c1c41e..710be9440 100644
--- a/src/widgets/spiral-toolbar.cpp
+++ b/src/widgets/spiral-toolbar.cpp
@@ -28,43 +28,32 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
-#include "toolbox.h"
-#include "spiral-toolbar.h"
 
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "spiral-toolbar.h"
+#include "desktop-handles.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
+#include "ege-adjustment-action.h"
+#include "ege-output-action.h"
+#include "ink-action.h"
+#include "preferences.h"
+#include "selection.h"
+#include "sp-spiral.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
 #include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "ui/tools/pen-tool.h"
-#include "../sp-spiral.h"
+#include "verbs.h"
+#include "widgets/spinbutton-events.h"
+#include "xml/node-event-vector.h"
+#include "xml/node.h"
+#include "xml/repr.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
 using Inkscape::UI::PrefPusher;
 
-
-
-
-
 //########################
 //##       Spiral       ##
 //########################
diff --git a/src/widgets/spiral-toolbar.h b/src/widgets/spiral-toolbar.h
index 194b54bce..3372ea224 100644
--- a/src/widgets/spiral-toolbar.h
+++ b/src/widgets/spiral-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_spiral_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_SPIRAL_TOOLBAR_H */
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index 49406d564..cf56b3255 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -28,34 +28,18 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
-#include "toolbox.h"
-#include "spray-toolbar.h"
 
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "spray-toolbar.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/repr.h"
-#include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "ui/tools/pen-tool.h"
-#include "ui/tools/spray-tool.h"
-
-using Inkscape::UI::UXManager;
+#include "ege-adjustment-action.h"
+#include "ege-select-one-action.h"
+#include "ink-action.h"
+#include "preferences.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
+
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
 using Inkscape::UI::PrefPusher;
diff --git a/src/widgets/spray-toolbar.h b/src/widgets/spray-toolbar.h
index 170b6bb8e..d1d5c7b4c 100644
--- a/src/widgets/spray-toolbar.h
+++ b/src/widgets/spray-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_SELECT_TOOLBAR_H */
diff --git a/src/widgets/star-toolbar.cpp b/src/widgets/star-toolbar.cpp
index 28b2c7e0c..7a7d0dc71 100644
--- a/src/widgets/star-toolbar.cpp
+++ b/src/widgets/star-toolbar.cpp
@@ -28,34 +28,26 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
-#include "toolbox.h"
-#include "star-toolbar.h"
 
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "star-toolbar.h"
+#include "desktop-handles.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
+#include "ege-adjustment-action.h"
+#include "ege-output-action.h"
+#include "ege-select-one-action.h"
+#include "ink-action.h"
+#include "selection.h"
+#include "sp-star.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
 #include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "ui/tools/pen-tool.h"
-#include "../sp-star.h"
-
+#include "verbs.h"
+#include "widgets/../preferences.h"
+#include "xml/node-event-vector.h"
+#include "xml/node.h"
+#include "xml/repr.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/star-toolbar.h b/src/widgets/star-toolbar.h
index 6f91d5570..aa0db785c 100644
--- a/src/widgets/star-toolbar.h
+++ b/src/widgets/star-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_star_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_SELECT_TOOLBAR_H */
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index 6d5d54871..349fefa12 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -28,48 +28,35 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
+#include "libnrtype/font-lister.h"
 #include <glibmm/i18n.h>
-#include "toolbox.h"
 #include "text-toolbar.h"
-
-#include "../desktop.h"
-#include "../desktop-handles.h"
-#include "../desktop-style.h"
+#include "connection-pool.h"
+#include "desktop-handles.h"
+#include "desktop-style.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../sp-root.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../connection-pool.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
-#include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "ui/tools/pen-tool.h"
-#include "../sp-namedview.h"
-#include "../svg/css-ostringstream.h"
-#include "../sp-flowtext.h"
-#include "../sp-text.h"
-#include "../style.h"
-#include "../libnrtype/font-lister.h"
-#include "../libnrtype/font-instance.h"
+#include "document.h"
+#include "ege-adjustment-action.h"
+#include "ege-select-one-action.h"
+#include "ink-action.h"
+#include "ink-comboboxentry-action.h"
+#include "inkscape.h"
+#include "preferences.h"
+#include "selection-chemistry.h"
+#include "selection.h"
+#include "sp-flowtext.h"
+#include "sp-root.h"
+#include "sp-text.h"
+#include "style.h"
+#include "svg/css-ostringstream.h"
+#include "text-editing.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
 #include "ui/tools/text-tool.h"
-#include "../text-editing.h"
-#include "widgets/font-selector.h"
-
+#include "verbs.h"
+#include "xml/repr.h"
 
-using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
 using Inkscape::UI::PrefPusher;
diff --git a/src/widgets/text-toolbar.h b/src/widgets/text-toolbar.h
index 68158d201..86a1cad21 100644
--- a/src/widgets/text-toolbar.h
+++ b/src/widgets/text-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_TEXT_TOOLBAR_H */
diff --git a/src/widgets/tweak-toolbar.cpp b/src/widgets/tweak-toolbar.cpp
index 6999b057d..050d7fb5e 100644
--- a/src/widgets/tweak-toolbar.cpp
+++ b/src/widgets/tweak-toolbar.cpp
@@ -30,32 +30,18 @@
 
 #include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
-#include "toolbox.h"
 #include "tweak-toolbar.h"
-
-#include "../desktop.h"
-#include "../desktop-handles.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/repr.h"
-#include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "ui/tools/pen-tool.h"
+#include "ege-adjustment-action.h"
+#include "ege-output-action.h"
+#include "ege-select-one-action.h"
+#include "ink-action.h"
+#include "preferences.h"
+#include "toolbox.h"
+#include "ui/icon-names.h"
 #include "ui/tools/tweak-tool.h"
 
-using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
 using Inkscape::UI::PrefPusher;
diff --git a/src/widgets/tweak-toolbar.h b/src/widgets/tweak-toolbar.h
index 6f840f2c1..1a65a0844 100644
--- a/src/widgets/tweak-toolbar.h
+++ b/src/widgets/tweak-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_SELECT_TOOLBAR_H */
diff --git a/src/widgets/zoom-toolbar.cpp b/src/widgets/zoom-toolbar.cpp
index a5ab6e211..79feef86d 100644
--- a/src/widgets/zoom-toolbar.cpp
+++ b/src/widgets/zoom-toolbar.cpp
@@ -28,38 +28,8 @@
 # include "config.h"
 #endif
 
-#include "ui/widget/spinbutton.h"
-#include "toolbox.h"
 #include "zoom-toolbar.h"
 
-#include "../desktop.h"
-#include "../desktop-handles.h"
-#include "document-undo.h"
-#include "../verbs.h"
-#include "../inkscape.h"
-#include "../selection-chemistry.h"
-#include "../selection.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/repr.h"
-#include "ui/uxmanager.h"
-#include "../ui/icon-names.h"
-#include "ui/tools/pen-tool.h"
-#include "ui/tools/tweak-tool.h"
-
-
-using Inkscape::UI::UXManager;
-using Inkscape::DocumentUndo;
-using Inkscape::UI::ToolboxFactory;
-using Inkscape::UI::PrefPusher;
-
 //########################
 //##    Zoom Toolbox    ##
 //########################
diff --git a/src/widgets/zoom-toolbar.h b/src/widgets/zoom-toolbar.h
index b8d6a42af..45d979066 100644
--- a/src/widgets/zoom-toolbar.h
+++ b/src/widgets/zoom-toolbar.h
@@ -27,9 +27,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 class SPDesktop;
 
+typedef struct _GtkActionGroup GtkActionGroup;
+typedef struct _GObject GObject;
+
 void       sp_zoom_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
 #endif /* !SEEN_ZOOM_TOOLBAR_H */