Header cleaning

(bzr r10963)

11 files changed, 13 insertions, 7 deletions

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"