header cleaning

(bzr r11017)

8 files changed, 18 insertions, 15 deletions

diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 48426967f..f2775f8f2 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -25,6 +25,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gtkmm/main.h>
+#include <gtkmm/messagedialog.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/textview.h>
 
diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index f37f27966..f52683623 100644
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -14,7 +14,7 @@
 #define INKSCAPE_EXTENSION_IMPEMENTATION_SCRIPT_H_SEEN
 
 #include "implementation.h"
-#include <gtkmm/messagedialog.h>
+#include <gtkmm/enums.h>
 
 namespace Inkscape {
 namespace XML {
@@ -28,7 +28,6 @@ namespace Extension {
 namespace Implementation {
 
 
-
 /**
  * Utility class used for loading and launching script extensions
  */
diff --git a/src/extension/input.cpp b/src/extension/input.cpp
index 320bf643c..1662ef073 100644
--- a/src/extension/input.cpp
+++ b/src/extension/input.cpp
@@ -11,11 +11,11 @@
 # include "config.h"
 #endif
 
+#include "prefdialog.h"
 #include "implementation/implementation.h"
 #include "timer.h"
 #include "input.h"
 #include "io/sys.h"
-#include "prefdialog.h"
 
 /* Inkscape::Extension::Input */
 
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 008db931d..ee091d54b 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -15,6 +15,8 @@
 # include <config.h>
 #endif
 
+#include "pdf-input.h"
+
 #ifdef HAVE_POPPLER
 #include <poppler/goo/GooString.h>
 #include <poppler/ErrorCodes.h>
@@ -35,7 +37,6 @@
 #include <gtkmm/frame.h>
 #include <gtkmm/scale.h>
 
-#include "pdf-input.h"
 #include "extension/system.h"
 #include "extension/input.h"
 #include "svg-builder.h"
diff --git a/src/extension/output.cpp b/src/extension/output.cpp
index 31a4c7bb7..8de5583c7 100644
--- a/src/extension/output.cpp
+++ b/src/extension/output.cpp
@@ -8,11 +8,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "prefdialog.h"
 #include "document.h"
 #include "implementation/implementation.h"
 #include "output.h"
 
-#include "prefdialog.h"
 
 /* Inkscape::Extension::Output */
 
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index 706d68e02..9c8475e2d 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -18,8 +18,9 @@
 # include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
+#include <gtkmm/box.h>
 #include <gtkmm/comboboxtext.h>
+#include <glibmm/i18n.h>
 
 #include "xml/node.h"
 #include "extension/extension.h"
@@ -28,7 +29,6 @@
 #include "sp-object.h"
 
 #include "radiobutton.h"
-#include <gtkmm/box.h>
 
 /**
  * The root directory in the preferences database for extension
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 9d3abae76..7d42c109a 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -7,6 +7,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "prefdialog.h"
 #include <gtkmm/stock.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/separator.h>
@@ -22,7 +23,8 @@
 #include "effect.h"
 #include "implementation/implementation.h"
 
-#include "prefdialog.h"
+#include "execution-env.h"
+#include "param/parameter.h"
 
 
 namespace Inkscape {
diff --git a/src/extension/prefdialog.h b/src/extension/prefdialog.h
index 0a10881d6..ff857272a 100644
--- a/src/extension/prefdialog.h
+++ b/src/extension/prefdialog.h
@@ -10,19 +10,19 @@
 #ifndef INKSCAPE_EXTENSION_DIALOG_H__
 #define INKSCAPE_EXTENSION_DIALOG_H__
 
+#include <gtkmm/dialog.h>
 #include <glibmm/ustring.h>
 
-#include <gdkmm/types.h>
-
-#include <gtkmm/dialog.h>
-#include <gtkmm/checkbutton.h>
-#include <gtkmm/socket.h>
 
-#include "execution-env.h"
-#include "param/parameter.h"
+namespace Gtk {
+class CheckButton;
+}
 
 namespace Inkscape {
 namespace Extension {
+class Effect;
+class ExecutionEnv;
+class Parameter;
 
 /** \brief  A class to represent the preferences for an extension */
 class PrefDialog : public Gtk::Dialog {