Fix even more forward declaration tags

(bzr r12206)

52 files changed, 80 insertions, 109 deletions

diff --git a/src/display/guideline.h b/src/display/guideline.h
index 164244c46..2d9a87d9b 100644
--- a/src/display/guideline.h
+++ b/src/display/guideline.h
@@ -21,7 +21,7 @@
 #define SP_GUIDELINE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_GUIDELINE, SPGuideLine))
 #define SP_IS_GUIDELINE(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_GUIDELINE))
 
-class SPCtrlPoint;
+struct SPCtrlPoint;
 
 struct SPGuideLine {
     SPCanvasItem item;
diff --git a/src/display/nr-filter-diffuselighting.h b/src/display/nr-filter-diffuselighting.h
index 043a5eb39..15cc8e1ff 100644
--- a/src/display/nr-filter-diffuselighting.h
+++ b/src/display/nr-filter-diffuselighting.h
@@ -19,9 +19,9 @@
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
 
-class SPFeDistantLight;
-class SPFePointLight;
-class SPFeSpotLight;
+struct SPFeDistantLight;
+struct SPFePointLight;
+struct SPFeSpotLight;
 struct SVGICCColor;
 
 namespace Inkscape {
diff --git a/src/display/nr-filter-specularlighting.h b/src/display/nr-filter-specularlighting.h
index c57e3a9ff..0d1c0644f 100644
--- a/src/display/nr-filter-specularlighting.h
+++ b/src/display/nr-filter-specularlighting.h
@@ -17,9 +17,9 @@
 #include "display/nr-light-types.h"
 #include "display/nr-filter-primitive.h"
 
-class SPFeDistantLight;
-class SPFePointLight;
-class SPFeSpotLight;
+struct SPFeDistantLight;
+struct SPFePointLight;
+struct SPFeSpotLight;
 struct SVGICCColor;
 
 namespace Inkscape {
diff --git a/src/display/nr-style.h b/src/display/nr-style.h
index 725828089..80547c43e 100644
--- a/src/display/nr-style.h
+++ b/src/display/nr-style.h
@@ -16,7 +16,7 @@
 #include <2geom/rect.h>
 #include "color.h"
 
-class SPPaintServer;
+struct SPPaintServer;
 struct SPStyle;
 
 namespace Inkscape {
diff --git a/src/display/nr-svgfonts.h b/src/display/nr-svgfonts.h
index 6138e2fbb..1101f93f2 100644
--- a/src/display/nr-svgfonts.h
+++ b/src/display/nr-svgfonts.h
@@ -18,8 +18,8 @@
 
 class SvgFont;
 struct SPFont;
-class SPGlyph;
-class SPMissingGlyph;
+struct SPGlyph;
+struct SPMissingGlyph;
 
 struct _GdkEventExpose;
 typedef _GdkEventExpose GdkEventExpose;
diff --git a/src/document-subset.h b/src/document-subset.h
index 5f87e6429..298b7872d 100644
--- a/src/document-subset.h
+++ b/src/document-subset.h
@@ -51,7 +51,7 @@ private:
 
     void _remove(SPObject *obj, bool subtree);
 
-    class Relations;
+    struct Relations;
 
     Relations *_relations;
 };
diff --git a/src/extension/internal/cairo-render-context.h b/src/extension/internal/cairo-render-context.h
index 94c7bb294..8829940c6 100644
--- a/src/extension/internal/cairo-render-context.h
+++ b/src/extension/internal/cairo-render-context.h
@@ -29,7 +29,7 @@
 #include <cairo.h>
 
 class SPClipPath;
-class SPMask;
+struct SPMask;
 
 namespace Inkscape {
 namespace Extension {
@@ -37,8 +37,8 @@ namespace Internal {
 
 class CairoRenderer;
 class CairoRenderContext;
-class CairoRenderState;
-class CairoGlyphInfo;
+struct CairoRenderState;
+struct CairoGlyphInfo;
 
 // Holds info for rendering a glyph
 struct CairoGlyphInfo {
diff --git a/src/extension/internal/cairo-renderer.h b/src/extension/internal/cairo-renderer.h
index db3068fed..c1482d82e 100644
--- a/src/extension/internal/cairo-renderer.h
+++ b/src/extension/internal/cairo-renderer.h
@@ -28,7 +28,7 @@
 #include <cairo.h>
 
 class SPClipPath;
-class SPMask;
+struct SPMask;
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
index 46cddd73b..610822959 100644
--- a/src/extension/internal/pdfinput/svg-builder.h
+++ b/src/extension/internal/pdfinput/svg-builder.h
@@ -31,10 +31,10 @@ namespace Inkscape {
 #include "CharTypes.h"
 class GooString;
 class Function;
-struct GfxState;
-class GfxColor;
+class GfxState;
+struct GfxColor;
 class GfxColorSpace;
-class GfxRGB;
+struct GfxRGB;
 class GfxPath;
 class GfxPattern;
 class GfxTilingPattern;
diff --git a/src/filters/colormatrix.h b/src/filters/colormatrix.h
index 8eb750ac1..558f01070 100644
--- a/src/filters/colormatrix.h
+++ b/src/filters/colormatrix.h
@@ -21,8 +21,6 @@
 #define SP_IS_FECOLORMATRIX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FECOLORMATRIX))
 #define SP_IS_FECOLORMATRIX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FECOLORMATRIX))
 
-class SPFeColorMatrixClass;
-
 struct SPFeColorMatrix : public SPFilterPrimitive {
     Inkscape::Filters::FilterColorMatrixType type;
     gdouble value;
diff --git a/src/filters/componenttransfer-funcnode.h b/src/filters/componenttransfer-funcnode.h
index d81e50577..ae1b2f8bb 100644
--- a/src/filters/componenttransfer-funcnode.h
+++ b/src/filters/componenttransfer-funcnode.h
@@ -34,11 +34,6 @@
 
 #define SP_IS_FEFUNCNODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FEFUNCNODE))
 
-/* Component Transfer funcNode class */
-
-class SPFeFuncNode;
-class SPFeFuncNodeClass;
-
 struct SPFeFuncNode : public SPObject {
     Inkscape::Filters::FilterComponentTransferType type;
     std::vector<double> tableValues;
@@ -49,6 +44,7 @@ struct SPFeFuncNode : public SPObject {
     double offset;
 };
 
+/* Component Transfer funcNode class */
 struct SPFeFuncNodeClass {
     SPObjectClass parent_class;
 };
diff --git a/src/filters/componenttransfer.h b/src/filters/componenttransfer.h
index 2df64009f..deb6fb740 100644
--- a/src/filters/componenttransfer.h
+++ b/src/filters/componenttransfer.h
@@ -24,8 +24,6 @@ namespace Filters {
 class FilterComponentTransfer;
 } }
 
-class SPFeComponentTransferClass;
-
 struct SPFeComponentTransfer : public SPFilterPrimitive {
     Inkscape::Filters::FilterComponentTransfer *renderer;
 };
diff --git a/src/filters/convolvematrix.h b/src/filters/convolvematrix.h
index 4c5261e05..cb2fbfb8d 100644
--- a/src/filters/convolvematrix.h
+++ b/src/filters/convolvematrix.h
@@ -24,8 +24,6 @@
 #define SP_IS_FECONVOLVEMATRIX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FECONVOLVEMATRIX))
 #define SP_IS_FECONVOLVEMATRIX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FECONVOLVEMATRIX))
 
-class SPFeConvolveMatrixClass;
-
 struct SPFeConvolveMatrix : public SPFilterPrimitive {
     NumberOptNumber order;
     std::vector<gdouble> kernelMatrix;
diff --git a/src/filters/diffuselighting.h b/src/filters/diffuselighting.h
index 2be58d864..1572385b9 100644
--- a/src/filters/diffuselighting.h
+++ b/src/filters/diffuselighting.h
@@ -28,8 +28,6 @@ namespace Filters {
 class FilterDiffuseLighting;
 } }
 
-class SPFeDiffuseLightingClass;
-
 struct SPFeDiffuseLighting : public SPFilterPrimitive {
     gfloat surfaceScale;
     guint surfaceScale_set : 1;
diff --git a/src/filters/distantlight.h b/src/filters/distantlight.h
index a68746334..b1febf5d3 100644
--- a/src/filters/distantlight.h
+++ b/src/filters/distantlight.h
@@ -25,10 +25,6 @@
 
 /* Distant light class */
 
-
-class SPFeDistantLight;
-class SPFeDistantLightClass;
-
 struct SPFeDistantLight : public SPObject {
 
     /** azimuth attribute */
diff --git a/src/filters/flood.h b/src/filters/flood.h
index d60321689..ab9f061d6 100644
--- a/src/filters/flood.h
+++ b/src/filters/flood.h
@@ -23,8 +23,6 @@ G_BEGIN_DECLS
 #define SP_IS_FEFLOOD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FEFLOOD))
 #define SP_IS_FEFLOOD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FEFLOOD))
 
-class SPFeFloodClass;
-
 struct SPFeFlood : public SPFilterPrimitive {
     guint32 color;
     SVGICCColor *icc;
diff --git a/src/filters/image.h b/src/filters/image.h
index b4081602a..a96e650b7 100644
--- a/src/filters/image.h
+++ b/src/filters/image.h
@@ -24,8 +24,6 @@
 #define SP_IS_FEIMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FEIMAGE))
 #define SP_IS_FEIMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FEIMAGE))
 
-class SPFeImageClass;
-
 struct SPFeImage : public SPFilterPrimitive {
     gchar *href;
 
diff --git a/src/filters/merge.h b/src/filters/merge.h
index 3243073ca..40a9bb848 100644
--- a/src/filters/merge.h
+++ b/src/filters/merge.h
@@ -18,8 +18,6 @@
 #define SP_IS_FEMERGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FEMERGE))
 #define SP_IS_FEMERGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FEMERGE))
 
-class SPFeMergeClass;
-
 struct SPFeMerge : public SPFilterPrimitive {
     
 };
diff --git a/src/filters/mergenode.h b/src/filters/mergenode.h
index 8352632a6..edb35faec 100644
--- a/src/filters/mergenode.h
+++ b/src/filters/mergenode.h
@@ -21,9 +21,6 @@
 #define SP_FEMERGENODE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_FEMERGENODE, SPFeMergeNode))
 #define SP_IS_FEMERGENODE(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_FEMERGENODE))
 
-class SPFeMergeNode;
-class SPFeMergeNodeClass;
-
 struct SPFeMergeNode : public SPObject {
     int input;
 };
diff --git a/src/filters/morphology.h b/src/filters/morphology.h
index b7005a3d9..9084d1b94 100644
--- a/src/filters/morphology.h
+++ b/src/filters/morphology.h
@@ -22,8 +22,6 @@
 #define SP_IS_FEMORPHOLOGY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FEMORPHOLOGY))
 #define SP_IS_FEMORPHOLOGY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FEMORPHOLOGY))
 
-class SPFeMorphologyClass;
-
 struct SPFeMorphology : public SPFilterPrimitive {
     Inkscape::Filters::FilterMorphologyOperator Operator;
     NumberOptNumber radius;
diff --git a/src/filters/offset.h b/src/filters/offset.h
index dba7ed8ef..08954a8e4 100644
--- a/src/filters/offset.h
+++ b/src/filters/offset.h
@@ -20,8 +20,6 @@
 #define SP_IS_FEOFFSET(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FEOFFSET))
 #define SP_IS_FEOFFSET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FEOFFSET))
 
-class SPFeOffsetClass;
-
 struct SPFeOffset : public SPFilterPrimitive {
     double dx, dy;
 };
diff --git a/src/filters/pointlight.h b/src/filters/pointlight.h
index c0b272021..3ec5d5791 100644
--- a/src/filters/pointlight.h
+++ b/src/filters/pointlight.h
@@ -23,12 +23,6 @@
 #define SP_IS_FEPOINTLIGHT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FEPOINTLIGHT))
 #define SP_IS_FEPOINTLIGHT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FEPOINTLIGHT))
 
-/* Distant light class */
-
-
-class SPFePointLight;
-class SPFePointLightClass;
-
 struct SPFePointLight : public SPObject {
 
     /** x coordinate of the light source */
diff --git a/src/filters/specularlighting.h b/src/filters/specularlighting.h
index 5cfbcb07c..4b31eb4c4 100644
--- a/src/filters/specularlighting.h
+++ b/src/filters/specularlighting.h
@@ -31,8 +31,6 @@ class FilterSpecularLighting;
 }
 }
 
-class SPFeSpecularLightingClass;
-
 struct SPFeSpecularLighting : public SPFilterPrimitive {
     gfloat surfaceScale;
     guint surfaceScale_set : 1;
diff --git a/src/filters/spotlight.h b/src/filters/spotlight.h
index 6e2463c08..1750ca95b 100644
--- a/src/filters/spotlight.h
+++ b/src/filters/spotlight.h
@@ -23,12 +23,6 @@
 #define SP_IS_FESPOTLIGHT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FESPOTLIGHT))
 #define SP_IS_FESPOTLIGHT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FESPOTLIGHT))
 
-/* Distant light class */
-
-
-class SPFeSpotLight;
-class SPFeSpotLightClass;
-
 struct SPFeSpotLight : public SPObject {
 
     /** x coordinate of the light source */
diff --git a/src/filters/tile.h b/src/filters/tile.h
index a376a6e10..48a552fc8 100644
--- a/src/filters/tile.h
+++ b/src/filters/tile.h
@@ -21,8 +21,6 @@
 #define SP_IS_FETILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FETILE))
 
 /* FeTile base class */
-class SPFeTileClass;
-
 struct SPFeTile : public SPFilterPrimitive {
     
 };
diff --git a/src/filters/turbulence.h b/src/filters/turbulence.h
index cbc4fb082..bad8315c1 100644
--- a/src/filters/turbulence.h
+++ b/src/filters/turbulence.h
@@ -24,7 +24,6 @@
 #define SP_IS_FETURBULENCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FETURBULENCE))
 
 /* FeTurbulence base class */
-class SPFeTurbulenceClass;
 
 struct SPFeTurbulence : public SPFilterPrimitive {
     /** TURBULENCE ATTRIBUTES HERE */
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp
index 1d086b57b..0f853c681 100644
--- a/src/libnrtype/Layout-TNG-Output.cpp
+++ b/src/libnrtype/Layout-TNG-Output.cpp
@@ -26,7 +26,6 @@ namespace Inkscape {
     namespace Extension {
         namespace Internal {
             class CairoRenderContext;
-            class CairoGlyphInfo;
         }
     }
 }
diff --git a/src/measure-context.h b/src/measure-context.h
index baf74d30e..b7673ad0d 100644
--- a/src/measure-context.h
+++ b/src/measure-context.h
@@ -18,9 +18,6 @@
 #define SP_MEASURE_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_MEASURE_CONTEXT, SPMeasureContext))
 #define SP_IS_MEASURE_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_MEASURE_CONTEXT))
 
-class SPMeasureContext;
-class SPMeasureContextClass;
-
 struct SPMeasureContext {
 	SPEventContext event_context;
 	SPCanvasItem *grabbed;
diff --git a/src/mesh-context.h b/src/mesh-context.h
index ed93e404f..e5d06ec0a 100644
--- a/src/mesh-context.h
+++ b/src/mesh-context.h
@@ -27,9 +27,6 @@
 #define SP_IS_MESH_CONTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_MESH_CONTEXT))
 #define SP_IS_MESH_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_MESH_CONTEXT))
 
-class SPMeshContext;
-class SPMeshContextClass;
-
 struct SPMeshContext : public SPEventContext {
 
     Geom::Point origin;
diff --git a/src/seltrans-handles.h b/src/seltrans-handles.h
index f625ebd68..14f50d784 100644
--- a/src/seltrans-handles.h
+++ b/src/seltrans-handles.h
@@ -21,7 +21,7 @@ namespace Inkscape
   class SelTrans;
 }
 
-class SPSelTransHandle;
+struct SPSelTransHandle;
 
 // request handlers
 gboolean sp_sel_trans_scale_request(Inkscape::SelTrans *seltrans,
diff --git a/src/seltrans.h b/src/seltrans.h
index 55c109ed7..effc767e3 100644
--- a/src/seltrans.h
+++ b/src/seltrans.h
@@ -30,7 +30,7 @@ struct SPKnot;
 class  SPDesktop;
 struct SPCanvasItem;
 struct SPCtrlLine;
-class  SPSelTransHandle;
+struct SPSelTransHandle;
 
 namespace Inkscape
 {
diff --git a/src/sp-clippath.h b/src/sp-clippath.h
index a77383c63..17546c6d3 100644
--- a/src/sp-clippath.h
+++ b/src/sp-clippath.h
@@ -21,7 +21,7 @@
 #define SP_IS_CLIPPATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_CLIPPATH))
 #define SP_IS_CLIPPATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_CLIPPATH))
 
-class SPClipPathView;
+struct SPClipPathView;
 
 #include "sp-object-group.h"
 #include "uri-references.h"
diff --git a/src/sp-mask.h b/src/sp-mask.h
index 6f1653133..97cf95ae1 100644
--- a/src/sp-mask.h
+++ b/src/sp-mask.h
@@ -24,7 +24,7 @@
 #define SP_IS_MASK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_MASK))
 #define SP_IS_MASK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_MASK))
 
-class SPMaskView;
+struct SPMaskView;
 
 namespace Inkscape {
 
diff --git a/src/sp-metadata.h b/src/sp-metadata.h
index 82b7c4fc5..454fd8d18 100644
--- a/src/sp-metadata.h
+++ b/src/sp-metadata.h
@@ -21,9 +21,6 @@
 #define SP_METADATA(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_METADATA, SPMetadata))
 #define SP_IS_METADATA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_METADATA))
 
-class SPMetadata;
-class SPMetadataClass;
-
 struct SPMetadata : public SPObject {
 };
 
diff --git a/src/sp-switch.h b/src/sp-switch.h
index f0442f27b..24a204731 100644
--- a/src/sp-switch.h
+++ b/src/sp-switch.h
@@ -35,7 +35,7 @@ public:
     CSwitch(SPGroup *group);
     virtual ~CSwitch();
 
-    friend class SPSwitch;
+    friend struct SPSwitch;
     
     virtual void onChildAdded(Inkscape::XML::Node *child);
     virtual void onChildRemoved(Inkscape::XML::Node *child);
diff --git a/src/spray-context.h b/src/spray-context.h
index 64368c7a6..781bbcce8 100644
--- a/src/spray-context.h
+++ b/src/spray-context.h
@@ -27,9 +27,6 @@
 #define SP_IS_SPRAY_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_SPRAY_CONTEXT))
 #define SP_IS_SPRAY_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), SP_TYPE_SPRAY_CONTEXT))
 
-class SPSprayContext;
-class SPSprayContextClass;
-
 namespace Inkscape {
   namespace UI {
       namespace Dialog {
diff --git a/src/style.cpp b/src/style.cpp
index 650b08aea..eef1c6ee5 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -63,7 +63,7 @@ using std::vector;
 
 #define SP_CSS_FONT_SIZE_DEFAULT 12.0;
 
-class SPStyleEnum;
+struct SPStyleEnum;
 
 /*#########################
 ## FORWARD DECLARATIONS
diff --git a/src/svg-view.h b/src/svg-view.h
index aaaa8a9a5..89f38ad34 100644
--- a/src/svg-view.h
+++ b/src/svg-view.h
@@ -13,7 +13,7 @@
 
 #include "ui/view/view.h"
 
-class SPCanvasGroup;
+struct SPCanvasGroup;
 struct SPCanvasItem;
 
 
diff --git a/src/tweak-context.h b/src/tweak-context.h
index cb1cf301b..a4567ce6f 100644
--- a/src/tweak-context.h
+++ b/src/tweak-context.h
@@ -21,9 +21,6 @@
 #define SP_IS_TWEAK_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_TWEAK_CONTEXT))
 #define SP_IS_TWEAK_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), SP_TYPE_TWEAK_CONTEXT))
 
-class SPTweakContext;
-class SPTweakContextClass;
-
 #define SAMPLING_SIZE 8        /* fixme: ?? */
 
 #define TC_MIN_PRESSURE      0.0
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 603786742..66c9e6ed0 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -22,14 +22,21 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/buttonbox.h>
-#include <gtkmm/label.h>
-#include <gtkmm/widget.h>
-#include <gtkmm/togglebutton.h>
+#include <gtkmm/dialog.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/image.h>
-#include <gtkmm/stockid.h>
+#include <gtkmm/label.h>
+#include <gtkmm/spinbutton.h>
 #include <gtkmm/stock.h>
-#include <gtkmm/table.h>
+#include <gtkmm/stockid.h>
+#if WITH_GTKMM_3_0
+# include <gtkmm/grid.h>
+#else
+# include <gtkmm/table.h>
+#endif
+#include <gtkmm/togglebutton.h>
+#include <gtkmm/widget.h>
+
 #ifdef WITH_GNOME_VFS
 # include <libgnomevfs/gnome-vfs-init.h>  // gnome_vfs_initialized
 #endif
diff --git a/src/ui/dialog/export.h b/src/ui/dialog/export.h
index 5dca9cfa5..202443a78 100644
--- a/src/ui/dialog/export.h
+++ b/src/ui/dialog/export.h
@@ -14,10 +14,12 @@
 
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
+
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/expander.h>
 #include <gtkmm/frame.h>
+#include <gtkmm/progressbar.h>
 #include <gtkmm/textview.h>
-#include <gtkmm/comboboxtext.h>
 
 #include "desktop.h"
 #include "ui/dialog/desktop-tracker.h"
@@ -25,6 +27,10 @@
 #include "ui/widget/button.h"
 #include "ui/widget/entry.h"
 
+namespace Gtk {
+class Dialog;
+}
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index d3ce99b00..c2e521aa3 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -15,7 +15,10 @@
 #endif
 
 #include "find.h"
+
+#include <gtkmm/entry.h>
 #include <gtkmm/widget.h>
+
 #include "verbs.h"
 
 #include "message-stack.h"
diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h
index 77a6c9d02..14d54b8d4 100644
--- a/src/ui/dialog/find.h
+++ b/src/ui/dialog/find.h
@@ -21,7 +21,11 @@
 #include "ui/widget/entry.h" 
 #include "ui/widget/frame.h"
 #include <glib.h>
-#include <gtkmm.h>
+
+#include <gtkmm/box.h>
+#include <gtkmm/buttonbox.h>
+#include <gtkmm/expander.h>
+#include <gtkmm/label.h>
 
 #include "desktop.h"
 #include "ui/dialog/desktop-tracker.h"
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index 9c9f7faa3..82e65435d 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -17,7 +17,9 @@
 
 #include <glib/gprintf.h>
 #include <glibmm/i18n.h>
+
 #include <gtkmm/alignment.h>
+#include <gtkmm/buttonbox.h>
 #include <gtkmm/cellrenderercombo.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/comboboxtext.h>
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index 114204961..8a2b0299a 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -38,6 +38,12 @@
 #include "sp-item.h"
 #include <glibmm/i18n.h>
 
+#if WITH_GTKMM_3_0
+# include <gtkmm/grid.h>
+#else
+# include <gtkmm/table.h>
+#endif
+
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h
index b49293ea1..7e3775d30 100644
--- a/src/ui/dialog/object-properties.h
+++ b/src/ui/dialog/object-properties.h
@@ -46,6 +46,14 @@ class SPAttributeTable;
 class SPDesktop;
 class SPItem;
 
+namespace Gtk {
+#if WITH_GTKMM_3_0
+class Grid;
+#else
+class Table;
+#endif
+}
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/svg-fonts-dialog.h b/src/ui/dialog/svg-fonts-dialog.h
index 9be984820..01f70654a 100644
--- a/src/ui/dialog/svg-fonts-dialog.h
+++ b/src/ui/dialog/svg-fonts-dialog.h
@@ -34,8 +34,8 @@ class HScale;
 #endif
 }
 
-class SPGlyph;
-class SPGlyphKerning;
+struct SPGlyph;
+struct SPGlyphKerning;
 class SvgFont;
 
 class SvgFontDrawingArea : Gtk::DrawingArea{
diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h
index cb4f69b9a..1444272e8 100644
--- a/src/ui/tool/path-manipulator.h
+++ b/src/ui/tool/path-manipulator.h
@@ -22,7 +22,7 @@
 
 struct SPCanvasItem;
 class SPCurve;
-struct SPPath;
+class SPPath;
 
 namespace Inkscape {
 namespace XML { class Node; }
diff --git a/src/ui/widget/entry.cpp b/src/ui/widget/entry.cpp
index 173e014d9..64d28119a 100644
--- a/src/ui/widget/entry.cpp
+++ b/src/ui/widget/entry.cpp
@@ -13,6 +13,8 @@
 
 #include "entry.h"
 
+#include <gtkmm/entry.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/entry.h b/src/ui/widget/entry.h
index 53b848fc9..de5cceadd 100644
--- a/src/ui/widget/entry.h
+++ b/src/ui/widget/entry.h
@@ -11,10 +11,10 @@
 #define INKSCAPE_UI_WIDGET_ENTRY__H
 
 #include "labelled.h"
-#include <gtkmm.h>
 
-#include <gtkmm/entry.h>
-#include <gtkmm/comboboxtext.h>
+namespace Gtk {
+class Entry;
+}
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/frame.h b/src/ui/widget/frame.h
index cf736d8a1..a04666651 100644
--- a/src/ui/widget/frame.h
+++ b/src/ui/widget/frame.h
@@ -10,11 +10,9 @@
 #ifndef INKSCAPE_UI_WIDGET_FRAME_H
 #define INKSCAPE_UI_WIDGET_FRAME_H
 
-#include <gtkmm.h>
-
-namespace Gtk {
-class Frame;
-}
+#include <gtkmm/alignment.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/label.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/zoom-context.h b/src/zoom-context.h
index e36dc3fbe..c09b5a1b3 100644
--- a/src/zoom-context.h
+++ b/src/zoom-context.h
@@ -19,9 +19,6 @@
 #define SP_ZOOM_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_ZOOM_CONTEXT, SPZoomContext))
 #define SP_IS_ZOOM_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_ZOOM_CONTEXT))
 
-class SPZoomContext;
-class SPZoomContextClass;
-
 struct SPZoomContext {
 	SPEventContext event_context;
 	SPCanvasItem *grabbed;