5 files changed, 13 insertions, 6 deletions
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 742411fb1..29af8bd75 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -14,7 +14,6 @@
 
 #include <gtk/gtk.h>
 
-#include "forward.h"
 #include "sp-object.h"
 #include "message.h"
 #include "ui/view/view-widget.h"
@@ -27,6 +26,7 @@
 // forward declaration
 typedef struct _EgeColorProfTracker EgeColorProfTracker;
 struct SPCanvas;
+class SPDesktopWidget;
 
 
 #define SP_TYPE_DESKTOP_WIDGET SPDesktopWidget::getType()
diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h
index 6b165aca2..b198895e7 100644
--- a/src/widgets/gradient-vector.h
+++ b/src/widgets/gradient-vector.h
@@ -21,7 +21,6 @@
 #include <sigc++/connection.h>
 
 #include <gtk/gtk.h>
-#include "../forward.h"
 
 #define SP_TYPE_GRADIENT_VECTOR_SELECTOR (sp_gradient_vector_selector_get_type ())
 #define SP_GRADIENT_VECTOR_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_GRADIENT_VECTOR_SELECTOR, SPGradientVectorSelector))
@@ -29,6 +28,10 @@
 #define SP_IS_GRADIENT_VECTOR_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_GRADIENT_VECTOR_SELECTOR))
 #define SP_IS_GRADIENT_VECTOR_SELECTOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SP_TYPE_GRADIENT_VECTOR_SELECTOR))
 
+class SPDocument;
+class SPGradient;
+class SPStop;
+
 struct SPGradientVectorSelector {
     GtkVBox vbox;
 
diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h
index f32c2c83d..25ba4aa97 100644
--- a/src/widgets/paint-selector.h
+++ b/src/widgets/paint-selector.h
@@ -18,11 +18,13 @@
 
 #include "color.h"
 #include "fill-or-stroke.h"
-#include "forward.h"
 #include "sp-gradient-spread.h"
 #include "sp-gradient-units.h"
 
 class SPGradient;
+class SPDesktop;
+class SPPattern;
+class SPStyle;
 
 #define SP_TYPE_PAINT_SELECTOR (sp_paint_selector_get_type ())
 #define SP_PAINT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_PAINT_SELECTOR, SPPaintSelector))
diff --git a/src/widgets/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h
index d5445c8bb..93342ff4e 100644
--- a/src/widgets/sp-attribute-widget.h
+++ b/src/widgets/sp-attribute-widget.h
@@ -42,9 +42,9 @@ struct SPAttributeWidgetClass;
 struct SPAttributeTable;
 struct SPAttributeTableClass;
 
-#include <gtk/gtk.h>
+class SPObject;
 
-#include <forward.h>
+#include <gtk/gtk.h>
 
 struct SPAttributeWidget {
     GtkEntry entry;
diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h
index 0f3ce83c5..a3fbddf0c 100644
--- a/src/widgets/toolbox.h
+++ b/src/widgets/toolbox.h
@@ -18,9 +18,11 @@
 #include <gtk/gtk.h>
 #include <glibmm/ustring.h>
 
-#include "forward.h"
 #include "icon-size.h"
 
+class SPDesktop;
+class SPEventContext;
+
 namespace Inkscape {
 namespace UI {