A couple of forward declarations

(bzr r12119)

20 files changed, 35 insertions, 11 deletions

diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 410e71730..2ea3c876b 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -39,6 +39,7 @@
 #include "sp-tref.h"
 #include "sp-tspan.h"
 #include "xml/repr.h"
+#include "xml/sp-css-attr.h"
 #include "libnrtype/font-style-to-pos.h"
 #include "sp-path.h"
 #include "event-context.h"
diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index f53dc93b4..7c358d871 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -13,6 +13,8 @@
 #endif
 
 #include <glibmm/i18n.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
 #include "config.h"
 #include "path-prefix.h"
 #include "dependency.h"
diff --git a/src/extension/extension.h b/src/extension/extension.h
index e0b643b6d..78999631a 100644
--- a/src/extension/extension.h
+++ b/src/extension/extension.h
@@ -19,6 +19,7 @@
 #include <vector>
 #include <glibmm/ustring.h>
 #include "xml/repr.h"
+#include <sigc++/signal.h>
 
 namespace Gtk {
 	class Table;
diff --git a/src/extension/internal/filter/filter-file.cpp b/src/extension/internal/filter/filter-file.cpp
index d129f590c..d569c6438 100644
--- a/src/extension/internal/filter/filter-file.cpp
+++ b/src/extension/internal/filter/filter-file.cpp
@@ -20,6 +20,7 @@
 
 /* System includes */
 #include <glibmm/i18n.h>
+#include <glibmm/fileutils.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index 67c0fae66..035a6f0aa 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -20,6 +20,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include <glibmm/miscutils.h>
 #include "javafx-out.h"
 #include <inkscape.h>
 #include <inkscape-version.h>
diff --git a/src/extension/timer.cpp b/src/extension/timer.cpp
index 3941ddcfc..e4e8632d2 100644
--- a/src/extension/timer.cpp
+++ b/src/extension/timer.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
+#include <glibmm/main.h>
 
 #include "extension.h"
 #include "timer.h"
diff --git a/src/file.cpp b/src/file.cpp
index 14f70fc8c..468d02eba 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -62,6 +62,7 @@
 #include "ui/view/view-widget.h"
 #include "uri.h"
 #include "xml/rebase-hrefs.h"
+#include "xml/sp-css-attr.h"
 #include "verbs.h"
 #include "event-log.h"
 #include "ui/dialog/font-substitution.h"
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 904c3b349..65b26937b 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -34,6 +34,7 @@
 #include "display/sp-ctrlcurve.h"
 #include "display/sp-canvas-util.h"
 #include "xml/repr.h"
+#include "xml/sp-css-attr.h"
 #include "svg/css-ostringstream.h"
 #include "svg/svg.h"
 #include "preferences.h"
diff --git a/src/io/gzipstream.cpp b/src/io/gzipstream.cpp
index 91b51140b..f9e30de91 100644
--- a/src/io/gzipstream.cpp
+++ b/src/io/gzipstream.cpp
@@ -28,6 +28,7 @@
 
 #include "gzipstream.h"
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <string>
 
diff --git a/src/io/gzipstream.h b/src/io/gzipstream.h
index 4debbfca9..89c5f64f3 100644
--- a/src/io/gzipstream.h
+++ b/src/io/gzipstream.h
@@ -17,7 +17,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
+#include <vector>
 #include "inkscapestream.h"
 #include <zlib.h>
 
diff --git a/src/io/inkscapestream.cpp b/src/io/inkscapestream.cpp
index da7870add..65f24cf59 100644
--- a/src/io/inkscapestream.cpp
+++ b/src/io/inkscapestream.cpp
@@ -11,7 +11,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
+#include <cstdlib>
 #include "inkscapestream.h"
 
 namespace Inkscape
diff --git a/src/io/inkscapestream.h b/src/io/inkscapestream.h
index a766e16e0..37c41552f 100644
--- a/src/io/inkscapestream.h
+++ b/src/io/inkscapestream.h
@@ -9,9 +9,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
 #include <cstdio>
-#include <glibmm.h>
+#include <glibmm/ustring.h>
 
 namespace Inkscape
 {
diff --git a/src/io/sys.cpp b/src/io/sys.cpp
index 26c1993a7..60e850c96 100644
--- a/src/io/sys.cpp
+++ b/src/io/sys.cpp
@@ -15,6 +15,7 @@
 # include "config.h"
 #endif
 
+#include <fstream>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <glibmm/fileutils.h>
diff --git a/src/preferences.cpp b/src/preferences.cpp
index 3f12c4f64..1d7009a99 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -13,6 +13,7 @@
 #include <cstring>
 #include <sstream>
 #include <glibmm/fileutils.h>
+#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
 #include <glib.h>
 #include <glib/gstdio.h>
diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index e3a44d8bb..bce86c465 100644
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
@@ -22,6 +22,7 @@
 using std::map;
 using std::pair;
 
+#include <glibmm/stringutils.h>
 #include "attributes.h"
 #include "document.h"
 #include "sp-filter.h"
diff --git a/src/sp-font-face.h b/src/sp-font-face.h
index 691c1f883..57702b683 100644
--- a/src/sp-font-face.h
+++ b/src/sp-font-face.h
@@ -6,6 +6,8 @@
 #ifndef __SP_FONTFACE_H__
 #define __SP_FONTFACE_H__
 
+#include <vector>
+
 /*
  * SVG <font-face> element implementation
  *
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index 44b323989..47b4d35ac 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -29,6 +29,7 @@
 #include "document.h"
 #include "xml/repr.h"
 #include "xml/attribute-record.h"
+#include "xml/sp-css-attr.h"
 
 #include "sp-textpath.h"
 #include "sp-flowtext.h"
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index 60d5f6ecc..44bceb826 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -28,6 +28,7 @@
 #include "sp-radial-gradient-fns.h"
 #include "sp-pattern.h"
 #include "xml/repr.h"
+#include "xml/sp-css-attr.h"
 #include "widgets/widget-sizes.h"
 #include "helper/units.h"
 #include "helper/action.h"
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index 4c339ad5a..24e2db9e1 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -27,6 +27,7 @@
 #include "xml/repr.h"
 #include "xml/simple-document.h"
 #include "xml/simple-node.h"
+#include "xml/sp-css-attr.h"
 #include "style.h"
 #include "libcroco/cr-sel-eng.h"
 
diff --git a/src/xml/repr.h b/src/xml/repr.h
index debd0f489..52f07d11f 100644
--- a/src/xml/repr.h
+++ b/src/xml/repr.h
@@ -14,16 +14,11 @@
 #ifndef SEEN_SP_REPR_H
 #define SEEN_SP_REPR_H
 
-#include <stdio.h>
 #include <glib.h>
-#include "gc-anchored.h"
+#include <glibmm/quark.h>
 
 #include "xml/node.h"
 #include "xml/document.h"
-#include "xml/sp-css-attr.h"
-#include "io/inkscapestream.h"
-
-#include <2geom/forward.h>
 
 #define SP_SODIPODI_NS_URI "http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
 #define SP_BROKEN_SODIPODI_NS_URI "http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -35,6 +30,18 @@
 #define SP_OLD_CC_NS_URI "http://web.resource.org/cc/"
 #define SP_DC_NS_URI "http://purl.org/dc/elements/1.1/"
 
+class SPCSSAttr;
+
+namespace Inkscape {
+namespace IO {
+class Writer;
+} // namespace IO
+} // namespace Inkscape
+
+namespace Geom {
+class Point;
+}
+
 /* SPXMLNs */
 char const *sp_xml_ns_uri_prefix(gchar const *uri, gchar const *suggested);
 char const *sp_xml_ns_prefix_uri(gchar const *prefix);