Merge Andrew's new OCAL dialog and clean headers. Please test

(bzr r11027)

17 files changed, 28 insertions, 4 deletions

diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index 17ba739f8..9dd9c83ee 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -16,13 +16,13 @@
 # include <config.h>
 #endif
 
+#include "file.h"
 #include "xslt.h"
 #include "../extension.h"
 #include "../output.h"
 
 #include "xml/repr.h"
 #include "io/sys.h"
-#include "file.h"
 #include <unistd.h>
 #include <cstring>
 #include "document.h"
diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index 3d4754adc..8f1e07211 100644
--- a/src/extension/internal/bluredge.cpp
+++ b/src/extension/internal/bluredge.cpp
@@ -14,6 +14,7 @@
 
 #include <vector>
 #include "desktop.h"
+#include "document.h"
 #include "selection.h"
 #include "helper/action.h"
 #include "preferences.h"
diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp
index 678a46095..4751a229a 100644
--- a/src/extension/internal/cairo-png-out.cpp
+++ b/src/extension/internal/cairo-png-out.cpp
@@ -37,6 +37,7 @@
 #include "sp-shape.h"
 
 #include "io/sys.h"
+#include "document.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 9cc3a4ce3..b455bd2b2 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -39,6 +39,7 @@
 #include "sp-shape.h"
 
 #include "io/sys.h"
+#include "document.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 7ea5718f7..5d45fcf87 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -37,6 +37,7 @@
 #include "sp-root.h"
 
 #include <2geom/affine.h>
+#include "document.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 3926cce29..61e943dba 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -66,6 +66,7 @@
 #include "io/sys.h"
 
 #include <cairo.h>
+#include "document.h"
 
 // include support for only the compiled-in surface types
 #ifdef CAIRO_HAS_PDF_SURFACE
diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp
index a9a31fe84..5a1bbe1c3 100644
--- a/src/extension/internal/gimpgrad.cpp
+++ b/src/extension/internal/gimpgrad.cpp
@@ -25,6 +25,8 @@
 #include "gimpgrad.h"
 #include "streq.h"
 #include "strneq.h"
+#include "document.h"
+#include "extension/extension.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index da5ea6d9e..56bce2fe8 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -17,6 +17,7 @@
 
 #include "desktop.h"
 #include "desktop-handles.h"
+#include "document.h"
 #include "selection.h"
 #include "sp-object.h"
 #include "util/glib-list-iterators.h"
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index f44640bf1..4a3e3907e 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -43,6 +43,7 @@
 #include <string>
 #include <stdio.h>
 #include <stdarg.h>
+#include "extension/extension.h"
 
 
 namespace Inkscape
diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp
index faac9ce44..decc42d94 100644
--- a/src/extension/internal/latex-pstricks-out.cpp
+++ b/src/extension/internal/latex-pstricks-out.cpp
@@ -22,6 +22,7 @@
 #include "sp-root.h"
 
 
+#include "document.h"
 
 
 namespace Inkscape {
diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index cc012c8b0..d1b784251 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -30,6 +30,7 @@
 #include "latex-pstricks.h"
 #include "sp-item.h"
 #include "style.h"
+#include "document.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp
index 12b42a78c..ebd73a033 100644
--- a/src/extension/internal/latex-text-renderer.cpp
+++ b/src/extension/internal/latex-text-renderer.cpp
@@ -44,6 +44,7 @@
 #include "extension/system.h"
 
 #include "io/sys.h"
+#include "document.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index bb9fd3d85..8bb96920d 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -83,7 +83,9 @@
 #include "dom/io/stringstream.h"
 
 
+#include "document.h"
 
+#include "extension/extension.h"
 
 
 
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index f501b97f1..d501777b5 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -40,6 +40,8 @@
 #include <string>
 #include <stdio.h>
 #include <stdarg.h>
+#include "document.h"
+#include "extension/extension.h"
 
 
 namespace Inkscape
diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp
index afc706e89..d054e4427 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -25,6 +25,7 @@
 #include <vector>
 #include "xml/attribute-record.h"
 #include "sp-root.h"
+#include "document.h"
 
 #ifdef WITH_GNOME_VFS
 # include <libgnomevfs/gnome-vfs.h>
diff --git a/src/extension/internal/svgz.cpp b/src/extension/internal/svgz.cpp
index 2c15120e7..fceafd3ee 100644
--- a/src/extension/internal/svgz.cpp
+++ b/src/extension/internal/svgz.cpp
@@ -16,6 +16,7 @@
 # include <config.h>
 #endif
 #include "svgz.h"
+#include "extension/extension.h"
 #include "extension/system.h"
 
 namespace Inkscape {
diff --git a/src/extension/system.h b/src/extension/system.h
index 716539de1..170c44346 100644
--- a/src/extension/system.h
+++ b/src/extension/system.h
@@ -15,14 +15,20 @@
 #ifndef INKSCAPE_EXTENSION_SYSTEM_H__
 #define INKSCAPE_EXTENSION_SYSTEM_H__
 
-#include "document.h"
-#include "extension/extension.h"
+#include <glibmm/ustring.h>
+
+class SPDocument;
 
 namespace Inkscape {
-namespace Extension {
 
+namespace Extension {
+class Extension;
 class Print;
 
+namespace Implementation {
+class Implementation;
+}
+
 /**
  * Used to distinguish between the various invocations of the save dialogs (and thus to determine
  * the file type and save path offered in the dialog)