Header cleaning

(bzr r10963)

6 files changed, 11 insertions, 6 deletions

diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index b5b91f383..6d1ddbbbd 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -12,6 +12,7 @@
 #include "helper/action.h"
 #include "ui/view/view.h"
 #include "desktop-handles.h"
+#include "prefdialog.h"
 #include "selection.h"
 #include "sp-namedview.h"
 #include "desktop.h"
diff --git a/src/extension/effect.h b/src/extension/effect.h
index 83b5cc036..bb36b9238 100644
--- a/src/extension/effect.h
+++ b/src/extension/effect.h
@@ -12,21 +12,21 @@
 #define INKSCAPE_EXTENSION_EFFECT_H__
 
 #include <config.h>
-
 #include <glibmm/i18n.h>
-#include <gtkmm/dialog.h>
-#include <gtk/gtk.h>
 #include "verbs.h"
-
-#include "prefdialog.h"
 #include "extension.h"
 
+namespace Gtk {
+	class VBox;
+}
+
 struct SPDocument;
 
 namespace Inkscape {
 
 
 namespace Extension {
+class PrefDialog;
 
 /** \brief  Effects are extensions that take a document and do something
             to it in place.  This class adds the extra functions required
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 646caa36a..4058fd787 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -19,6 +19,7 @@
 #include "selection.h"
 #include "effect.h"
 #include "document.h"
+#include "document-undo.h"
 #include "desktop.h"
 #include "ui/view/view.h"
 #include "sp-namedview.h"
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index 8b4c8805b..deb354d00 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -10,6 +10,8 @@
 #include "gdkpixbuf-input.h"
 #include "selection-chemistry.h"
 #include "sp-image.h"
+#include "document-undo.h"
+#include <set>
 
 namespace Inkscape {
 
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index ab609186a..e5d535d3b 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -37,6 +37,7 @@
 #include "pdf-parser.h"
 
 #include "document-private.h"
+#include "document-undo.h"
 #include "inkscape.h"
 
 #include "dialogs/dialog-events.h"
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index 4f8d2ebe6..82d0a726f 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -36,8 +36,8 @@
 #include "xml/rebase-hrefs.h"
 #include "io/sys.h"
 #include "inkscape.h"
+#include "document-undo.h"
 
-/* #include "implementation/plugin.h" */
 
 namespace Inkscape {
 namespace Extension {