Header cleaning

(bzr r11015)

13 files changed, 35 insertions, 11 deletions

diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h
index 4fdb448a9..2e33822e7 100644
--- a/src/ui/dialog/align-and-distribute.h
+++ b/src/ui/dialog/align-and-distribute.h
@@ -27,6 +27,7 @@
 
 #include "ui/widget/panel.h"
 #include "ui/widget/notebook-page.h"
+#include "2geom/rect.h"
 
 
 class SPItem;
diff --git a/src/ui/dialog/extensions.h b/src/ui/dialog/extensions.h
index 8b0fc2780..73876bccc 100644
--- a/src/ui/dialog/extensions.h
+++ b/src/ui/dialog/extensions.h
@@ -11,8 +11,8 @@
 #ifndef SEEN_EXTENSIONS_H
 #define SEEN_EXTENSIONS_H
 
-#include <gtkmm/textview.h>
 #include "ui/widget/panel.h"
+#include <gtkmm/textview.h>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index ab89bdb97..e3cc4b74b 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -32,6 +32,7 @@
 #include "verbs.h"
 #include "widgets/font-selector.h"
 #include "text-editing.h"
+#include "selection.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 9f63f4654..98a14ddf3 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -47,6 +47,7 @@
 #include "display/canvas-grid.h"
 #include "path-prefix.h"
 #include "io/resource.h"
+#include "inkscape.h"
 
 #ifdef HAVE_ASPELL
 # include <aspell.h>
diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp
index 1f55887f4..a1c747ce8 100644
--- a/src/ui/dialog/object-attributes.cpp
+++ b/src/ui/dialog/object-attributes.cpp
@@ -21,6 +21,8 @@
 #include "xml/repr.h"
 #include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/object-attributes.h"
+#include "inkscape.h"
+#include "selection.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index eaf34c66d..c82b3a20f 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -23,6 +23,8 @@
 #include "../../document-undo.h"
 #include "verbs.h"
 #include "object-properties.h"
+#include "inkscape.h"
+#include "selection.h"
 
 
 namespace Inkscape {
diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h
index 6084d5aef..73df1d0ff 100644
--- a/src/ui/dialog/panel-dialog.h
+++ b/src/ui/dialog/panel-dialog.h
@@ -23,6 +23,7 @@
 #include "ui/dialog/floating-behavior.h"
 #include "ui/dialog/dock-behavior.h"
 #include "preferences.h"
+#include "inkscape.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h
index 8a0f2e822..65ff3a1c0 100644
--- a/src/ui/dialog/spellcheck.h
+++ b/src/ui/dialog/spellcheck.h
@@ -17,6 +17,7 @@
 #include <gtkmm/box.h>
 #include <gtkmm/textview.h>
 #include <gtkmm/button.h>
+#include <gtkmm/buttonbox.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/separator.h>
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index c215cf129..c136a0147 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -51,6 +51,7 @@
 #include "display/cairo-utils.h"
 #include "sp-gradient-reference.h"
 #include "dialog-manager.h"
+#include "selection.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h
index 9417f690e..4d00538a9 100644
--- a/src/ui/dialog/text-edit.h
+++ b/src/ui/dialog/text-edit.h
@@ -34,6 +34,8 @@
 #include "widgets/font-selector.h"
 #include "ui/dialog/desktop-tracker.h"
 
+class SPItem;
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index 920ff0d2c..39c3d6cf6 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -27,6 +27,7 @@
 
 #include "tracedialog.h"
 #include "trace/potrace/inkscape-potrace.h"
+#include "inkscape.h"
 
 
 namespace Inkscape {
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 0871fbffd..0989c7d0d 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -29,6 +29,7 @@
 #include "desktop-handles.h"
 #include "inkscape.h"
 #include "widgets/eek-preview.h"
+#include "ui/previewfillable.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index 64efa8837..c1942ef05 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -13,22 +13,32 @@
 #ifndef SEEN_INKSCAPE_UI_WIDGET_PANEL_H
 #define SEEN_INKSCAPE_UI_WIDGET_PANEL_H
 
-#include <vector>
-
-#include "inkscape.h"
-#include "selection.h"
-#include "ui/previewfillable.h"
-
-#include <gtkmm/arrow.h>
 #include <gtkmm/box.h>
+#include <gtkmm/arrow.h>
 #include <gtkmm/button.h>
-#include <gtkmm/buttonbox.h>
-#include <gtkmm/checkmenuitem.h>
 #include <gtkmm/eventbox.h>
-#include <gtkmm/menuitem.h>
+#include <gtkmm/label.h>
+
+#include <vector>
+
+class SPDesktop;
+class SPDocument;
+
+namespace Gtk {
+	class CheckMenuItem;
+	class HButtonBox;
+	class MenuItem;
+}
 
 namespace Inkscape {
+
+struct Application;
+class Selection;
+
 namespace UI {
+
+class PreviewFillable;
+
 namespace Widget {
 
 /**