Reduce header bloat

(bzr r13341.1.184)

45 files changed, 59 insertions, 109 deletions

diff --git a/src/axis-manip.h b/src/axis-manip.h
index 9392e2ddd..7842b4135 100644
--- a/src/axis-manip.h
+++ b/src/axis-manip.h
@@ -13,7 +13,7 @@
 #define SEEN_AXIS_MANIP_H
 
 #include <utility>
-#include <gtk/gtk.h>
+#include <glib.h>
 
 namespace Proj {
 
diff --git a/src/desktop-events.h b/src/desktop-events.h
index 7123ce91b..dc85e563b 100644
--- a/src/desktop-events.h
+++ b/src/desktop-events.h
@@ -13,13 +13,15 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
 class  SPDesktop;
 struct SPDesktopWidget;
 struct SPCanvasItem;
 
+typedef union  _GdkEvent         GdkEvent;
+typedef struct _GdkEventCrossing GdkEventCrossing;
+typedef struct _GdkEventMotion   GdkEventMotion;
+typedef struct _GtkWidget        GtkWidget;
+
 /* Item handlers */
 
 int sp_desktop_root_handler (SPCanvasItem *item, GdkEvent *event, SPDesktop *desktop);
diff --git a/src/display/sp-canvas-item.h b/src/display/sp-canvas-item.h
index 6781be59c..a388ffa91 100644
--- a/src/display/sp-canvas-item.h
+++ b/src/display/sp-canvas-item.h
@@ -24,8 +24,6 @@
 #endif
 
 #include <glib-object.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
 #include <2geom/rect.h>
 #include "ui/control-types.h"
 
@@ -36,6 +34,8 @@ struct SPCanvasBuf;
 struct SPCanvasGroup;
 
 typedef struct _SPCanvasItemClass SPCanvasItemClass;
+typedef union  _GdkEvent          GdkEvent;
+typedef struct _GdkCursor         GdkCursor;
 
 #define SP_TYPE_CANVAS_ITEM (sp_canvas_item_get_type())
 #define SP_CANVAS_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_CANVAS_ITEM, SPCanvasItem))
diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index 72ae4b6bc..adae30f35 100644
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -30,7 +30,6 @@
 # endif
 #endif
 
-#include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <glibmm/ustring.h>
diff --git a/src/ege-adjustment-action.h b/src/ege-adjustment-action.h
index 590035eb3..8cfaa3e52 100644
--- a/src/ege-adjustment-action.h
+++ b/src/ege-adjustment-action.h
@@ -45,9 +45,7 @@
 
 /* Note: this file should be kept compilable as both .cpp and .c */
 
-#include <glib.h>
 #include <gtk/gtk.h>
-#include <glib-object.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ege-output-action.h b/src/ege-output-action.h
index fc21c2f27..0f4e21805 100644
--- a/src/ege-output-action.h
+++ b/src/ege-output-action.h
@@ -45,9 +45,7 @@
 
 /* Note: this file should be kept compilable as both .cpp and .c */
 
-#include <glib.h>
 #include <gtk/gtk.h>
-#include <glib-object.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ege-select-one-action.h b/src/ege-select-one-action.h
index d605f4a67..0c5cecaa3 100644
--- a/src/ege-select-one-action.h
+++ b/src/ege-select-one-action.h
@@ -48,9 +48,7 @@
 
 /* Note: this file should be kept compilable as both .cpp and .c */
 
-#include <glib.h>
 #include <gtk/gtk.h>
-#include <glib-object.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/extension/input.h b/src/extension/input.h
index b01ffeb86..2a0a177a0 100644
--- a/src/extension/input.h
+++ b/src/extension/input.h
@@ -14,9 +14,8 @@
 #include <exception>
 #include <glib.h>
 #include "extension.h"
-#include "xml/repr.h"
-#include "document.h"
-#include <gtk/gtk.h>
+
+class SPDocument;
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 084fbcd58..9a5a78a34 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -27,12 +27,12 @@
 # include "config.h"
 #endif
 
-//#include <png.h>   //This must precede text_reassemble.h or it blows up in pngconf.h when compiling
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <libuemf/symbol_convert.h>
 
+#include "document.h"
 #include "sp-root.h" // even though it is included indirectly by wmf-inout.h
 #include "sp-path.h"
 #include "print.h"
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index 5ccad678a..c03e7efe0 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -33,6 +33,7 @@
 #include <stdint.h>
 #include <libuemf/symbol_convert.h>
 
+#include "document.h"
 #include "sp-root.h" // even though it is included indirectly by wmf-inout.h
 #include "sp-path.h"
 #include "print.h"
diff --git a/src/extension/output.h b/src/extension/output.h
index c5b1beb45..44a731ca0 100644
--- a/src/extension/output.h
+++ b/src/extension/output.h
@@ -13,7 +13,6 @@
 #ifndef INKSCAPE_EXTENSION_OUTPUT_H__
 #define INKSCAPE_EXTENSION_OUTPUT_H__
 
-#include <gtk/gtk.h>
 #include "extension.h"
 class SPDocument;
 
diff --git a/src/helper/action.h b/src/helper/action.h
index 1f2de87b4..4b81ee7f9 100644
--- a/src/helper/action.h
+++ b/src/helper/action.h
@@ -13,12 +13,8 @@
 #define SEEN_INKSCAPE_SP_ACTION_H
 
 #include "helper/action-context.h"
-#include <sigc++/sigc++.h>
+#include <sigc++/signal.h>
 #include <glibmm/ustring.h>
-#include <glib-object.h>
-
-struct SPAction;
-struct SPActionClass;
 
 #define SP_TYPE_ACTION (sp_action_get_type())
 #define SP_ACTION(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_ACTION, SPAction))
diff --git a/src/icon-size.h b/src/icon-size.h
index 4bb4f1df6..d7a9c9b0b 100644
--- a/src/icon-size.h
+++ b/src/icon-size.h
@@ -12,8 +12,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
-
 #include <gtk/gtk.h>
 
 namespace Inkscape {
diff --git a/src/ink-action.h b/src/ink-action.h
index 1d4106681..ac5cb9873 100644
--- a/src/ink-action.h
+++ b/src/ink-action.h
@@ -2,9 +2,7 @@
 #define SEEN_INK_ACTION
 
 
-#include <glib.h>
 #include <gtk/gtk.h>
-#include <glib-object.h>
 #include "icon-size.h"
 #include "attributes.h"
 
diff --git a/src/ink-comboboxentry-action.h b/src/ink-comboboxentry-action.h
index a66f0790e..04b66e8fe 100644
--- a/src/ink-comboboxentry-action.h
+++ b/src/ink-comboboxentry-action.h
@@ -19,12 +19,8 @@
 #ifndef SEEN_INK_COMBOBOXENTRY_ACTION
 #define SEEN_INK_COMBOBOXENTRY_ACTION
 
-#include <glib.h>
-#include <glib-object.h>
-
 #include <gtk/gtk.h>
 
-
 #define INK_COMBOBOXENTRY_TYPE_ACTION           (ink_comboboxentry_action_get_type())
 #define INK_COMBOBOXENTRY_ACTION(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), INK_COMBOBOXENTRY_TYPE_ACTION, Ink_ComboBoxEntry_Action))
 #define INK_COMBOBOXENTRY_ACTION_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass),  INK_COMBOBOXENTRY_TYPE_ACTION, Ink_ComboBoxEntry_ActionClass))
diff --git a/src/knot.cpp b/src/knot.cpp
index 6205af26a..49b4dbb54 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -28,6 +28,7 @@
 #include "message-stack.h"
 #include "message-context.h"
 #include "ui/tools/tool-base.h"
+#include <gtk/gtk.h>
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/knot.h b/src/knot.h
index b18f89566..b79614bcb 100644
--- a/src/knot.h
+++ b/src/knot.h
@@ -17,14 +17,12 @@
 #include <gdk/gdk.h>
 #include <2geom/point.h>
 #include "knot-enums.h"
-#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "enums.h"
-#include <gtk/gtk.h>
-#include "sp-item.h"
 
 class SPDesktop;
 struct SPCanvasItem;
+class SPItem;
 
 #define SP_KNOT(obj) (dynamic_cast<SPKnot*>(static_cast<SPKnot*>(obj)))
 #define SP_IS_KNOT(obj) (dynamic_cast<const SPKnot*>(static_cast<const SPKnot*>(obj)) != NULL)
diff --git a/src/proj_pt.h b/src/proj_pt.h
index 226c182cc..28ec0aca3 100644
--- a/src/proj_pt.h
+++ b/src/proj_pt.h
@@ -13,7 +13,7 @@
 #define SEEN_PROJ_PT_H
 
 #include <2geom/point.h>
-#include <gtk/gtk.h>
+#include <glib.h>
 
 namespace Proj {
 
diff --git a/src/sp-pattern.h b/src/sp-pattern.h
index eb34b6714..8f7dbbadd 100644
--- a/src/sp-pattern.h
+++ b/src/sp-pattern.h
@@ -13,21 +13,17 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
-
-#include "sp-item.h"
-
 #define SP_PATTERN(obj) (dynamic_cast<SPPattern*>((SPObject*)obj))
 #define SP_IS_PATTERN(obj) (dynamic_cast<const SPPattern*>((SPObject*)obj) != NULL)
 
 class SPPatternReference;
+class SPItem;
 
 #include "svg/svg-length.h"
 #include "sp-paint-server.h"
 #include "uri-references.h"
 #include "viewbox.h"
 
-#include <stddef.h>
 #include <sigc++/connection.h>
 
 
diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h
index 9bacc701d..70da86338 100644
--- a/src/ui/dialog/clonetiler.h
+++ b/src/ui/dialog/clonetiler.h
@@ -11,7 +11,6 @@
 #define __SP_CLONE_TILER_H__
 
 #include "ui/widget/panel.h"
-#include <gtk/gtk.h>
 
 #include "ui/dialog/desktop-tracker.h"
 #include "ui/widget/color-picker.h"
diff --git a/src/ui/dialog/export.h b/src/ui/dialog/export.h
index 6f3c0dfac..23af0109b 100644
--- a/src/ui/dialog/export.h
+++ b/src/ui/dialog/export.h
@@ -12,20 +12,11 @@
 #ifndef SP_EXPORT_H
 #define SP_EXPORT_H
 
-#include <gtk/gtk.h>
-#include <glibmm/i18n.h>
-
-#include <gtkmm/comboboxtext.h>
-#include <gtkmm/expander.h>
-#include <gtkmm/frame.h>
 #include <gtkmm/progressbar.h>
-#include <gtkmm/textview.h>
 
-#include "desktop.h"
 #include "ui/dialog/desktop-tracker.h"
 #include "ui/widget/panel.h"
 #include "ui/widget/button.h"
-#include "ui/widget/entry.h"
 
 namespace Gtk {
 class Dialog;
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 8ba3ad684..575519848 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -40,6 +40,7 @@
 #include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
 
+#include "document.h"
 #include "extension/input.h"
 #include "extension/output.h"
 #include "extension/db.h"
diff --git a/src/ui/tools/flood-tool.h b/src/ui/tools/flood-tool.h
index 3ed670e8b..5104a42e9 100644
--- a/src/ui/tools/flood-tool.h
+++ b/src/ui/tools/flood-tool.h
@@ -11,9 +11,7 @@
  * Released under GNU GPL
  */
 
-#include <stddef.h>
-#include <sigc++/sigc++.h>
-#include <gtk/gtk.h>
+#include <sigc++/connection.h>
 #include "ui/tools/tool-base.h"
 
 #define SP_FLOOD_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::FloodTool*>((Inkscape::UI::Tools::ToolBase*)obj))
diff --git a/src/ui/tools/select-tool.h b/src/ui/tools/select-tool.h
index edc4069a2..5af99a56a 100644
--- a/src/ui/tools/select-tool.h
+++ b/src/ui/tools/select-tool.h
@@ -13,7 +13,6 @@
  */
 
 #include "ui/tools/tool-base.h"
-#include <gtk/gtk.h>
 
 #define SP_SELECT_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::SelectTool*>((Inkscape::UI::Tools::ToolBase*)obj))
 #define SP_IS_SELECT_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::SelectTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL)
diff --git a/src/ui/tools/spiral-tool.h b/src/ui/tools/spiral-tool.h
index 416aeb7e4..add92342d 100644
--- a/src/ui/tools/spiral-tool.h
+++ b/src/ui/tools/spiral-tool.h
@@ -15,17 +15,15 @@
  * Released under GNU GPL
  */
 
-#include <gtk/gtk.h>
-#include <stddef.h>
-#include <sigc++/sigc++.h>
+#include <sigc++/connection.h>
 #include <2geom/point.h>
 #include "ui/tools/tool-base.h"
 
-#include "sp-spiral.h"
-
 #define SP_SPIRAL_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::SpiralTool*>((Inkscape::UI::Tools::ToolBase*)obj))
 #define SP_IS_SPIRAL_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::SpiralTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL)
 
+class SPSpiral;
+
 namespace Inkscape {
 namespace UI {
 namespace Tools {
diff --git a/src/ui/tools/text-tool.h b/src/ui/tools/text-tool.h
index ca2b3d19a..289ee180d 100644
--- a/src/ui/tools/text-tool.h
+++ b/src/ui/tools/text-tool.h
@@ -14,10 +14,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-/*  #include <gdk/gdkic.h> */
-#include <stddef.h>
-#include <sigc++/sigc++.h>
-#include <gtk/gtk.h>
+#include <sigc++/connection.h>
 
 #include "ui/tools/tool-base.h"
 #include <2geom/point.h>
@@ -26,6 +23,8 @@
 #define SP_TEXT_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::TextTool*>((Inkscape::UI::Tools::ToolBase*)obj))
 #define SP_IS_TEXT_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::TextTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL)
 
+typedef struct _GtkIMContext GtkIMContext;
+
 struct SPCtrlLine;
 
 namespace Inkscape {
diff --git a/src/ui/widget/unit-tracker.h b/src/ui/widget/unit-tracker.h
index 61bb556ef..06245930e 100644
--- a/src/ui/widget/unit-tracker.h
+++ b/src/ui/widget/unit-tracker.h
@@ -16,13 +16,16 @@
 #define INKSCAPE_UI_WIDGET_UNIT_TRACKER_H
 
 #include <map>
-#include <gtk/gtk.h>
-
 #include "util/units.h"
 
 using Inkscape::Util::Unit;
 using Inkscape::Util::UnitType;
 
+typedef struct _GObject       GObject;
+typedef struct _GtkAction     GtkAction;
+typedef struct _GtkAdjustment GtkAdjustment;
+typedef struct _GtkListStore  GtkListStore;
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index f97bba072..cda97654e 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -18,6 +18,7 @@
 #include "helper/action-context.h"
 #include "interface.h"
 #include "shortcuts.h"
+#include "helper/action.h"
 
 #include <gdk/gdkkeysyms.h>
 
diff --git a/src/widgets/button.h b/src/widgets/button.h
index d5e29da1a..2bceb5e97 100644
--- a/src/widgets/button.h
+++ b/src/widgets/button.h
@@ -17,10 +17,18 @@
 #define SP_IS_BUTTON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_BUTTON))
 
 #include <gtk/gtk.h>
-#include <sigc++/sigc++.h>
-#include "helper/action.h"
+#include <sigc++/connection.h>
 #include "icon-size.h"
 
+struct SPAction;
+
+namespace Inkscape {
+namespace UI {
+namespace View {
+class View;
+}
+}
+}
 
 typedef enum {
 	SP_BUTTON_TYPE_NORMAL,
diff --git a/src/widgets/eek-preview.h b/src/widgets/eek-preview.h
index e4c724cc5..883ce713e 100644
--- a/src/widgets/eek-preview.h
+++ b/src/widgets/eek-preview.h
@@ -37,7 +37,6 @@
 #ifndef SEEN_EEK_PREVIEW_H
 #define SEEN_EEK_PREVIEW_H
 
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 /**
diff --git a/src/widgets/gradient-image.h b/src/widgets/gradient-image.h
index 6a9c89acf..0d3833441 100644
--- a/src/widgets/gradient-image.h
+++ b/src/widgets/gradient-image.h
@@ -17,7 +17,6 @@
 
 class SPGradient;
 
-#include <glib.h>
 #include <sigc++/connection.h>
 
 #define SP_TYPE_GRADIENT_IMAGE (sp_gradient_image_get_type ())
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index e85c115a8..a5e16aed2 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -16,8 +16,10 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
+#include <gtkmm/treeview.h>
+
 #include "gradient-vector.h"
-#include <gtk/gtk.h>
 
 #include "document.h"
 #include "document-undo.h"
diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h
index 1a6468ad4..e090d7cbd 100644
--- a/src/widgets/gradient-selector.h
+++ b/src/widgets/gradient-selector.h
@@ -19,27 +19,23 @@
 # include <config.h>
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include <gtkmm/entry.h>
-#include <gtkmm/label.h>
-#include <gtkmm/table.h>
 #include <gtkmm/liststore.h>
-#include <gtkmm/treeview.h>
 #include <gtkmm/scrolledwindow.h>
 
 #include <vector>
-#include "sp-gradient.h"
 #include "sp-gradient-spread.h"
 #include "sp-gradient-units.h"
 
+class SPDocument;
 class SPGradient;
 
+namespace Gtk {
+class CellRendererPixbuf;
+class CellRendererText;
+class ScrolledWindow;
+class TreeView;
+}
+
 #define SP_TYPE_GRADIENT_SELECTOR (sp_gradient_selector_get_type ())
 #define SP_GRADIENT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_GRADIENT_SELECTOR, SPGradientSelector))
 #define SP_GRADIENT_SELECTOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SP_TYPE_GRADIENT_SELECTOR, SPGradientSelectorClass))
diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h
index fc85b0d9c..5ae90b28f 100644
--- a/src/widgets/gradient-vector.h
+++ b/src/widgets/gradient-vector.h
@@ -19,16 +19,8 @@
 # include "config.h"
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include <gtkmm/liststore.h>
-
-#include <stddef.h>
 #include <sigc++/connection.h>
-
-#include <gtk/gtk.h>
 #include "gradient-selector.h"
 
 #define SP_TYPE_GRADIENT_VECTOR_SELECTOR (sp_gradient_vector_selector_get_type ())
diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h
index 1e8ad6d2e..788aa673e 100644
--- a/src/widgets/paint-selector.h
+++ b/src/widgets/paint-selector.h
@@ -12,7 +12,6 @@
  *
  */
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #include "color.h"
diff --git a/src/widgets/sp-color-icc-selector.h b/src/widgets/sp-color-icc-selector.h
index f63ab0853..6cdaff639 100644
--- a/src/widgets/sp-color-icc-selector.h
+++ b/src/widgets/sp-color-icc-selector.h
@@ -2,8 +2,6 @@
 #define SEEN_SP_COLOR_ICC_SELECTOR_H
 
 #include <glib.h>
-#include <gtk/gtk.h>
-
 #include "sp-color-selector.h"
 
 namespace Inkscape {
diff --git a/src/widgets/sp-color-notebook.h b/src/widgets/sp-color-notebook.h
index 50c2bb2e7..469bb56e8 100644
--- a/src/widgets/sp-color-notebook.h
+++ b/src/widgets/sp-color-notebook.h
@@ -12,7 +12,6 @@
  * This code is in public domain
  */
 
-#include <gtk/gtk.h>
 #include "sp-color-selector.h"
 
 #include <glib.h>
diff --git a/src/widgets/sp-color-scales.h b/src/widgets/sp-color-scales.h
index de6544d11..72cbafa2f 100644
--- a/src/widgets/sp-color-scales.h
+++ b/src/widgets/sp-color-scales.h
@@ -2,9 +2,7 @@
 #define SEEN_SP_COLOR_SCALES_H
 
 #include <glib.h>
-#include <gtk/gtk.h>
 
-#include <color.h>
 #include <widgets/sp-color-selector.h>
 
 struct SPColorScales;
diff --git a/src/widgets/sp-color-selector.h b/src/widgets/sp-color-selector.h
index 9d71a4a56..30061774a 100644
--- a/src/widgets/sp-color-selector.h
+++ b/src/widgets/sp-color-selector.h
@@ -2,9 +2,7 @@
 #define SEEN_SP_COLOR_SELECTOR_H
 
 #include <gtk/gtk.h>
-#include "../color.h"
-
-#include <glib.h>
+#include "color.h"
 
 struct SPColorSelector;
 
diff --git a/src/widgets/sp-color-slider.h b/src/widgets/sp-color-slider.h
index 85db01081..b81d62e41 100644
--- a/src/widgets/sp-color-slider.h
+++ b/src/widgets/sp-color-slider.h
@@ -14,8 +14,6 @@
 
 #include <gtk/gtk.h>
 
-#include <glib.h>
-
 #define SP_TYPE_COLOR_SLIDER (sp_color_slider_get_type ())
 #define SP_COLOR_SLIDER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_COLOR_SLIDER, SPColorSlider))
 #define SP_COLOR_SLIDER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SP_TYPE_COLOR_SLIDER, SPColorSliderClass))
diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h
index 23ac0050d..12b060dbe 100644
--- a/src/widgets/sp-color-wheel-selector.h
+++ b/src/widgets/sp-color-wheel-selector.h
@@ -1,7 +1,6 @@
 #ifndef SEEN_SP_COLOR_WHEEL_SELECTOR_H
 #define SEEN_SP_COLOR_WHEEL_SELECTOR_H
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #include "sp-color-selector.h"
diff --git a/src/widgets/sp-widget.h b/src/widgets/sp-widget.h
index b3cce32a6..6227c3a72 100644
--- a/src/widgets/sp-widget.h
+++ b/src/widgets/sp-widget.h
@@ -15,7 +15,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #define SP_TYPE_WIDGET (sp_widget_get_type())
diff --git a/src/widgets/sp-xmlview-content.h b/src/widgets/sp-xmlview-content.h
index a09d2d92d..140eacf46 100644
--- a/src/widgets/sp-xmlview-content.h
+++ b/src/widgets/sp-xmlview-content.h
@@ -14,8 +14,6 @@
 
 #include <config.h>
 #include <gtk/gtk.h>
-#include <glib.h>
-
 
 #define SP_TYPE_XMLVIEW_CONTENT (sp_xmlview_content_get_type ())
 #define SP_XMLVIEW_CONTENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_XMLVIEW_CONTENT, SPXMLViewContent))
diff --git a/src/widgets/spinbutton-events.h b/src/widgets/spinbutton-events.h
index c1df88c8a..9bf50d87c 100644
--- a/src/widgets/spinbutton-events.h
+++ b/src/widgets/spinbutton-events.h
@@ -10,7 +10,9 @@
  */
 
 #include <glib.h>
-#include <gtk/gtk.h>      /* GtkWidget */
+
+typedef struct _GdkEventKey GdkEventKey;
+typedef struct _GtkWidget   GtkWidget;
 
 gboolean spinbutton_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data);
 void spinbutton_undo (GtkWidget *w);
diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h
index fb749bfb5..db9130034 100644
--- a/src/widgets/toolbox.h
+++ b/src/widgets/toolbox.h
@@ -13,15 +13,15 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
 #include <glibmm/ustring.h>
 
 #include "icon-size.h"
-#include "../ege-adjustment-action.h"
-#include "../preferences.h"
+#include "preferences.h"
 
 #define TOOLBAR_SLIDER_HINT "full"
 
+typedef struct _EgeAdjustmentAction      EgeAdjustmentAction;
+
 class SPDesktop;
 
 namespace Inkscape {