6 files changed, 11 insertions, 6 deletions
diff --git a/src/ui/context-menu.h b/src/ui/context-menu.h
index 1f8208ebe..39753f93f 100644
--- a/src/ui/context-menu.h
+++ b/src/ui/context-menu.h
@@ -13,10 +13,13 @@
 
 #include <gtk/gtk.h>
 
-#include "forward.h"
 #include "sp-object.h"
-/* Append object-specific part to context menu */
 
+class SPDesktop;
+
+/**
+ * Append object-specific part to context menu.
+ */
 void sp_object_menu (SPObject *object, SPDesktop *desktop, GtkMenu *menu);
 
 #endif
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h
index 1598a04d3..e6e771f1b 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.h
+++ b/src/ui/dialog/filedialogimpl-gtkmm.h
@@ -49,6 +49,9 @@
 
 namespace Inkscape
 {
+
+class URI;
+
 namespace UI
 {
 namespace Dialog
diff --git a/src/ui/tool/control-point.h b/src/ui/tool/control-point.h
index 9f62fca42..72106403e 100644
--- a/src/ui/tool/control-point.h
+++ b/src/ui/tool/control-point.h
@@ -18,10 +18,11 @@
 #include <gtkmm.h>
 #include <2geom/point.h>
 
-#include "forward.h"
 #include "util/accumulators.h"
 #include "display/sodipodi-ctrl.h"
 
+class SPDesktop;
+
 namespace Inkscape {
 namespace UI {
 
diff --git a/src/ui/tool/multi-path-manipulator.h b/src/ui/tool/multi-path-manipulator.h
index c25719790..29b618b5f 100644
--- a/src/ui/tool/multi-path-manipulator.h
+++ b/src/ui/tool/multi-path-manipulator.h
@@ -13,7 +13,6 @@
 
 #include <stddef.h>
 #include <sigc++/connection.h>
-#include "forward.h"
 #include "ui/tool/commit-events.h"
 #include "ui/tool/manipulator.h"
 #include "ui/tool/modifier-tracker.h"
diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h
index 218e697b7..6f7ab01d4 100644
--- a/src/ui/tool/node-tool.h
+++ b/src/ui/tool/node-tool.h
@@ -17,7 +17,6 @@
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "event-context.h"
-#include "forward.h"
 #include "ui/tool/node-types.h"
 
 #define INK_TYPE_NODE_TOOL               (ink_node_tool_get_type ())
diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h
index 27a83f06b..edaf5a8de 100644
--- a/src/ui/tool/path-manipulator.h
+++ b/src/ui/tool/path-manipulator.h
@@ -17,12 +17,12 @@
 #include <2geom/affine.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include "forward.h"
 #include "ui/tool/node.h"
 #include "ui/tool/manipulator.h"
 
 struct SPCanvasItem;
 struct SPCurve;
+struct SPPath;
 
 namespace Inkscape {
 namespace XML { class Node; }