Header tidying, suppress all gdk deprecation errors in gtkmm

(bzr r11030)

6 files changed, 23 insertions, 13 deletions

diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index 8b2161425..5294a5ee0 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -18,6 +18,7 @@
 #include "display/drawing-item.h"
 #include "display/nr-filter.h"
 #include "display/nr-filter-image.h"
+#include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
 
 namespace Inkscape {
diff --git a/src/display/nr-filter-image.h b/src/display/nr-filter-image.h
index 0e0c9a823..c0b9d6e81 100644
--- a/src/display/nr-filter-image.h
+++ b/src/display/nr-filter-image.h
@@ -12,15 +12,16 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <gdkmm/pixbuf.h>
 #include "display/nr-filter-primitive.h"
-#include "display/nr-filter-slot.h"
-#include "display/nr-filter-units.h"
-#include "sp-item.h"
 #include <glibmm/refptr.h>
-#include <gdkmm/pixbuf.h>
+
+class SPDocument;
+class SPItem;
 
 namespace Inkscape {
 namespace Filters {
+class FilterSlot;
 
 class FilterImage : public FilterPrimitive {
 public:
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index 6e3eb91d5..f580a5044 100644
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -9,6 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "display/nr-filter-image.h"
 #include <glib.h>
 #include <cmath>
 #include <cstring>
@@ -30,7 +31,6 @@
 #include "display/nr-filter-displacement-map.h"
 #include "display/nr-filter-flood.h"
 #include "display/nr-filter-gaussian.h"
-#include "display/nr-filter-image.h"
 #include "display/nr-filter-merge.h"
 #include "display/nr-filter-morphology.h"
 #include "display/nr-filter-offset.h"
diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp
index 1ba158635..e095fb9a9 100644
--- a/src/display/nr-svgfonts.cpp
+++ b/src/display/nr-svgfonts.cpp
@@ -28,6 +28,10 @@
 #include "display/curve.h"
 #include "xml/repr.h"
 #include "sp-font-face.h"
+#include "sp-glyph.h"
+#include "sp-missing-glyph.h"
+#include "sp-font.h"
+#include "sp-glyph-kerning.h"
 
 //*************************//
 // UserFont Implementation //
diff --git a/src/display/nr-svgfonts.h b/src/display/nr-svgfonts.h
index 3cfcbaa72..6138e2fbb 100644
--- a/src/display/nr-svgfonts.h
+++ b/src/display/nr-svgfonts.h
@@ -14,15 +14,19 @@
  */
 
 #include "cairo.h"
-#include <gtkmm/widget.h>
-#include "../sp-glyph.h"
-#include "../sp-missing-glyph.h"
-#include "../sp-font.h"
-#include "../sp-glyph-kerning.h"
-#include <sigc++/sigc++.h>
+#include <sigc++/connection.h>
 
 class SvgFont;
 struct SPFont;
+class SPGlyph;
+class SPMissingGlyph;
+
+struct _GdkEventExpose;
+typedef _GdkEventExpose GdkEventExpose;
+
+namespace Gtk {
+class Widget;
+}
 
 class UserFont{
 public:
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index fd320927b..11836baa2 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -19,8 +19,7 @@
 # include <config.h>
 #endif
 
-#include <gtk/gtk.h>
-
+#include <gdkmm/region.h>
 #include "helper/sp-marshal.h"
 #include <2geom/rect.h>
 #include <2geom/affine.h>
@@ -35,6 +34,7 @@
 #include "debug/gdk-event-latency-tracker.h"
 #include "desktop.h"
 #include "sp-namedview.h"
+#include <gdkmm/rectangle.h>
 
 using Inkscape::Debug::GdkEventLatencyTracker;