More header cleanup/fwd declarations

(bzr r10986)

4 files changed, 11 insertions, 18 deletions

diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h
index dc11231b9..dbe874365 100644
--- a/src/display/cairo-utils.h
+++ b/src/display/cairo-utils.h
@@ -13,11 +13,12 @@
 #define SEEN_INKSCAPE_DISPLAY_CAIRO_UTILS_H
 
 #include <glib.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <cairomm/cairomm.h>
 #include <2geom/forward.h>
 
 struct SPColor;
+struct _GdkPixbuf;
+typedef struct _GdkPixbuf GdkPixbuf;
 
 namespace Inkscape {
 
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index ab0592fc6..73f695241 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -18,8 +18,8 @@
   * THIS FILE AND THE HEADER FILE NEED CLEANING UP. PLEASE DO NOT HESISTATE TO DO SO.
   */
 
+#include "ui/widget/registered-widget.h"
 #include "display/canvas-axonomgrid.h"
-
 #include "2geom/line.h"
 #include "desktop.h"
 #include "canvas-grid.h"
@@ -34,7 +34,6 @@
 #include "sp-namedview.h"
 #include "sp-object.h"
 #include "svg/svg-color.h"
-#include "ui/widget/registered-widget.h"
 #include "util/mathfns.h"
 #include "xml/node-event-vector.h"
 #include "round.h"
diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h
index ec42b5f83..04919f947 100644
--- a/src/display/canvas-axonomgrid.h
+++ b/src/display/canvas-axonomgrid.h
@@ -6,22 +6,17 @@
  *
   */
 
-#include <display/sp-canvas.h>
-#include "xml/repr.h"
-
-#include "ui/widget/registry.h"
-
-#include "xml/node-event-vector.h"
-
-#include "snapper.h"
 #include "line-snapper.h"
-
 #include "canvas-grid.h"
 
+class  SPCanvasBuf;
 class  SPDesktop;
 struct SPNamedView;
 
 namespace Inkscape {
+namespace XML {
+	class Node;
+};
 
 class CanvasAxonomGrid : public CanvasGrid {
 public:
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index 173c0c02b..bba9b7e95 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -8,14 +8,8 @@
 #ifndef INKSCAPE_CANVAS_GRID_H
 #define INKSCAPE_CANVAS_GRID_H
 
-#include <cstring>
-#include <string>
-
 #include "sp-canvas-item.h"
-#include "xml/repr.h"
 #include "ui/widget/registry.h"
-#include "xml/node-event-vector.h"
-#include "snapper.h"
 #include "line-snapper.h"
 
 class  SPDesktop;
@@ -28,7 +22,11 @@ namespace Gtk {
 }
 
 namespace Inkscape {
+class Snapper;
 
+namespace XML {
+class Node;
+}
 
 enum GridType {
     GRID_RECTANGULAR = 0,