Kill ancient gcc version check in configure.ac and fix a load of broken forward declarations

(bzr r12203)

61 files changed, 67 insertions, 99 deletions

diff --git a/configure.ac b/configure.ac
index c92828905..219748f28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,31 +130,6 @@ if test "$GCC" = "yes"; then
   # C++-specific flags are defined further below.  Look for CXXFLAGS...
 fi
 
-dnl Verify our GCC version
-if test "x$GXX" = "xyes"; then
-	AC_MSG_CHECKING([GNU compiler version])
-
-	# Don't pass CXXFLAGS to the following CXX command as some 
-	# of them can't be specified along with '-v'.
-	cc_version=["`$CXX -v 2>&1 </dev/null |grep 'gcc version' |\
-		sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"]
-
-	AC_MSG_RESULT([$cc_version])
-
-	# Some version numbers
-	cc_vers_major=`echo $cc_version | cut -f1 -d.`
-	cc_vers_minor=`echo $cc_version | cut -f2 -d.`
-	cc_vers_patch=`echo $cc_version | cut -f3 -d.`
-	test -n "$cc_vers_major" || cc_vers_major=0
-	test -n "$cc_vers_minor" || cc_vers_minor=0
-	test -n "$cc_vers_patch" || cc_vers_patch=0
-	cc_vers_all=`expr $cc_vers_major '*' 1000000 + $cc_vers_minor '*' 1000 + $cc_vers_patch`
-
-	if test $cc_vers_major -lt 3; then
-		AC_MSG_ERROR([gcc >= 3.0 is needed to compile inkscape])
-	fi
-fi
-
 # Detect a working version of unordered containers.
 AC_MSG_CHECKING([TR1 unordered_set usability])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <tr1/unordered_set>]],
diff --git a/src/box3d-side.h b/src/box3d-side.h
index ed4972e29..dee775fca 100644
--- a/src/box3d-side.h
+++ b/src/box3d-side.h
@@ -23,9 +23,7 @@
 #define SP_IS_BOX3D_SIDE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_BOX3D_SIDE))
 
 class SPBox3D;
-class Box3DSide;
-class Box3DSideClass;
-class Persp3D;
+struct Persp3D;
 
 // FIXME: Would it be better to inherit from SPPath instead?
 struct Box3DSide : public SPPolygon {
diff --git a/src/box3d.h b/src/box3d.h
index 5dbf0cf5e..320edadf4 100644
--- a/src/box3d.h
+++ b/src/box3d.h
@@ -26,8 +26,7 @@
 #define SP_IS_BOX3D(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_BOX3D))
 #define SP_IS_BOX3D_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_BOX3D))
 
-class Box3DSide;
-class Persp3D;
+struct Persp3D;
 class Persp3DReference;
 
 class SPBox3D : public SPGroup {
diff --git a/src/cms-system.h b/src/cms-system.h
index c528deb94..ecaba956e 100644
--- a/src/cms-system.h
+++ b/src/cms-system.h
@@ -15,7 +15,7 @@ class SPDocument;
 
 namespace Inkscape {
 
-class ColorProfile;
+struct ColorProfile;
 
 class CMSSystem {
 public:
diff --git a/src/connector-context.h b/src/connector-context.h
index e157bbf50..597feac38 100644
--- a/src/connector-context.h
+++ b/src/connector-context.h
@@ -27,7 +27,7 @@
 #define SP_IS_CONNECTOR_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), SP_TYPE_CONNECTOR_CONTEXT))
 
 struct SPKnot;
-struct SPCurve;
+class SPCurve;
 
 namespace Inkscape
 {
diff --git a/src/desktop-handles.h b/src/desktop-handles.h
index 6bf6f87d2..de0d45273 100644
--- a/src/desktop-handles.h
+++ b/src/desktop-handles.h
@@ -17,7 +17,7 @@
 class SPDesktop;
 class SPDocument;
 class SPEventContext;
-class SPNamedView;
+struct SPNamedView;
 struct SPCanvas;
 struct SPCanvasGroup;
 struct SPCanvasItem;
diff --git a/src/display/canvas-bpath.h b/src/display/canvas-bpath.h
index f0520f012..72eca6eeb 100644
--- a/src/display/canvas-bpath.h
+++ b/src/display/canvas-bpath.h
@@ -22,7 +22,7 @@
 struct SPCanvasBPath;
 struct SPCanvasBPathClass;
 struct SPCanvasGroup;
-struct SPCurve;
+class SPCurve;
 
 #define SP_TYPE_CANVAS_BPATH (sp_canvas_bpath_get_type ())
 #define SP_CANVAS_BPATH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CANVAS_BPATH, SPCanvasBPath))
diff --git a/src/document-undo.h b/src/document-undo.h
index 087e12b5a..f19ba9bb2 100644
--- a/src/document-undo.h
+++ b/src/document-undo.h
@@ -7,7 +7,7 @@ class SPDesktop;
 
 namespace Inkscape {
 
-class Application;
+struct Application;
 
 class DocumentUndo
 {
diff --git a/src/document.h b/src/document.h
index ca709a8b6..1255edcb0 100644
--- a/src/document.h
+++ b/src/document.h
@@ -31,7 +31,6 @@ namespace Avoid {
 class Router;
 }
 
-struct SPDesktop;
 class  SPItem;
 class  SPObject;
 struct SPGroup;
@@ -45,14 +44,14 @@ namespace Inkscape {
     class EventLog;
     class ProfileManager;
     namespace XML {
-        class Document;
+        struct Document;
         class Node;
     }
 }
 
 class SPDefs;
 class SP3DBox;
-class Persp3D;
+struct Persp3D;
 class Persp3DImpl;
 class SPItemCtx;
 
diff --git a/src/draw-anchor.h b/src/draw-anchor.h
index fc3ebaffc..89ff8b180 100644
--- a/src/draw-anchor.h
+++ b/src/draw-anchor.h
@@ -9,7 +9,7 @@
 #include <2geom/point.h>
 
 struct SPDrawContext;
-struct SPCurve;
+class SPCurve;
 struct SPCanvasItem;
 
 /// The drawing anchor.
diff --git a/src/extension/effect.h b/src/extension/effect.h
index 6616a23ec..193b90a97 100644
--- a/src/extension/effect.h
+++ b/src/extension/effect.h
@@ -20,7 +20,7 @@ namespace Gtk {
 	class VBox;
 }
 
-struct SPDocument;
+class SPDocument;
 
 namespace Inkscape {
 
diff --git a/src/extension/extension.h b/src/extension/extension.h
index dcabb3df7..b6b4c51ed 100644
--- a/src/extension/extension.h
+++ b/src/extension/extension.h
@@ -71,7 +71,7 @@ namespace Gtk {
 #define INKSCAPE_EXTENSION_NS_NC "extension"
 #define INKSCAPE_EXTENSION_NS    "extension:"
 
-struct SPDocument;
+class SPDocument;
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/filter/filter.h b/src/extension/internal/filter/filter.h
index 1e8a3be0f..9aaa84aec 100644
--- a/src/extension/internal/filter/filter.h
+++ b/src/extension/internal/filter/filter.h
@@ -19,7 +19,7 @@
 namespace Inkscape {
 
 namespace XML {
-	class Document;
+	struct Document;
 }
 
 namespace Extension {
diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
index a550565d6..46cddd73b 100644
--- a/src/extension/internal/pdfinput/svg-builder.h
+++ b/src/extension/internal/pdfinput/svg-builder.h
@@ -19,7 +19,7 @@
 class SPDocument;
 namespace Inkscape {
     namespace XML {
-        class Document;
+        struct Document;
         class Node;
     }
 }
diff --git a/src/extension/output.h b/src/extension/output.h
index 5f6785b8b..c5b1beb45 100644
--- a/src/extension/output.h
+++ b/src/extension/output.h
@@ -15,7 +15,7 @@
 
 #include <gtk/gtk.h>
 #include "extension.h"
-struct SPDocument;
+class SPDocument;
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/file.h b/src/file.h
index 6ef60469a..b8e15bf3e 100644
--- a/src/file.h
+++ b/src/file.h
@@ -18,8 +18,8 @@
 #include <glibmm/ustring.h>
 #include "ui/dialog/ocaldialogs.h"
 
-struct SPDesktop;
-struct SPDocument;
+class SPDesktop;
+class SPDocument;
 class SPObject;
 
 namespace Inkscape {
diff --git a/src/helper/pixbuf-ops.h b/src/helper/pixbuf-ops.h
index af573277c..44851d388 100644
--- a/src/helper/pixbuf-ops.h
+++ b/src/helper/pixbuf-ops.h
@@ -14,7 +14,7 @@
 
 #include <glib.h>
 
-struct SPDocument;
+class SPDocument;
 
 bool sp_export_jpg_file (SPDocument *doc, gchar const *filename, double x0, double y0, double x1, double y1,
              unsigned int width, unsigned int height, double xdpi, double ydpi, unsigned long bgcolor, double quality, GSList *items_only = NULL);
diff --git a/src/helper/png-write.h b/src/helper/png-write.h
index a8658ef88..8c04b25dc 100644
--- a/src/helper/png-write.h
+++ b/src/helper/png-write.h
@@ -16,7 +16,7 @@
 
 #include <glib.h>
 #include <2geom/forward.h>
-struct SPDocument;
+class SPDocument;
 
 enum ExportResult {
     EXPORT_ERROR = 0,
diff --git a/src/inkscape.h b/src/inkscape.h
index 6ab07be86..368c7fa60 100644
--- a/src/inkscape.h
+++ b/src/inkscape.h
@@ -15,15 +15,15 @@
 #include <list>
 #include <glib.h>
 
-struct SPDesktop;
-struct SPDocument;
+class SPDesktop;
+class SPDocument;
 struct SPEventContext;
 
 namespace Inkscape {
     struct Application;
     namespace XML {
         class Node;
-        class Document;
+        struct Document;
         }
 }
 
diff --git a/src/knot.h b/src/knot.h
index ec640df3a..4d87d703f 100644
--- a/src/knot.h
+++ b/src/knot.h
@@ -24,8 +24,6 @@
 #include "sp-item.h"
 
 class SPDesktop;
-class SPKnot;
-class SPKnotClass;
 struct SPCanvasItem;
 
 #define SP_TYPE_KNOT            (sp_knot_get_type())
diff --git a/src/knotholder.h b/src/knotholder.h
index 792a0c912..eab981184 100644
--- a/src/knotholder.h
+++ b/src/knotholder.h
@@ -35,7 +35,7 @@ class PowerStrokePointArrayParamKnotHolderEntity;
 class KnotHolderEntity;
 class SPItem;
 class SPDesktop;
-class SPKnot;
+struct SPKnot;
 
 /* fixme: Think how to make callbacks most sensitive (Lauris) */
 typedef void (* SPKnotHolderReleasedFunc) (SPItem *item);
diff --git a/src/line-geometry.h b/src/line-geometry.h
index dcd157d47..48baad265 100644
--- a/src/line-geometry.h
+++ b/src/line-geometry.h
@@ -19,6 +19,8 @@
 #include "document.h"
 #include "ui/view/view.h"
 
+class SPDesktop;
+
 namespace Box3D {
 
 class Line {
diff --git a/src/live_effects/lpeobject.h b/src/live_effects/lpeobject.h
index 3ea1ea9ad..2d04f8842 100644
--- a/src/live_effects/lpeobject.h
+++ b/src/live_effects/lpeobject.h
@@ -15,7 +15,7 @@
 namespace Inkscape {
     namespace XML {
         class Node;
-        class Document;
+        struct Document;
     }
     namespace LivePathEffect {
         class Effect;
diff --git a/src/profile-manager.h b/src/profile-manager.h
index be9446c17..9d361f40c 100644
--- a/src/profile-manager.h
+++ b/src/profile-manager.h
@@ -17,7 +17,7 @@ class SPDocument;
 
 namespace Inkscape {
 
-class ColorProfile;
+struct ColorProfile;
 
 class ProfileManager : public DocumentSubset,
                        public GC::Finalized
diff --git a/src/satisfied-guide-cns.h b/src/satisfied-guide-cns.h
index 27fe043d0..73e1e7e7f 100644
--- a/src/satisfied-guide-cns.h
+++ b/src/satisfied-guide-cns.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include <sp-item.h>
 
+class SPDesktop;
 class SPGuideConstraint;
 
 void satisfied_guide_cns(SPDesktop const &desktop,
diff --git a/src/selection-chemistry.h b/src/selection-chemistry.h
index 5b35ded09..83dd93bdd 100644
--- a/src/selection-chemistry.h
+++ b/src/selection-chemistry.h
@@ -29,6 +29,7 @@ namespace LivePathEffect {
 }
 
 class SPCSSAttr;
+class SPDesktop;
 
 namespace Inkscape {
     class SelectionHelper {
diff --git a/src/selection.h b/src/selection.h
index 85e06a5c6..10775dcb5 100644
--- a/src/selection.h
+++ b/src/selection.h
@@ -27,9 +27,10 @@
 #include "sp-item.h"
 #include "snapped-point.h"
 
+class SPDesktop;
 class SPItem;
 class SPBox3D;
-class Persp3D;
+struct Persp3D;
 
 namespace Inkscape {
 namespace XML {
diff --git a/src/snap.h b/src/snap.h
index 67af20063..6a87d95cc 100644
--- a/src/snap.h
+++ b/src/snap.h
@@ -31,7 +31,7 @@ enum SPGuideDragType { // used both here and in desktop-events.cpp
 };
 
 class SPGuide;
-class SPNamedView;
+struct SPNamedView;
 
 /**
  * Class to coordinate snapping operations.
diff --git a/src/sp-conn-end-pair.h b/src/sp-conn-end-pair.h
index 53dd61ccf..9f7f5a5d2 100644
--- a/src/sp-conn-end-pair.h
+++ b/src/sp-conn-end-pair.h
@@ -21,7 +21,7 @@
 
 
 class SPConnEnd;
-struct SPCurve;
+class SPCurve;
 class SPPath;
 class SPItem;
 class SPObject;
diff --git a/src/sp-ellipse.h b/src/sp-ellipse.h
index 5074be354..d22501f6b 100644
--- a/src/sp-ellipse.h
+++ b/src/sp-ellipse.h
@@ -27,9 +27,6 @@ G_BEGIN_DECLS
 #define SP_IS_GENERICELLIPSE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_GENERICELLIPSE))
 #define SP_IS_GENERICELLIPSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_GENERICELLIPSE))
 
-class SPGenericEllipse;
-class SPGenericEllipseClass;
-
 struct SPGenericEllipse : public SPShape {
 	SVGLength cx;
 	SVGLength cy;
diff --git a/src/sp-guide.h b/src/sp-guide.h
index c39252066..45ce405cd 100644
--- a/src/sp-guide.h
+++ b/src/sp-guide.h
@@ -21,6 +21,7 @@
 
 struct SPCanvas;
 struct SPCanvasGroup;
+class SPDesktop;
 
 G_BEGIN_DECLS
 
diff --git a/src/sp-item.h b/src/sp-item.h
index 85ef3531e..a3ba1dbe2 100644
--- a/src/sp-item.h
+++ b/src/sp-item.h
@@ -30,7 +30,7 @@
 class SPGuideConstraint;
 struct SPClipPathReference;
 struct SPMaskReference;
-struct SPAvoidRef;
+class SPAvoidRef;
 struct SPPrintContext;
 
 namespace Inkscape {
diff --git a/src/sp-lpe-item.h b/src/sp-lpe-item.h
index 69fde5d58..2ed073dc3 100644
--- a/src/sp-lpe-item.h
+++ b/src/sp-lpe-item.h
@@ -25,7 +25,8 @@
 #define SP_IS_LPE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_LPE_ITEM))
 
 struct LivePathEffectObject;
-struct SPCurve;
+class SPCurve;
+class SPDesktop;
 
 namespace Inkscape{ 
 namespace Display {
diff --git a/src/sp-object.h b/src/sp-object.h
index 5828eda13..19df6a554 100644
--- a/src/sp-object.h
+++ b/src/sp-object.h
@@ -58,15 +58,13 @@ class SPObjectClass;
 #include "version.h"
 #include "util/forward-pointer-iterator.h"
 
-
-class  SPDesktop;
-struct SPCSSAttr;
+class SPCSSAttr;
 struct SPStyle;
 
 namespace Inkscape {
 namespace XML {
 class Node;
-class Document;
+struct Document;
 }
 }
 
@@ -90,8 +88,6 @@ typedef enum {
     SP_INVALID_ACCESS_ERR
 } SPExceptionType;
 
-class SPException;
-
 /// An attempt to implement exceptions, unused?
 struct SPException {
     SPExceptionType code;
@@ -100,8 +96,6 @@ struct SPException {
 #define SP_EXCEPTION_INIT(ex) {(ex)->code = SP_NO_EXCEPTION;}
 #define SP_EXCEPTION_IS_OK(ex) (!(ex) || ((ex)->code == SP_NO_EXCEPTION))
 
-class SPCtx;
-
 /// Unused
 struct SPCtx {
     unsigned int flags;
@@ -113,8 +107,6 @@ enum {
 };
 
 class SPDocument;
-class SPIXmlSpace;
-class SPObject;
 
 /// Internal class consisting of two bits.
 struct SPIXmlSpace {
diff --git a/src/text-editing.h b/src/text-editing.h
index deb6f8538..04ef6461d 100644
--- a/src/text-editing.h
+++ b/src/text-editing.h
@@ -19,6 +19,7 @@
 #include "text-tag-attributes.h"
 
 class  SPCSSAttr;
+class  SPDesktop;
 class  SPItem;
 class  SPObject;
 struct SPStyle;
diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h
index 9d2fac71f..0a6e3a786 100644
--- a/src/ui/dialog/xml-tree.h
+++ b/src/ui/dialog/xml-tree.h
@@ -28,7 +28,7 @@
 #include "ui/dialog/desktop-tracker.h"
 #include "message.h"
 
-struct SPDesktop;
+class SPDesktop;
 struct SPObject;
 struct SPXMLViewAttrList;
 struct SPXMLViewContent;
diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h
index a51b8c410..cb4f69b9a 100644
--- a/src/ui/tool/path-manipulator.h
+++ b/src/ui/tool/path-manipulator.h
@@ -21,7 +21,7 @@
 #include "ui/tool/manipulator.h"
 
 struct SPCanvasItem;
-struct SPCurve;
+class SPCurve;
 struct SPPath;
 
 namespace Inkscape {
diff --git a/src/ui/view/view-widget.h b/src/ui/view/view-widget.h
index 668f9d19a..295e7932b 100644
--- a/src/ui/view/view-widget.h
+++ b/src/ui/view/view-widget.h
@@ -23,7 +23,7 @@ class View;
 } // namespace Inkscape
 
 class SPViewWidget;
-class SPNamedView;
+struct SPNamedView;
 
 #define SP_TYPE_VIEW_WIDGET (sp_view_widget_get_type ())
 #define SP_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_VIEW_WIDGET, SPViewWidget))
diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h
index d3a208525..c7c09a816 100644
--- a/src/ui/widget/object-composite-settings.h
+++ b/src/ui/widget/object-composite-settings.h
@@ -21,6 +21,8 @@
 #include "ui/widget/filter-effect-chooser.h"
 #include "ui/widget/spinbutton.h"
 
+class SPDesktop;
+
 namespace Inkscape {
 class Application;
 
diff --git a/src/widgets/arc-toolbar.h b/src/widgets/arc-toolbar.h
index 69d7b8a17..dba2fcd5a 100644
--- a/src/widgets/arc-toolbar.h
+++ b/src/widgets/arc-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_arc_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/box3d-toolbar.h b/src/widgets/box3d-toolbar.h
index 50535b8de..d80934b01 100644
--- a/src/widgets/box3d-toolbar.h
+++ b/src/widgets/box3d-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void box3d_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/calligraphy-toolbar.h b/src/widgets/calligraphy-toolbar.h
index 5b2e3c5d4..9650e03b1 100644
--- a/src/widgets/calligraphy-toolbar.h
+++ b/src/widgets/calligraphy-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void sp_calligraphy_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 void update_presets_list(GObject *tbl);
diff --git a/src/widgets/connector-toolbar.h b/src/widgets/connector-toolbar.h
index 6e69cf047..2ab26e56c 100644
--- a/src/widgets/connector-toolbar.h
+++ b/src/widgets/connector-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_connector_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/dropper-toolbar.h b/src/widgets/dropper-toolbar.h
index eee50ae5c..aa2116daf 100644
--- a/src/widgets/dropper-toolbar.h
+++ b/src/widgets/dropper-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_dropper_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/erasor-toolbar.h b/src/widgets/erasor-toolbar.h
index f00ceebe4..b1bb3a3fa 100644
--- a/src/widgets/erasor-toolbar.h
+++ b/src/widgets/erasor-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_eraser_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/gradient-toolbar.h b/src/widgets/gradient-toolbar.h
index 980a41a83..74cfb2886 100644
--- a/src/widgets/gradient-toolbar.h
+++ b/src/widgets/gradient-toolbar.h
@@ -13,7 +13,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void sp_gradient_toolbox_prep(SPDesktop * /*desktop*/, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/lpe-toolbar.h b/src/widgets/lpe-toolbar.h
index 837ef4c1e..1796f8027 100644
--- a/src/widgets/lpe-toolbar.h
+++ b/src/widgets/lpe-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_lpetool_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/measure-toolbar.h b/src/widgets/measure-toolbar.h
index 7ec6cd6c3..4b90ccb9f 100644
--- a/src/widgets/measure-toolbar.h
+++ b/src/widgets/measure-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_measure_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/mesh-toolbar.h b/src/widgets/mesh-toolbar.h
index 277525804..f84cff59b 100644
--- a/src/widgets/mesh-toolbar.h
+++ b/src/widgets/mesh-toolbar.h
@@ -15,7 +15,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void sp_mesh_toolbox_prep(    SPDesktop * /*desktop*/, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/node-toolbar.h b/src/widgets/node-toolbar.h
index ac57a0f80..dcccf1712 100644
--- a/src/widgets/node-toolbar.h
+++ b/src/widgets/node-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/paintbucket-toolbar.h b/src/widgets/paintbucket-toolbar.h
index f49861e1f..fe25c7fe2 100644
--- a/src/widgets/paintbucket-toolbar.h
+++ b/src/widgets/paintbucket-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_paintbucket_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/pencil-toolbar.h b/src/widgets/pencil-toolbar.h
index 89269d668..14f1e8930 100644
--- a/src/widgets/pencil-toolbar.h
+++ b/src/widgets/pencil-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void    sp_pencil_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 void    sp_pen_toolbox_prep(SPDesktop * /*desktop*/, GtkActionGroup* mainActions, GObject* holder);
diff --git a/src/widgets/rect-toolbar.h b/src/widgets/rect-toolbar.h
index 2f22d7e27..e123c095b 100644
--- a/src/widgets/rect-toolbar.h
+++ b/src/widgets/rect-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_rect_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/spiral-toolbar.h b/src/widgets/spiral-toolbar.h
index 3e4d7b46f..194b54bce 100644
--- a/src/widgets/spiral-toolbar.h
+++ b/src/widgets/spiral-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_spiral_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/spray-toolbar.h b/src/widgets/spray-toolbar.h
index 8ac0ec9af..170b6bb8e 100644
--- a/src/widgets/spray-toolbar.h
+++ b/src/widgets/spray-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/star-toolbar.h b/src/widgets/star-toolbar.h
index 793f73f8b..6f91d5570 100644
--- a/src/widgets/star-toolbar.h
+++ b/src/widgets/star-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_star_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/text-toolbar.h b/src/widgets/text-toolbar.h
index 34109c022..68158d201 100644
--- a/src/widgets/text-toolbar.h
+++ b/src/widgets/text-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/tweak-toolbar.h b/src/widgets/tweak-toolbar.h
index 64608de70..6f840f2c1 100644
--- a/src/widgets/tweak-toolbar.h
+++ b/src/widgets/tweak-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/widgets/zoom-toolbar.h b/src/widgets/zoom-toolbar.h
index 9f1af4e5e..b8d6a42af 100644
--- a/src/widgets/zoom-toolbar.h
+++ b/src/widgets/zoom-toolbar.h
@@ -28,7 +28,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void       sp_zoom_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);
 
diff --git a/src/xml/event-fns.h b/src/xml/event-fns.h
index 65c65c48c..5e3b43ad8 100644
--- a/src/xml/event-fns.h
+++ b/src/xml/event-fns.h
@@ -4,7 +4,7 @@
 namespace Inkscape {
 namespace XML {
 
-class Document;
+struct Document;
 class Event;
 class NodeObserver;
 
diff --git a/src/xml/rebase-hrefs.h b/src/xml/rebase-hrefs.h
index adb09e52a..5baf96516 100644
--- a/src/xml/rebase-hrefs.h
+++ b/src/xml/rebase-hrefs.h
@@ -4,7 +4,7 @@
 #include <glib.h>
 #include "util/list.h"
 #include "xml/attribute-record.h"
-struct SPDocument;
+class SPDocument;
 
 namespace Inkscape {
 namespace XML {