Reduce header bloat

(bzr r13341.1.184)

18 files changed, 29 insertions, 44 deletions

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 {