Fix even more forward declaration tags

(bzr r12206)

12 files changed, 54 insertions, 18 deletions

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 {