More header cleanup/fwd declarations

(bzr r10986)

17 files changed, 55 insertions, 36 deletions

diff --git a/src/arc-context.cpp b/src/arc-context.cpp
index b4e8f0522..b62da2db8 100644
--- a/src/arc-context.cpp
+++ b/src/arc-context.cpp
@@ -46,6 +46,7 @@
 #include "event-context.h"
 
 #include "arc-context.h"
+#include "display/sp-canvas-item.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index ec9dbcea3..d24ddfed0 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -38,6 +38,7 @@
 #include "message-context.h"
 #include "preferences.h"
 #include "snap.h"
+#include "display/sp-canvas.h"
 #include "sp-guide.h"
 #include "sp-metrics.h"
 #include "sp-namedview.h"
diff --git a/src/desktop.h b/src/desktop.h
index f0fd5064c..9927e45f3 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -25,8 +25,6 @@
 #include "config.h"
 #endif
 
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 
@@ -35,9 +33,7 @@
 
 #include "ui/view/view.h"
 #include "ui/view/edit-widget-interface.h"
-
 #include "display/rendermode.h"
-#include "display/snap-indicator.h"
 
 class SPCSSAttr;
 struct SPCanvas;
@@ -57,7 +53,10 @@ namespace Gtk
 
 typedef int sp_verb_t;
 
-
+struct _GdkEventAny;
+typedef struct _GdkEventAny GdkEventAny;
+struct _GdkEventWindowState;
+typedef struct _GdkEventWindowState GdkEventWindowState;
 
 namespace Inkscape {
   class Application;
@@ -70,6 +69,10 @@ namespace Inkscape {
       namespace Dialog {
           class DialogManager;
       }
+
+      namespace Widget {
+	      class Dock;
+      }
   }
   namespace Whiteboard {
       class SessionManager;
@@ -77,7 +80,7 @@ namespace Inkscape {
   namespace Display {
       class TemporaryItemList;
       class TemporaryItem;
-      //class SnapIndicator;
+      class SnapIndicator;
   }
 }
 
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,
diff --git a/src/document.cpp b/src/document.cpp
index 26d281b90..08563d761 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -62,6 +62,7 @@
 #include "unit-constants.h"
 #include "xml/repr.h"
 #include "xml/rebase-hrefs.h"
+#include "libcroco/cr-cascade.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/document.h b/src/document.h
index bf1644d0f..f28e615d8 100644
--- a/src/document.h
+++ b/src/document.h
@@ -19,11 +19,8 @@
 
 #include <stddef.h>
 #include <sigc++/sigc++.h>
-#include <sigc++/class_slot.h>
-
 #include "libcroco/cr-cascade.h"
 #include <2geom/forward.h>
-
 #include "gc-managed.h"
 #include "gc-finalized.h"
 #include "gc-anchored.h"
diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp
index 1dbd38432..3a93df33a 100644
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
@@ -16,6 +16,7 @@
 #endif
 
 #include <glibmm.h>
+#include <glibmm/i18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <2geom/transforms.h>
diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h
index 32cc37402..b0230b7c4 100644
--- a/src/extension/implementation/implementation.h
+++ b/src/extension/implementation/implementation.h
@@ -12,13 +12,21 @@
 #ifndef SEEN_INKSCAPE_EXTENSION_IMPLEMENTATION_H
 #define SEEN_INKSCAPE_EXTENSION_IMPLEMENTATION_H
 
-#include <gtk/gtk.h>
-#include <gdkmm/types.h>
-#include <gtkmm/widget.h>
-
-#include "xml/node.h"
-#include <2geom/forward.h>
-#include <2geom/point.h>
+#include <vector>
+#include <sigc++/signal.h>
+#include <glibmm/value.h>
+
+namespace Geom {
+	class Affine;
+	class OptRect;
+	class Path;
+	typedef std::vector<Path> PathVector;
+	class Point;
+}
+
+namespace Gtk {
+	class Widget;
+}
 
 class SPDocument;
 class SPStyle;
@@ -31,6 +39,10 @@ class View;
 } // namespace View
 } // namespace UI
 
+namespace XML {
+	class Node;
+} // namespace XML
+
 namespace Extension {
 
 class Effect;
diff --git a/src/extension/internal/filter/filter.h b/src/extension/internal/filter/filter.h
index 08bc1c3f0..1e8a3be0f 100644
--- a/src/extension/internal/filter/filter.h
+++ b/src/extension/internal/filter/filter.h
@@ -8,11 +8,20 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glibmm/i18n.h>
 
 #include "extension/implementation/implementation.h"
 
 namespace Inkscape {
+
+namespace XML {
+	class Document;
+}
+
 namespace Extension {
 
 class Effect;
diff --git a/src/preferences.h b/src/preferences.h
index 0fd0dffb7..5dcf4524d 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -13,7 +13,6 @@
 #ifndef INKSCAPE_PREFSTORE_H
 #define INKSCAPE_PREFSTORE_H
 
-#include <string>
 #include <map>
 #include <vector>
 #include <climits>
diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index 9e2ae0be0..7231038dc 100644
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
@@ -44,6 +44,7 @@
 #include "context-fns.h"
 #include "shape-editor.h"
 #include "verbs.h"
+#include "display/sp-canvas-item.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/sp-namedview.h b/src/sp-namedview.h
index 8c51ad838..69cc9c2b5 100644
--- a/src/sp-namedview.h
+++ b/src/sp-namedview.h
@@ -23,7 +23,6 @@
 #include "sp-object-group.h"
 #include "sp-metric.h"
 #include "snap.h"
-#include "display/canvas-grid.h"
 #include "document.h"
 
 struct SPUnit;
diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp
index c78394714..cb2100cca 100644
--- a/src/spiral-context.cpp
+++ b/src/spiral-context.cpp
@@ -43,6 +43,7 @@
 #include "context-fns.h"
 #include "shape-editor.h"
 #include "verbs.h"
+#include "display/sp-canvas-item.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/star-context.cpp b/src/star-context.cpp
index 39bce8ea5..4156384d5 100644
--- a/src/star-context.cpp
+++ b/src/star-context.cpp
@@ -45,6 +45,7 @@
 #include "context-fns.h"
 #include "shape-editor.h"
 #include "verbs.h"
+#include "display/sp-canvas-item.h"
 
 #include "star-context.h"