Reverted changes to r15024 after many building problems

(bzr r15027)

13 files changed, 25 insertions, 11 deletions

diff --git a/src/extension/db.cpp b/src/extension/db.cpp
index f17b784a9..a3c54915d 100644
--- a/src/extension/db.cpp
+++ b/src/extension/db.cpp
@@ -13,7 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 #include "db.h"
 #include "input.h"
diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index 837520381..624be12f9 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -9,12 +9,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <glibmm/i18n.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
+#include "config.h"
+#include "path-prefix.h"
 #include "dependency.h"
 #include "db.h"
 #include "extension.h"
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index ef254f623..e7299ba51 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -13,6 +13,7 @@
 #include "helper/action.h"
 #include "ui/view/view.h"
 
+#include "selection.h"
 #include "sp-namedview.h"
 #include "desktop.h"
 #include "implementation/implementation.h"
diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp
index 9ec643759..db354c0ce 100644
--- a/src/extension/error-file.cpp
+++ b/src/extension/error-file.cpp
@@ -9,7 +9,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "ui/dialog/extensions.h"
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 569e2c762..d5c80f26e 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -8,8 +8,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include "gtkmm/messagedialog.h"
@@ -23,6 +25,7 @@
 #include "document.h"
 #include "document-undo.h"
 #include "desktop.h"
+#include "ui/view/view.h"
 #include "sp-namedview.h"
 
 #include "display/sp-canvas.h"
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 56ff0a5f4..6f7539360 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -16,7 +16,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"
 #endif
 
 #include <gtkmm/box.h>
diff --git a/src/extension/implementation/implementation.cpp b/src/extension/implementation/implementation.cpp
index 995d3d9ad..92a8a2833 100644
--- a/src/extension/implementation/implementation.cpp
+++ b/src/extension/implementation/implementation.cpp
@@ -11,7 +11,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 #include "implementation.h"
 
@@ -22,6 +22,7 @@
 #include "selection.h"
 #include "desktop.h"
 
+#include "ui/view/view.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index 373378d97..85ae9efde 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -13,7 +13,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "file.h"
@@ -22,11 +22,13 @@
 #include "../output.h"
 #include "extension/input.h"
 
+#include "xml/repr.h"
 #include "io/sys.h"
 #include <unistd.h>
 #include <cstring>
 #include "document.h"
 
+#include <libxml/parser.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
 
diff --git a/src/extension/input.cpp b/src/extension/input.cpp
index 2ba48ffda..5cef38009 100644
--- a/src/extension/input.cpp
+++ b/src/extension/input.cpp
@@ -8,12 +8,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
+# include "config.h"
 #endif
 
 #include "prefdialog.h"
 #include "implementation/implementation.h"
 #include "timer.h"
 #include "input.h"
+#include "io/sys.h"
 
 /* Inkscape::Extension::Input */
 
diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp
index 3bea0e1e6..863a176ca 100644
--- a/src/extension/loader.cpp
+++ b/src/extension/loader.cpp
@@ -11,6 +11,7 @@
 
 #include "loader.h"
 #include "system.h"
+#include <exception>
 #include <string.h>
 #include "dependency.h"
 #include "inkscape-version.h"
diff --git a/src/extension/loader.h b/src/extension/loader.h
index cd362f87b..0d3a69061 100644
--- a/src/extension/loader.h
+++ b/src/extension/loader.h
@@ -1,5 +1,4 @@
-/** @file#include <config.h>
-
+/** @file
  * Loader for external plug-ins.
  *//*
  *
diff --git a/src/extension/patheffect.cpp b/src/extension/patheffect.cpp
index e30ec97df..bedab7fd8 100644
--- a/src/extension/patheffect.cpp
+++ b/src/extension/patheffect.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "document-private.h"
+#include "sp-object.h"
 
 #include "patheffect.h"
 #include "db.h"
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index df9e967bc..3c623455a 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -17,10 +17,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include "ui/interface.h"
+#include <unistd.h>
+#include <glibmm/miscutils.h>
 
 #include "system.h"
 #include "preferences.h"
@@ -38,7 +40,7 @@
 #include "inkscape.h"
 #include "document-undo.h"
 #include "loader.h"
-#include <glibmm/miscutils.h>
+
 
 namespace Inkscape {
 namespace Extension {