Cleanup for src/forward.h. (About 19 of the affected files did not require the contents forward.h at all).

(bzr r10667)

72 files changed, 274 insertions, 319 deletions

diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp
index fdbe33222..2148e9e97 100644
--- a/src/box3d-side.cpp
+++ b/src/box3d-side.cpp
@@ -24,6 +24,8 @@
 #include "desktop-style.h"
 #include "box3d.h"
 
+struct SPPathClass;
+
 static void box3d_side_class_init (Box3DSideClass *klass);
 static void box3d_side_init (Box3DSide *side);
 
diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index 41c9d4c63..cc9e7a6cb 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -606,7 +606,8 @@ cmsHTRANSFORM ColorProfile::getTransfGamutCheck()
     return impl->_gamutTransf;
 }
 
-bool ColorProfile::GamutCheck(SPColor color){
+bool ColorProfile::GamutCheck(SPColor color)
+{
     BYTE outofgamut = 0;
 
     guint32 val = color.toRGBA32(0);
diff --git a/src/color-profile.h b/src/color-profile.h
index a9724defc..ae63e4047 100644
--- a/src/color-profile.h
+++ b/src/color-profile.h
@@ -11,6 +11,8 @@
 #include <glibmm/ustring.h>
 #include "cms-color-types.h"
 
+struct SPColor;
+
 namespace Inkscape {
 
 enum {
diff --git a/src/color.h b/src/color.h
index 8e6b54dd1..418b12c89 100644
--- a/src/color.h
+++ b/src/color.h
@@ -1,5 +1,5 @@
-#ifndef __SP_COLOR_H__
-#define __SP_COLOR_H__
+#ifndef SEEN_SP_COLOR_H
+#define SEEN_SP_COLOR_H
 
 /** \file
  * Colors.
@@ -82,5 +82,4 @@ void sp_color_rgb_to_cmyk_floatv (float *cmyk, float r, float g, float b);
 void sp_color_cmyk_to_rgb_floatv (float *rgb, float c, float m, float y, float k);
 
 
-#endif
-
+#endif // SEEN_SP_COLOR_H
diff --git a/src/connector-context.h b/src/connector-context.h
index 97e21025d..128f2bbeb 100644
--- a/src/connector-context.h
+++ b/src/connector-context.h
@@ -16,7 +16,6 @@
 #include <sigc++/sigc++.h>
 #include <sigc++/connection.h>
 #include "event-context.h"
-#include <forward.h>
 #include <2geom/point.h>
 #include "libavoid/connector.h"
 #include "connection-points.h"
diff --git a/src/desktop-handles.h b/src/desktop-handles.h
index 74001d890..6bf6f87d2 100644
--- a/src/desktop-handles.h
+++ b/src/desktop-handles.h
@@ -1,5 +1,5 @@
-#ifndef __SP_DESKTOP_HANDLES_H__
-#define __SP_DESKTOP_HANDLES_H__
+#ifndef SEEN_SP_DESKTOP_HANDLES_H
+#define SEEN_SP_DESKTOP_HANDLES_H
 
 /*
  * Frontends
@@ -13,11 +13,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "forward.h"
 
+class SPDesktop;
+class SPDocument;
+class SPEventContext;
+class SPNamedView;
 struct SPCanvas;
-struct SPCanvasItem;
 struct SPCanvasGroup;
+struct SPCanvasItem;
 
 namespace Inkscape { 
     class MessageStack;
@@ -46,7 +49,7 @@ SPCanvasGroup * sp_desktop_tempgroup (SPDesktop const * desktop);
 Inkscape::MessageStack * sp_desktop_message_stack (SPDesktop const * desktop);
 SPNamedView * sp_desktop_namedview (SPDesktop const * desktop);
 
-#endif
+#endif // SEEN_SP_DESKTOP_HANDLES_H
 
 /*
   Local Variables:
diff --git a/src/desktop-style.h b/src/desktop-style.h
index 6aa685a36..3719c2a9e 100644
--- a/src/desktop-style.h
+++ b/src/desktop-style.h
@@ -1,5 +1,5 @@
-#ifndef __SP_DESKTOP_STYLE_H__
-#define __SP_DESKTOP_STYLE_H__
+#ifndef SEEN_SP_DESKTOP_STYLE_H
+#define SEEN_SP_DESKTOP_STYLE_H
 
 /*
  * Desktop style management
@@ -13,7 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 class ColorRGBA;
 struct SPCSSAttr;
@@ -83,7 +83,7 @@ int sp_desktop_query_style_from_list (GSList *list, SPStyle *style, int property
 int sp_desktop_query_style(SPDesktop *desktop, SPStyle *style, int property);
 bool sp_desktop_query_style_all (SPDesktop *desktop, SPStyle *query);
 
-#endif
+#endif // SEEN_SP_DESKTOP_STYLE_H
 
 
 /*
diff --git a/src/dialogs/dialog-events.h b/src/dialogs/dialog-events.h
index 9c0a82f23..53be16682 100644
--- a/src/dialogs/dialog-events.h
+++ b/src/dialogs/dialog-events.h
@@ -9,11 +9,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifndef __DIALOG_EVENTS_H__
-#define __DIALOG_EVENTS_H__
+#ifndef SEEN_DIALOG_EVENTS_H
+#define SEEN_DIALOG_EVENTS_H
 
 #include <gtk/gtk.h>
-#include <forward.h>
  
 /*
  * event callback can only accept one argument, but we need two,
@@ -28,6 +27,12 @@ namespace Gtk {
 class Window;
 class Entry;
 }
+
+class SPDesktop;
+
+namespace Inkscape {
+class Application;
+} // namespace Inkscape
  
 typedef struct { 
     GtkWidget *win;
diff --git a/src/dialogs/item-properties.h b/src/dialogs/item-properties.h
index 7d57ae5e8..51f5d7032 100644
--- a/src/dialogs/item-properties.h
+++ b/src/dialogs/item-properties.h
@@ -11,13 +11,11 @@
 #ifndef SEEN_DIALOGS_ITEM_PROPERTIES_H
 #define SEEN_DIALOGS_ITEM_PROPERTIES_H
 
-#include <glib.h>
 #include <gtk/gtk.h>
-#include "../forward.h"
 
-GtkWidget *sp_item_widget_new (void);
+GtkWidget *sp_item_widget_new(void);
 
-void sp_item_dialog (void);
+void sp_item_dialog(void);
 
 #endif
 
diff --git a/src/dialogs/object-attributes.h b/src/dialogs/object-attributes.h
index b490ebfa1..53b3ee37f 100644
--- a/src/dialogs/object-attributes.h
+++ b/src/dialogs/object-attributes.h
@@ -13,8 +13,8 @@
 #define SEEN_DIALOGS_OBJECT_ATTRIBUTES_H
 
 #include <glib.h>
-#include <gtk/gtk.h>
-#include "../forward.h"
+
+class SPObject;
 
 void sp_object_attributes_dialog (SPObject *object, const gchar *tag);
 
diff --git a/src/display/canvas-temporary-item-list.h b/src/display/canvas-temporary-item-list.h
index 47556b9f1..7a9f8b87a 100644
--- a/src/display/canvas-temporary-item-list.h
+++ b/src/display/canvas-temporary-item-list.h
@@ -12,10 +12,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "forward.h"
 #include <list>
+#include <glib.h>
 
 struct SPCanvasItem;
+class SPDesktop;
 
 namespace Inkscape {
 namespace Display {
diff --git a/src/display/snap-indicator.h b/src/display/snap-indicator.h
index d60ff1481..ff08a8a8c 100644
--- a/src/display/snap-indicator.h
+++ b/src/display/snap-indicator.h
@@ -14,9 +14,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "forward.h"
 #include "snapped-point.h"
 
+class SPDesktop;
+
 namespace Inkscape {
 namespace Display {
 
diff --git a/src/document-undo.h b/src/document-undo.h
index afd595ed8..7ff45c269 100644
--- a/src/document-undo.h
+++ b/src/document-undo.h
@@ -3,8 +3,12 @@
 
 typedef struct _GtkObject GtkObject;
 
+class SPDesktop;
+
 namespace Inkscape {
 
+class Application;
+
 class DocumentUndo
 {
 public:
diff --git a/src/draw-context.h b/src/draw-context.h
index 17540649b..53114d820 100644
--- a/src/draw-context.h
+++ b/src/draw-context.h
@@ -1,5 +1,5 @@
-#ifndef __SP_DRAW_CONTEXT_H__
-#define __SP_DRAW_CONTEXT_H__
+#ifndef SEEN_SP_DRAW_CONTEXT_H
+#define SEEN_SP_DRAW_CONTEXT_H
 
 /*
  * Generic drawing context
@@ -18,7 +18,6 @@
 #include <sigc++/sigc++.h>
 #include <2geom/point.h>
 #include "event-context.h"
-#include <forward.h>
 #include "live_effects/effect.h"
 
 /* Freehand context */
@@ -90,7 +89,7 @@ void spdc_endpoint_snap_free(SPEventContext const *ec, Geom::Point &p, guint sta
 void spdc_check_for_and_apply_waiting_LPE(SPDrawContext *dc, SPItem *item);
 void spdc_create_single_dot(SPEventContext *ec, Geom::Point const &pt, char const *tool, guint event_state);
 
-#endif
+#endif // SEEN_SP_DRAW_CONTEXT_H
 
 /*
   Local Variables:
diff --git a/src/event-context.h b/src/event-context.h
index b0772c23a..ca13fe7e8 100644
--- a/src/event-context.h
+++ b/src/event-context.h
@@ -1,5 +1,5 @@
-#ifndef __SP_EVENT_CONTEXT_H__
-#define __SP_EVENT_CONTEXT_H__
+#ifndef SEEN_SP_EVENT_CONTEXT_H
+#define SEEN_SP_EVENT_CONTEXT_H
 
 /** \file
  * SPEventContext: base class for event processors
@@ -38,6 +38,13 @@ namespace Inkscape {
     }
 }
 
+
+#define SP_TYPE_EVENT_CONTEXT (sp_event_context_get_type())
+#define SP_EVENT_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_EVENT_CONTEXT, SPEventContext))
+#define SP_IS_EVENT_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_EVENT_CONTEXT))
+
+GType sp_event_context_get_type();
+
 gboolean sp_event_context_snap_watchdog_callback(gpointer data);
 void sp_event_context_discard_delayed_snap_event(SPEventContext *ec);
 
@@ -184,7 +191,7 @@ void ec_shape_event_attr_changed(Inkscape::XML::Node *shape_repr,
 
 void event_context_print_event_info(GdkEvent *event, bool print_return = true);
 
-#endif
+#endif // SEEN_SP_EVENT_CONTEXT_H
 
 
 /*
diff --git a/src/extension/execution-env.h b/src/extension/execution-env.h
index be7cf3fb7..92f496b90 100644
--- a/src/extension/execution-env.h
+++ b/src/extension/execution-env.h
@@ -17,10 +17,16 @@
 
 #include <gtkmm/dialog.h>
 
-#include "forward.h"
 #include "extension.h"
 
 namespace Inkscape {
+
+namespace UI {
+namespace View {
+class View;
+} // namespace View
+} // namespace UI
+
 namespace Extension {
 
 class Effect;
diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h
index e648a66cd..443046846 100644
--- a/src/extension/implementation/implementation.h
+++ b/src/extension/implementation/implementation.h
@@ -16,12 +16,21 @@
 #include <gdkmm/types.h>
 #include <gtkmm/widget.h>
 
-#include "forward.h"
 #include "xml/node.h"
 #include <2geom/forward.h>
 #include <2geom/point.h>
 
+class SPDocument;
+class SPStyle;
+
 namespace Inkscape {
+
+namespace UI {
+namespace View {
+class View;
+} // namespace View
+} // namespace UI
+
 namespace Extension {
 
 class Effect;
diff --git a/src/extension/print.h b/src/extension/print.h
index 8d401d646..c1afe59b3 100644
--- a/src/extension/print.h
+++ b/src/extension/print.h
@@ -13,7 +13,6 @@
 
 #include "extension.h"
 
-#include "forward.h"
 #include "sp-item.h"
 
 namespace Inkscape {
diff --git a/src/filter-chemistry.h b/src/filter-chemistry.h
index 9f16419fd..2ac3ebe8f 100644
--- a/src/filter-chemistry.h
+++ b/src/filter-chemistry.h
@@ -14,11 +14,16 @@
 #ifndef SEEN_SP_FILTER_CHEMISTRY_H
 #define SEEN_SP_FILTER_CHEMISTRY_H
 
-#include "forward.h"
+#include <glib.h>
+
 #include "display/nr-filter-types.h"
 
+class SPDocument;
 class SPFilter;
 class SPFilterPrimitive;
+class SPItem;
+class SPObject;
+
 
 SPFilterPrimitive *filter_add_primitive(SPFilter *filter, Inkscape::Filters::FilterPrimitiveType);
 SPFilter *new_filter (SPDocument *document);
diff --git a/src/forward.h b/src/forward.h
deleted file mode 100644
index 352fae6fa..000000000
--- a/src/forward.h
+++ /dev/null
@@ -1,175 +0,0 @@
-#ifndef FORWARD_H_SEEN
-#define FORWARD_H_SEEN
-
-/*
- * Forward declarations of most used objects
- *
- * Author:
- *   Lauris Kaplinski <lauris@kaplinski.com>
- *   Abhishek Sharma
- *
- * Copyright (C) 2001-2002 Lauris Kaplinski
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#include <glib-object.h>
-
-/* Generic containers */
-
-namespace Inkscape {
-struct Application;
-struct ApplicationClass;
-}
-
-/* Editing window */
-
-class SPDesktop;
-class SPDesktopClass;
-
-class SPDesktopWidget;
-class SPDesktopWidgetClass;
-
-GType sp_desktop_get_type ();
-
-class SPEventContext;
-class SPEventContextClass;
-
-#define SP_TYPE_EVENT_CONTEXT (sp_event_context_get_type ())
-#define SP_EVENT_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_EVENT_CONTEXT, SPEventContext))
-#define SP_IS_EVENT_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_EVENT_CONTEXT))
-
-GType sp_event_context_get_type ();
-
-/* Document tree */
-
-class SPDocument;
-class SPDocumentClass;
-
-/* Objects */
-
-class SPGroup;
-class SPGroupClass;
-
-class SPNamedView;
-class SPNamedViewClass;
-
-class SPGuide;
-class SPGuideClass;
-
-class SPObjectGroup;
-class SPObjectGroupClass;
-
-struct SPMarker;
-struct SPMarkerClass;
-class SPMarkerReference;
-
-class SPPath;
-class SPPathClass;
-
-class SPShape;
-class SPShapeClass;
-
-class SPPolygon;
-class SPPolygonClass;
-
-class SPEllipse;
-class SPEllipseClass;
-
-class SPCircle;
-class SPCircleClass;
-
-class SPArc;
-class SPArcClass;
-
-class SPChars;
-class SPCharsClass;
-
-class SPText;
-class SPTextClass;
-
-class SPTSpan;
-class SPTSpanClass;
-
-class SPString;
-class SPStringClass;
-
-class SPStop;
-class SPStopClass;
-
-class SPGradient;
-class SPGradientClass;
-class SPGradientReference;
-
-class SPLinearGradient;
-class SPLinearGradientClass;
-
-class SPRadialGradient;
-class SPRadialGradientClass;
-
-class SPPattern;
-
-class SPClipPath;
-class SPClipPathClass;
-class SPClipPathReference;
-
-class SPMaskReference;
-
-class SPAvoidRef;
-
-class SPAnchor;
-class SPAnchorClass;
-
-/* Misc */
-
-class ColorRGBA;
-
-class SPColor;
-
-class SPStyle;
-
-class SPEvent;
-
-class SPPrintContext;
-
-namespace Inkscape {
-namespace UI {
-namespace View {
-class View;
-};
-};
-};
-
-class SPViewWidget;
-class SPViewWidgetClass;
-
-class StopOnTrue;
-
-namespace Inkscape {
-class URI;
-class URIReference;
-}
-
-struct box_solution;
-
-
-/* verbs */
-
-typedef int sp_verb_t;
-namespace Inkscape {
-    class Verb;
-}
-
-#endif // FORWARD_H_SEEN
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/gradient-chemistry.h b/src/gradient-chemistry.h
index e0d9a1f46..f797f928d 100644
--- a/src/gradient-chemistry.h
+++ b/src/gradient-chemistry.h
@@ -18,9 +18,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "forward.h"
 #include "sp-gradient.h"
 
+class SPItem;
+
 /*
  * Either normalizes given gradient to vector, or returns fresh normalized
  * vector - in latter case, original gradient is flattened and stops cleared
diff --git a/src/gradient-drag.h b/src/gradient-drag.h
index 4ad9a1e16..2fd0e46f0 100644
--- a/src/gradient-drag.h
+++ b/src/gradient-drag.h
@@ -1,5 +1,5 @@
-#ifndef __GRADIENT_DRAG_H__
-#define __GRADIENT_DRAG_H__
+#ifndef SEEN_GRADIENT_DRAG_H
+#define SEEN_GRADIENT_DRAG_H
 
 /*
  * On-canvas gradient dragging
@@ -18,14 +18,27 @@
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <vector>
+#include <glib.h>
+#include <glibmm/ustring.h>
 
-#include <forward.h>
 #include <2geom/point.h>
-#include <knot-enums.h>
+
+#include "knot-enums.h"
 
 struct SPItem;
 struct SPKnot;
 
+class SPDesktop;
+class SPCSSAttr;
+class SPLinearGradient;
+class SPObject;
+class SPRadialGradient;
+class SPStop;
+
+namespace Inkscape {
+class Selection;
+} // namespace Inkscape
+
 /**
 This class represents a single draggable point of a gradient. It remembers the item
 which has the gradient, whether it's fill or stroke, the point type (from the
@@ -187,4 +200,4 @@ private:
     sigc::connection style_query_connection;
 };
 
-#endif
+#endif // SEEN_GRADIENT_DRAG_H
diff --git a/src/helper/action.h b/src/helper/action.h
index e7c799992..0cd010b34 100644
--- a/src/helper/action.h
+++ b/src/helper/action.h
@@ -14,7 +14,7 @@
 
 #include <sigc++/sigc++.h>
 #include <glibmm/ustring.h>
-#include "forward.h"
+#include <glib-object.h>
 
 struct SPAction;
 struct SPActionClass;
@@ -26,6 +26,11 @@ struct SPActionClass;
 
 namespace Inkscape {
 class Verb;
+namespace UI {
+namespace View {
+class View;
+} // namespace View
+} // namespace UI
 }
 
 /** All the data that is required to be an action.  This
diff --git a/src/helper/stock-items.h b/src/helper/stock-items.h
index ddad55415..7299e070e 100644
--- a/src/helper/stock-items.h
+++ b/src/helper/stock-items.h
@@ -1,4 +1,5 @@
-#define __INK_STOCK_ITEMS__
+#ifndef SEEN_INK_STOCK_ITEMS_H
+#define SEEN_INK_STOCK_ITEMS_H
 
 /*
  * Stock-items
@@ -14,7 +15,8 @@
 
 #include <glib/gtypes.h>
 
-#include <forward.h>
+class SPObject;
 
 SPObject *get_stock_item(gchar const *urn);
 
+#endif // SEEN_INK_STOCK_ITEMS_H
diff --git a/src/inkscape-private.h b/src/inkscape-private.h
index a6643b989..470a1f5bd 100644
--- a/src/inkscape-private.h
+++ b/src/inkscape-private.h
@@ -1,5 +1,5 @@
-#ifndef __INKSCAPE_PRIVATE_H__
-#define __INKSCAPE_PRIVATE_H__
+#ifndef SEEN_INKSCAPE_PRIVATE_H
+#define SEEN_INKSCAPE_PRIVATE_H
 
 /*
  * Some forward declarations
@@ -12,6 +12,7 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+#include <glib-object.h>
 
 #define SP_TYPE_INKSCAPE (inkscape_get_type ())
 #define SP_INKSCAPE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_INKSCAPE, Inkscape))
@@ -19,9 +20,9 @@
 #define SP_IS_INKSCAPE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_INKSCAPE))
 #define SP_IS_INKSCAPE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_INKSCAPE))
 
-#include "forward.h"
 #include "inkscape.h"
 
+class SPColor;
 namespace Inkscape { class Selection; }
 
 GType inkscape_get_type (void);
@@ -52,7 +53,7 @@ bool inkscape_remove_document (SPDocument *document);
 
 void inkscape_set_color (SPColor *color, float opacity);
 
-#endif
+#endif // SEEN_INKSCAPE_PRIVATE_H
 
 
 
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index fe59732a5..f07d0cac4 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -88,6 +88,10 @@ enum {
 # FORWARD DECLARATIONS
 ################################*/
 
+namespace Inkscape {
+class ApplicationClass;
+}
+
 static void inkscape_class_init (Inkscape::ApplicationClass *klass);
 static void inkscape_init (SPObject *object);
 static void inkscape_dispose (GObject *object);
diff --git a/src/interface.h b/src/interface.h
index a39769632..2b01a20d7 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -17,9 +17,21 @@
 
 #include <gtk/gtk.h>
 
-#include "forward.h"
 #include "sp-item.h"
 
+class SPViewWidget;
+
+namespace Inkscape {
+
+class Verb;
+
+namespace UI {
+namespace View {
+class View;
+} // namespace View
+} // namespace UI
+} // namespace Inkscape
+
 /**
  *  Create a new document window.
  */
diff --git a/src/knot.h b/src/knot.h
index 250165f79..ad152b54c 100644
--- a/src/knot.h
+++ b/src/knot.h
@@ -1,5 +1,5 @@
-#ifndef __SP_KNOT_H__
-#define __SP_KNOT_H__
+#ifndef SEEN_SP_KNOT_H
+#define SEEN_SP_KNOT_H
 
 /** \file
  * Declarations for SPKnot: Desktop-bound visual control object.
@@ -16,12 +16,12 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include "forward.h"
 #include <2geom/point.h>
 #include "knot-enums.h"
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 
+class SPDesktop;
 class SPKnot;
 class SPKnotClass;
 struct SPCanvasItem;
@@ -179,7 +179,7 @@ void sp_knot_handler_request_position(GdkEvent *event, SPKnot *knot);
 Geom::Point sp_knot_position(SPKnot const *knot);
 
 
-#endif /* !__SP_KNOT_H__ */
+#endif // SEEN_SP_KNOT_H
 
 /*
   Local Variables:
diff --git a/src/knotholder.h b/src/knotholder.h
index 0dd3bba1e..2e2844801 100644
--- a/src/knotholder.h
+++ b/src/knotholder.h
@@ -1,5 +1,5 @@
-#ifndef __SP_KNOTHOLDER_H__
-#define __SP_KNOTHOLDER_H__
+#ifndef SEEN_SP_KNOTHOLDER_H
+#define SEEN_SP_KNOTHOLDER_H
 
 /*
  * KnotHolder - Hold SPKnot list and manage signals
@@ -19,7 +19,6 @@
 
 #include <glib/gtypes.h>
 #include "knot-enums.h"
-#include "forward.h"
 #include <2geom/forward.h>
 #include "knot-holder-entity.h"
 #include <list>
@@ -71,7 +70,7 @@ void knot_moved_handler(SPKnot *knot, Geom::Point const *p, guint state, gpointe
 void knot_ungrabbed_handler(SPKnot *knot, unsigned int state, KnotHolder *kh);
 **/
 
-#endif /* !__SP_KNOTHOLDER_H__ */
+#endif // SEEN_SP_KNOTHOLDER_H
 
 /*
   Local Variables:
diff --git a/src/libnrtype/font-style-to-pos.h b/src/libnrtype/font-style-to-pos.h
index 635c7378d..41ba6cf72 100644
--- a/src/libnrtype/font-style-to-pos.h
+++ b/src/libnrtype/font-style-to-pos.h
@@ -1,12 +1,13 @@
-#ifndef __FONT_STYLE_TO_POS_H__
-#define __FONT_STYLE_TO_POS_H__
+#ifndef SEEN_FONT_STYLE_TO_POS_H
+#define SEEN_FONT_STYLE_TO_POS_H
 
-#include <forward.h> /* SPStyle */
 #include <libnrtype/nr-type-pos-def.h>
 
-NRTypePosDef font_style_to_pos (SPStyle const &style);
+class SPStyle;
 
-#endif /* __FONT_STYLE_TO_POS_H__ */
+NRTypePosDef font_style_to_pos(SPStyle const &style);
+
+#endif // SEEN_FONT_STYLE_TO_POS_H
 
 /*
   Local Variables:
diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h
index 8d2b406eb..571c3b1f1 100644
--- a/src/live_effects/lpeobject-reference.h
+++ b/src/live_effects/lpeobject-reference.h
@@ -9,7 +9,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
-#include <forward.h>
 #include <uri-references.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
diff --git a/src/live_effects/parameter/path-reference.h b/src/live_effects/parameter/path-reference.h
index 26fce952a..d24f05a4f 100644
--- a/src/live_effects/parameter/path-reference.h
+++ b/src/live_effects/parameter/path-reference.h
@@ -10,7 +10,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
-#include <forward.h>
 #include "sp-item.h"
 #include <uri-references.h>
 #include <stddef.h>
diff --git a/src/path-chemistry.h b/src/path-chemistry.h
index 03adeeff9..b88b84087 100644
--- a/src/path-chemistry.h
+++ b/src/path-chemistry.h
@@ -1,5 +1,5 @@
-#ifndef __PATH_CHEMISTRY_H__
-#define __PATH_CHEMISTRY_H__
+#ifndef SEEN_PATH_CHEMISTRY_H
+#define SEEN_PATH_CHEMISTRY_H
 
 /*
  * Here are handlers for modifying selections, specific to paths
@@ -13,7 +13,16 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "forward.h"
+#include <glib.h>
+
+class SPDesktop;
+class SPItem;
+
+namespace Inkscape {
+namespace XML {
+class Node;
+} // namespace XML
+} // namespace Inkscape
 
 void sp_selected_path_combine (SPDesktop *desktop);
 void sp_selected_path_break_apart (SPDesktop *desktop);
@@ -23,7 +32,7 @@ Inkscape::XML::Node *sp_selected_item_to_curved_repr(SPItem *item, guint32 text_
 void sp_selected_path_reverse (SPDesktop *desktop);
 bool sp_item_list_to_curves(const GSList *items, GSList **selected, GSList **to_select, bool skip_all_lpeitems = false);
 
-#endif
+#endif // SEEN_PATH_CHEMISTRY_H
 
 /*
   Local Variables:
diff --git a/src/print.h b/src/print.h
index 35e45f6ed..2f587b95b 100644
--- a/src/print.h
+++ b/src/print.h
@@ -14,9 +14,11 @@
 #include <gtkmm.h>
 //#include <libnr/nr-path.h>
 #include <2geom/forward.h>
-#include "forward.h"
 
 
+class SPDocument;
+class SPStyle;
+
 namespace Inkscape {
 namespace Extension {
 
diff --git a/src/rubberband.h b/src/rubberband.h
index 6c857fb63..0761d8066 100644
--- a/src/rubberband.h
+++ b/src/rubberband.h
@@ -14,7 +14,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "forward.h"
 #include <boost/optional.hpp>
 #include <vector>
 #include <2geom/point.h>
@@ -25,6 +24,7 @@
 class CtrlRect;
 class SPCanvasItem;
 class SPCurve;
+class SPDesktop;
 
 enum {
     RUBBERBAND_MODE_RECT,
diff --git a/src/satisfied-guide-cns.h b/src/satisfied-guide-cns.h
index 57803daf4..27fe043d0 100644
--- a/src/satisfied-guide-cns.h
+++ b/src/satisfied-guide-cns.h
@@ -1,7 +1,6 @@
-#ifndef __SATISFIED_GUIDE_CNS_H__
-#define __SATISFIED_GUIDE_CNS_H__
+#ifndef SEEN_SATISFIED_GUIDE_CNS_H
+#define SEEN_SATISFIED_GUIDE_CNS_H
 
-#include <forward.h>
 #include <2geom/forward.h>
 #include <vector>
 #include <sp-item.h>
@@ -13,7 +12,7 @@ void satisfied_guide_cns(SPDesktop const &desktop,
                          std::vector<SPGuideConstraint> &cns);
 
 
-#endif /* !__SATISFIED_GUIDE_CNS_H__ */
+#endif // SEEN_SATISFIED_GUIDE_CNS_H
 
 /*
   Local Variables:
diff --git a/src/selection-chemistry.h b/src/selection-chemistry.h
index b3d64ae8e..1c193fc93 100644
--- a/src/selection-chemistry.h
+++ b/src/selection-chemistry.h
@@ -17,7 +17,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "forward.h"
 #include "sp-item.h"
 #include "2geom/forward.h"
 
diff --git a/src/selection.h b/src/selection.h
index 39e75685e..081776427 100644
--- a/src/selection.h
+++ b/src/selection.h
@@ -22,7 +22,6 @@
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 
-#include "forward.h"
 #include "gc-managed.h"
 #include "gc-finalized.h"
 #include "gc-anchored.h"
diff --git a/src/seltrans.h b/src/seltrans.h
index 9d14fda26..3a5fa006e 100644
--- a/src/seltrans.h
+++ b/src/seltrans.h
@@ -1,5 +1,5 @@
-#ifndef __SELTRANS_H__
-#define __SELTRANS_H__
+#ifndef SEEN_SELTRANS_H
+#define SEEN_SELTRANS_H
 
 /*
  * Helper object for transforming selected items
@@ -21,7 +21,6 @@
 #include <2geom/affine.h>
 #include <2geom/rect.h>
 #include "knot.h"
-#include "forward.h"
 #include "selcue.h"
 #include "message-context.h"
 #include <vector>
@@ -181,7 +180,7 @@ private:
 
 }
 
-#endif
+#endif // SEEN_SELTRANS_H
 
 
 /*
diff --git a/src/shape-editor.h b/src/shape-editor.h
index 1f0958a3e..206ff269b 100644
--- a/src/shape-editor.h
+++ b/src/shape-editor.h
@@ -1,5 +1,5 @@
-#ifndef __SHAPE_EDITOR_H__
-#define __SHAPE_EDITOR_H__
+#ifndef SEEN_SHAPE_EDITOR_H
+#define SEEN_SHAPE_EDITOR_H
 
 /*
  * Inkscape::ShapeEditor
@@ -12,17 +12,20 @@
  *
  */
 
-#include <forward.h>
+#include <glib.h>
+
 #include <2geom/forward.h>
 
+
 namespace Inkscape { namespace NodePath { class Path; } }
 namespace Inkscape { namespace XML { class Node; } }
 
 class KnotHolder;
+class LivePathEffectObject;
 class SPDesktop;
+class SPItem;
 class SPNodeContext;
 class ShapeEditorsCollective;
-class LivePathEffectObject;
 
 #include <2geom/point.h>
 #include <boost/optional.hpp>
@@ -73,7 +76,7 @@ private:
     Inkscape::XML::Node *knotholder_listener_attached_for;
 };
 
-#endif
+#endif // SEEN_SHAPE_EDITOR_H
 
 
 /*
diff --git a/src/snap.h b/src/snap.h
index 4a8f4b7c1..8fefa1cf2 100644
--- a/src/snap.h
+++ b/src/snap.h
@@ -31,6 +31,7 @@ enum SPGuideDragType { // used both here and in desktop-events.cpp
     SP_DRAG_NONE
 };
 
+class SPGuide;
 class SPNamedView;
 
 /// Class to coordinate snapping operations
diff --git a/src/sp-conn-end-pair.h b/src/sp-conn-end-pair.h
index 98096a246..7648e253a 100644
--- a/src/sp-conn-end-pair.h
+++ b/src/sp-conn-end-pair.h
@@ -13,7 +13,6 @@
  */
 #include <glib/gtypes.h>
 
-#include "forward.h"
 #include <stddef.h>
 #include <sigc++/connection.h>
 #include <sigc++/functors/slot.h>
@@ -23,7 +22,11 @@
 
 class SPConnEnd;
 struct SPCurve;
+class SPPath;
+class SPItem;
+class SPObject;
 
+namespace Geom { class Point; }
 namespace Inkscape {
 namespace XML {
 class Node;
diff --git a/src/sp-conn-end.h b/src/sp-conn-end.h
index 052e8ddcb..d2785b0e2 100644
--- a/src/sp-conn-end.h
+++ b/src/sp-conn-end.h
@@ -9,6 +9,7 @@
 #include "connection-points.h"
 #include "conn-avoid-ref.h"
 
+class SPPath;
 
 class SPConnEnd {
 public:
diff --git a/src/sp-gradient-reference.h b/src/sp-gradient-reference.h
index 770593823..2737df702 100644
--- a/src/sp-gradient-reference.h
+++ b/src/sp-gradient-reference.h
@@ -2,6 +2,8 @@
 #define SEEN_SP_GRADIENT_REFERENCE_H
 
 #include "uri-references.h"
+
+class SPGradient;
 class SPObject;
 
 class SPGradientReference : public Inkscape::URIReference {
diff --git a/src/sp-gradient.h b/src/sp-gradient.h
index 85eb70e9b..c92d07fd3 100644
--- a/src/sp-gradient.h
+++ b/src/sp-gradient.h
@@ -29,7 +29,7 @@
 #include <sigc++/connection.h>
 
 struct SPGradientReference;
-
+class SPStop;
 
 #define SP_TYPE_GRADIENT (SPGradient::getType())
 #define SP_GRADIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_GRADIENT, SPGradient))
diff --git a/src/sp-guide-attachment.h b/src/sp-guide-attachment.h
index e5c63d04e..09d4375df 100644
--- a/src/sp-guide-attachment.h
+++ b/src/sp-guide-attachment.h
@@ -1,7 +1,6 @@
 #ifndef SEEN_SP_GUIDE_ATTACHMENT_H
 #define SEEN_SP_GUIDE_ATTACHMENT_H
 
-#include <forward.h>
 #include "sp-item.h"
 
 class SPGuideAttachment {
diff --git a/src/sp-guide-constraint.h b/src/sp-guide-constraint.h
index a39660e75..763696788 100644
--- a/src/sp-guide-constraint.h
+++ b/src/sp-guide-constraint.h
@@ -1,7 +1,7 @@
-#ifndef __SP_GUIDE_CONSTRAINT_H__
-#define __SP_GUIDE_CONSTRAINT_H__
+#ifndef SEEN_SP_GUIDE_CONSTRAINT_H
+#define SEEN_SP_GUIDE_CONSTRAINT_H
 
-#include <forward.h>
+class SPGuide;
 
 class SPGuideConstraint {
 public:
@@ -29,7 +29,7 @@ public:
 };
 
 
-#endif /* !__SP_GUIDE_CONSTRAINT_H__ */
+#endif // SEEN_SP_GUIDE_CONSTRAINT_H
 
 
 /*
diff --git a/src/sp-item-notify-moveto.h b/src/sp-item-notify-moveto.h
index 1e6ff2854..ec47508dd 100644
--- a/src/sp-item-notify-moveto.h
+++ b/src/sp-item-notify-moveto.h
@@ -1,13 +1,14 @@
-#ifndef __SP_ITEM_NOTIFY_MOVETO_H__
-#define __SP_ITEM_NOTIFY_MOVETO_H__
+#ifndef SEEN_SP_ITEM_NOTIFY_MOVETO_H
+#define SEEN_SP_ITEM_NOTIFY_MOVETO_H
 
-#include <forward.h>
+class SPItem;
+class SPGuide;
 
 void sp_item_notify_moveto(SPItem &item, SPGuide const &g, int const snappoint_ix,
                            double position, bool const commit);
 
 
-#endif /* !__SP_ITEM_NOTIFY_MOVETO_H__ */
+#endif // SEEN_SP_ITEM_NOTIFY_MOVETO_H
 
 
 /*
diff --git a/src/sp-item-rm-unsatisfied-cns.h b/src/sp-item-rm-unsatisfied-cns.h
index 97742dd4d..62f688b51 100644
--- a/src/sp-item-rm-unsatisfied-cns.h
+++ b/src/sp-item-rm-unsatisfied-cns.h
@@ -1,11 +1,12 @@
-#ifndef __SP_ITEM_RM_UNSATISFIED_CNS_H__
-#define __SP_ITEM_RM_UNSATISFIED_CNS_H__
-#include <forward.h>
+#ifndef SEEN_SP_ITEM_RM_UNSATISFIED_CNS_H
+#define SEEN_SP_ITEM_RM_UNSATISFIED_CNS_H
+
+class SPItem;
 
 void sp_item_rm_unsatisfied_cns(SPItem &item);
 
 
-#endif /* !__SP_ITEM_RM_UNSATISFIED_CNS_H__ */
+#endif // SEEN_SP_ITEM_RM_UNSATISFIED_CNS_H
 
 /*
   Local Variables:
diff --git a/src/sp-item-transform.h b/src/sp-item-transform.h
index 4ea8f976f..5e67dd276 100644
--- a/src/sp-item-transform.h
+++ b/src/sp-item-transform.h
@@ -1,8 +1,10 @@
-#ifndef SP_ITEM_TRANSFORM_H
-#define SP_ITEM_TRANSFORM_H
+#ifndef SEEN_SP_ITEM_TRANSFORM_H
+#define SEEN_SP_ITEM_TRANSFORM_H
+
+#include <glib.h>
 
-#include "forward.h"
 #include <2geom/forward.h>
+class SPItem;
 
 void sp_item_rotate_rel(SPItem *item, Geom::Rotate const &rotation);
 void sp_item_scale_rel (SPItem *item, Geom::Scale const &scale);
@@ -14,7 +16,7 @@ Geom::Affine get_scale_transform_for_variable_stroke (Geom::Rect const &bbox_vis
 Geom::Rect get_visual_bbox (Geom::OptRect const &initial_geom_bbox, Geom::Affine const &abs_affine, gdouble const initial_strokewidth, bool const transform_stroke);
 
 
-#endif /* !SP_ITEM_TRANSFORM_H */
+#endif // SEEN_SP_ITEM_TRANSFORM_H
 
 /*
   Local Variables:
diff --git a/src/sp-item-update-cns.h b/src/sp-item-update-cns.h
index bf8de715d..d0b080552 100644
--- a/src/sp-item-update-cns.h
+++ b/src/sp-item-update-cns.h
@@ -1,12 +1,15 @@
-#ifndef __SP_ITEM_UPDATE_CNS_H__
-#define __SP_ITEM_UPDATE_CNS_H__
-#include <forward.h>
+#ifndef SEEN_SP_ITEM_UPDATE_CNS_H
+#define SEEN_SP_ITEM_UPDATE_CNS_H
+
 #include <2geom/forward.h>
 
+class SPDesktop;
+class SPItem;
+
 void sp_item_update_cns(SPItem &item, SPDesktop const &desktop);
 
 
-#endif /* !__SP_ITEM_UPDATE_CNS_H__ */
+#endif // SEEN_SP_ITEM_UPDATE_CNS_H
 
 /*
   Local Variables:
diff --git a/src/sp-object-repr.h b/src/sp-object-repr.h
index 407af0bcc..0ac49bba4 100644
--- a/src/sp-object-repr.h
+++ b/src/sp-object-repr.h
@@ -12,7 +12,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "forward.h"
 #include "sp-object.h"
 namespace Inkscape {
 namespace XML {
diff --git a/src/sp-object.h b/src/sp-object.h
index 38d39c4cd..a4220e720 100644
--- a/src/sp-object.h
+++ b/src/sp-object.h
@@ -57,7 +57,6 @@ class SPObjectClass;
 #include <sigc++/functors/slot.h>
 #include <sigc++/signal.h>
 
-#include "forward.h"
 #include "version.h"
 #include "util/forward-pointer-iterator.h"
 #include "desktop-style.h"
@@ -111,7 +110,9 @@ enum {
     SP_XML_SPACE_PRESERVE
 };
 
+class SPDocument;
 class SPIXmlSpace;
+class SPObject;
 
 /// Internal class consisting of two bits.
 struct SPIXmlSpace {
@@ -119,7 +120,6 @@ struct SPIXmlSpace {
     guint value : 1;
 };
 
-class SPObject;
 
 /*
  * Refcounting
diff --git a/src/sp-pattern.h b/src/sp-pattern.h
index acfa3e76e..cb6d1dbf0 100644
--- a/src/sp-pattern.h
+++ b/src/sp-pattern.h
@@ -15,7 +15,6 @@
 
 #include <gtk/gtk.h>
 
-#include "forward.h"
 #include "sp-item.h"
 #define SP_TYPE_PATTERN (sp_pattern_get_type ())
 #define SP_PATTERN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_PATTERN, SPPattern))
@@ -25,6 +24,7 @@
 
 GType sp_pattern_get_type (void);
 
+class SPPattern;
 class SPPatternClass;
 
 #include "svg/svg-length.h"
@@ -34,6 +34,7 @@ class SPPatternClass;
 #include <stddef.h>
 #include <sigc++/connection.h>
 
+
 class SPPatternReference : public Inkscape::URIReference {
 public:
     SPPatternReference (SPObject *obj) : URIReference(obj) {}
diff --git a/src/sp-tref-reference.h b/src/sp-tref-reference.h
index 2e340f423..2d12437d9 100644
--- a/src/sp-tref-reference.h
+++ b/src/sp-tref-reference.h
@@ -12,7 +12,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
-#include <forward.h>
 #include "sp-item.h"
 #include <uri-references.h>
 #include <stddef.h>
diff --git a/src/sp-use-reference.h b/src/sp-use-reference.h
index 25a67b85b..bbedb9875 100644
--- a/src/sp-use-reference.h
+++ b/src/sp-use-reference.h
@@ -9,7 +9,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
-#include <forward.h>
 #include "sp-item.h"
 #include <uri-references.h>
 #include <stddef.h>
diff --git a/src/style.h b/src/style.h
index 6150b03c7..6c9ee992e 100644
--- a/src/style.h
+++ b/src/style.h
@@ -16,7 +16,6 @@
  */
 
 #include "color.h"
-#include "forward.h"
 #include "sp-marker-loc.h"
 #include "sp-filter.h"
 #include "sp-filter-reference.h"
diff --git a/src/text-chemistry.h b/src/text-chemistry.h
index cb86fc6c6..1ae0a1779 100644
--- a/src/text-chemistry.h
+++ b/src/text-chemistry.h
@@ -1,5 +1,5 @@
-#ifndef __TEXT_CHEMISTRY_H__
-#define __TEXT_CHEMISTRY_H__
+#ifndef SEEN_TEXT_CHEMISTRY_H
+#define SEEN_TEXT_CHEMISTRY_H
 
 /*
  * Text commands
@@ -12,16 +12,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "forward.h"
-
-void text_put_on_path (void);
-void text_remove_from_path (void);
-void text_remove_all_kerns (void);
+void text_put_on_path(void);
+void text_remove_from_path(void);
+void text_remove_all_kerns(void);
 void text_flow_into_shape();
 void text_unflow();
 void flowtext_to_text();
 
-#endif
+#endif // SEEN_TEXT_CHEMISTRY_H
 
 /*
   Local Variables:
diff --git a/src/tools-switch.h b/src/tools-switch.h
index 75c728179..9765def92 100644
--- a/src/tools-switch.h
+++ b/src/tools-switch.h
@@ -12,7 +12,11 @@
 #ifndef SEEN_TOOLS_SWITCH_H
 #define SEEN_TOOLS_SWITCH_H
 
-#include <forward.h>
+class SPDesktop;
+class SPItem;
+namespace Geom {
+class Point;
+}
 
 enum {
   TOOLS_INVALID,
@@ -44,7 +48,7 @@ int tools_active(SPDesktop *dt);
 void tools_switch(SPDesktop *dt, int num);
 void tools_switch_by_item (SPDesktop *dt, SPItem *item, Geom::Point const p);
 
-#endif /* !SEEN_TOOLS_SWITCH_H */
+#endif // !SEEN_TOOLS_SWITCH_H
 
 /*
   Local Variables:
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; }
diff --git a/src/uri-references.h b/src/uri-references.h
index 938dd4cd8..631d440da 100644
--- a/src/uri-references.h
+++ b/src/uri-references.h
@@ -1,5 +1,5 @@
-#ifndef __SP_URI_REFERENCES_H__
-#define __SP_URI_REFERENCES_H__
+#ifndef SEEN_SP_URI_REFERENCES_H
+#define SEEN_SP_URI_REFERENCES_H
 
 /*
  * Helper methods for resolving URI References
@@ -19,11 +19,12 @@
 #include <sigc++/trackable.h>
 
 #include "bad-uri-exception.h"
-#include "forward.h"
 #include "sp-object.h"
 
 namespace Inkscape {
 
+class URI;
+
 /**
  * A class encapsulating a reference to a particular URI; observers can
  * be notified when the URI comes to reference a different SPObject.
@@ -152,4 +153,15 @@ SPObject* sp_css_uri_reference_resolve( SPDocument *document, const gchar *uri )
 
 SPObject *sp_uri_reference_resolve (SPDocument *document, const gchar *uri);
 
-#endif
+#endif // SEEN_SP_URI_REFERENCES_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/verbs.h b/src/verbs.h
index 364a9a598..7c16ff530 100644
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -21,10 +21,18 @@
 #include <string.h>
 #include "config.h"
 #include "require-config.h"   /* HAVE_GTK_WINDOW_FULLSCREEN */
-#include "forward.h"
 #include <glibmm/ustring.h>
 
 struct SPAction;
+class SPDocument;
+
+namespace Inkscape {
+namespace UI {
+namespace View {
+class View;
+} // namespace View
+} // namespace UI
+} // namespace Inkscape
 
 /** \brief This anonymous enum is used to provide a list of the Verbs
            which are defined staticly in the verb files.  There may be
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 {