Cleaning up a few headers

(bzr r10961)

10 files changed, 24 insertions, 39 deletions

diff --git a/src/ui/dialog/dialog-manager.h b/src/ui/dialog/dialog-manager.h
index 45d8d8f66..33b166aa1 100644
--- a/src/ui/dialog/dialog-manager.h
+++ b/src/ui/dialog/dialog-manager.h
@@ -14,7 +14,6 @@
 #ifndef INKSCAPE_UI_DIALOG_MANAGER_H
 #define INKSCAPE_UI_DIALOG_MANAGER_H
 
-#include <glib.h>
 #include "dialog.h"
 #include <map>
 
diff --git a/src/ui/dialog/dock-behavior.h b/src/ui/dialog/dock-behavior.h
index 98c111719..cc599286f 100644
--- a/src/ui/dialog/dock-behavior.h
+++ b/src/ui/dialog/dock-behavior.h
@@ -13,18 +13,13 @@
 #ifndef INKSCAPE_UI_DIALOG_DOCK_BEHAVIOR_H
 #define INKSCAPE_UI_DIALOG_DOCK_BEHAVIOR_H
 
-#include <map>
-
-#include <gtkmm/buttonbox.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/paned.h>
-
 #include "ui/widget/dock-item.h"
-
-#include "libgdl/gdl.h"
-
 #include "behavior.h"
 
+namespace Gtk {
+	class Paned;
+}
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 874fbce83..d7c46323d 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -63,6 +63,7 @@
 #include <iostream>
 
 #include <gtkmm/colorbutton.h>
+#include <gtkmm/paned.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/stock.h>
 
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index e353178ed..521510e1e 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -34,6 +34,8 @@
 #include <2geom/point.h>
 #include <2geom/angle.h>
 
+#include <gtkmm/stock.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Dialogs {
diff --git a/src/ui/dialog/guides.h b/src/ui/dialog/guides.h
index 20136fbff..d06c3afc8 100644
--- a/src/ui/dialog/guides.h
+++ b/src/ui/dialog/guides.h
@@ -13,13 +13,9 @@
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/table.h>
-#include <gtkmm/spinbutton.h>
 #include <gtkmm/label.h>
-#include <gtkmm/stock.h>
-#include <gtkmm/adjustment.h>
 #include <gtkmm/colorbutton.h>
 #include "ui/widget/button.h"
-#include "ui/widget/spinbutton.h"
 #include "ui/widget/unit-menu.h"
 #include "ui/widget/scalar-unit.h"
 #include "ui/widget/entry.h"
diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h
index 1da3a3447..3679e6acb 100644
--- a/src/ui/dialog/ocaldialogs.h
+++ b/src/ui/dialog/ocaldialogs.h
@@ -12,23 +12,11 @@
 #ifndef __OCAL_DIALOG_H__
 #define __OCAL_DIALOG_H__
 
-#include <glibmm.h>
-#include <vector>
-#include "filedialogimpl-gtkmm.h"
-
 //General includes
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <set>
-#include <libxml/parser.h>
 #include <libxml/tree.h>
 
-
 //Gtk includes
-#include <glibmm/i18n.h>
-#include <glib/gstdio.h>
-#include <gtkmm/frame.h>
+#include <gtkmm/dialog.h>
 #include <gtkmm/listviewtext.h>
 #include <gtkmm/scrolledwindow.h>
 
@@ -44,15 +32,7 @@
 #endif
 
 //Inkscape includes
-#include <extension/input.h>
-#include <extension/output.h>
-#include <extension/db.h>
-#include "inkscape.h"
-#include "svg-view-widget.h"
-#include "gc-core.h"
-
-//For export dialog
-#include "ui/widget/scalar-unit.h"
+#include "ui/dialog/filedialog.h"
 
 
 namespace Inkscape
@@ -61,6 +41,8 @@ namespace UI
 {   
 namespace Dialog
 {   
+
+class SVGPreview;
     
 /*#########################################################################
 ### F I L E     D I A L O G    O C A L    B A S E    C L A S S
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 4df4ba30e..1285741ca 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -32,6 +32,7 @@
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/node.h"
 #include "ui/tool/path-manipulator.h"
+#include <gdk/gdkkeysyms.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/dock-item.h b/src/ui/widget/dock-item.h
index 48cd71846..573307452 100644
--- a/src/ui/widget/dock-item.h
+++ b/src/ui/widget/dock-item.h
@@ -11,14 +11,16 @@
 #ifndef INKSCAPE_UI_WIGET_DOCK_ITEM_H
 #define INKSCAPE_UI_WIGET_DOCK_ITEM_H
 
-#include <gtkmm/button.h>
-#include <gtkmm/buttonbox.h>
+#include <gtkmm/box.h>
 #include <gtkmm/frame.h>
-#include <gtkmm/paned.h>
 #include <gtkmm/window.h>
 
 #include "libgdl/gdl.h"
 
+namespace Gtk {
+	class HButtonBox;
+}
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index 5846a0c64..72fd48344 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -15,6 +15,7 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
+#include <gtkmm/radiobutton.h>
 #include <gtkmm/scale.h>
 
 #include "xml/repr.h"
diff --git a/src/ui/widget/tolerance-slider.h b/src/ui/widget/tolerance-slider.h
index 790ed0e74..d0b78e3c1 100644
--- a/src/ui/widget/tolerance-slider.h
+++ b/src/ui/widget/tolerance-slider.h
@@ -10,6 +10,12 @@
 #ifndef INKSCAPE_UI_WIDGET_TOLERANCE_SLIDER__H_
 #define INKSCAPE_UI_WIDGET_TOLERANCE_SLIDER__H_
 
+#include <gtkmm/radiobuttongroup.h>
+
+namespace Gtk {
+	class RadioButton;
+}
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {