Reverted changes to r15024 after many building problems

(bzr r15027)

6 files changed, 13 insertions, 2 deletions

diff --git a/src/svg/css-ostringstream.cpp b/src/svg/css-ostringstream.cpp
index ef0413372..33985443e 100644
--- a/src/svg/css-ostringstream.cpp
+++ b/src/svg/css-ostringstream.cpp
@@ -1,6 +1,7 @@
 #include "svg/css-ostringstream.h"
 #include "svg/strip-trailing-zeros.h"
 #include "preferences.h"
+#include <glib.h>
 
 Inkscape::CSSOStringStream::CSSOStringStream()
 {
diff --git a/src/svg/path-string.cpp b/src/svg/path-string.cpp
index 7d0092dfa..6dddeadff 100644
--- a/src/svg/path-string.cpp
+++ b/src/svg/path-string.cpp
@@ -17,6 +17,7 @@
 #include "svg/stringstream.h"
 #include "svg/svg.h"
 #include "preferences.h"
+#include <algorithm>
 
 // 1<=numericprecision<=16, doubles are only accurate upto (slightly less than) 16 digits (and less than one digit doesn't make sense)
 // Please note that these constants are used to allocate sufficient space to hold serialized numbers
diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp
index 21635c79b..d9d79bba5 100644
--- a/src/svg/svg-affine.cpp
+++ b/src/svg/svg-affine.cpp
@@ -12,7 +12,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <cstring>
@@ -21,6 +21,7 @@
 #include <cstdio>
 #include <glib.h>
 #include <2geom/transforms.h>
+#include <2geom/angle.h>
 #include "svg.h"
 #include "preferences.h"
 
diff --git a/src/svg/svg-angle.cpp b/src/svg/svg-angle.cpp
index 9d4435a18..ed5ccd45e 100644
--- a/src/svg/svg-angle.cpp
+++ b/src/svg/svg-angle.cpp
@@ -13,13 +13,16 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <cstring>
 #include <string>
+#include <math.h>
 #include <glib.h>
 
+#include "svg.h"
+#include "stringstream.h"
 #include "svg/svg-angle.h"
 #include "util/units.h"
 
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index 89a5636a8..693094048 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -19,6 +19,7 @@
 #include <cstdio> // sprintf
 #include <cstring>
 #include <string>
+#include <cassert>
 #include <math.h>
 #include <glib.h> // g_assert
 #include <errno.h>
diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
index 13795f2a3..7bb58fc9c 100644
--- a/src/svg/svg-path.cpp
+++ b/src/svg/svg-path.cpp
@@ -17,13 +17,17 @@
 
 #include <cstring>
 #include <string>
+#include <cassert>
 #include <glib.h> // g_assert()
 
 #include <2geom/pathvector.h>
+#include <2geom/path.h>
 #include <2geom/curves.h>
 #include <2geom/sbasis-to-bezier.h>
 #include <2geom/path-sink.h>
 #include <2geom/svg-path-parser.h>
+#include <2geom/exception.h>
+#include <2geom/angle.h>
 
 #include "svg/svg.h"
 #include "svg/path-string.h"