Move classes derived from SPObject to own directory.

A lot of header clean-up.

28 files changed, 372 insertions, 258 deletions

diff --git a/src/widgets/arc-toolbar.cpp b/src/widgets/arc-toolbar.cpp
index d4c36d516..cd4f4c4d3 100644
--- a/src/widgets/arc-toolbar.cpp
+++ b/src/widgets/arc-toolbar.cpp
@@ -28,28 +28,32 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
-
 #include "arc-toolbar.h"
 
+#include <glibmm/i18n.h>
+
 #include "desktop.h"
 #include "document-undo.h"
-#include "widgets/ege-adjustment-action.h"
-#include "widgets/ege-output-action.h"
 #include "ink-action.h"
 #include "ink-radio-action.h"
 #include "mod360.h"
 #include "selection.h"
-#include "sp-ellipse.h"
 #include "toolbox.h"
+#include "verbs.h"
+
+#include "object/sp-ellipse.h"
+
 #include "ui/icon-names.h"
+#include "ui/tools/arc-tool.h"
 #include "ui/uxmanager.h"
 #include "ui/widget/ink-select-one-action.h"
 #include "ui/widget/unit-tracker.h"
-#include "ui/tools/arc-tool.h"
-#include "verbs.h"
+
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
 #include "widgets/spinbutton-events.h"
 #include "widgets/widget-sizes.h"
+
 #include "xml/node-event-vector.h"
 
 using Inkscape::UI::Widget::UnitTracker;
diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp
index 29a447afd..4b944314d 100644
--- a/src/widgets/box3d-toolbar.cpp
+++ b/src/widgets/box3d-toolbar.cpp
@@ -28,23 +28,28 @@
 #include <config.h>
 #endif
 
+#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 
 #include "box3d-toolbar.h"
-#include "box3d.h"
 
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "widgets/ege-adjustment-action.h"
-#include "widgets/ink-toggle-action.h"
 #include "inkscape.h"
-#include "persp3d.h"
 #include "toolbox.h"
+#include "verbs.h"
+
+#include "object/box3d.h"
+#include "object/persp3d.h"
+
 #include "ui/icon-names.h"
 #include "ui/tools/box3d-tool.h"
 #include "ui/uxmanager.h"
-#include "verbs.h"
+
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ink-toggle-action.h"
+
 #include "xml/node-event-vector.h"
 
 using Inkscape::UI::UXManager;
diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp
index 349163255..2030e7acb 100644
--- a/src/widgets/connector-toolbar.cpp
+++ b/src/widgets/connector-toolbar.cpp
@@ -35,19 +35,24 @@
 
 #include "desktop.h"
 #include "document-undo.h"
-#include "widgets/ege-adjustment-action.h"
 #include "enums.h"
 #include "graphlayout.h"
 #include "ink-action.h"
 #include "ink-toggle-action.h"
 #include "inkscape.h"
-#include "sp-namedview.h"
 #include "toolbox.h"
+#include "verbs.h"
+
+#include "object/sp-namedview.h"
+#include "object/sp-path.h"
+
 #include "ui/icon-names.h"
 #include "ui/tools/connector-tool.h"
 #include "ui/uxmanager.h"
-#include "verbs.h"
+
+#include "widgets/ege-adjustment-action.h"
 #include "widgets/spinbutton-events.h"
+
 #include "xml/node-event-vector.h"
 
 using Inkscape::UI::UXManager;
diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index 05f3ab44c..ed2dbe321 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -19,14 +19,19 @@
 #include "dash-selector.h"
 
 #include <cstring>
+
 #include <glibmm/i18n.h>
+
 #include <2geom/coord.h>
 
+#include "preferences.h"
+
+#include "display/cairo-utils.h"
+
 #include "style.h"
+
 #include "ui/dialog-events.h"
-#include "preferences.h"
 #include "ui/widget/spinbutton.h"
-#include "display/cairo-utils.h"
 
 gchar const *const SPDashSelector::_prefs_path = "/palette/dashes";
 
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index ac2eac801..2e84313b1 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -24,50 +24,57 @@
 # include "config.h"
 #endif
 
+#include <gtkmm/cssprovider.h>
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/paned.h>
+
 #include <2geom/rect.h>
 
-#include "ui/dialog/dialog-manager.h"
-#include "ui/tools/box3d-tool.h"
+#include "attributes.h"
 #include "cms-system.h"
 #include "conn-avoid-ref.h"
-#include "desktop.h"
 #include "desktop-events.h"
-
 #include "desktop-widget.h"
-#include "display/sp-canvas.h"
-#include "display/canvas-arena.h"
+#include "desktop.h"
 #include "ege-color-prof-tracker.h"
-#include "widgets/ege-select-one-action.h"
-#include <extension/db.h>
 #include "file.h"
+#include "inkscape-version.h"
+#include "verbs.h"
+
+#include "display/canvas-arena.h"
+#include "display/sp-canvas.h"
+
+#include "extension/db.h"
+
 #include "helper/action.h"
-#include "util/units.h"
-#include "ui/widget/unit-tracker.h"
-#include "ui/interface.h"
-#include "sp-image.h"
-#include "sp-namedview.h"
+
+#include "object/sp-image.h"
+#include "object/sp-namedview.h"
+#include "object/sp-root.h"
+
+#include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/swatches.h"
 #include "ui/icon-names.h"
+#include "ui/interface.h"
+#include "ui/tools/box3d-tool.h"
+#include "ui/uxmanager.h"
 #include "ui/widget/dock.h"
 #include "ui/widget/ink-select-one-action.h"
 #include "ui/widget/layer-selector.h"
 #include "ui/widget/selected-style.h"
-#include "ui/uxmanager.h"
+#include "ui/widget/unit-tracker.h"
+
 #include "util/ege-appear-time-tracker.h"
-#include "sp-root.h"
-#include "attributes.h"
+#include "util/units.h"
+
 // We're in the "widgets" directory, so no need to explicitly prefix these:
 #include "button.h"
+#include "ege-select-one-action.h"
 #include "gimp/ruler.h"
 #include "spinbutton-events.h"
 #include "spw-utilities.h"
 #include "toolbox.h"
 #include "widget-sizes.h"
-#include "verbs.h"
-#include <gtkmm/cssprovider.h>
-#include <gtkmm/paned.h>
-#include <gtkmm/messagedialog.h>
-#include "inkscape-version.h"
 
 using Inkscape::UI::Widget::UnitTracker;
 using Inkscape::UI::UXManager;
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index c61a857e7..8b3a31516 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -25,27 +25,28 @@
 #include <gtkmm/box.h>
 #include <glibmm/i18n.h>
 
-#include "verbs.h"
-
-#include "desktop.h"
-#include "selection.h"
-
 #include "desktop-style.h"
-#include "display/sp-canvas.h"
+#include "desktop.h"
 #include "document-private.h"
 #include "document-undo.h"
+#include "fill-n-stroke-factory.h"
+#include "fill-style.h"
 #include "gradient-chemistry.h"
 #include "inkscape.h"
-#include "sp-linear-gradient.h"
-#include "sp-mesh-gradient.h"
-#include "sp-pattern.h"
-#include "sp-radial-gradient.h"
-#include "sp-text.h"
+#include "selection.h"
+#include "verbs.h"
+
+#include "object/sp-defs.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-mesh-gradient.h"
+#include "object/sp-pattern.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-text.h"
 #include "style.h"
-#include "widgets/paint-selector.h"
 
-#include "fill-style.h"
-#include "fill-n-stroke-factory.h"
+#include "display/sp-canvas.h"
+
+#include "widgets/paint-selector.h"
 
 
 // These can be deleted once we sort out the libart dependence.
diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index 638cffda6..65b1a6733 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -11,17 +11,19 @@
  */
 
 #include <sigc++/sigc++.h>
+
 #include <glibmm/refptr.h>
 #include <gdkmm/pixbuf.h>
+
 #include <cairomm/surface.h>
 
-#include "display/cairo-utils.h"
 #include "gradient-image.h"
 #include "macros.h"
-#include "sp-gradient.h"
-#include "sp-stop.h"
 
-#define VBLOCK 16
+#include "display/cairo-utils.h"
+
+#include "object/sp-gradient.h"
+#include "object/sp-stop.h"
 
 static void sp_gradient_image_size_request (GtkWidget *widget, GtkRequisition *requisition);
 
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index 99ef9f19b..db2d7f028 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -17,24 +17,25 @@
 #include <config.h>
 #endif
 
+#include <glibmm/i18n.h>
 #include <gtkmm/treeview.h>
 
-#include "gradient-vector.h"
-
-#include "document.h"
-#include "document-undo.h"
 #include "document-private.h"
+#include "document-undo.h"
+#include "document.h"
 #include "gradient-chemistry.h"
+#include "gradient-vector.h"
+#include "id-clash.h"
 #include "inkscape.h"
-#include "verbs.h"
-#include "helper/action.h"
+#include "paint-selector.h"
 #include "preferences.h"
+#include "verbs.h"
 
-#include <glibmm/i18n.h>
-
-#include "paint-selector.h"
+#include "object/sp-defs.h"
 #include "style.h"
-#include "id-clash.h"
+
+#include "helper/action.h"
+
 #include "ui/icon-names.h"
 
 enum {
diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h
index e058c5112..93ef5d8c1 100644
--- a/src/widgets/gradient-selector.h
+++ b/src/widgets/gradient-selector.h
@@ -23,8 +23,8 @@
 #include <gtkmm/scrolledwindow.h>
 
 #include <vector>
-#include "sp-gradient-spread.h"
-#include "sp-gradient-units.h"
+#include "object/sp-gradient-spread.h"
+#include "object/sp-gradient-units.h"
 
 class SPDocument;
 class SPGradient;
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index 6a7d4b931..d5cc3fd11 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -16,13 +16,12 @@
 #include <config.h>
 #endif
 
-#include "ui/widget/color-preview.h"
 #include <glibmm/i18n.h>
 
+
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "widgets/ege-adjustment-action.h"
 #include "gradient-chemistry.h"
 #include "gradient-drag.h"
 #include "gradient-toolbar.h"
@@ -31,17 +30,22 @@
 #include "ink-toggle-action.h"
 #include "macros.h"
 #include "selection.h"
-#include "sp-defs.h"
-#include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
-#include "sp-stop.h"
-#include "style.h"
 #include "toolbox.h"
+#include "verbs.h"
+
+#include "object/sp-defs.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-stop.h"
+#include "style.h"
+
 #include "ui/icon-names.h"
-#include "ui/util.h"
 #include "ui/tools/gradient-tool.h"
+#include "ui/util.h"
+#include "ui/widget/color-preview.h"
 #include "ui/widget/ink-select-one-action.h"
-#include "verbs.h"
+
+#include "widgets/ege-adjustment-action.h"
 #include "widgets/gradient-image.h"
 #include "widgets/gradient-vector.h"
 
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index fdba2b56d..412f0b7e2 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -23,37 +23,47 @@
 #include <config.h>
 #endif
 
+#include <set>
+
 #include <glibmm.h>
-#include "gradient-vector.h"
-#include "ui/widget/color-preview.h"
-#include "verbs.h"
-#include "macros.h"
 #include <glibmm/i18n.h>
-#include <set>
-#include "../widgets/gradient-image.h"
-#include "../inkscape.h"
-#include "../document-private.h"
-#include "../gradient-chemistry.h"
-#include "../helper/window.h"
-#include "io/resource.h"
 
-#include "xml/repr.h"
 
-#include "../preferences.h"
-#include "svg/css-ostringstream.h"
-#include "sp-stop.h"
-#include "selection-chemistry.h"
-#include "style.h"
-#include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
+
+
+#include "document-private.h"
+#include "gradient-chemistry.h"
+#include "inkscape.h"
+#include "preferences.h"
 #include "desktop.h"
+#include "document-undo.h"
+#include "gradient-vector.h"
 #include "layer-manager.h"
+#include "macros.h"
+#include "selection-chemistry.h"
+#include "verbs.h"
 
-#include "document-undo.h"
+#include "helper/window.h"
+
+#include "io/resource.h"
+
+#include "object/sp-defs.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-root.h"
+#include "object/sp-stop.h"
+#include "style.h"
+
+#include "svg/css-ostringstream.h"
 
 #include "ui/dialog-events.h"
 #include "ui/selected-color.h"
 #include "ui/widget/color-notebook.h"
+#include "ui/widget/color-preview.h"
+
+#include "widgets/gradient-image.h"
+
+#include "xml/repr.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::UI::SelectedColor;
diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp
index 4c88b42d6..fb5e5428a 100644
--- a/src/widgets/mesh-toolbar.cpp
+++ b/src/widgets/mesh-toolbar.cpp
@@ -18,41 +18,40 @@
 #include <config.h>
 #endif
 
+#include <glibmm/i18n.h>
 #include <gtkmm.h>
 
-#include "ui/widget/color-preview.h"
-#include "toolbox.h"
 #include "mesh-toolbar.h"
 
+#include "desktop-style.h"
+#include "desktop.h"
+#include "document-private.h"
+#include "document-undo.h"
+#include "gradient-chemistry.h"
+#include "gradient-drag.h"
+#include "ink-action.h"
+#include "ink-radio-action.h"
+#include "ink-toggle-action.h"
+#include "inkscape.h"
+#include "toolbox.h"
 #include "verbs.h"
 
-#include "widgets/spinbutton-events.h"
-#include "widgets/gradient-image.h"
+#include "object/sp-defs.h"
+#include "object/sp-mesh-gradient.h"
+#include "object/sp-stop.h"
 #include "style.h"
 
-#include "inkscape.h"
-#include "document-private.h"
-#include "document-undo.h"
-#include "desktop.h"
-
-#include <glibmm/i18n.h>
+#include "svg/css-ostringstream.h"
 
+#include "ui/icon-names.h"
 #include "ui/tools/gradient-tool.h"
 #include "ui/tools/mesh-tool.h"
+#include "ui/widget/color-preview.h"
 #include "ui/widget/ink-select-one-action.h"
-#include "gradient-drag.h"
-#include "sp-mesh-gradient.h"
-#include "gradient-chemistry.h"
-#include "ui/icon-names.h"
 
 #include "widgets/ege-adjustment-action.h"
-#include "ink-action.h"
-#include "ink-radio-action.h"
-#include "ink-toggle-action.h"
-
-#include "sp-stop.h"
-#include "svg/css-ostringstream.h"
-#include "desktop-style.h"
+#include "widgets/gradient-image.h"
+#include "widgets/spinbutton-events.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
diff --git a/src/widgets/node-toolbar.cpp b/src/widgets/node-toolbar.cpp
index b1346ed89..b1091ac69 100644
--- a/src/widgets/node-toolbar.cpp
+++ b/src/widgets/node-toolbar.cpp
@@ -28,24 +28,28 @@
 #include <config.h>
 #endif
 
-#include "ui/tool/multi-path-manipulator.h"
 #include <glibmm/i18n.h>
-#include "node-toolbar.h"
+
 
 #include "desktop.h"
 #include "document-undo.h"
-#include "widgets/ege-adjustment-action.h"
 #include "ink-toggle-action.h"
 #include "ink-tool-menu-action.h"
 #include "inkscape.h"
+#include "node-toolbar.h"
 #include "selection-chemistry.h"
-#include "sp-namedview.h"
 #include "toolbox.h"
+#include "verbs.h"
+
+#include "object/sp-namedview.h"
+
 #include "ui/icon-names.h"
 #include "ui/tool/control-point-selection.h"
+#include "ui/tool/multi-path-manipulator.h"
 #include "ui/tools/node-tool.h"
 #include "ui/widget/unit-tracker.h"
-#include "verbs.h"
+
+#include "widgets/ege-adjustment-action.h"
 #include "widgets/widget-sizes.h"
 
 using Inkscape::UI::Widget::UnitTracker;
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 557dc8da2..991d81d4a 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -25,30 +25,36 @@
 #include <string>
 #include <vector>
 
-#include "widgets/swatch-selector.h"
-#include "sp-pattern.h"
 #include <glibmm/i18n.h>
-#include "widgets/widget-sizes.h"
-#include "xml/repr.h"
 
-#include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
-#include "sp-mesh-gradient.h"
-#include "sp-stop.h"
-/* fixme: Move it from dialogs to here */
+#include "desktop-style.h"
+#include "document-private.h"
 #include "gradient-selector.h"
-#include <inkscape.h>
-#include <document-private.h>
-#include <desktop-style.h>
-#include <style.h>
-#include "svg/css-ostringstream.h"
+#include "inkscape.h"
+#include "paint-selector.h"
 #include "path-prefix.h"
-#include "io/sys.h"
+
 #include "helper/stock-items.h"
+
+#include "style.h"
+
+#include "io/sys.h"
+
+#include "object/sp-linear-gradient.h"
+#include "object/sp-mesh-gradient.h"
+#include "object/sp-pattern.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-stop.h"
+
+#include "svg/css-ostringstream.h"
+
 #include "ui/icon-names.h"
 #include "ui/widget/color-notebook.h"
 
-#include "paint-selector.h"
+#include "widgets/swatch-selector.h"
+#include "widgets/widget-sizes.h"
+
+#include "xml/repr.h"
 
 #ifdef SP_PS_VERBOSE
 #include "svg/svg-icc-color.h"
diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h
index 3302632b8..8433d66f8 100644
--- a/src/widgets/paint-selector.h
+++ b/src/widgets/paint-selector.h
@@ -21,8 +21,10 @@
 
 #include "color.h"
 #include "fill-or-stroke.h"
-#include "sp-gradient-spread.h"
-#include "sp-gradient-units.h"
+
+#include "object/sp-gradient-spread.h"
+#include "object/sp-gradient-units.h"
+
 #include "ui/selected-color.h"
 
 class SPGradient;
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index 14fb72f97..f26a4400c 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -32,26 +32,35 @@
 #include <glibmm/i18n.h>
 
 #include "pencil-toolbar.h"
+
 #include "desktop.h"
-#include "widgets/ege-adjustment-action.h"
-#include "widgets/ege-select-one-action.h"
+#include "selection.h"
+#include "toolbox.h"
+
 #include "ink-action.h"
 #include "ink-radio-action.h"
 #include "ink-toggle-action.h"
-#include "toolbox.h"
-#include "ui/tools-switch.h"
+
+#include "live_effects/lpe-bspline.h"
+#include "live_effects/lpe-powerstroke.h"
+#include "live_effects/lpe-simplify.h"
+#include "live_effects/lpe-spiro.h"
+#include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpeobject.h"
+
+#include "display/curve.h"
+
+#include "object/sp-shape.h"
+
 #include "ui/icon-names.h"
+#include "ui/tools-switch.h"
 #include "ui/tools/pen-tool.h"
 #include "ui/uxmanager.h"
+
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-select-one-action.h"
 #include "widgets/spinbutton-events.h"
-#include <selection.h>
-#include "display/curve.h"
-#include "live_effects/lpe-simplify.h"
-#include "live_effects/lpe-powerstroke.h"
-#include "live_effects/lpe-bspline.h"
-#include "live_effects/lpe-spiro.h"
-#include "live_effects/lpeobject.h"
-#include "live_effects/lpeobject-reference.h"
+
 
 using Inkscape::UI::UXManager;
 using Inkscape::UI::ToolboxFactory;
diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp
index 5b7362e09..df6abf9da 100644
--- a/src/widgets/rect-toolbar.cpp
+++ b/src/widgets/rect-toolbar.cpp
@@ -28,25 +28,30 @@
 #include <config.h>
 #endif
 
+#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 
 #include "rect-toolbar.h"
 
 #include "desktop.h"
 #include "document-undo.h"
-#include "widgets/ege-adjustment-action.h"
-#include "widgets/ege-output-action.h"
-#include "widgets/ink-action.h"
 #include "inkscape.h"
-#include "sp-namedview.h"
-#include "sp-rect.h"
 #include "toolbox.h"
+#include "verbs.h"
+
+#include "object/sp-namedview.h"
+#include "object/sp-rect.h"
+
 #include "ui/icon-names.h"
 #include "ui/tools/rect-tool.h"
 #include "ui/uxmanager.h"
 #include "ui/widget/unit-tracker.h"
-#include "verbs.h"
+
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
+#include "widgets/ink-action.h"
 #include "widgets/widget-sizes.h"
+
 #include "xml/node-event-vector.h"
 
 using Inkscape::UI::Widget::UnitTracker;
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 0932589d2..df90d3d12 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -16,30 +16,36 @@
 #include <config.h>
 #endif
 
+#include <glibmm/i18n.h>
+
 #include <2geom/rect.h>
 
-#include "ui/widget/spinbutton.h"
-#include <glibmm/i18n.h>
 #include "select-toolbar.h"
 
 #include "desktop.h"
-#include "display/sp-canvas.h"
 #include "document-undo.h"
 #include "document.h"
-#include "widgets/ege-adjustment-action.h"
-#include "helper/action-context.h"
-#include "helper/action.h"
 #include "ink-action.h"
 #include "ink-toggle-action.h"
 #include "inkscape.h"
 #include "message-stack.h"
 #include "selection-chemistry.h"
-#include "sp-item-transform.h"
-#include "sp-namedview.h"
 #include "toolbox.h"
+#include "verbs.h"
+
+#include "display/sp-canvas.h"
+
+#include "helper/action-context.h"
+#include "helper/action.h"
+
+#include "object/sp-item-transform.h"
+#include "object/sp-namedview.h"
+
 #include "ui/icon-names.h"
+#include "ui/widget/spinbutton.h"
 #include "ui/widget/unit-tracker.h"
-#include "verbs.h"
+
+#include "widgets/ege-adjustment-action.h"
 #include "widgets/sp-widget.h"
 #include "widgets/widget-sizes.h"
 
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index 6116d3be5..d89e6296c 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -12,19 +12,21 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "sp-attribute-widget.h"
-
 #include <glibmm/i18n.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/grid.h>
 
-#include "sp-object.h"
-#include "xml/repr.h"
+#include "sp-attribute-widget.h"
+
 #include "macros.h"
 #include "document.h"
 #include "document-undo.h"
 #include "verbs.h"
 
+#include "object/sp-object.h"
+
+#include "xml/repr.h"
+
 using Inkscape::DocumentUndo;
 
 /**
diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp
index a2d5ec44e..79ea30e8e 100644
--- a/src/widgets/spiral-toolbar.cpp
+++ b/src/widgets/spiral-toolbar.cpp
@@ -28,22 +28,27 @@
 #include <config.h>
 #endif
 
+#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 
 #include "spiral-toolbar.h"
 
 #include "desktop.h"
 #include "document-undo.h"
-#include "widgets/ege-adjustment-action.h"
-#include "widgets/ege-output-action.h"
-#include "widgets/ink-action.h"
 #include "selection.h"
-#include "sp-spiral.h"
 #include "toolbox.h"
+#include "verbs.h"
+
+#include "object/sp-spiral.h"
+
 #include "ui/icon-names.h"
 #include "ui/uxmanager.h"
-#include "verbs.h"
+
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
+#include "widgets/ink-action.h"
 #include "widgets/spinbutton-events.h"
+
 #include "xml/node-event-vector.h"
 
 using Inkscape::UI::UXManager;
diff --git a/src/widgets/star-toolbar.cpp b/src/widgets/star-toolbar.cpp
index 13c4440ca..801cdf379 100644
--- a/src/widgets/star-toolbar.cpp
+++ b/src/widgets/star-toolbar.cpp
@@ -34,18 +34,22 @@
 
 #include "desktop.h"
 #include "document-undo.h"
-#include "widgets/ege-adjustment-action.h"
-#include "widgets/ege-output-action.h"
-#include "widgets/ege-select-one-action.h"
 #include "ink-action.h"
 #include "ink-radio-action.h"
 #include "selection.h"
-#include "sp-star.h"
 #include "toolbox.h"
+#include "verbs.h"
+
+#include "object/sp-star.h"
+
 #include "ui/icon-names.h"
 #include "ui/tools/star-tool.h"
 #include "ui/uxmanager.h"
-#include "verbs.h"
+
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ege-output-action.h"
+#include "widgets/ege-select-one-action.h"
+
 #include "xml/node-event-vector.h"
 
 using Inkscape::UI::UXManager;
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index 51377fd41..95a8ce078 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -19,25 +19,25 @@
 #include "stroke-marker-selector.h"
 
 #include <glibmm/i18n.h>
-
-
-#include "style.h"
-#include "ui/dialog-events.h"
+#include <gtkmm/icontheme.h>
 
 #include "desktop-style.h"
 #include "path-prefix.h"
-#include "io/sys.h"
-#include "sp-marker.h"
-#include "sp-defs.h"
-#include "sp-root.h"
-#include "ui/cache/svg_preview_cache.h"
+#include "stroke-style.h"
+
 #include "helper/stock-items.h"
 
-#include <gtkmm/icontheme.h>
-#include "ui/widget/spinbutton.h"
-#include "ui/util.h"
+#include "io/sys.h"
 
-#include "stroke-style.h"
+#include "object/sp-defs.h"
+#include "object/sp-marker.h"
+#include "object/sp-root.h"
+#include "style.h"
+
+#include "ui/cache/svg_preview_cache.h"
+#include "ui/dialog-events.h"
+#include "ui/util.h"
+#include "ui/widget/spinbutton.h"
 
 static Inkscape::UI::Cache::SvgPreview svg_preview_cache;
 
diff --git a/src/widgets/stroke-marker-selector.h b/src/widgets/stroke-marker-selector.h
index fb68aad58..78e5569af 100644
--- a/src/widgets/stroke-marker-selector.h
+++ b/src/widgets/stroke-marker-selector.h
@@ -10,6 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include <vector>
+
 #include <gtkmm/box.h>
 #include <gtkmm/combobox.h>
 #include <gtkmm/liststore.h>
@@ -19,10 +20,13 @@
 #include "desktop.h"
 #include "document.h"
 #include "inkscape.h"
+
 #include "display/drawing.h"
-#include "sp-marker.h"
+
+class SPMarker;
 
 namespace Gtk {
+
 class Container;
 class Adjustment;
 }
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index fba6157e2..b127efcff 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -17,11 +17,19 @@
 
 #define noSP_SS_VERBOSE
 
+#include "desktop-widget.h"
 #include "stroke-style.h"
-#include "sp-stop.h"
+
+#include "object/sp-marker.h"
+#include "object/sp-namedview.h"
+#include "object/sp-rect.h"
+#include "object/sp-stop.h"
+#include "object/sp-text.h"
+
 #include "svg/svg-color.h"
+
 #include "ui/widget/unit-menu.h"
-#include "desktop-widget.h"
+
 #include "widgets/style-utils.h"
 
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h
index b8eaec8e8..034d385e7 100644
--- a/src/widgets/stroke-style.h
+++ b/src/widgets/stroke-style.h
@@ -21,49 +21,46 @@
 # include "config.h"
 #endif
 
-#include "widgets/dash-selector.h"
-#include <gtkmm/radiobutton.h>
-#include <gtkmm/grid.h>
-
 #include <glibmm/i18n.h>
+#include <gtkmm/grid.h>
+#include <gtkmm/radiobutton.h>
 
-#include "desktop.h"
 #include "desktop-style.h"
-#include "ui/dialog-events.h"
-#include "display/canvas-bpath.h" // for SP_STROKE_LINEJOIN_*
-#include "display/drawing.h"
+#include "desktop.h"
 #include "document-private.h"
 #include "document-undo.h"
+#include "fill-n-stroke-factory.h"
+#include "fill-style.h" // to get sp_fill_style_widget_set_desktop
 #include "gradient-chemistry.h"
-#include "helper/stock-items.h"
+
 #include "inkscape.h"
 #include "io/sys.h"
-#include "sp-marker.h"
-#include "preferences.h"
 #include "path-prefix.h"
+#include "preferences.h"
 #include "selection.h"
-#include "sp-linear-gradient.h"
-#include "sp-namedview.h"
-#include "sp-pattern.h"
-#include "sp-radial-gradient.h"
-#include "sp-rect.h"
-#include "sp-text.h"
+#include "verbs.h"
+
+#include "display/canvas-bpath.h" // for SP_STROKE_LINEJOIN_*
+#include "display/drawing.h"
+
+#include "helper/stock-items.h"
+
 #include "style.h"
+
 #include "svg/css-ostringstream.h"
+
 #include "ui/cache/svg_preview_cache.h"
+#include "ui/dialog-events.h"
 #include "ui/icon-names.h"
+#include "ui/widget/spinbutton.h"
+
+#include "widgets/dash-selector.h"
 #include "widgets/paint-selector.h"
 #include "widgets/sp-widget.h"
 #include "widgets/spw-utilities.h"
-#include "ui/widget/spinbutton.h"
-#include "xml/repr.h"
+#include "widgets/stroke-marker-selector.h"
 
-#include "stroke-style.h"
-#include "stroke-marker-selector.h"
-#include "fill-style.h" // to get sp_fill_style_widget_set_desktop
-#include "fill-n-stroke-factory.h"
-
-#include "verbs.h"
+#include "xml/repr.h"
 
 namespace Gtk {
 class Widget;
diff --git a/src/widgets/swatch-selector.cpp b/src/widgets/swatch-selector.cpp
index b9cce1d19..3bfa83cd9 100644
--- a/src/widgets/swatch-selector.cpp
+++ b/src/widgets/swatch-selector.cpp
@@ -1,15 +1,21 @@
+
 #include "swatch-selector.h"
+
 #include <glibmm/i18n.h>
 
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
 #include "gradient-chemistry.h"
 #include "gradient-selector.h"
-#include "sp-stop.h"
+#include "verbs.h"
+
+#include "object/sp-stop.h"
+
 #include "svg/css-ostringstream.h"
 #include "svg/svg-color.h"
-#include "verbs.h"
+
 #include "ui/widget/color-notebook.h"
+
 #include "xml/node.h"
 
 namespace Inkscape
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index 184c9fd4b..6288999a6 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -30,35 +30,41 @@
 #include <config.h>
 #endif
 
-#include "libnrtype/font-lister.h"
 #include <glibmm/i18n.h>
+
 #include "text-toolbar.h"
 
 #include "desktop-style.h"
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "widgets/ege-adjustment-action.h"
 #include "ink-radio-action.h"
 #include "ink-toggle-action.h"
-#include "widgets/ink-comboboxentry-action.h"
-#include "widgets/style-utils.h"
 #include "inkscape.h"
 #include "selection-chemistry.h"
-#include "sp-flowtext.h"
-#include "sp-root.h"
-#include "sp-text.h"
-#include "sp-tspan.h"
-#include "sp-flowdiv.h"
-#include "style.h"
-#include "svg/css-ostringstream.h"
 #include "text-editing.h"
 #include "toolbox.h"
+#include "verbs.h"
+
+#include "libnrtype/font-lister.h"
+
+#include "object/sp-flowdiv.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-root.h"
+#include "object/sp-text.h"
+#include "object/sp-tspan.h"
+#include "style.h"
+
+#include "svg/css-ostringstream.h"
+
 #include "ui/icon-names.h"
 #include "ui/tools/text-tool.h"
-#include "ui/widget/unit-tracker.h"
 #include "ui/widget/ink-select-one-action.h"
-#include "verbs.h"
+#include "ui/widget/unit-tracker.h"
+
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ink-comboboxentry-action.h"
+#include "widgets/style-utils.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 11be3b15d..5894391ff 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -36,31 +36,38 @@
 #include <gtkmm/toolitem.h>
 #include <glibmm/i18n.h>
 
-#include "../desktop.h"
-#include "../desktop-style.h"
+#include "desktop-style.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "widgets/ege-adjustment-action.h"
-#include "../helper/action.h"
+#include "inkscape.h"
+#include "shortcuts.h"
+#include "verbs.h"
+
 #include "ink-action.h"
 #include "ink-toggle-action.h"
-#include "../inkscape.h"
+
+#include "helper/action.h"
+
+#include "io/resource.h"
+
+#include "object/sp-namedview.h"
+
+#include "ui/icon-names.h"
 #include "ui/interface.h"
-#include "../shortcuts.h"
-#include "../sp-namedview.h"
 #include "ui/tools-switch.h"
-#include "../ui/icon-names.h"
-#include "../ui/widget/style-swatch.h"
-#include "../ui/widget/unit-tracker.h"
-#include "../verbs.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
-#include "ui/widget/spinbutton.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/attribute-record.h"
-#include "../xml/node-event-vector.h"
 #include "ui/uxmanager.h"
-#include "io/resource.h"
+#include "ui/widget/spinbutton.h"
+#include "ui/widget/style-swatch.h"
+#include "ui/widget/unit-tracker.h"
+
+#include "widgets/button.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/spinbutton-events.h"
+#include "widgets/spw-utilities.h"
+#include "widgets/widget-sizes.h"
+
+#include "xml/attribute-record.h"
+#include "xml/node-event-vector.h"
 
 #include "arc-toolbar.h"
 #include "box3d-toolbar.h"