Header cleaning

(bzr r10963)

30 files changed, 43 insertions, 8 deletions

diff --git a/src/ui/context-menu.cpp b/src/ui/context-menu.cpp
index e99a19e11..8824ad914 100644
--- a/src/ui/context-menu.cpp
+++ b/src/ui/context-menu.cpp
@@ -17,9 +17,11 @@
 #include "../xml/repr.h"
 #include "desktop.h"
 #include "document.h"
+#include "document-undo.h"
 #include "message-stack.h"
 #include "preferences.h"
 #include "ui/dialog/dialog-manager.h"
+#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 714a0d9d5..b3fcf268c 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -45,6 +45,7 @@
 #include "verbs.h"
 #include "widgets/icon.h"
 #include "sp-root.h"
+#include "document-undo.h"
 
 #include "align-and-distribute.h"
 
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index c63044174..25f055f08 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -24,6 +24,7 @@
 #include "desktop-style.h"
 #include "display/cairo-utils.h"
 #include "document.h"
+#include "document-undo.h"
 #include "inkscape.h" // for SP_ACTIVE_DESKTOP
 #include "io/resource.h"
 #include "io/sys.h"
@@ -33,6 +34,7 @@
 #include "svg/svg-color.h"
 #include "xml/node.h"
 #include "xml/repr.h"
+#include "verbs.h"
 
 #include "color.h" // for SP_RGBA32_U_COMPOSE
 
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index d7c46323d..7e83069cc 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -27,6 +27,7 @@
 #include "dialog-manager.h"
 #include "dir-util.h"
 #include "document.h"
+#include "document-undo.h"
 #include "filter-chemistry.h"
 #include "filter-effects-dialog.h"
 #include "filter-enums.h"
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index b6182eaff..ab89bdb97 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -25,6 +25,7 @@
 
 #include "desktop.h"
 #include "document.h" // for SPDocumentUndo::done()
+#include "document-undo.h"
 #include "libnrtype/font-instance.h"
 #include "sp-flowtext.h"
 #include "sp-text.h"
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 521510e1e..61b4fe389 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -21,6 +21,7 @@
 #include "display/guideline.h"
 #include "desktop.h"
 #include "document.h"
+#include "document-undo.h"
 #include "sp-guide.h"
 #include "sp-namedview.h"
 #include "desktop-handles.h"
@@ -30,6 +31,7 @@
 #include "dialogs/dialog-events.h"
 #include "message-context.h"
 #include "xml/repr.h"
+#include "verbs.h"
 
 #include <2geom/point.h>
 #include <2geom/angle.h>
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 3a49a267c..51ade2756 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -36,6 +36,7 @@
 #include "selection.h"
 #include "sp-root.h"
 #include "xml/repr.h"
+#include "verbs.h"
 
 #include "icon-preview.h"
 
diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp
index cc9a4fb42..b674e990b 100644
--- a/src/ui/dialog/layer-properties.cpp
+++ b/src/ui/dialog/layer-properties.cpp
@@ -18,11 +18,13 @@
 #include "inkscape.h"
 #include "desktop.h"
 #include "document.h"
+#include "document-undo.h"
 #include "layer-manager.h"
 #include "message-stack.h"
 #include "desktop-handles.h"
 #include "sp-object.h"
 #include "sp-item.h"
+#include "verbs.h"
 
 #include "layer-properties.h"
 
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 28a1e939c..9dc3a18f5 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -21,6 +21,7 @@
 #include "desktop.h"
 #include "desktop-style.h"
 #include "document.h"
+#include "document-undo.h"
 #include "helper/action.h"
 #include "inkscape.h"
 #include "layer-fns.h"
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 4ddacb1b3..92d28f184 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -24,6 +24,7 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "gtkmm/widget.h"
 #include "inkscape.h"
 #include "live_effects/effect.h"
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index 26d8e6f24..eaf34c66d 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -20,6 +20,8 @@
 
 #include "../../desktop-handles.h"
 #include "../../document.h"
+#include "../../document-undo.h"
+#include "verbs.h"
 #include "object-properties.h"
 
 
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index 40fc42969..a91ccf196 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -31,6 +31,7 @@
 #include "svg/svg-color.h"
 #include "io/sys.h"
 
+#include <glibmm/i18n.h>
 
 
 static void draw_page(
diff --git a/src/ui/dialog/print.h b/src/ui/dialog/print.h
index 0184bc783..bfa6bbe97 100644
--- a/src/ui/dialog/print.h
+++ b/src/ui/dialog/print.h
@@ -11,12 +11,10 @@
 #ifndef INKSCAPE_UI_DIALOG_PRINT_H
 #define INKSCAPE_UI_DIALOG_PRINT_H
 
-#include <glibmm/i18n.h>
 #include <gtkmm/printoperation.h> // GtkMM
-#include <gtk/gtk.h> // Gtk
 
-#include "desktop.h"
-#include "sp-item.h"
+class SPItem;
+class SPDocument;
 
 #include "ui/widget/rendering-options.h"
 
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 1a55b9e00..7210ab3a6 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -18,6 +18,7 @@
 #ifdef ENABLE_SVG_FONTS
 
 #include "document-private.h"
+#include "document-undo.h"
 #include <gtkmm/notebook.h>
 #include <gtkmm/stock.h>
 #include <glibmm/i18n.h>
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 50f8a90aa..c215cf129 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <map>
 #include <algorithm>
+#include <set>
 
 #include <gtk/gtk.h> //for GTK_RESPONSE* types
 #include <glibmm/i18n.h>
@@ -28,6 +29,7 @@
 #include "desktop-style.h"
 #include "document.h"
 #include "document-private.h"
+#include "document-undo.h"
 #include "extension/db.h"
 #include "inkscape.h"
 #include "inkscape.h"
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index 8ca0ba348..929f91346 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -29,6 +29,7 @@
 #include "desktop-handles.h"
 #include "selection.h"
 #include "document.h"
+#include "document-undo.h"
 #include "sp-item.h"
 #include "widgets/icon.h"
 #include "tile.h"
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 996aaf19e..4b4e99da0 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -20,6 +20,7 @@
 #include <2geom/transforms.h>
 
 #include "document.h"
+#include "document-undo.h"
 #include "desktop-handles.h"
 #include "transformation.h"
 #include "align-and-distribute.h"
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index 74de33b27..75dfcd16e 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -21,6 +21,7 @@
 
 
 #include "document.h"
+#include "document-undo.h"
 #include "inkscape.h"
 #include "verbs.h"
 #include "desktop-handles.h"
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index d5e2bf4ec..62710031f 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -16,6 +16,7 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "live_effects/lpeobject.h"
 #include "message-stack.h"
 #include "preferences.h"
@@ -26,6 +27,7 @@
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
 #include "util/unordered-containers.h"
+#include "verbs.h"
 
 #include <gdk/gdkkeysyms.h>
 
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index 2bcb5a157..08141ac71 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -13,9 +13,11 @@
 #include "inkscape.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "dialogs/dialog-events.h"
 
 #include "widgets/sp-color-notebook.h"
+#include "verbs.h"
 
 #include "color-picker.h"
 
diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h
index 9dad40031..cece8a361 100644
--- a/src/ui/widget/color-picker.h
+++ b/src/ui/widget/color-picker.h
@@ -17,11 +17,9 @@
 #include <gtkmm/button.h>
 #include <gtkmm/dialog.h>
 #include <sigc++/sigc++.h>
-#include "widgets/sp-color-selector.h"
 #include "ui/widget/color-preview.h"
-//#include "ui/dialog/dialog.h"
-
 
+struct SPColorSelector;
 
 namespace Inkscape
 {
diff --git a/src/ui/widget/combo-enums.h b/src/ui/widget/combo-enums.h
index 9dfb920a5..d2f6fc43b 100644
--- a/src/ui/widget/combo-enums.h
+++ b/src/ui/widget/combo-enums.h
@@ -13,9 +13,11 @@
 
 #include <gtkmm/combobox.h>
 #include <gtkmm/liststore.h>
+#include "ui/widget/labelled.h"
 #include "attr-widget.h"
 #include "util/enums.h"
-#include "ui/widget/labelled.h"
+
+#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index 9605571d1..6655b045b 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -25,6 +25,8 @@
 #include "rdf.h"
 #include "ui/widget/registry.h"
 #include "sp-root.h"
+#include "document-undo.h"
+#include "verbs.h"
 
 #include "entity-entry.h"
 
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 08534059b..59317435c 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -21,6 +21,7 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "layer-manager.h"
 #include "sp-item.h"
 #include "ui/dialog/layer-properties.h"
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 28b140036..8a9d84e36 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -22,6 +22,8 @@
 #include "ui/widget/registry.h"
 #include "rdf.h"
 #include "inkscape.h"
+#include "document-undo.h"
+#include "verbs.h"
 
 #include "licensor.h"
 
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 75170971e..06095fb13 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -17,6 +17,7 @@
 #include "desktop-handles.h"
 #include "desktop-style.h"
 #include "document.h"
+#include "document-undo.h"
 #include "filter-chemistry.h"
 #include "inkscape.h"
 #include "selection.h"
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index 80acb98e6..52a44114d 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -26,6 +26,7 @@
 #include "inkscape.h"
 
 #include "document.h"
+#include "document-undo.h"
 #include "desktop-handles.h"
 #include "sp-namedview.h"
 
diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index c6ac3a381..cf0241fd1 100644
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -31,6 +31,7 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "document-undo.h"
 #include "sp-namedview.h"
 #include "verbs.h"
 
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 3d3cd4bb8..3931256cb 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -32,6 +32,7 @@
 #include "ui/dialog/panel-dialog.h"
 #include "xml/repr.h"
 #include "document.h"
+#include "document-undo.h"
 #include "widgets/widget-sizes.h"
 #include "widgets/spinbutton-events.h"
 #include "widgets/gradient-image.h"
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index 72fd48344..be710f5e5 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -23,6 +23,7 @@
 
 #include "inkscape.h"
 #include "document.h"
+#include "document-undo.h"
 #include "desktop-handles.h"
 #include "sp-namedview.h"