Prevent false gtk deprecation warnings in canvas-grid and tidy headers

(bzr r10988)

11 files changed, 19 insertions, 3 deletions

diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 73f695241..478a33044 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -37,6 +37,7 @@
 #include "util/mathfns.h"
 #include "xml/node-event-vector.h"
 #include "round.h"
+#include "display/sp-canvas.h"
 
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index a28624fe9..11bccf2a6 100644
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -25,6 +25,7 @@
 #include "display/curve.h"
 #include "display/cairo-utils.h"
 #include "helper/geom.h"
+#include "display/sp-canvas.h"
 
 static void sp_canvas_bpath_class_init (SPCanvasBPathClass *klass);
 static void sp_canvas_bpath_init (SPCanvasBPath *path);
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index ea406663c..c4f7e7d91 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -13,6 +13,7 @@
  * Don't be shy to correct things.
  */
 
+#include "ui/widget/registered-widget.h"
 #include "desktop.h"
 #include "sp-canvas-util.h"
 #include "util/mathfns.h"
@@ -20,7 +21,6 @@
 #include "display/cairo-utils.h"
 #include "display/canvas-axonomgrid.h"
 #include "display/canvas-grid.h"
-#include "display/sp-canvas-util.h"
 #include "display/sp-canvas-group.h"
 #include "document.h"
 #include "helper/units.h"
@@ -30,10 +30,10 @@
 #include "sp-object.h"
 #include "svg/svg-color.h"
 #include "svg/stringstream.h"
-#include "ui/widget/registered-widget.h"
 #include "util/mathfns.h"
 #include "xml/node-event-vector.h"
 #include "verbs.h"
+#include "display/sp-canvas.h"
 
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp
index 673bd0af6..f7a8713b6 100644
--- a/src/display/canvas-text.cpp
+++ b/src/display/canvas-text.cpp
@@ -24,6 +24,7 @@
 #include "display/cairo-utils.h"
 #include "desktop.h"
 #include "color.h"
+#include "display/sp-canvas.h"
 
 static void sp_canvastext_class_init (SPCanvasTextClass *klass);
 static void sp_canvastext_init (SPCanvasText *canvastext);
diff --git a/src/display/guideline.cpp b/src/display/guideline.cpp
index f2802c6fe..dad989655 100644
--- a/src/display/guideline.cpp
+++ b/src/display/guideline.cpp
@@ -23,6 +23,7 @@
 #include "inkscape.h" // for inkscape_active_desktop()
 #include "desktop.h"
 #include "sp-namedview.h"
+#include "display/sp-canvas.h"
 
 static void sp_guideline_class_init(SPGuideLineClass *c);
 static void sp_guideline_init(SPGuideLine *guideline);
diff --git a/src/display/sodipodi-ctrl.cpp b/src/display/sodipodi-ctrl.cpp
index b4fbaefc6..1380b491a 100644
--- a/src/display/sodipodi-ctrl.cpp
+++ b/src/display/sodipodi-ctrl.cpp
@@ -10,6 +10,7 @@
 #include "sp-canvas-util.h"
 #include "sodipodi-ctrl.h"
 #include "display/cairo-utils.h"
+#include "display/sp-canvas.h"
 
 enum {
     ARG_0,
diff --git a/src/display/sodipodi-ctrlrect.cpp b/src/display/sodipodi-ctrlrect.cpp
index 7942514a7..3b50d0b5d 100644
--- a/src/display/sodipodi-ctrlrect.cpp
+++ b/src/display/sodipodi-ctrlrect.cpp
@@ -17,6 +17,7 @@
 #include "sodipodi-ctrlrect.h"
 #include "sp-canvas-util.h"
 #include "display/cairo-utils.h"
+#include "display/sp-canvas.h"
 
 /*
  * Currently we do not have point method, as it should always be painted
diff --git a/src/display/sp-canvas-util.h b/src/display/sp-canvas-util.h
index 41e085a5c..07323f31a 100644
--- a/src/display/sp-canvas-util.h
+++ b/src/display/sp-canvas-util.h
@@ -13,7 +13,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "sp-canvas.h"
+#include <glibmm/value.h>
+
+struct SPCanvasItem;
+struct SPCanvasBuf;
+
+namespace Geom {
+	class Affine;
+}
 
 /* Miscellaneous utility & convenience functions for general canvas objects */
 
diff --git a/src/display/sp-ctrlline.cpp b/src/display/sp-ctrlline.cpp
index 646dcd89e..3175baf96 100644
--- a/src/display/sp-ctrlline.cpp
+++ b/src/display/sp-ctrlline.cpp
@@ -26,6 +26,7 @@
 #include "display/sp-canvas-util.h"
 #include "display/cairo-utils.h"
 #include "color.h"
+#include "display/sp-canvas.h"
 
 
 static void sp_ctrlline_class_init (SPCtrlLineClass *klass);
diff --git a/src/display/sp-ctrlpoint.cpp b/src/display/sp-ctrlpoint.cpp
index 3d82f8b05..3c8e2bc5d 100644
--- a/src/display/sp-ctrlpoint.cpp
+++ b/src/display/sp-ctrlpoint.cpp
@@ -18,6 +18,7 @@
 #endif
 #include <color.h>
 #include "display/cairo-utils.h"
+#include "display/sp-canvas.h"
 
 
 static void sp_ctrlpoint_class_init (SPCtrlPointClass *klass);
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 7ab10f84d..c4c8ba15f 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -47,6 +47,7 @@
 #include "sp-namedview.h"
 #include "selection-chemistry.h"
 #include "verbs.h"
+#include "display/sp-canvas.h"
 
 using Inkscape::DocumentUndo;