Reverted changes to r15024 after many building problems

(bzr r15027)

8 files changed, 24 insertions, 3 deletions

diff --git a/src/helper/action-context.cpp b/src/helper/action-context.cpp
index 1ea12776b..d52e43d96 100644
--- a/src/helper/action-context.cpp
+++ b/src/helper/action-context.cpp
@@ -14,6 +14,7 @@
 #include "layer-model.h"
 #include "selection.h"
 #include "helper/action-context.h"
+#include "ui/view/view.h"
 
 namespace Inkscape {
 
diff --git a/src/helper/action.cpp b/src/helper/action.cpp
index e37575a9c..060bf317c 100644
--- a/src/helper/action.cpp
+++ b/src/helper/action.cpp
@@ -9,6 +9,8 @@
  * This code is in public domain
  */
 
+#include <string.h>
+
 #include "debug/logger.h"
 #include "debug/timestamp.h"
 #include "debug/simple-event.h"
diff --git a/src/helper/action.h b/src/helper/action.h
index 9a16cdfc7..4b81ee7f9 100644
--- a/src/helper/action.h
+++ b/src/helper/action.h
@@ -15,7 +15,6 @@
 #include "helper/action-context.h"
 #include <sigc++/signal.h>
 #include <glibmm/ustring.h>
-#include <glib-object.h>
 
 #define SP_TYPE_ACTION (sp_action_get_type())
 #define SP_ACTION(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_ACTION, SPAction))
diff --git a/src/helper/geom-nodetype.cpp b/src/helper/geom-nodetype.cpp
index da620b3fd..fe8e8af0e 100644
--- a/src/helper/geom-nodetype.cpp
+++ b/src/helper/geom-nodetype.cpp
@@ -12,6 +12,8 @@
 #include "helper/geom-nodetype.h"
 
 #include <2geom/curve.h>
+#include <2geom/point.h>
+#include <vector>
 
 namespace Geom {
 
diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp
index 10641692d..d2e9f9a1b 100644
--- a/src/helper/geom-pathstroke.cpp
+++ b/src/helper/geom-pathstroke.cpp
@@ -9,9 +9,13 @@
 
 #include <iomanip>
 #include <2geom/path-sink.h>
+#include <2geom/point.h>
+#include <2geom/bezier-curve.h>
+#include <2geom/elliptical-arc.h>
 #include <2geom/sbasis-to-bezier.h> // cubicbezierpath_from_sbasis
 #include <2geom/path-intersection.h>
 #include <2geom/circle.h>
+#include <math.h>
 
 #include "helper/geom-pathstroke.h"
 
diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp
index 42c494c00..ecb330b01 100644
--- a/src/helper/geom.cpp
+++ b/src/helper/geom.cpp
@@ -12,8 +12,15 @@
 #include <algorithm>
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
+#include <typeinfo>
+#include <2geom/pathvector.h>
+#include <2geom/path.h>
 #include <2geom/curves.h>
+#include <2geom/transforms.h>
+#include <2geom/rect.h>
+#include <2geom/coord.h>
 #include <2geom/sbasis-to-bezier.h>
+#include <math.h> // for M_PI
 
 using Geom::X;
 using Geom::Y;
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index 8a363d736..9639096fb 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -12,9 +12,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
+#include <png.h>
 #include <boost/scoped_ptr.hpp>
 #include <2geom/transforms.h>
 
@@ -23,8 +24,11 @@
 #include "display/cairo-utils.h"
 #include "display/drawing.h"
 #include "display/drawing-context.h"
+#include "display/drawing-item.h"
 #include "document.h"
+#include "sp-item.h"
 #include "sp-root.h"
+#include "sp-use.h"
 #include "sp-defs.h"
 #include "util/units.h"
 
diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
index e2b7e5b8c..9430feeff 100644
--- a/src/helper/png-write.cpp
+++ b/src/helper/png-write.cpp
@@ -14,17 +14,19 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <png.h>
 #include "ui/interface.h"
 #include <2geom/rect.h>
 #include <2geom/transforms.h>
+#include <glib.h>
 #include "png-write.h"
 #include "io/sys.h"
 #include "display/drawing.h"
 #include "display/drawing-context.h"
+#include "display/drawing-item.h"
 #include "document.h"
 #include "sp-item.h"
 #include "sp-root.h"