Reverted changes to r15024 after many building problems

(bzr r15027)

8 files changed, 15 insertions, 3 deletions

diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp
index e1506e3f2..eb3870978 100644
--- a/src/xml/node-fns.cpp
+++ b/src/xml/node-fns.cpp
@@ -1,4 +1,5 @@
 #ifdef HAVE_CONFIG_H
+# include "config.h"
 #endif
 
 #include <map>
diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index 7e3d4fa7e..a8ac3b4cc 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -4,7 +4,10 @@
 #include "io/sys.h"
 #include "sp-object.h"
 #include "streq.h"
+#include "util/share.h"
+#include "xml/attribute-record.h"
 #include "xml/node.h"
+#include <glib.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/convert.h>
 #include <glibmm/uriutils.h>
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index 9590fa97f..c043904a7 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -26,8 +26,10 @@
 
 #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"
 
 using Inkscape::Util::List;
 using Inkscape::XML::AttributeRecord;
diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index 5f576d00f..6977bc1e2 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -11,7 +11,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <cstring>
@@ -39,6 +39,7 @@
 #include "preferences.h"
 
 #include <glibmm/miscutils.h>
+#include <map>
 
 using Inkscape::IO::Writer;
 using Inkscape::Util::List;
diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp
index 4d093a4ea..ce93bccab 100644
--- a/src/xml/repr-util.cpp
+++ b/src/xml/repr-util.cpp
@@ -17,6 +17,8 @@
 
 #include "config.h"
 
+#include <math.h>
+
 #if HAVE_STRING_H
 # include <cstring>
 #endif
diff --git a/src/xml/repr.cpp b/src/xml/repr.cpp
index 8ad1ac06b..0a384c9c1 100644
--- a/src/xml/repr.cpp
+++ b/src/xml/repr.cpp
@@ -17,7 +17,7 @@
 #define noREPR_VERBOSE
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <cstring>
diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index 49057a54b..3cbedc80b 100644
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -16,17 +16,19 @@
 
 #include <cstring>
 #include <string>
-#include <iostream>
 
 #include <glib.h>
 
 #include "preferences.h"
 
+#include "xml/node.h"
 #include "xml/simple-node.h"
 #include "xml/node-event-vector.h"
 #include "xml/node-fns.h"
+#include "xml/repr.h"
 #include "debug/event-tracker.h"
 #include "debug/simple-event.h"
+#include "util/share.h"
 #include "util/format.h"
 
 #include "attribute-rel-util.h"
diff --git a/src/xml/simple-node.h b/src/xml/simple-node.h
index 2aecdffda..d09392249 100644
--- a/src/xml/simple-node.h
+++ b/src/xml/simple-node.h
@@ -19,6 +19,7 @@
 #define SEEN_INKSCAPE_XML_SIMPLE_NODE_H
 
 #include <cassert>
+#include <iostream>
 
 #include "xml/node.h"
 #include "xml/attribute-record.h"