Header cleaning

(bzr r11015)

4 files changed, 41 insertions, 23 deletions

diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index e5d535d3b..008db931d 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -16,7 +16,6 @@
 #endif
 
 #ifdef HAVE_POPPLER
-
 #include <poppler/goo/GooString.h>
 #include <poppler/ErrorCodes.h>
 #include <poppler/GlobalParams.h>
@@ -30,6 +29,12 @@
 #include <poppler/glib/poppler-page.h>
 #endif
 
+#include <gtkmm/alignment.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/drawingarea.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/scale.h>
+
 #include "pdf-input.h"
 #include "extension/system.h"
 #include "extension/input.h"
@@ -43,6 +48,7 @@
 #include "dialogs/dialog-events.h"
 #include <gtk/gtk.h>
 #include "ui/widget/spinbutton.h"
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
index 6d3fd104a..7282de322 100644
--- a/src/extension/internal/pdfinput/pdf-input.h
+++ b/src/extension/internal/pdfinput/pdf-input.h
@@ -16,27 +16,34 @@
 
 #ifdef HAVE_POPPLER
 
+#include <gtkmm/dialog.h>
+
 #include "../../implementation/implementation.h"
 
-#include <gtkmm/dialog.h>
-#include <gtkmm/button.h>
-#include <gtkmm/buttonbox.h>
-#include <gtkmm/label.h>
-#include <gtkmm/box.h>
-#include <gtkmm/checkbutton.h>
-#include <gtkmm/comboboxtext.h>
-#include <gtkmm/drawingarea.h>
-#include <gtkmm/alignment.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/scale.h>
-#include <glibmm/i18n.h>
-#include <gdk/gdk.h>
-
-#include "PDFDoc.h"
 #ifdef HAVE_POPPLER_CAIRO
-#include <poppler/glib/poppler-document.h>
+struct _PopplerDocument;
+typedef struct _PopplerDocument            PopplerDocument;
 #endif
 
+struct _GdkEventExpose;
+typedef _GdkEventExpose GdkEventExpose;
+
+class Page;
+class PDFDoc;
+
+namespace Gtk {
+  class Alignment;
+  class Button;
+  class CheckButton;
+  class ComboBoxText;
+  class DrawingArea;
+  class Frame;
+  class HBox;
+  class HScale;
+  class VBox;
+  class Label;
+}
+
 namespace Inkscape {
 
 namespace UI {
diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp
index bf6ae708a..ab10abf3a 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/description.cpp
@@ -16,10 +16,8 @@
 
 #include "description.h"
 
-#include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
-#include <gtkmm/spinbutton.h>
-#include <sstream>
+#include <gtkmm/label.h>
 #include <glibmm/i18n.h>
 
 #include "xml/node.h"
diff --git a/src/extension/param/description.h b/src/extension/param/description.h
index a33ff719a..3a72c4112 100644
--- a/src/extension/param/description.h
+++ b/src/extension/param/description.h
@@ -8,12 +8,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/widget.h>
-#include <xml/node.h>
-#include <document.h>
 #include "parameter.h"
 
+class SPDocument;
+
+namespace Gtk {
+	class Widget;
+}
+
 namespace Inkscape {
+namespace Xml {
+	class Node;
+}
+
 namespace Extension {
 
 /** \brief  A description parameter */