More header cleanup/fwd declarations

(bzr r10986)

2 files changed, 28 insertions, 7 deletions

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;