Move classes derived from SPObject to own directory.

A lot of header clean-up.

97 files changed, 1271 insertions, 994 deletions

diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index eeb99e045..829c6b0ef 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -20,17 +20,19 @@
 #endif
 
 #include <gtk/gtk.h>
+
 #include <2geom/transforms.h>
-#include "sp-namedview.h"
+
 #include "selection.h"
 #include "inkscape.h"
-#include "sp-rect.h"
 #include "document-private.h"
+
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
 #include "display/drawing-item.h"
 #include "display/drawing.h"
 
+
 #include "ui/cache/svg_preview_cache.h"
 
 GdkPixbuf* render_pixbuf(Inkscape::Drawing &drawing, double scale_factor, Geom::Rect const &dbox, unsigned psize)
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index e11aabcb6..ac09b803f 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -41,43 +41,45 @@
 #include "message-stack.h"
 #include "context-fns.h"
 #include "ui/tools/dropper-tool.h" // used in copy()
-#include "style.h"
 #include "extension/db.h" // extension database
 #include "extension/input.h"
 #include "extension/output.h"
 #include "selection-chemistry.h"
 #include <2geom/transforms.h>
-#include "box3d.h"
 #include "gradient-drag.h"
-#include "sp-marker.h"
-#include "sp-item-transform.h" // for sp_item_scale_rel, used in _pasteSize
-#include "sp-path.h"
-#include "sp-pattern.h"
-#include "sp-gradient-reference.h"
-#include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
-#include "sp-clippath.h"
-#include "sp-mask.h"
-#include "sp-textpath.h"
-#include "sp-rect.h"
-#include "sp-object.h"
 #include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
 #include "live_effects/parameter/path.h"
-#include "svg/svg.h" // for sp_svg_transform_write, used in _copySelection
-#include "svg/css-ostringstream.h" // used in copy
 #include "ui/tools/text-tool.h"
 #include "text-editing.h"
 #include "ui/tools-switch.h"
 #include "path-chemistry.h"
 #include "util/units.h"
 #include "helper/png-write.h"
-#include "svg/svg-color.h"
-#include "sp-namedview.h"
-#include "persp3d.h"
-#include "object-set.h"
 #include "extension/find_extension_by_mime.h"
 
+#include "object/box3d.h"
+#include "object/persp3d.h"
+#include "object/sp-clippath.h"
+#include "object/sp-defs.h"
+#include "object/sp-gradient-reference.h"
+#include "object/sp-item-transform.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-marker.h"
+#include "object/sp-mask.h"
+#include "object/sp-pattern.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-rect.h"
+#include "object/sp-root.h"
+#include "object/sp-shape.h"
+#include "object/sp-use.h"
+#include "object/sp-textpath.h"
+#include "style.h"
+
+#include "svg/svg.h" // for sp_svg_transform_write, used in _copySelection
+#include "svg/css-ostringstream.h" // used in copy
+#include "svg/svg-color.h"
+
 /// Made up mimetype to represent Gdk::Pixbuf clipboard contents.
 #define CLIPBOARD_GDK_PIXBUF_TARGET "image/x-gdk-pixbuf"
 
diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp
index 3ca752c82..1a5691c3f 100644
--- a/src/ui/contextmenu.cpp
+++ b/src/ui/contextmenu.cpp
@@ -39,13 +39,14 @@
 #include "selection.h"
 #include "selection-chemistry.h"
 #include "shortcuts.h"
-#include "sp-anchor.h"
-#include "sp-clippath.h"
-#include "sp-image.h"
-#include "sp-item.h"
-#include "sp-mask.h"
-#include "sp-shape.h"
-#include "sp-text.h"
+
+#include "object/sp-anchor.h"
+#include "object/sp-clippath.h"
+#include "object/sp-image.h"
+#include "object/sp-mask.h"
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
+
 #include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/layer-properties.h"
 #include "verbs.h"
diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index 4f094f876..7a87a75ad 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -21,7 +21,7 @@
 # include <config.h>
 #endif
 
-#include "ui/dialog/aboutbox.h"
+#include "aboutbox.h"
 
 #include <fstream>
 
@@ -32,15 +32,17 @@
 #include <gtkmm/aspectframe.h>
 #include <gtkmm/textview.h>
 
-#include "path-prefix.h"
 #include "document.h"
+#include "inkscape-version.h"
+#include "path-prefix.h"
 #include "svg-view-widget.h"
-#include "sp-text.h"
 #include "text-editing.h"
+
+#include "object/sp-text.h"
+
 #include "ui/icon-names.h"
 #include "util/units.h"
 
-#include "inkscape-version.h"
 
 
 namespace Inkscape {
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 4314c9e89..d622b5e06 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -21,32 +21,34 @@
 #include "config.h"
 #endif
 
-#include "align-and-distribute.h"
+#include <glibmm/i18n.h>
+
 #include <2geom/transforms.h>
-#include "ui/widget/spinbutton.h"
 
-#include "unclump.h"
+#include "align-and-distribute.h"
+
+#include "desktop.h"
+#include "document-undo.h"
 #include "document.h"
 #include "graphlayout.h"
 #include "inkscape.h"
 #include "preferences.h"
 #include "removeoverlap.h"
-#include "sp-flowtext.h"
-#include "sp-item-transform.h"
-#include "sp-text.h"
 #include "text-editing.h"
-#include "ui/tools-switch.h"
-#include "ui/icon-names.h"
-#include "ui/tools/node-tool.h"
-#include "ui/tool/multi-path-manipulator.h"
-#include "ui/tool/control-point-selection.h"
+#include "unclump.h"
 #include "verbs.h"
-#include "sp-root.h"
-#include "document-undo.h"
-#include "desktop.h"
 
-#include <glibmm/i18n.h>
+#include "object/sp-flowtext.h"
+#include "object/sp-item-transform.h"
+#include "object/sp-root.h"
+#include "object/sp-text.h"
 
+#include "ui/icon-names.h"
+#include "ui/tool/control-point-selection.h"
+#include "ui/tool/multi-path-manipulator.h"
+#include "ui/tools-switch.h"
+#include "ui/tools/node-tool.h"
+#include "ui/widget/spinbutton.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 59c9e4cd4..06f25c5ae 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -21,7 +21,6 @@
 #include "clonetiler.h"
 
 #include <glibmm/i18n.h>
-#include <2geom/transforms.h>
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/checkbutton.h>
@@ -29,26 +28,35 @@
 #include <gtkmm/liststore.h>
 #include <gtkmm/radiobutton.h>
 
+#include <2geom/transforms.h>
+
 #include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "filter-chemistry.h"
+#include "inkscape.h"
+#include "message-stack.h"
+#include "unclump.h"
+#include "verbs.h"
 
 #include "display/cairo-utils.h"
-#include "display/drawing.h"
 #include "display/drawing-context.h"
-#include "document.h"
-#include "document-undo.h"
-#include "filter-chemistry.h"
-#include "ui/widget/unit-menu.h"
+#include "display/drawing.h"
+
 #include "helper/window.h"
-#include "inkscape.h"
+
+#include "object/sp-item.h"
+#include "object/sp-namedview.h"
+#include "object/sp-root.h"
+#include "object/sp-use.h"
+
+#include "ui/icon-names.h"
 #include "ui/interface.h"
-#include "message-stack.h"
-#include "sp-namedview.h"
+#include "ui/widget/spinbutton.h"
+#include "ui/widget/unit-menu.h"
+
 #include "svg/svg-color.h"
 #include "svg/svg.h"
-#include "ui/icon-names.h"
-#include "ui/widget/spinbutton.h"
-#include "unclump.h"
-#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::Util::unit_table;
diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h
index db3049ef1..f42ef8fbe 100644
--- a/src/ui/dialog/clonetiler.h
+++ b/src/ui/dialog/clonetiler.h
@@ -14,7 +14,6 @@
 
 #include "ui/dialog/desktop-tracker.h"
 #include "ui/widget/color-picker.h"
-#include "sp-root.h"
 
 namespace Gtk {
     class CheckButton;
@@ -22,6 +21,14 @@ namespace Gtk {
     class ToggleButton;
 }
 
+class SPItem;
+class SPObject;
+
+namespace Geom {
+    class Rect;
+    class Affine;
+}
+
 namespace Inkscape {
 namespace UI {
 
diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp
index 37f2b4c30..efceeae11 100644
--- a/src/ui/dialog/cssdialog.cpp
+++ b/src/ui/dialog/cssdialog.cpp
@@ -12,10 +12,12 @@
  */
 
 #include "cssdialog.h"
-#include "ui/widget/addtoicon.h"
+
 #include "verbs.h"
-#include "sp-object.h"
 #include "selection.h"
+
+#include "ui/widget/addtoicon.h"
+
 #include "xml/attribute-record.h"
 
 namespace Inkscape {
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index c219603b4..e46f5ec6c 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -20,11 +20,12 @@
 
 #include "document-metadata.h"
 #include "desktop.h"
-
 #include "rdf.h"
-#include "sp-namedview.h"
-#include "ui/widget/entity-entry.h"
 #include "verbs.h"
+
+#include "object/sp-namedview.h"
+
+#include "ui/widget/entity-entry.h"
 #include "xml/node-event-vector.h"
 
 
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 6b213f99a..aae9ce867 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -22,29 +22,30 @@
 # include <config.h>
 #endif
 
-#include "ui/widget/notebook-page.h"
-#include "document-properties.h"
 #include "display/canvas-grid.h"
+#include "document-properties.h"
+#include "rdf.h"
+#include "verbs.h"
 
 #include "io/sys.h"
-#include "ui/shape-editor.h"
-#include "sp-root.h"
-#include "sp-script.h"
+
+#include "object/sp-root.h"
+#include "object/sp-script.h"
 #include "style.h"
-#include "ui/tools-switch.h"
-#include "ui/dialog/filedialog.h"
-#include "verbs.h"
-#include "xml/node-event-vector.h"
 
-#include "rdf.h"
+#include "ui/dialog/filedialog.h"
+#include "ui/icon-names.h"
+#include "ui/shape-editor.h"
+#include "ui/tools-switch.h"
 #include "ui/widget/entity-entry.h"
+#include "ui/widget/notebook-page.h"
+
+#include "xml/node-event-vector.h"
 
 #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
-#include "color-profile.h"
+#include "object/color-profile.h"
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
-#include "ui/icon-names.h"
-
 using std::pair;
 
 namespace Inkscape {
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index fc985aa44..380c8a9c4 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -30,35 +30,36 @@
 #include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
 
-#include "ui/widget/unit-menu.h"
-#include "helper/window.h"
-#include "inkscape.h"
-#include "document.h"
-#include "document-undo.h"
+#include <gdl/gdl-dock-item.h>
 
+#include "document-undo.h"
+#include "document.h"
 #include "file.h"
-#include "sp-namedview.h"
-#include "selection-chemistry.h"
-
-#include "ui/dialog-events.h"
+#include "inkscape.h"
 #include "preferences.h"
+#include "selection-chemistry.h"
 #include "verbs.h"
-#include "ui/interface.h"
-#include "sp-root.h"
 
-#include "extension/output.h"
-#include "extension/db.h"
+// required to set status message after export
+#include "desktop.h"
+#include "message-stack.h"
+
+#include "helper/png-write.h"
+#include "helper/window.h"
 
-#include "io/sys.h"
 #include "io/resource.h"
+#include "io/sys.h"
 
-#include "helper/png-write.h"
+#include "object/sp-namedview.h"
+#include "object/sp-root.h"
 
-#include <gdl/gdl-dock-item.h>
+#include "ui/dialog-events.h"
+#include "ui/interface.h"
+#include "ui/widget/unit-menu.h"
+
+#include "extension/db.h"
+#include "extension/output.h"
 
-// required to set status message after export
-#include "desktop.h"
-#include "message-stack.h"
 
 #ifdef WIN32
 #include <windows.h>
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index 16a9a026b..f09546bdc 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -15,7 +15,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#include "ui/widget/notebook-page.h"
 
 #include "desktop-style.h"
 #include "document.h"
@@ -23,15 +22,18 @@
 #include "filter-chemistry.h"
 #include "inkscape.h"
 #include "preferences.h"
-#include "style.h"
+#include "verbs.h"
+
 #include "svg/css-ostringstream.h"
+
 #include "ui/icon-names.h"
-#include "verbs.h"
+#include "ui/view/view-widget.h"
+#include "ui/widget/notebook-page.h"
+
 #include "widgets/fill-style.h"
 #include "widgets/paint-selector.h"
 #include "widgets/stroke-style.h"
 
-#include "ui/view/view-widget.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/filter-editor.cpp b/src/ui/dialog/filter-editor.cpp
index 7cec7dc01..ef702aba4 100644
--- a/src/ui/dialog/filter-editor.cpp
+++ b/src/ui/dialog/filter-editor.cpp
@@ -14,54 +14,53 @@
 #include "config.h"
 #endif
 
-#include "dialog-manager.h"
+#include <string>
 
+#include <gtkmm.h>
 #include <gdkmm/display.h>
+#include <glibmm/convert.h>
+#include <glibmm/error.h>
+#include <glibmm/i18n.h>
+#include <glibmm/main.h>
+#include <glibmm/stringutils.h>
+
 #if GTK_CHECK_VERSION(3, 20, 0)
 # include <gdkmm/seat.h>
 #else
 # include <gdkmm/devicemanager.h>
 #endif
 
-#include "ui/widget/spinbutton.h"
-
-#include <glibmm/i18n.h>
-#include <glibmm/stringutils.h>
-#include <glibmm/main.h>
-#include <glibmm/convert.h>
-#include <glibmm/error.h>
 
 #include "desktop.h"
-
-#include "document.h"
+#include "dialog-manager.h"
 #include "document-undo.h"
+#include "document.h"
 #include "filter-chemistry.h"
 #include "filter-editor.h"
 #include "filter-enums.h"
 #include "inkscape.h"
-#include "filters/blend.h"
-#include "filters/colormatrix.h"
-#include "filters/componenttransfer.h"
-#include "filters/componenttransfer-funcnode.h"
-#include "filters/convolvematrix.h"
-#include "filters/distantlight.h"
-#include "filters/merge.h"
-#include "filters/mergenode.h"
-#include "filters/pointlight.h"
-#include "filters/spotlight.h"
-
-#include "style.h"
-#include "svg/svg-color.h"
-#include "ui/dialog/filedialog.h"
+#include "selection-chemistry.h"
 #include "verbs.h"
 
 #include "io/sys.h"
 #include "io/resource.h"
-#include "selection-chemistry.h"
 
-#include <string>
+#include "object/filters/blend.h"
+#include "object/filters/colormatrix.h"
+#include "object/filters/componenttransfer.h"
+#include "object/filters/componenttransfer-funcnode.h"
+#include "object/filters/convolvematrix.h"
+#include "object/filters/distantlight.h"
+#include "object/filters/merge.h"
+#include "object/filters/mergenode.h"
+#include "object/filters/pointlight.h"
+#include "object/filters/spotlight.h"
+#include "style.h"
 
-#include <gtkmm.h>
+#include "svg/svg-color.h"
+
+#include "ui/dialog/filedialog.h"
+#include "ui/widget/spinbutton.h"
 
 using namespace Inkscape::Filters;
 using namespace Inkscape::IO::Resource;
diff --git a/src/ui/dialog/filter-editor.h b/src/ui/dialog/filter-editor.h
index 6acb83f02..5bf16dc10 100644
--- a/src/ui/dialog/filter-editor.h
+++ b/src/ui/dialog/filter-editor.h
@@ -12,10 +12,6 @@
 #ifndef INKSCAPE_UI_DIALOG_FILTER_EDITOR_H
 #define INKSCAPE_UI_DIALOG_FILTER_EDITOR_H
 
-#include "attributes.h"
-#include "ui/widget/panel.h"
-#include "sp-filter.h"
-
 #include <gtkmm/notebook.h>
 #include <gtkmm/sizegroup.h>
 #include <gtkmm/builder.h>
@@ -28,6 +24,9 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/treeview.h>
 
+#include "ui/widget/panel.h"
+
+
 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 41797b1e7..e62d309c5 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -19,17 +19,19 @@
 #include "config.h"
 #endif
 
-#include "dialog-manager.h"
 #include <gtkmm/imagemenuitem.h>
 
 #include <gdkmm/display.h>
+#include <gdkmm/general.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/colorbutton.h>
+#include <gtkmm/eventbox.h>
 #if GTK_CHECK_VERSION(3, 20, 0)
 # include <gdkmm/seat.h>
 #else
 # include <gdkmm/devicemanager.h>
 #endif
 
-#include "ui/widget/spinbutton.h"
 
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
@@ -37,36 +39,35 @@
 #include <glibmm/convert.h>
 
 #include "desktop.h"
-
-#include "document.h"
+#include "dialog-manager.h"
 #include "document-undo.h"
+#include "document.h"
 #include "filter-chemistry.h"
 #include "filter-effects-dialog.h"
 #include "filter-enums.h"
 #include "inkscape.h"
-#include "filters/blend.h"
-#include "filters/colormatrix.h"
-#include "filters/componenttransfer.h"
-#include "filters/componenttransfer-funcnode.h"
-#include "filters/convolvematrix.h"
-#include "filters/distantlight.h"
-#include "filters/merge.h"
-#include "filters/mergenode.h"
-#include "filters/pointlight.h"
-#include "filters/spotlight.h"
+#include "selection-chemistry.h"
+#include "verbs.h"
 
+#include "object/filters/blend.h"
+#include "object/filters/colormatrix.h"
+#include "object/filters/componenttransfer.h"
+#include "object/filters/componenttransfer-funcnode.h"
+#include "object/filters/convolvematrix.h"
+#include "object/filters/distantlight.h"
+#include "object/filters/merge.h"
+#include "object/filters/mergenode.h"
+#include "object/filters/pointlight.h"
+#include "object/filters/spotlight.h"
 #include "style.h"
+
 #include "svg/svg-color.h"
+
 #include "ui/dialog/filedialog.h"
-#include "verbs.h"
+#include "ui/widget/spinbutton.h"
 
 #include "io/sys.h"
-#include "selection-chemistry.h"
 
-#include <gtkmm/colorbutton.h>
-#include <gdkmm/general.h>
-#include <gtkmm/checkbutton.h>
-#include <gtkmm/eventbox.h>
 
 using namespace Inkscape::Filters;
 
diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index 73d23bd37..d7bfff7d2 100644
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -16,21 +16,23 @@
 
 #include <memory>
 
-#include "attributes.h"
-#include "ui/widget/panel.h"
-#include "sp-filter.h"
-#include "ui/widget/combo-enums.h"
-
-#include "ui/widget/spin-scale.h"
-#include "xml/helper-observer.h"
-#include "ui/dialog/desktop-tracker.h"
-
 #include <gtkmm/notebook.h>
 #include <gtkmm/sizegroup.h>
 
 #include <gtkmm/paned.h>
 #include <gtkmm/scrolledwindow.h>
 
+#include "attributes.h"
+
+#include "ui/dialog/desktop-tracker.h"
+#include "ui/widget/combo-enums.h"
+#include "ui/widget/panel.h"
+#include "ui/widget/spin-scale.h"
+
+#include "xml/helper-observer.h"
+
+class SPFilter;
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index 0f327d6d1..d172eca57 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -17,43 +17,44 @@
 #include "find.h"
 
 #include <gtkmm/entry.h>
+#include <glibmm/i18n.h>
+#include <glibmm/regex.h>
 
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "inkscape.h"
+#include "message-stack.h"
+#include "selection-chemistry.h"
+#include "text-editing.h"
 #include "verbs.h"
 
-#include "message-stack.h"
 #include "helper/window.h"
-#include "inkscape.h"
-#include "desktop.h"
-#include "document.h"
-#include "document-undo.h"
 
+#include "object/sp-defs.h"
+#include "object/sp-ellipse.h"
+#include "object/sp-flowdiv.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-image.h"
+#include "object/sp-line.h"
+#include "object/sp-offset.h"
+#include "object/sp-path.h"
+#include "object/sp-polyline.h"
+#include "object/sp-rect.h"
+#include "object/sp-root.h"
+#include "object/sp-spiral.h"
+#include "object/sp-star.h"
+#include "object/sp-text.h"
+#include "object/sp-tref.h"
+#include "object/sp-tspan.h"
+#include "object/sp-use.h"
 
 #include "ui/dialog-events.h"
 #include "ui/interface.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
-#include "sp-flowdiv.h"
-#include "text-editing.h"
-#include "sp-tspan.h"
-#include "sp-tref.h"
-#include "selection-chemistry.h"
-#include "sp-defs.h"
-#include "sp-rect.h"
-#include "sp-ellipse.h"
-#include "sp-star.h"
-#include "sp-spiral.h"
-#include "sp-path.h"
-#include "sp-line.h"
-#include "sp-polyline.h"
-#include "sp-item-group.h"
-#include "sp-image.h"
-#include "sp-offset.h"
-#include "sp-root.h"
-#include "xml/node-iterators.h"
+
 #include "xml/attribute-record.h"
+#include "xml/node-iterators.h"
 
-#include <glibmm/i18n.h>
-#include <glibmm/regex.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index ad035aa8d..a07a7b7b3 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -10,37 +10,35 @@
 #include "config.h"
 #endif
 
+#include <set>
+
+#include <glibmm/i18n.h>
+#include <glibmm/regex.h>
+
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/textview.h>
 
-#include <set>
 #include "font-substitution.h"
 
-#include "inkscape.h"
 #include "desktop.h"
 #include "document.h"
-
-#include "ui/dialog-events.h"
-
+#include "inkscape.h"
 #include "selection-chemistry.h"
-
-#include "sp-root.h"
-#include "sp-text.h"
-#include "sp-textpath.h"
-#include "sp-flowtext.h"
-#include "sp-flowdiv.h"
-#include "sp-tspan.h"
-#include "sp-tref.h"
-#include "style.h"
 #include "text-editing.h"
 
+#include "object/sp-root.h"
+#include "object/sp-text.h"
+#include "object/sp-textpath.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-flowdiv.h"
+#include "object/sp-tspan.h"
+
 #include "libnrtype/FontFactory.h"
 #include "libnrtype/font-instance.h"
 
-#include <glibmm/i18n.h>
-#include <glibmm/regex.h>
+#include "ui/dialog-events.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index c600d8e94..eb13700ec 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -19,15 +19,18 @@
 #include <gtkmm/scrolledwindow.h>
 
 #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"
+#include "document.h" // for SPDocumentUndo::done()
+#include "selection.h"
+#include "text-editing.h"
 #include "verbs.h"
+
+#include "libnrtype/font-instance.h"
+
+#include "object/sp-flowtext.h"
+#include "object/sp-text.h"
+
 #include "widgets/font-selector.h"
-#include "text-editing.h"
-#include "selection.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 5dc64bb24..dd926296d 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -16,21 +16,26 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include "guides.h"
 
-#include "display/guideline.h"
+#include <glibmm/i18n.h>
+
 #include "desktop.h"
-#include "document.h"
 #include "document-undo.h"
-#include "sp-guide.h"
-#include "sp-namedview.h"
+#include "document.h"
+#include "message-context.h"
+#include "verbs.h"
+
+#include "object/sp-guide.h"
+#include "object/sp-namedview.h"
 
+#include "display/guideline.h"
+
+#include "ui/dialog-events.h"
 #include "ui/tools/tool-base.h"
+
 #include "widgets/desktop-widget.h"
-#include <glibmm/i18n.h>
-#include "ui/dialog-events.h"
-#include "message-context.h"
-#include "verbs.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index aeb56e563..47f6f3121 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -17,29 +17,30 @@
 #include "config.h"
 #endif
 
-#include <gtkmm/buttonbox.h>
-
 #include <glibmm/i18n.h>
 #include <glibmm/timer.h>
 #include <glibmm/main.h>
 
+#include <gtkmm/buttonbox.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/frame.h>
-#include "ui/widget/frame.h"
 
 #include "desktop.h"
+#include "document.h"
+#include "inkscape.h"
+#include "verbs.h"
 
 #include "display/cairo-utils.h"
 #include "display/drawing.h"
 #include "display/drawing-context.h"
-#include "document.h"
-#include "inkscape.h"
-#include "sp-namedview.h"
-#include "sp-root.h"
-#include "verbs.h"
+
+#include "object/sp-namedview.h"
+#include "object/sp-root.h"
 
 #include "icon-preview.h"
 
+#include "ui/widget/frame.h"
+
 extern "C" {
 // takes doc, drawing, icon, and icon name to produce pixels
 guchar *
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 2a50c14fc..96c446d0c 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -18,6 +18,7 @@
 #endif
 
 #include "inkscape-preferences.h"
+
 #include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/markup.h>
@@ -25,27 +26,31 @@
 #include <gtkmm/recentmanager.h>
 #include <gtkmm/recentinfo.h>
 
+#include "cms-system.h"
+#include "document.h"
+#include "enums.h"
+#include "inkscape.h"
+#include "message-stack.h"
+#include "path-prefix.h"
 #include "preferences.h"
-#include "verbs.h"
 #include "selcue.h"
-
-#include "extension/internal/gdkpixbuf-input.h"
-#include "message-stack.h"
-#include "style.h"
-#include "selection.h"
 #include "selection-chemistry.h"
-#include "ui/widget/style-swatch.h"
-#include "display/nr-filter-gaussian.h"
-#include "cms-system.h"
-#include "color-profile.h"
+#include "selection.h"
+#include "shortcuts.h"
+#include "verbs.h"
+
 #include "display/canvas-grid.h"
-#include "path-prefix.h"
+#include "display/nr-filter-gaussian.h"
+
+#include "extension/internal/gdkpixbuf-input.h"
+
 #include "io/resource.h"
 #include "io/sys.h"
-#include "inkscape.h"
-#include "shortcuts.h"
-#include "document.h"
 
+#include "object/color-profile.h"
+#include "style.h"
+
+#include "ui/widget/style-swatch.h"
 
 #ifdef HAVE_ASPELL
 # include <aspell.h>
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index e16b1a0f5..6f609736a 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -14,25 +14,30 @@
 #endif
 
 #include "layers.h"
+
 #include <gtkmm/icontheme.h>
 #include <gtkmm/separatormenuitem.h>
 #include <glibmm/main.h>
 
-#include "desktop.h"
 #include "desktop-style.h"
-#include "document.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "helper/action.h"
+#include "document.h"
 #include "inkscape.h"
 #include "layer-fns.h"
 #include "layer-manager.h"
+#include "selection-chemistry.h"
+#include "verbs.h"
+
+#include "helper/action.h"
+
+#include "object/sp-root.h"
+
 #include "svg/css-ostringstream.h"
+
 #include "ui/icon-names.h"
-#include "ui/widget/imagetoggler.h"
-#include "verbs.h"
-#include "sp-root.h"
 #include "ui/tools/tool-base.h"
-#include "selection-chemistry.h"
+#include "ui/widget/imagetoggler.h"
 
 //#define DUMP_LAYERS 1
 
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 24591d496..ec8ae4f31 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -18,25 +18,31 @@
 
 #include "livepatheffect-editor.h"
 
-#include "desktop.h"
 #include <gtkmm/expander.h>
-#include "document.h"
+
+#include "desktop.h"
 #include "document-undo.h"
-#include "helper/action.h"
+#include "document.h"
 #include "inkscape.h"
-#include "live_effects/effect.h"
-#include "live_effects/lpeobject.h"
-#include "live_effects/lpeobject-reference.h"
+#include "livepatheffect-add.h"
 #include "path-chemistry.h"
 #include "selection-chemistry.h"
-#include "sp-item-group.h"
-#include "sp-path.h"
-#include "sp-rect.h"
-#include "sp-text.h"
+#include "verbs.h"
+
+#include "helper/action.h"
+
+#include "live_effects/effect.h"
+#include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpeobject.h"
+
+#include "object/sp-item-group.h"
+#include "object/sp-path.h"
+#include "object/sp-rect.h"
+#include "object/sp-use.h"
+#include "object/sp-text.h"
+
 #include "ui/icon-names.h"
 #include "ui/widget/imagetoggler.h"
-#include "verbs.h"
-#include "livepatheffect-add.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp
index 0facb9038..f3e93ded8 100644
--- a/src/ui/dialog/object-attributes.cpp
+++ b/src/ui/dialog/object-attributes.cpp
@@ -20,16 +20,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "ui/dialog/dialog-manager.h"
-#include "desktop.h"
+#include <glibmm/i18n.h>
 
-#include "sp-anchor.h"
-#include "sp-image.h"
+#include "desktop.h"
+#include "inkscape.h"
 #include "verbs.h"
+
+#include "object/sp-anchor.h"
+#include "object/sp-image.h"
+
 #include "ui/dialog/object-attributes.h"
+#include "ui/dialog/dialog-manager.h"
+
 #include "widgets/sp-attribute-widget.h"
-#include "inkscape.h"
-#include <glibmm/i18n.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index ad80a0171..2d2ee9e2c 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -27,18 +27,21 @@
  */
 
 #include "object-properties.h"
-#include "widgets/sp-attribute-widget.h"
 
-#include "document.h"
-#include "document-undo.h"
-#include "verbs.h"
-#include "inkscape.h"
-#include "desktop.h"
-#include "sp-image.h"
 #include <glibmm/i18n.h>
 
 #include <gtkmm/grid.h>
 
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "inkscape.h"
+#include "verbs.h"
+
+#include "object/sp-image.h"
+
+#include "widgets/sp-attribute-widget.h"
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index e01660ad1..c2ee66cd7 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -16,39 +16,44 @@
 #endif
 
 #include "objects.h"
+
 #include <gtkmm/icontheme.h>
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/separatormenuitem.h>
 #include <glibmm/main.h>
 
-#include "desktop.h"
 #include "desktop-style.h"
-#include "ui/dialog-events.h"
-#include "document.h"
+#include "desktop.h"
 #include "document-undo.h"
+#include "document.h"
 #include "filter-chemistry.h"
-#include "filters/blend.h"
-#include "filters/gaussian-blur.h"
-#include "helper/action.h"
 #include "inkscape.h"
 #include "layer-manager.h"
 #include "shortcuts.h"
-#include "sp-clippath.h"
-#include "sp-mask.h"
-#include "sp-root.h"
-#include "sp-shape.h"
+#include "verbs.h"
+
+#include "helper/action.h"
+
+#include "object/filters/blend.h"
+#include "object/filters/gaussian-blur.h"
+#include "object/sp-clippath.h"
+#include "object/sp-mask.h"
+#include "object/sp-root.h"
+#include "object/sp-shape.h"
 #include "style.h"
-#include "ui/tools-switch.h"
+
+#include "ui/dialog-events.h"
 #include "ui/icon-names.h"
 #include "ui/selected-color.h"
-#include "ui/widget/imagetoggler.h"
-#include "ui/widget/layertypeicon.h"
-#include "ui/widget/insertordericon.h"
-#include "ui/widget/clipmaskicon.h"
-#include "ui/widget/highlight-picker.h"
+#include "ui/tools-switch.h"
 #include "ui/tools/node-tool.h"
-#include "verbs.h"
+#include "ui/widget/clipmaskicon.h"
 #include "ui/widget/color-notebook.h"
+#include "ui/widget/highlight-picker.h"
+#include "ui/widget/imagetoggler.h"
+#include "ui/widget/insertordericon.h"
+#include "ui/widget/layertypeicon.h"
+
 #include "xml/node-observer.h"
 
 //#define DUMP_LAYERS 1
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index 3e6617cfe..d5f3de406 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -26,28 +26,30 @@
 #  include <glibmm/dispatcher.h>
 #endif // GLIBMM_DISABLE_DEPRECATED
 
-#include "pixelartdialog.h"
-#include <gtkmm/radiobutton.h>
-#include <gtkmm/messagedialog.h>
-
 #include <glibmm/i18n.h>
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/radiobutton.h>
 
-#include "ui/widget/spinbutton.h"
-#include "ui/widget/frame.h"
-
-#include "desktop.h"
 #include "desktop-tracker.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
 #include "message-stack.h"
+#include "pixelartdialog.h"
 #include "selection.h"
 
-#include "sp-image.h"
 #include "display/cairo-utils.h"
+
 #include "libdepixelize/kopftracer2011.h"
-#include "document.h"
-#include "svg/svg.h"
-#include "svg/svg-color.h"
+
+#include "object/sp-image.h"
+
 #include "svg/css-ostringstream.h"
-#include "document-undo.h"
+#include "svg/svg-color.h"
+#include "svg/svg.h"
+
+#include "ui/widget/frame.h"
+#include "ui/widget/spinbutton.h"
 
 #ifdef HAVE_OPENMP
 #include <omp.h>
diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp
index 2f18d5c0d..7f535092f 100644
--- a/src/ui/dialog/polar-arrange-tab.cpp
+++ b/src/ui/dialog/polar-arrange-tab.cpp
@@ -7,22 +7,24 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "ui/dialog/polar-arrange-tab.h"
-#include "ui/dialog/tile.h"
+#include <glibmm/i18n.h>
+#include <gtkmm/messagedialog.h>
 
 #include <2geom/transforms.h>
-#include <glibmm/i18n.h>
 
-#include "verbs.h"
-#include "preferences.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
 #include "inkscape.h"
+#include "preferences.h"
+#include "verbs.h"
+
+#include "object/sp-ellipse.h"
+#include "object/sp-item-transform.h"
+
+#include "ui/dialog/polar-arrange-tab.h"
+#include "ui/dialog/tile.h"
 
-#include "document.h"
-#include "document-undo.h"
-#include "desktop.h"
-#include "sp-ellipse.h"
-#include "sp-item-transform.h"
-#include <gtkmm/messagedialog.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/prototype.cpp b/src/ui/dialog/prototype.cpp
index 46bf5cb11..1280cba87 100644
--- a/src/ui/dialog/prototype.cpp
+++ b/src/ui/dialog/prototype.cpp
@@ -9,14 +9,15 @@
  * Released under the GNU GPL, read the file 'COPYING' for more information.
  */
 
-#include "ui/dialog/prototype.h"
-#include "verbs.h"
+#include "prototype.h"
+
 #include "desktop.h"
 #include "document.h"
 #include "selection.h"
+#include "verbs.h"
 
 // Only for use in demonstration widget.
-#include "sp-root.h"
+#include "object/sp-root.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp
index 3d91ad559..252782081 100644
--- a/src/ui/dialog/spellcheck.cpp
+++ b/src/ui/dialog/spellcheck.cpp
@@ -23,15 +23,20 @@
 #include "ui/tools-switch.h"
 #include "ui/tools/text-tool.h"
 #include "ui/interface.h"
-#include "sp-flowtext.h"
 #include "text-editing.h"
-#include "sp-tref.h"
-#include "sp-defs.h"
 #include "selection-chemistry.h"
 #include "display/curve.h"
 #include "document-undo.h"
-#include "sp-root.h"
 #include "verbs.h"
+
+#include "object/sp-defs.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-object.h"
+#include "object/sp-root.h"
+#include "object/sp-string.h"
+#include "object/sp-text.h"
+#include "object/sp-tref.h"
+
 #include <glibmm/i18n.h>
 
 #ifdef WIN32
diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h
index e7563ad1e..aa89a7bdd 100644
--- a/src/ui/dialog/spellcheck.h
+++ b/src/ui/dialog/spellcheck.h
@@ -29,13 +29,17 @@
 
 #include "ui/dialog/desktop-tracker.h"
 #include "ui/widget/panel.h"
-#include "sp-text.h"
+
+#include "text-editing.h"
 
 #ifdef HAVE_ASPELL
 #include <aspell.h>
 #endif  /* HAVE_ASPELL */
 
 class SPDesktop;
+class SPObject;
+class SPItem;
+class SPCanvasItem;
 
 namespace Inkscape {
 class Preferences;
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index 76ab2c7d6..17850712f 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -12,16 +12,18 @@
  */
 
 #include "styledialog.h"
-#include "ui/widget/addtoicon.h"
 #include "verbs.h"
-#include "sp-object.h"
 #include "selection.h"
-#include "xml/attribute-record.h"
-#include "xml/node-observer.h"
 #include "attribute-rel-svg.h"
 #include "inkscape.h"
 #include "document-undo.h"
 
+
+#include "ui/widget/addtoicon.h"
+
+#include "xml/attribute-record.h"
+#include "xml/node-observer.h"
+
 #include <glibmm/i18n.h>
 #include <glibmm/regex.h>
 
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 5d0080443..19d67916a 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -25,16 +25,18 @@
 #include "selection.h"
 #include "svg/svg.h"
 #include "xml/repr.h"
-#include "sp-font-face.h"
 #include "desktop.h"
 
 #include <sstream>
 #include "display/nr-svgfonts.h"
 #include "verbs.h"
-#include "sp-glyph.h"
-#include "sp-missing-glyph.h"
-#include "sp-font.h"
-#include "sp-glyph-kerning.h"
+
+#include "object/sp-font-face.h"
+#include "object/sp-glyph.h"
+#include "object/sp-missing-glyph.h"
+#include "object/sp-font.h"
+#include "object/sp-glyph-kerning.h"
+#include "object/sp-defs.h"
 
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 5c0deda62..e57dde639 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -42,12 +42,15 @@
 #include "io/resource.h"
 #include "message-context.h"
 #include "path-prefix.h"
-#include "style.h"
+
 #include "ui/previewholder.h"
 #include "widgets/desktop-widget.h"
 #include "widgets/gradient-vector.h"
 #include "display/cairo-utils.h"
-#include "sp-gradient-reference.h"
+
+#include "object/sp-defs.h"
+#include "object/sp-gradient-reference.h"
+
 #include "dialog-manager.h"
 #include "verbs.h"
 #include "gradient-chemistry.h"
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 117e3da5d..0ef631a3a 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -39,10 +39,11 @@
 
 #include "document.h"
 #include "inkscape.h"
-#include "sp-root.h"
-#include "sp-use.h"
-#include "sp-defs.h"
-#include "sp-symbol.h"
+
+#include "object/sp-root.h"
+#include "object/sp-use.h"
+#include "object/sp-defs.h"
+#include "object/sp-symbol.h"
 
 #ifdef WITH_LIBVISIO
   #include <libvisio/libvisio.h>
diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h
index 0b0312220..5f341c3b1 100644
--- a/src/ui/dialog/symbols.h
+++ b/src/ui/dialog/symbols.h
@@ -18,11 +18,11 @@
 #include "display/drawing.h"
 #include "ui/dialog/desktop-tracker.h"
 #include "ui/widget/panel.h"
-#include "sp-symbol.h"
-#include "sp-use.h"
 #include <vector>
 
 class SPObject;
+class SPSymbol;
+class SPUse;
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index 3df59bb31..24f167500 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -26,24 +26,20 @@
 #include "inkscape.h"
 #include "layer-fns.h"
 #include "layer-manager.h"
-#include "sp-shape.h"
+
 #include "svg/css-ostringstream.h"
 #include "ui/widget/layertypeicon.h"
 #include "ui/widget/addtoicon.h"
 #include "verbs.h"
 #include "xml/node-observer.h"
-#include "sp-root.h"
 #include "ui/tools/tool-base.h" //"event-context.h"
 //#include "dialogs/dialog-events.h"
 #include "ui/widget/color-notebook.h"
-#include "style.h"
 #include "filter-chemistry.h"
-#include "sp-clippath.h"
-#include "sp-mask.h"
-#include "sp-tag.h"
-#include "sp-defs.h"
-#include "sp-tag-use.h"
-#include "sp-tag-use-reference.h"
+
+#include "object/sp-item.h"
+#include "object/sp-defs.h"
+#include "object/sp-object-group.h"
 
 //#define DUMP_LAYERS 1
 
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp
index 8aeaa4046..12c6b0298 100644
--- a/src/ui/dialog/template-widget.cpp
+++ b/src/ui/dialog/template-widget.cpp
@@ -14,14 +14,14 @@
 #include <gtkmm/messagedialog.h>
 
 #include "desktop.h"
-
 #include "document.h"
 #include "document-undo.h"
 #include "file.h"
-#include "sp-namedview.h"
-#include "extension/implementation/implementation.h"
 #include "inkscape.h"
 
+#include "extension/implementation/implementation.h"
+
+#include "object/sp-namedview.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 8ada1b3b9..7ce39695e 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -21,7 +21,9 @@
 #endif
 
 #include "text-edit.h"
-#include <libnrtype/font-instance.h>
+
+#include <glibmm/i18n.h>
+#include <glibmm/markup.h>
 
 #ifdef WITH_GTKSPELL
 extern "C" {
@@ -29,27 +31,32 @@ extern "C" {
 }
 #endif
 
-#include <libnrtype/font-lister.h>
-
-#include "helper/window.h"
-#include "inkscape.h"
-#include "document.h"
-#include "desktop.h"
 #include "desktop-style.h"
-
+#include "desktop.h"
 #include "document-undo.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
+#include "document.h"
+#include "inkscape.h"
 #include "text-editing.h"
-#include "ui/icon-names.h"
 #include "verbs.h"
-#include "ui/interface.h"
+
+#include "helper/window.h"
+
+#include <libnrtype/font-instance.h>
+#include <libnrtype/font-lister.h>
+
+#include "object/sp-flowtext.h"
+#include "object/sp-text.h"
+#include "object/sp-textpath.h"
+
 #include "svg/css-ostringstream.h"
-#include "widgets/font-selector.h"
-#include <glibmm/i18n.h>
-#include <glibmm/markup.h>
+
+#include "ui/icon-names.h"
+#include "ui/interface.h"
+
 #include "util/units.h"
-#include "sp-textpath.h"
+
+#include "widgets/font-selector.h"
+
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index fc9fe271e..561a88a92 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -16,23 +16,26 @@
 #endif
 
 #include <gtkmm/dialog.h>
-#include <2geom/transforms.h>
 
-#include "document.h"
-#include "document-undo.h"
-#include "desktop.h"
+#include <2geom/transforms.h>
 
-#include "transformation.h"
 #include "align-and-distribute.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
 #include "inkscape.h"
-#include "selection-chemistry.h"
 #include "message-stack.h"
+#include "selection-chemistry.h"
+#include "transformation.h"
 #include "verbs.h"
-#include "sp-namedview.h"
-#include "sp-item-transform.h"
+
+#include "object/sp-item-transform.h"
+#include "object/sp-namedview.h"
+
 #include "ui/icon-names.h"
 
 
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index 11691deb4..e3975dfdc 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -17,26 +17,29 @@
  */
 
 #include "xml-tree.h"
+
 #include <glibmm/i18n.h>
 
-#include "desktop.h"
 
-#include "ui/dialog-events.h"
-#include "document.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "ui/tools/tool-base.h"
-#include "helper/window.h"
+#include "document.h"
 #include "inkscape.h"
-#include "ui/interface.h"
 #include "message-context.h"
 #include "message-stack.h"
 #include "shortcuts.h"
-#include "sp-root.h"
-#include "sp-string.h"
-#include "sp-tspan.h"
-#include "ui/icon-names.h"
 #include "verbs.h"
 
+#include "helper/window.h"
+
+#include "object/sp-root.h"
+#include "object/sp-string.h"
+
+#include "ui/dialog-events.h"
+#include "ui/icon-names.h"
+#include "ui/interface.h"
+#include "ui/tools/tool-base.h"
+
 #include "widgets/sp-xmlview-attr-list.h"
 #include "widgets/sp-xmlview-content.h"
 #include "widgets/sp-xmlview-tree.h"
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 7df3502f7..0be3ef684 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -23,56 +23,63 @@
 #include <config.h>
 #endif
 
-#include "ui/dialog/dialog-manager.h"
 #include <gtkmm/icontheme.h>
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/separatormenuitem.h>
-#include "file.h"
 #include <glibmm/miscutils.h>
 
+#include "desktop-style.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
 #include "enums.h"
+#include "file.h"
+#include "gradient-drag.h"
 #include "inkscape.h"
+#include "message-context.h"
+#include "message-stack.h"
+#include "preferences.h"
+#include "selection-chemistry.h"
+#include "shortcuts.h"
+#include "svg-view-widget.h"
+
+#include "display/sp-canvas.h"
+
 #include "extension/db.h"
 #include "extension/effect.h"
+#include "extension/find_extension_by_mime.h"
 #include "extension/input.h"
-#include "preferences.h"
-#include "shortcuts.h"
-#include "document.h"
 
-#include "ui/interface.h"
-#include "ui/monitor.h"
-#include "desktop.h"
-#include "selection-chemistry.h"
-#include "svg-view-widget.h"
-#include "widgets/desktop-widget.h"
-#include "sp-item-group.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
-#include "sp-namedview.h"
-#include "sp-root.h"
 #include "helper/action.h"
 #include "helper/window.h"
+
 #include "io/sys.h"
-#include "ui/dialog-events.h"
-#include "message-context.h"
-#include "ui/uxmanager.h"
-#include "ui/clipboard.h"
 
-#include "display/sp-canvas.h"
-#include "svg/svg-color.h"
-#include "desktop-style.h"
+#include "object/sp-anchor.h"
+#include "object/sp-clippath.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-image.h"
+#include "object/sp-item-group.h"
+#include "object/sp-mask.h"
+#include "object/sp-namedview.h"
+#include "object/sp-root.h"
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
 #include "style.h"
+
+#include "svg/svg-color.h"
+
+#include "ui/clipboard.h"
+#include "ui/dialog-events.h"
+#include "ui/dialog/dialog-manager.h"
+#include "ui/dialog/layer-properties.h"
+#include "ui/interface.h"
+#include "ui/monitor.h"
 #include "ui/tools/tool-base.h"
-#include "gradient-drag.h"
+#include "ui/uxmanager.h"
+
+#include "widgets/desktop-widget.h"
 #include "widgets/ege-paint-def.h"
-#include "document-undo.h"
-#include "sp-anchor.h"
-#include "sp-clippath.h"
-#include "sp-image.h"
-#include "sp-mask.h"
-#include "message-stack.h"
-#include "ui/dialog/layer-properties.h"
-#include "extension/find_extension_by_mime.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/shape-editor-knotholders.cpp b/src/ui/shape-editor-knotholders.cpp
index b2e41bac4..5fb677f27 100644
--- a/src/ui/shape-editor-knotholders.cpp
+++ b/src/ui/shape-editor-knotholders.cpp
@@ -15,25 +15,27 @@
 #include <config.h>
 #endif
 
-#include "sp-item.h"
-#include "sp-rect.h"
-#include "box3d.h"
-#include "sp-ellipse.h"
-#include "sp-star.h"
-#include "sp-spiral.h"
-#include "sp-offset.h"
-#include "sp-flowtext.h"
+#include <glibmm/i18n.h>
+
 #include "preferences.h"
-#include "style.h"
 #include "desktop.h"
-
-#include "sp-namedview.h"
-#include "live_effects/effect.h"
-#include "sp-pattern.h"
-#include <glibmm/i18n.h>
 #include "knotholder.h"
 #include "knot-holder-entity.h"
 
+#include "live_effects/effect.h"
+
+#include "object/box3d.h"
+#include "object/sp-ellipse.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-item.h"
+#include "object/sp-namedview.h"
+#include "object/sp-offset.h"
+#include "object/sp-pattern.h"
+#include "object/sp-rect.h"
+#include "object/sp-spiral.h"
+#include "object/sp-star.h"
+#include "style.h"
+
 #define sp_round(v,m) (((v) < 0.0) ? ((ceil((v) / (m) - 0.5)) * (m)) : ((floor((v) / (m) + 0.5)) * (m)))
 
 class RectKnotHolder : public KnotHolder {
diff --git a/src/ui/shape-editor.cpp b/src/ui/shape-editor.cpp
index 4851c413f..3a5aec056 100644
--- a/src/ui/shape-editor.cpp
+++ b/src/ui/shape-editor.cpp
@@ -17,9 +17,10 @@
 #include "desktop.h"
 #include "document.h"
 #include "knotholder.h"
-#include "sp-shape.h"
-#include "sp-path.h"
 #include "inkscape.h"
+
+#include "object/sp-path.h"
+
 #include "ui/shape-editor.h"
 #include "xml/node-event-vector.h"
 
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index 8ab9fcbd7..005e60c62 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -7,16 +7,21 @@
  */
 
 #include <iostream>
+
 #include <gdk/gdkkeysyms.h>
 #include <gdkmm.h>
+
 #include <2geom/point.h>
+
 #include "desktop.h"
+#include "message-context.h"
 
 #include "display/sp-canvas.h"
 #include "display/snap-indicator.h"
+
+#include "object/sp-namedview.h"
+
 #include "ui/tools/tool-base.h"
-#include "message-context.h"
-#include "sp-namedview.h"
 #include "ui/control-manager.h"
 #include "ui/tool/control-point.h"
 #include "ui/tool/event-utils.h"
diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp
index 908e18474..685823aaa 100644
--- a/src/ui/tool/curve-drag-point.cpp
+++ b/src/ui/tool/curve-drag-point.cpp
@@ -13,7 +13,9 @@
 #include "ui/tool/event-utils.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
-#include "sp-namedview.h"
+
+#include "object/sp-namedview.h"
+#include "object/sp-path.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index 9cfa4ed31..b982a622f 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -10,22 +10,25 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "node.h"
+#include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
-#include "desktop.h"
 
+#include "desktop.h"
 #include "document.h"
 #include "document-undo.h"
-#include "live_effects/lpeobject.h"
 #include "message-stack.h"
-#include "sp-path.h"
+#include "node.h"
+#include "verbs.h"
+
+#include "live_effects/lpeobject.h"
+
+#include "object/sp-path.h"
+
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
-#include "verbs.h"
 
-#include <gdk/gdkkeysyms.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index f9e9f0b86..94a80a882 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -9,23 +9,26 @@
 #include <iostream>
 #include <stdexcept>
 #include <boost/utility.hpp>
-#include "multi-path-manipulator.h"
+
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
+
 #include <2geom/bezier-utils.h>
+
+#include "desktop.h"
+#include "multi-path-manipulator.h"
+#include "snap.h"
+
 #include "display/sp-ctrlline.h"
 #include "display/sp-canvas.h"
 #include "display/sp-canvas-util.h"
-#include "desktop.h"
 
-#include "snap.h"
-#include "sp-namedview.h"
 #include "ui/control-manager.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/path-manipulator.h"
 #include "ui/tools/node-tool.h"
 #include "ui/tools-switch.h"
-#include <gdk/gdkkeysyms.h>
 
 namespace {
 
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index e7c595893..82cad419d 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -10,25 +10,31 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "live_effects/lpe-powerstroke.h"
-#include "live_effects/lpe-bspline.h"
 #include <2geom/bezier-utils.h>
 #include <2geom/path-sink.h>
-#include "ui/tool/path-manipulator.h"
 
 #include "display/sp-canvas.h"
 #include "display/sp-canvas-util.h"
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
+
+#include "helper/geom.h"
+
 #include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpe-powerstroke.h"
+#include "live_effects/lpe-bspline.h"
 #include "live_effects/parameter/path.h"
-#include "helper/geom.h"
+
+#include "object/sp-path.h"
 #include "style.h"
+
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/curve-drag-point.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/multi-path-manipulator.h"
+#include "ui/tool/path-manipulator.h"
+
 #include "xml/node-observer.h"
 
 namespace Inkscape {
diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp
index 083a7d0ba..f64b9732e 100644
--- a/src/ui/tool/transform-handle-set.cpp
+++ b/src/ui/tool/transform-handle-set.cpp
@@ -11,22 +11,29 @@
 
 #include <math.h>
 #include <algorithm>
-#include "control-point.h"
+
 #include <glib/gi18n.h>
+
 #include <2geom/transforms.h>
+
+#include "control-point.h"
 #include "desktop.h"
-#include "sp-namedview.h"
+#include "pure-transform.h"
+#include "seltrans.h"
+#include "snap.h"
 
 #include "display/sodipodi-ctrlrect.h"
-#include "pure-transform.h"
+
+#include "object/sp-namedview.h"
+
 #include "ui/tool/commit-events.h"
 #include "ui/tool/control-point-selection.h"
-#include "ui/tool/selectable-control-point.h"
 #include "ui/tool/event-utils.h"
+#include "ui/tool/node.h"
+#include "ui/tool/selectable-control-point.h"
 #include "ui/tool/transform-handle-set.h"
 #include "ui/tools/node-tool.h"
-#include "ui/tool/node.h"
-#include "seltrans.h"
+
 
 // FIXME BRAIN DAMAGE WARNING: this is a global variable in select-context.cpp
 // It should be moved to a header
diff --git a/src/ui/tools-switch.cpp b/src/ui/tools-switch.cpp
index e2803ccfd..5953887ce 100644
--- a/src/ui/tools-switch.cpp
+++ b/src/ui/tools-switch.cpp
@@ -20,15 +20,14 @@
 
 #include "ui/tools-switch.h"
 
-#include "box3d.h"
-#include "sp-ellipse.h"
-#include "sp-flowtext.h"
-#include "sp-offset.h"
-#include "sp-path.h"
-#include "sp-rect.h"
-#include "sp-star.h"
-#include "sp-spiral.h"
-#include "sp-text.h"
+#include "object/sp-rect.h"
+#include "object/sp-ellipse.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-offset.h"
+#include "object/sp-path.h"
+#include "object/sp-star.h"
+#include "object/sp-spiral.h"
+#include "object/sp-text.h"
 
 // TODO: How many of these are actually needed?
 #include "ui/tools/arc-tool.h"
diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index 33f323eb3..e620b7cb1 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -19,31 +19,35 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <glibmm/i18n.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "macros.h"
-#include <glibmm/i18n.h>
-#include "display/sp-canvas.h"
-#include "sp-ellipse.h"
-#include "document.h"
+#include "context-fns.h"
+#include "desktop-style.h"
+#include "desktop.h"
 #include "document-undo.h"
-#include "sp-namedview.h"
+#include "document.h"
+#include "macros.h"
+#include "message-context.h"
+#include "preferences.h"
 #include "selection.h"
+#include "snap.h"
+#include "verbs.h"
+
+#include "display/sp-canvas.h"
+#include "display/sp-canvas-item.h"
+
+#include "object/sp-ellipse.h"
+#include "object/sp-namedview.h"
 
 #include "pixmaps/cursor-ellipse.xpm"
-#include "xml/repr.h"
-#include "xml/node-event-vector.h"
-#include "preferences.h"
-#include "message-context.h"
-#include "desktop.h"
-#include "desktop-style.h"
-#include "context-fns.h"
-#include "verbs.h"
+
+#include "ui/tools/arc-tool.h"
 #include "ui/shape-editor.h"
 #include "ui/tools/tool-base.h"
 
-#include "ui/tools/arc-tool.h"
-#include "display/sp-canvas-item.h"
+#include "xml/repr.h"
+#include "xml/node-event-vector.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index 09ee2cda9..52c66fb2b 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -16,30 +16,36 @@
  */
 
 #include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
-#include "macros.h"
-#include "display/sp-canvas.h"
-#include "document.h"
+
+#include "context-fns.h"
+#include "desktop-style.h"
+#include "desktop.h"
+#include "document-private.h"
 #include "document-undo.h"
-#include "sp-namedview.h"
-#include "selection.h"
+#include "document.h"
+#include "macros.h"
+#include "message-context.h"
+#include "perspective-line.h"
 #include "selection-chemistry.h"
+#include "selection.h"
+#include "verbs.h"
 
 #include "display/sp-canvas-item.h"
-#include "desktop.h"
-#include "message-context.h"
+#include "display/sp-canvas.h"
+
 #include "pixmaps/cursor-3dbox.xpm"
-#include "box3d.h"
+
+#include "object/box3d-side.h"
+#include "object/box3d.h"
+#include "object/sp-defs.h"
+#include "object/sp-namedview.h"
+
+#include "ui/shape-editor.h"
 #include "ui/tools/box3d-tool.h"
-#include <glibmm/i18n.h>
+
 #include "xml/node-event-vector.h"
-#include "context-fns.h"
-#include "desktop-style.h"
-#include "perspective-line.h"
-#include "box3d-side.h"
-#include "document-private.h"
-#include "ui/shape-editor.h"
-#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index 2a29b25b0..ccf5e3be5 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -30,34 +30,38 @@
 #include <cstring>
 #include <numeric>
 
-#include "svg/svg.h"
-#include "display/canvas-bpath.h"
-#include "display/cairo-utils.h"
 #include <2geom/pathvector.h>
 #include <2geom/bezier-utils.h>
 #include <2geom/circle.h>
-#include "display/curve.h"
-#include "macros.h"
-#include "document.h"
-#include "document-undo.h"
-#include "selection.h"
-#include "desktop.h"
-#include "desktop-events.h"
 
-#include "desktop-style.h"
-#include "message-context.h"
-#include "pixmaps/cursor-calligraphy.xpm"
 #include "context-fns.h"
+#include "desktop-events.h"
+#include "desktop-style.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
 #include "inkscape.h"
+#include "macros.h"
+#include "message-context.h"
+#include "selection.h"
 #include "splivarot.h"
-#include "sp-item-group.h"
-#include "sp-shape.h"
-#include "sp-path.h"
-#include "sp-text.h"
-#include "display/sp-canvas.h"
+#include "verbs.h"
+
+#include "display/cairo-utils.h"
 #include "display/canvas-arena.h"
+#include "display/canvas-bpath.h"
+#include "display/curve.h"
+#include "display/sp-canvas.h"
+
 #include "livarot/Shape.h"
-#include "verbs.h"
+
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
+
+#include "pixmaps/cursor-calligraphy.xpm"
+
+#include "svg/svg.h"
+
 
 #include "ui/tools/calligraphic-tool.h"
 #include "ui/tools/freehand-base.h"
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index bb2e724ae..ec55ab80b 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -66,40 +66,45 @@
  *
  */
 
-
-
-#include <gdk/gdkkeysyms.h>
 #include <string>
 #include <cstring>
 
-#include "ui/tools/connector-tool.h"
-#include "pixmaps/cursor-connector.xpm"
-#include "xml/node-event-vector.h"
-#include "svg/svg.h"
-#include "desktop.h"
-#include "desktop-style.h"
+#include <glibmm/i18n.h>
+#include <glibmm/stringutils.h>
+#include <gdk/gdkkeysyms.h>
 
-#include "document.h"
+#include "context-fns.h"
+#include "desktop-style.h"
+#include "desktop.h"
 #include "document-undo.h"
+#include "document.h"
+#include "inkscape.h"
 #include "message-context.h"
 #include "message-stack.h"
 #include "selection.h"
-#include "inkscape.h"
-#include "sp-path.h"
-#include "display/sp-canvas.h"
-#include "display/canvas-bpath.h"
-#include <glibmm/i18n.h>
-#include <glibmm/stringutils.h>
 #include "snap.h"
-#include "sp-conn-end.h"
-#include "libavoid/router.h"
-#include "context-fns.h"
-#include "sp-namedview.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
-#include "display/curve.h"
 #include "verbs.h"
 
+#include "display/canvas-bpath.h"
+#include "display/curve.h"
+#include "display/sp-canvas.h"
+
+#include "libavoid/router.h"
+
+#include "object/sp-conn-end.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-namedview.h"
+#include "object/sp-path.h"
+#include "object/sp-text.h"
+
+#include "pixmaps/cursor-connector.xpm"
+
+#include "svg/svg.h"
+
+#include "ui/tools/connector-tool.h"
+
+#include "xml/node-event-vector.h"
+
 using Inkscape::DocumentUndo;
 
 namespace Inkscape {
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index 7bde1b698..07fc4b719 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -18,33 +18,36 @@
 #include <glibmm/i18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
+
 #include <2geom/transforms.h>
 #include <2geom/circle.h>
 
+#include "color-rgba.h"
+#include "desktop-style.h"
+#include "desktop.h"
+#include "document-undo.h"
 #include "macros.h"
+#include "message-context.h"
+#include "preferences.h"
+#include "selection.h"
+#include "sp-cursor.h"
+#include "verbs.h"
+
 #include "display/canvas-bpath.h"
 #include "display/canvas-arena.h"
 #include "display/curve.h"
 #include "display/cairo-utils.h"
-#include "svg/svg-color.h"
-#include "color-rgba.h"
-#include "desktop-style.h"
-#include "preferences.h"
-#include "sp-namedview.h"
-#include "sp-cursor.h"
-#include "desktop.h"
 
-#include "selection.h"
-#include "document-undo.h"
+#include "object/sp-namedview.h"
 
 #include "pixmaps/cursor-dropper-f.xpm"
 #include "pixmaps/cursor-dropper-s.xpm"
 #include "pixmaps/cursor-dropping-f.xpm"
 #include "pixmaps/cursor-dropping-s.xpm"
 
+#include "svg/svg-color.h"
+
 #include "ui/tools/dropper-tool.h"
-#include "message-context.h"
-#include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index 7892e865b..01ae71413 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -24,48 +24,53 @@
 
 #define noERASER_VERBOSE
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <glibmm/i18n.h>
 #include <string>
 #include <cstring>
 #include <numeric>
 
-#include "svg/svg.h"
-#include "display/sp-canvas.h"
-#include "display/canvas-bpath.h"
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
+
 #include <2geom/bezier-utils.h>
+#include <2geom/pathvector.h>
 
-#include "macros.h"
-#include "document.h"
-#include "selection.h"
-#include "desktop.h"
+#include "context-fns.h"
 #include "desktop-events.h"
-
 #include "desktop-style.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "layer-manager.h"
+#include "layer-model.h"
+#include "macros.h"
 #include "message-context.h"
-#include "pixmaps/cursor-eraser.xpm"
-#include "context-fns.h"
+#include "path-chemistry.h"
 #include "rubberband.h"
+#include "selection-chemistry.h"
+#include "selection.h"
 #include "splivarot.h"
-#include "sp-item-group.h"
-#include "sp-shape.h"
-#include "sp-path.h"
-#include "sp-clippath.h"
-#include "sp-rect.h"
-#include "sp-text.h"
-#include "sp-root.h"
-#include "display/canvas-bpath.h"
-#include "display/canvas-arena.h"
-#include "document-undo.h"
 #include "verbs.h"
-#include "style.h"
-#include <2geom/pathvector.h>
-#include "path-chemistry.h"
-#include "selection-chemistry.h"
+
+#include "display/sp-canvas.h"
+#include "display/canvas-arena.h"
+#include "display/canvas-bpath.h"
 #include "display/curve.h"
-#include "layer-model.h"
-#include "layer-manager.h"
+
+#include "object/sp-clippath.h"
+#include "object/sp-item-group.h"
+#include "object/sp-path.h"
+#include "object/sp-rect.h"
+#include "object/sp-root.h"
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
+#include "object/sp-use.h"
+#include "style.h"
+
+#include "pixmaps/cursor-eraser.xpm"
+
+#include "svg/svg.h"
+
 #include "ui/tools/eraser-tool.h"
 
 using Inkscape::DocumentUndo;
diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index 401b50c1c..487f3f7d8 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -21,43 +21,53 @@
 #include <config.h>
 #endif
 
+#include "flood-tool.h"
+
 #include <cmath>
-#include "trace/potrace/inkscape-potrace.h"
-#include <2geom/pathvector.h>
-#include <gdk/gdkkeysyms.h>
 #include <queue>
+
+#include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 
+#include <2geom/pathvector.h>
+
 #include "color.h"
 #include "context-fns.h"
+#include "desktop-style.h"
 #include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "macros.h"
+#include "message-context.h"
+#include "message-stack.h"
+#include "rubberband.h"
+#include "selection.h"
+#include "splivarot.h"
+#include "verbs.h"
 
-#include "desktop-style.h"
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
 #include "display/drawing-image.h"
 #include "display/drawing.h"
 #include "display/sp-canvas.h"
-#include "document.h"
-#include "document-undo.h"
-#include "ui/tools/flood-tool.h"
+
 #include "livarot/Path.h"
 #include "livarot/Shape.h"
-#include "macros.h"
-#include "message-context.h"
-#include "message-stack.h"
-#include "rubberband.h"
-#include "selection.h"
-#include "ui/shape-editor.h"
-#include "splivarot.h"
-#include "sp-namedview.h"
-#include "sp-root.h"
+
+#include "object/sp-namedview.h"
+#include "object/sp-path.h"
+#include "object/sp-root.h"
+
+#include "pixmaps/cursor-paintbucket.xpm"
+
 #include "svg/svg.h"
+
 #include "trace/imagemap.h"
-#include "xml/node-event-vector.h"
-#include "verbs.h"
+#include "trace/potrace/inkscape-potrace.h"
 
-#include "pixmaps/cursor-paintbucket.xpm"
+#include "ui/shape-editor.h"
+
+#include "xml/node-event-vector.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/flood-tool.h b/src/ui/tools/flood-tool.h
index 100875f22..7eadeea34 100644
--- a/src/ui/tools/flood-tool.h
+++ b/src/ui/tools/flood-tool.h
@@ -11,14 +11,19 @@
  * Released under GNU GPL
  */
 
+#include <vector>
+
 #include <sigc++/connection.h>
+
 #include "ui/tools/tool-base.h"
-#include <vector>
 
 #define SP_FLOOD_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::FloodTool*>((Inkscape::UI::Tools::ToolBase*)obj))
 #define SP_IS_FLOOD_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::FloodTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL)
 
 namespace Inkscape {
+
+class Selection;
+
 namespace UI {
 namespace Tools {
 
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 8a078d510..26d812394 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -20,28 +20,33 @@
 #include <config.h>
 #endif
 
+#include "desktop-style.h"
+#include "macros.h"
+#include "message-stack.h"
+#include "selection-chemistry.h"
+
+#include "display/canvas-bpath.h"
+#include "display/curve.h"
+
 #include "live_effects/lpe-bendpath.h"
 #include "live_effects/lpe-patternalongpath.h"
 #include "live_effects/lpe-simplify.h"
 #include "live_effects/lpe-powerstroke.h"
-#include "display/canvas-bpath.h"
+
 #include "svg/svg.h"
-#include "display/curve.h"
 
-#include "desktop-style.h"
+#include "object/sp-item-group.h"
+#include "object/sp-path.h"
+#include "object/sp-rect.h"
+#include "object/sp-use.h"
+#include "style.h"
+
+#include "ui/clipboard.h"
+#include "ui/control-manager.h"
 #include "ui/draw-anchor.h"
-#include "macros.h"
-#include "message-stack.h"
+#include "ui/tools/lpe-tool.h"
 #include "ui/tools/pen-tool.h"
 #include "ui/tools/pencil-tool.h"
-#include "ui/tools/lpe-tool.h"
-#include "selection-chemistry.h"
-#include "sp-item-group.h"
-#include "sp-rect.h"
-#include "style.h"
-#include "ui/control-manager.h"
-// clipboard support
-#include "ui/clipboard.h"
 
 #define MIN_PRESSURE      0.0
 #define MAX_PRESSURE      1.0
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index 81d2f6a5b..b0c2a0185 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -16,31 +16,34 @@
 #include <config.h>
 #endif
 
-
+#include <glibmm/i18n.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "macros.h"
-#include "document.h"
-#include "selection.h"
 #include "desktop.h"
-
-#include "message-context.h"
-#include "message-stack.h"
-#include "pixmaps/cursor-gradient.xpm"
-#include "pixmaps/cursor-gradient-add.xpm"
-#include "ui/tools/gradient-tool.h"
+#include "document-undo.h"
+#include "document.h"
 #include "gradient-chemistry.h"
-#include <glibmm/i18n.h>
 #include "gradient-drag.h"
-#include "display/sp-ctrlline.h"
-#include "sp-stop.h"
-#include "svg/css-ostringstream.h"
-#include "snap.h"
-#include "sp-namedview.h"
+#include "macros.h"
+#include "message-context.h"
+#include "message-stack.h"
 #include "rubberband.h"
-#include "document-undo.h"
-#include "verbs.h"
 #include "selection-chemistry.h"
+#include "selection.h"
+#include "snap.h"
+#include "verbs.h"
+
+#include "object/sp-namedview.h"
+#include "object/sp-stop.h"
+
+#include "display/sp-ctrlline.h"
+
+#include "pixmaps/cursor-gradient-add.xpm"
+#include "pixmaps/cursor-gradient.xpm"
+
+#include "svg/css-ostringstream.h"
+
+#include "ui/tools/gradient-tool.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp
index ad3964f4a..f62a70c34 100644
--- a/src/ui/tools/lpe-tool.cpp
+++ b/src/ui/tools/lpe-tool.cpp
@@ -18,25 +18,29 @@
 #include <config.h>
 #endif
 
-#include <2geom/sbasis-geometric.h>
-
 #include <glibmm/i18n.h>
-#include "pixmaps/cursor-crosshairs.xpm"
 #include <gtk/gtk.h>
+
+#include <2geom/sbasis-geometric.h>
+
 #include "desktop.h"
+#include "document.h"
 #include "message-context.h"
-#include "ui/shape-editor.h"
+#include "message-stack.h"
 #include "selection.h"
 
-#include "document.h"
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "display/canvas-text.h"
-#include "message-stack.h"
-#include "sp-path.h"
+
+#include "object/sp-path.h"
+
+#include "pixmaps/cursor-crosshairs.xpm"
+
 #include "util/units.h"
 
 #include "ui/tools/lpe-tool.h"
+#include "ui/shape-editor.h"
 
 using Inkscape::Util::unit_table;
 using Inkscape::UI::Tools::PenTool;
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 8037a02a9..724e121d9 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -15,37 +15,47 @@
 #endif
 
 #include <gtkmm.h>
+#include <glibmm/i18n.h>
+
 #include <boost/none_t.hpp>
-#include "util/units.h"
-#include "display/curve.h"
-#include "display/sodipodi-ctrl.h"
-#include "display/sp-ctrlline.h"
-#include "display/sp-ctrlcurve.h"
-#include "display/sp-canvas.h"
-#include "display/sp-canvas-util.h"
-#include "svg/svg.h"
-#include "svg/svg-color.h"
-#include "ui/tools/measure-tool.h"
-#include "ui/tools/freehand-base.h"
+
 #include <2geom/line.h>
 #include <2geom/path-intersection.h>
-#include "ui/dialog/knot-properties.h"
-#include "sp-namedview.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
-#include "sp-defs.h"
-#include "sp-root.h"
-#include "svg/stringstream.h"
-#include "rubberband.h"
-#include "path-chemistry.h"
+
+#include "desktop-style.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "text-editing.h"
-#include "pixmaps/cursor-measure.xpm"
 #include "inkscape.h"
-#include "desktop-style.h"
+#include "path-chemistry.h"
+#include "rubberband.h"
+#include "text-editing.h"
 #include "verbs.h"
-#include <glibmm/i18n.h>
+
+#include "display/curve.h"
+#include "display/sodipodi-ctrl.h"
+#include "display/sp-canvas-util.h"
+#include "display/sp-canvas.h"
+#include "display/sp-ctrlcurve.h"
+#include "display/sp-ctrlline.h"
+
+#include "object/sp-defs.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-namedview.h"
+#include "object/sp-root.h"
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
+
+#include "pixmaps/cursor-measure.xpm"
+
+#include "svg/stringstream.h"
+#include "svg/svg-color.h"
+#include "svg/svg.h"
+
+#include "ui/dialog/knot-properties.h"
+#include "ui/tools/freehand-base.h"
+#include "ui/tools/measure-tool.h"
+
+#include "util/units.h"
 
 using Inkscape::ControlManager;
 using Inkscape::CTLINE_SECONDARY;
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index 94d7eedfc..703e57ac8 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -27,33 +27,33 @@
 
 // General
 #include "desktop.h"
-
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
+#include "gradient-drag.h"
+#include "gradient-chemistry.h"
 #include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
 #include "rubberband.h"
 #include "selection.h"
 #include "snap.h"
-#include "sp-namedview.h"
 #include "verbs.h"
-#include "sp-text.h"
-#include "sp-defs.h"
+
+#include "display/sp-ctrlcurve.h"
+#include "display/curve.h"
+
+#include "object/sp-defs.h"
+#include "object/sp-mesh-gradient.h"
+#include "object/sp-namedview.h"
+#include "object/sp-text.h"
 #include "style.h"
-#include "ui/control-manager.h"
 
-// Gradient specific
-#include "gradient-drag.h"
-#include "gradient-chemistry.h"
 #include "pixmaps/cursor-gradient.xpm"
 #include "pixmaps/cursor-gradient-add.xpm"
 
-// Mesh specific
+#include "ui/control-manager.h"
 #include "ui/tools/mesh-tool.h"
-#include "sp-mesh-gradient.h"
-#include "display/sp-ctrlcurve.h"
-#include "display/curve.h"
+
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/mesh-tool.h b/src/ui/tools/mesh-tool.h
index 1f012dc53..9c13ec30e 100644
--- a/src/ui/tools/mesh-tool.h
+++ b/src/ui/tools/mesh-tool.h
@@ -20,7 +20,8 @@
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "ui/tools/tool-base.h"
-#include "sp-mesh-array.h"
+
+#include "object/sp-mesh-array.h"
 
 #define SP_MESH_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::MeshTool*>((Inkscape::UI::Tools::ToolBase*)obj))
 #define SP_IS_MESH_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::MeshTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL)
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 2b3de5203..6e586b0e9 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -10,41 +10,49 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "ui/tool/curve-drag-point.h"
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
+
+
+
 #include "desktop.h"
+#include "document.h"
+#include "message-context.h"
+#include "selection-chemistry.h"
+#include "selection.h"
+#include "snap.h"
 
-#include "display/sp-canvas-group.h"
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
+#include "display/sp-canvas-group.h"
 #include "display/sp-canvas.h"
-#include "document.h"
+
 #include "live_effects/effect.h"
 #include "live_effects/lpeobject.h"
-#include "message-context.h"
-#include "selection.h"
-#include "ui/shape-editor.h" // temporary!
-#include "snap.h"
-#include "sp-namedview.h"
-#include "sp-clippath.h"
-#include "sp-item-group.h"
-#include "sp-mask.h"
-#include "sp-text.h"
+
+#include "object/sp-clippath.h"
+#include "object/sp-item-group.h"
+#include "object/sp-mask.h"
+#include "object/sp-namedview.h"
+#include "object/sp-path.h"
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
+
+#include "pixmaps/cursor-node-d.xpm"
+#include "pixmaps/cursor-node.xpm"
+
 #include "ui/control-manager.h"
-#include "ui/tools/node-tool.h"
-#include "ui/tools-switch.h"
-#include "ui/tools/tool-base.h"
+#include "ui/shape-editor.h" // temporary!
 #include "ui/tool/control-point-selection.h"
+#include "ui/tool/curve-drag-point.h"
 #include "ui/tool/event-utils.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
 #include "ui/tool/selector.h"
+#include "ui/tools-switch.h"
+#include "ui/tools/node-tool.h"
+#include "ui/tools/tool-base.h"
 
-#include "pixmaps/cursor-node.xpm"
-#include "pixmaps/cursor-node-d.xpm"
-#include "selection-chemistry.h"
-
-#include <gdk/gdkkeysyms.h>
 
 /** @struct NodeTool
  *
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 0616ba013..7dd120077 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -16,42 +16,47 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gdk/gdkkeysyms.h>
 #include <cstring>
 #include <string>
 
-#include "shortcuts.h"
-#include "verbs.h"
+#include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
-#include "ui/tools/pen-tool.h"
-#include "sp-namedview.h"
-#include "desktop.h"
+#include <2geom/curves.h>
 
-#include "selection.h"
-#include "selection-chemistry.h"
-#include "ui/draw-anchor.h"
-#include "message-stack.h"
+#include "context-fns.h"
+#include "desktop.h"
+#include "macros.h"
 #include "message-context.h"
-#include "display/sp-canvas.h"
-#include "display/curve.h"
-#include "pixmaps/cursor-pen.xpm"
+#include "message-stack.h"
+#include "selection-chemistry.h"
+#include "selection.h"
+#include "shortcuts.h"
+#include "verbs.h"
+
 #include "display/canvas-bpath.h"
-#include "display/sp-ctrlline.h"
+#include "display/curve.h"
 #include "display/sodipodi-ctrl.h"
-#include <glibmm/i18n.h>
-#include "macros.h"
-#include "context-fns.h"
-#include "ui/tools-switch.h"
+#include "display/sp-canvas.h"
+#include "display/sp-ctrlline.h"
+
+#include "object/sp-path.h"
+
+#include "pixmaps/cursor-pen.xpm"
+
 #include "ui/control-manager.h"
+#include "ui/draw-anchor.h"
+#include "ui/tools-switch.h"
+#include "ui/tools/pen-tool.h"
+
 // we include the necessary files for BSpline & Spiro
 #include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
 #include "live_effects/parameter/path.h"
+
 #define INKSCAPE_LPE_SPIRO_C
 #include "live_effects/lpe-spiro.h"
 
-
-#include <2geom/curves.h>
 #include "helper/geom-nodetype.h"
 
 // For handling un-continuous paths:
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 2f68688a1..590ef3634 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -17,37 +17,45 @@
  */
 
 #include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
+
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/bezier-utils.h>
 
 #include "ui/tools/pencil-tool.h"
+
+
 #include "desktop.h"
 #include "inkscape.h"
 
-#include "selection.h"
-#include "selection-chemistry.h"
-#include "ui/draw-anchor.h"
-#include "message-stack.h"
+#include "context-fns.h"
+#include "desktop-style.h"
 #include "message-context.h"
-#include "sp-path.h"
+#include "message-stack.h"
+#include "selection-chemistry.h"
+#include "selection.h"
 #include "snap.h"
-#include "pixmaps/cursor-pencil.xpm"
-#include <2geom/sbasis-to-bezier.h>
-#include <2geom/bezier-utils.h>
+
 #include "display/canvas-bpath.h"
-#include <glibmm/i18n.h>
-#include "context-fns.h"
-#include "sp-namedview.h"
-#include "xml/node.h"
-#include "xml/sp-css-attr.h"
-#include "svg/svg.h"
 #include "display/curve.h"
-#include "desktop-style.h"
-#include "style.h"
 #include "display/sp-canvas.h"
-#include "display/curve.h"
+
 #include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-powerstroke-interpolators.h"
+
+#include "object/sp-path.h"
+#include "style.h"
+
+#include "pixmaps/cursor-pencil.xpm"
+
+#include "svg/svg.h"
+
+#include "ui/draw-anchor.h"
 #include "ui/tool/event-utils.h"
 
+#include "xml/node.h"
+#include "xml/sp-css-attr.h"
+
 namespace Inkscape {
 namespace UI {
 namespace Tools {
diff --git a/src/ui/tools/pencil-tool.h b/src/ui/tools/pencil-tool.h
index c361978cb..24f2c8bfc 100644
--- a/src/ui/tools/pencil-tool.h
+++ b/src/ui/tools/pencil-tool.h
@@ -6,12 +6,13 @@
  */
 
 #include "ui/tools/freehand-base.h"
-#include "sp-shape.h"
+
 #include <2geom/piecewise.h>
 #include <2geom/d2.h>
 #include <2geom/sbasis.h>
 #include <2geom/pathvector.h>
 
+class SPShape;
 
 #define DDC_MIN_PRESSURE      0.0
 #define DDC_MAX_PRESSURE      1.0
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index 655650ef4..60524b275 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -14,30 +14,35 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gdk/gdkkeysyms.h>
 #include <cstring>
 #include <string>
 
-#include "macros.h"
-#include "display/sp-canvas.h"
-#include "sp-rect.h"
-#include "document.h"
-#include "document-undo.h"
-#include "sp-namedview.h"
-#include "selection.h"
-#include "selection-chemistry.h"
+#include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
-#include "desktop.h"
+#include "context-fns.h"
 #include "desktop-style.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "macros.h"
 #include "message-context.h"
+#include "selection-chemistry.h"
+#include "selection.h"
+#include "verbs.h"
+
+#include "display/sp-canvas-item.h"
+#include "display/sp-canvas.h"
+
+#include "object/sp-rect.h"
+#include "object/sp-namedview.h"
+
 #include "pixmaps/cursor-rect.xpm"
+
+#include "ui/shape-editor.h"
 #include "ui/tools/rect-tool.h"
-#include <glibmm/i18n.h>
+
 #include "xml/node-event-vector.h"
-#include "context-fns.h"
-#include "ui/shape-editor.h"
-#include "verbs.h"
-#include "display/sp-canvas-item.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/rect-tool.h b/src/ui/tools/rect-tool.h
index a22f1caa8..ac056668f 100644
--- a/src/ui/tools/rect-tool.h
+++ b/src/ui/tools/rect-tool.h
@@ -20,7 +20,7 @@
 #include <2geom/point.h>
 #include "ui/tools/tool-base.h"
 
-#include "sp-rect.h"
+class SPRect;
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index 2468575c6..ddc6e2881 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -17,36 +17,43 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+
 #include <cstring>
 #include <string>
+
 #include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
+
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
 #include "macros.h"
+#include "message-stack.h"
 #include "rubberband.h"
-#include "document.h"
-#include "document-undo.h"
+#include "selection-chemistry.h"
+#include "selection-describer.h"
 #include "selection.h"
+#include "seltrans.h"
 #include "sp-cursor.h"
+
+#include "display/drawing-item.h"
+#include "display/sp-canvas.h"
+#include "display/sp-canvas-item.h"
+
+#include "object/box3d.h"
 #include "style.h"
-#include "pixmaps/cursor-select-m.xpm"
+
 #include "pixmaps/cursor-select-d.xpm"
+#include "pixmaps/cursor-select-m.xpm"
 #include "pixmaps/handles.xpm"
-#include <glibmm/i18n.h>
 
+#include "ui/tools-switch.h"
 #include "ui/tools/select-tool.h"
-#include "selection-chemistry.h"
+
 #ifdef WITH_DBUS
 #include "extension/dbus/document-interface.h"
 #endif
-#include "desktop.h"
 
-#include "sp-root.h"
-#include "ui/tools-switch.h"
-#include "message-stack.h"
-#include "selection-describer.h"
-#include "seltrans.h"
-#include "box3d.h"
-#include "display/sp-canvas.h"
-#include "display/drawing-item.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp
index bb8ce6356..7a1881295 100644
--- a/src/ui/tools/spiral-tool.cpp
+++ b/src/ui/tools/spiral-tool.cpp
@@ -14,29 +14,33 @@
  * Released under GNU GPL
  */
 
-#include <gdk/gdkkeysyms.h>
 #include <cstring>
 #include <string>
 
-#include "macros.h"
-#include "display/sp-canvas.h"
-#include "sp-spiral.h"
-#include "document.h"
-#include "document-undo.h"
-#include "sp-namedview.h"
-#include "selection.h"
+#include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
-#include "desktop.h"
+#include "context-fns.h"
 #include "desktop-style.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "macros.h"
 #include "message-context.h"
 #include "pixmaps/cursor-spiral.xpm"
-#include "ui/tools/spiral-tool.h"
-#include <glibmm/i18n.h>
-#include "xml/node-event-vector.h"
-#include "context-fns.h"
-#include "ui/shape-editor.h"
+#include "selection.h"
 #include "verbs.h"
+
 #include "display/sp-canvas-item.h"
+#include "display/sp-canvas.h"
+
+#include "object/sp-namedview.h"
+#include "object/sp-spiral.h"
+
+#include "ui/shape-editor.h"
+#include "ui/tools/spiral-tool.h"
+
+#include "xml/node-event-vector.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 5a68fa969..beb556dff 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -22,52 +22,49 @@
 
 #include <numeric>
 
-#include "ui/dialog/dialog-manager.h"
+#include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
-#include "svg/svg.h"
+#include <2geom/circle.h>
 
-#include "macros.h"
-#include "document.h"
-#include "document-undo.h"
-#include "selection.h"
-#include "desktop.h"
-#include "desktop-events.h"
 
-#include "message-context.h"
-#include "pixmaps/cursor-spray.xpm"
 #include "context-fns.h"
+#include "desktop-events.h"
+#include "desktop-style.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "filter-chemistry.h"
 #include "inkscape.h"
-
-#include "splivarot.h"
-#include "sp-item-group.h"
-#include "sp-shape.h"
-#include "sp-path.h"
+#include "macros.h"
+#include "message-context.h"
 #include "path-chemistry.h"
+#include "selection.h"
+#include "splivarot.h"
+#include "verbs.h"
 
-// For color picking
-#include "display/drawing.h"
-#include "display/drawing-context.h"
 #include "display/cairo-utils.h"
-#include "desktop-style.h"
-#include "svg/svg-color.h"
-
-#include "sp-text.h"
-#include "sp-flowtext.h"
-#include "display/sp-canvas.h"
 #include "display/canvas-arena.h"
 #include "display/curve.h"
+#include "display/drawing-context.h"
+#include "display/drawing.h"
+#include "display/sp-canvas.h"
+
+#include "helper/action.h"
+
 #include "livarot/Shape.h"
-#include <2geom/circle.h>
-#include "box3d.h"
-#include "sp-item-transform.h"
-#include "filter-chemistry.h"
+
+#include "object/box3d.h"
+#include "object/sp-item-transform.h"
+
+#include "pixmaps/cursor-spray.xpm"
+
+#include "svg/svg.h"
+#include "svg/svg-color.h"
 
 #include "ui/tools/spray-tool.h"
-#include "helper/action.h"
-#include "verbs.h"
+#include "ui/dialog/dialog-manager.h"
 
-#include <gdk/gdkkeysyms.h>
-#include <glibmm/i18n.h>
 
 using Inkscape::DocumentUndo;
 using namespace std;
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index ed25503c4..d6fcf0409 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -22,28 +22,31 @@
 #include <string>
 
 #include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
-#include "macros.h"
-#include "display/sp-canvas.h"
-#include "sp-star.h"
-#include "document.h"
-#include "document-undo.h"
-#include "sp-namedview.h"
-#include "selection.h"
-
-#include "desktop.h"
+#include "context-fns.h"
 #include "desktop-style.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "macros.h"
 #include "message-context.h"
-#include "pixmaps/cursor-star.xpm"
-#include <glibmm/i18n.h>
-#include "xml/node-event-vector.h"
-#include "context-fns.h"
-#include "ui/shape-editor.h"
+#include "selection.h"
 #include "verbs.h"
+
+#include "display/sp-canvas.h"
 #include "display/sp-canvas-item.h"
 
+#include "object/sp-namedview.h"
+#include "object/sp-star.h"
+
+#include "pixmaps/cursor-star.xpm"
+
+#include "ui/shape-editor.h"
 #include "ui/tools/star-tool.h"
 
+#include "xml/node-event-vector.h"
+
 using Inkscape::DocumentUndo;
 
 namespace Inkscape {
diff --git a/src/ui/tools/star-tool.h b/src/ui/tools/star-tool.h
index da3774e68..a697582d3 100644
--- a/src/ui/tools/star-tool.h
+++ b/src/ui/tools/star-tool.h
@@ -19,7 +19,7 @@
 #include <2geom/point.h>
 #include "ui/tools/tool-base.h"
 
-#include "sp-star.h"
+class SPStar;
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 692b65c44..8db6c323c 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -17,38 +17,42 @@
 #include <config.h>
 #endif
 
+#include <gdk/gdkkeysyms.h>
 #include <gtkmm/clipboard.h>
+#include <glibmm/i18n.h>
+
 #include <display/sp-ctrlline.h>
 #include <display/sodipodi-ctrlrect.h>
 #include <display/sp-ctrlquadr.h>
-#include <gdk/gdkkeysyms.h>
-#include <glibmm/i18n.h>
 
 #include "context-fns.h"
-
 #include "desktop-style.h"
 #include "desktop.h"
-#include "document.h"
 #include "document-undo.h"
+#include "document.h"
 #include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
-#include "pixmaps/cursor-text-insert.xpm"
-#include "pixmaps/cursor-text.xpm"
 #include "rubberband.h"
 #include "selection-chemistry.h"
 #include "selection.h"
-#include "ui/shape-editor.h"
-#include "sp-flowtext.h"
-#include "sp-namedview.h"
-#include "sp-text.h"
-#include "style.h"
-#include "ui/tools/text-tool.h"
 #include "text-editing.h"
-#include "ui/control-manager.h"
 #include "verbs.h"
-#include "xml/node-event-vector.h"
+
+#include "object/sp-flowtext.h"
+#include "object/sp-namedview.h"
+#include "object/sp-text.h"
+#include "style.h"
+
+#include "pixmaps/cursor-text-insert.xpm"
+#include "pixmaps/cursor-text.xpm"
+
+#include "ui/control-manager.h"
+#include "ui/shape-editor.h"
+#include "ui/tools/text-tool.h"
+
 #include "xml/attribute-record.h"
+#include "xml/node-event-vector.h"
 #include "xml/sp-css-attr.h"
 
 using Inkscape::ControlManager;
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 83a084a60..9f9a155c2 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -18,11 +18,32 @@
 #include <config.h>
 #endif
 
-#include "widgets/desktop-widget.h"
+#include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
 #include "shortcuts.h"
 #include "file.h"
 
+
+
+#include "desktop-events.h"
+#include "desktop-style.h"
+#include "desktop.h"
+#include "gradient-drag.h"
+#include "knot-ptr.h"
+#include "macros.h"
+#include "message-context.h"
+#include "rubberband.h"
+#include "selcue.h"
+#include "selection.h"
+#include "sp-cursor.h"
+
+#include "display/sp-canvas.h"
+#include "display/sp-canvas-group.h"
+#include "display/canvas-rotate.h"
+
+#include "object/sp-guide.h"
+
 #include "ui/contextmenu.h"
 #include "ui/interface.h"
 #include "ui/event-debug.h"
@@ -36,27 +57,9 @@
 #include "ui/tools/node-tool.h"
 #include "ui/tool/shape-record.h"
 
-#include <gdk/gdkkeysyms.h>
-#include <glibmm/i18n.h>
+#include "widgets/desktop-widget.h"
 
-#include "display/sp-canvas.h"
-#include "display/sp-canvas-group.h"
-#include "display/canvas-rotate.h"
 #include "xml/node-event-vector.h"
-#include "sp-cursor.h"
-#include "desktop.h"
-
-#include "desktop-events.h"
-#include "desktop-style.h"
-#include "sp-namedview.h"
-#include "selection.h"
-#include "macros.h"
-#include "message-context.h"
-#include "gradient-drag.h"
-#include "rubberband.h"
-#include "selcue.h"
-#include "sp-guide.h"
-#include "knot-ptr.h"
 
 // globals for temporary switching to selector by space
 static bool selector_toggled = FALSE;
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 9348ef842..bcc30a74f 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -11,67 +11,67 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <numeric>
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 
-#include <numeric>
-
-#include "svg/svg.h"
+#include <2geom/circle.h>
 
-#include "macros.h"
-#include "document.h"
-#include "document-undo.h"
-#include "selection.h"
-#include "desktop.h"
+#include "context-fns.h"
 #include "desktop-events.h"
-
 #include "desktop-style.h"
-#include "message-context.h"
-#include "pixmaps/cursor-tweak-move.xpm"
-#include "pixmaps/cursor-tweak-move-in.xpm"
-#include "pixmaps/cursor-tweak-move-out.xpm"
-#include "pixmaps/cursor-tweak-move-jitter.xpm"
-#include "pixmaps/cursor-tweak-scale-up.xpm"
-#include "pixmaps/cursor-tweak-scale-down.xpm"
-#include "pixmaps/cursor-tweak-rotate-clockwise.xpm"
-#include "pixmaps/cursor-tweak-rotate-counterclockwise.xpm"
-#include "pixmaps/cursor-tweak-more.xpm"
-#include "pixmaps/cursor-tweak-less.xpm"
-#include "pixmaps/cursor-tweak-thin.xpm"
-#include "pixmaps/cursor-tweak-thicken.xpm"
-#include "pixmaps/cursor-tweak-attract.xpm"
-#include "pixmaps/cursor-tweak-repel.xpm"
-#include "pixmaps/cursor-tweak-push.xpm"
-#include "pixmaps/cursor-tweak-roughen.xpm"
-#include "pixmaps/cursor-tweak-color.xpm"
-#include "context-fns.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
+#include "filter-chemistry.h"
+#include "gradient-chemistry.h"
 #include "inkscape.h"
-#include "splivarot.h"
-#include "sp-item-group.h"
-#include "sp-shape.h"
-#include "sp-path.h"
+#include "macros.h"
+#include "message-context.h"
 #include "path-chemistry.h"
-#include "sp-stop.h"
-#include "sp-gradient-reference.h"
-#include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
-#include "sp-mesh-gradient.h"
-#include "sp-mesh-array.h"
-#include "gradient-chemistry.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
-#include "display/sp-canvas.h"
+#include "selection.h"
+#include "splivarot.h"
+#include "verbs.h"
+
 #include "display/canvas-arena.h"
 #include "display/curve.h"
+#include "display/sp-canvas.h"
+
 #include "livarot/Shape.h"
-#include <2geom/circle.h>
+
+#include "object/box3d.h"
+#include "object/filters/gaussian-blur.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-item-transform.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-mesh-gradient.h"
+#include "object/sp-path.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-stop.h"
+#include "object/sp-text.h"
 #include "style.h"
-#include "box3d.h"
-#include "sp-item-transform.h"
-#include "filter-chemistry.h"
-#include "filters/gaussian-blur.h"
-#include "verbs.h"
+
+#include "pixmaps/cursor-tweak-attract.xpm"
+#include "pixmaps/cursor-tweak-color.xpm"
+#include "pixmaps/cursor-tweak-less.xpm"
+#include "pixmaps/cursor-tweak-more.xpm"
+#include "pixmaps/cursor-tweak-move-in.xpm"
+#include "pixmaps/cursor-tweak-move-jitter.xpm"
+#include "pixmaps/cursor-tweak-move-out.xpm"
+#include "pixmaps/cursor-tweak-move.xpm"
+#include "pixmaps/cursor-tweak-push.xpm"
+#include "pixmaps/cursor-tweak-repel.xpm"
+#include "pixmaps/cursor-tweak-rotate-clockwise.xpm"
+#include "pixmaps/cursor-tweak-rotate-counterclockwise.xpm"
+#include "pixmaps/cursor-tweak-roughen.xpm"
+#include "pixmaps/cursor-tweak-scale-down.xpm"
+#include "pixmaps/cursor-tweak-scale-up.xpm"
+#include "pixmaps/cursor-tweak-thicken.xpm"
+#include "pixmaps/cursor-tweak-thin.xpm"
+
+#include "svg/svg.h"
 
 #include "ui/tools/tweak-tool.h"
 
diff --git a/src/ui/widget/attr-widget.h b/src/ui/widget/attr-widget.h
index 1238798ef..e54116a67 100644
--- a/src/ui/widget/attr-widget.h
+++ b/src/ui/widget/attr-widget.h
@@ -12,7 +12,7 @@
 #define INKSCAPE_UI_WIDGET_ATTR_WIDGET_H
 
 #include "attributes.h"
-#include "sp-object.h"
+#include "object/sp-object.h"
 #include "xml/node.h"
 
 namespace Inkscape {
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index aaf5ba5c2..32f99747a 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -2,26 +2,28 @@
 #include "config.h"
 #endif
 
+#include <set>
+
 #include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
 
-#include <set>
+#include "colorspace.h"
+#include "document.h"
+#include "inkscape.h"
+#include "profile-manager.h"
+
+#include "svg/svg-icc-color.h"
 
 #include "ui/dialog-events.h"
 #include "ui/util.h"
 #include "ui/widget/color-icc-selector.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
-#include "svg/svg-icc-color.h"
-#include "colorspace.h"
-#include "document.h"
-#include "inkscape.h"
-#include "profile-manager.h"
 
 #define noDEBUG_LCMS
 
 #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
-#include "color-profile.h"
+#include "object/color-profile.h"
 #include "cms-system.h"
 #include "color-profile-cms-fns.h"
 
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index cda41bdb7..308bb968e 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -24,14 +24,16 @@
 #include <gtkmm/notebook.h>
 #include <gtkmm/radiobutton.h>
 
-#include "preferences.h"
-#include "widgets/spw-utilities.h"
-#include "svg/svg-icc-color.h"
-#include "inkscape.h"
+#include "cms-system.h"
 #include "document.h"
+#include "inkscape.h"
+#include "preferences.h"
 #include "profile-manager.h"
-#include "color-profile.h"
-#include "cms-system.h"
+
+#include "object/color-profile.h"
+
+#include "svg/svg-icc-color.h"
+
 #include "ui/dialog-events.h"
 #include "ui/tools-switch.h"
 #include "ui/tools/tool-base.h"
@@ -41,6 +43,8 @@
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-wheel-selector.h"
 
+#include "widgets/spw-utilities.h"
+
 using Inkscape::CMSSystem;
 
 #define XPAD 4
diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index fddd7ae1d..67412b1e0 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -17,19 +17,21 @@
 #include <config.h>
 #endif
 
+#include "entity-entry.h"
+
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/entry.h>
 
-#include "inkscape.h"
-#include "rdf.h"
-#include "ui/widget/registry.h"
-#include "sp-root.h"
-#include "document-undo.h"
 #include "document-private.h"
+#include "document-undo.h"
+#include "inkscape.h"
 #include "preferences.h"
+#include "rdf.h"
 #include "verbs.h"
 
-#include "entity-entry.h"
+#include "object/sp-root.h"
+
+#include "ui/widget/registry.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp
index e8ad78022..12c920264 100644
--- a/src/ui/widget/font-variants.cpp
+++ b/src/ui/widget/font-variants.cpp
@@ -13,13 +13,14 @@
 
 #include <gtkmm.h>
 #include <glibmm/i18n.h>
+
 #include <libnrtype/font-instance.h>
 
 #include "font-variants.h"
 
 // For updating from selection
 #include "desktop.h"
-#include "sp-text.h"
+#include "object/sp-text.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 7a3909975..c9b3664fc 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -25,11 +25,13 @@
 
 #include <glibmm/i18n.h>
 
+#include "verbs.h"
 
 #include "helper/action.h"
-#include "sp-root.h"
+
+#include "object/sp-root.h"
+
 #include "ui/widget/button.h"
-#include "verbs.h"
 
 using std::pair;
 using Inkscape::Util::unit_table;
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index 345864a44..078aba9cf 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -14,27 +14,29 @@
 #include <config.h>
 #endif
 
+#include <glibmm/i18n.h>
+#include <glibmm/convert.h>
+#include <glibmm/regex.h>
+
 #include <gtkmm/box.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/scale.h>
 #include <gtkmm/table.h>
 
-#include "preferences.h"
-#include "ui/widget/preferences-widget.h"
-#include "verbs.h"
-#include "selcue.h"
-#include "io/sys.h"
+
 #include "desktop.h"
 #include "inkscape.h"
-
 #include "message-stack.h"
-#include "style.h"
+#include "preferences.h"
+#include "selcue.h"
 #include "selection-chemistry.h"
+#include "verbs.h"
+
+#include "io/sys.h"
+
 #include "ui/dialog/filedialog.h"
+#include "ui/widget/preferences-widget.h"
 
-#include <glibmm/i18n.h>
-#include <glibmm/convert.h>
-#include <glibmm/regex.h>
 
 #ifdef WIN32
 #include <windows.h>
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 209388146..753b72c2e 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -19,15 +19,17 @@
 
 #include "registered-widget.h"
 
-#include "widgets/spinbutton-events.h"
+#include <gtkmm/radiobutton.h>
+
+#include "verbs.h"
+
+#include "object/sp-root.h"
 
 #include "svg/svg-color.h"
 #include "svg/stringstream.h"
 
-#include "verbs.h"
-#include "sp-root.h"
+#include "widgets/spinbutton-events.h"
 
-#include <gtkmm/radiobutton.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index 765fa77b6..6064e9461 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -29,7 +29,7 @@
 #include "document.h"
 #include "document-undo.h"
 #include "desktop.h"
-#include "sp-namedview.h"
+#include "object/sp-namedview.h"
 
 #include <gtkmm/checkbutton.h>
 
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 1c6556884..d317fa216 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -15,38 +15,43 @@
 
 #include "selected-style.h"
 
-#include "widgets/spw-utilities.h"
-#include "ui/widget/color-preview.h"
+#include <gtkmm/separatormenuitem.h>
 
+
+#include "desktop-style.h"
+#include "document-undo.h"
+#include "gradient-chemistry.h"
+#include "message-context.h"
 #include "selection.h"
+#include "sp-cursor.h"
+
+#include "display/sp-canvas.h"
 
+#include "object/sp-linear-gradient.h"
+#include "object/sp-mesh-gradient.h"
+#include "object/sp-namedview.h"
+#include "object/sp-pattern.h"
+#include "object/sp-radial-gradient.h"
 #include "style.h"
-#include "desktop-style.h"
-#include "sp-namedview.h"
-#include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
-#include "sp-mesh-gradient.h"
-#include "sp-pattern.h"
+
+#include "pixmaps/cursor-adj-a.xpm"
+#include "pixmaps/cursor-adj-h.xpm"
+#include "pixmaps/cursor-adj-l.xpm"
+#include "pixmaps/cursor-adj-s.xpm"
+
+#include "svg/css-ostringstream.h"
+#include "svg/svg-color.h"
+
 #include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/fill-and-stroke.h"
 #include "ui/dialog/panel-dialog.h"
-#include "document-undo.h"
-#include "widgets/widget-sizes.h"
-#include "widgets/spinbutton-events.h"
-#include "widgets/gradient-image.h"
-#include "svg/svg-color.h"
-#include "svg/css-ostringstream.h"
 #include "ui/tools/tool-base.h"
-#include "message-context.h"
-#include <display/sp-canvas.h>
-#include "pixmaps/cursor-adj-h.xpm"
-#include "pixmaps/cursor-adj-s.xpm"
-#include "pixmaps/cursor-adj-l.xpm"
-#include "pixmaps/cursor-adj-a.xpm"
-#include "sp-cursor.h"
-#include "gradient-chemistry.h"
+#include "ui/widget/color-preview.h"
 
-#include <gtkmm/separatormenuitem.h>
+#include "widgets/gradient-image.h"
+#include "widgets/spinbutton-events.h"
+#include "widgets/spw-utilities.h"
+#include "widgets/widget-sizes.h"
 
 using Inkscape::Util::unit_table;
 
diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp
index a779e6feb..e23627080 100644
--- a/src/ui/widget/style-subject.cpp
+++ b/src/ui/widget/style-subject.cpp
@@ -5,14 +5,13 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#include "ui/widget/style-subject.h"
+#include "style-subject.h"
 
 #include "desktop.h"
-#include "xml/sp-css-attr.h"
 #include "desktop-style.h"
-
 #include "selection.h"
-#include "style.h"
+
+#include "xml/sp-css-attr.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/style-subject.h b/src/ui/widget/style-subject.h
index 15a072f44..b75b3ffa7 100644
--- a/src/ui/widget/style-subject.h
+++ b/src/ui/widget/style-subject.h
@@ -12,10 +12,14 @@
 
 #include <boost/optional.hpp>
 #include <2geom/rect.h>
-#include "sp-item.h"
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 
+#include "object/sp-item.h"
+#include "object/sp-tag.h"
+#include "object/sp-tag-use.h"
+#include "object/sp-tag-use-reference.h"
+
 class SPDesktop;
 class SPObject;
 class SPCSSAttr;
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index 2dccb55c4..14a6c4502 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -13,22 +13,26 @@
 
 #include "style-swatch.h"
 
-#include "widgets/spw-utilities.h"
-#include "ui/widget/color-preview.h"
+#include <glibmm/i18n.h>
+#include <gtkmm/grid.h>
 
-#include "style.h"
-#include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
-#include "sp-pattern.h"
-#include "xml/sp-css-attr.h"
-#include "widgets/widget-sizes.h"
-#include "util/units.h"
-#include "helper/action.h"
 #include "inkscape.h"
 #include "verbs.h"
-#include <glibmm/i18n.h>
 
-#include <gtkmm/grid.h>
+#include "object/sp-linear-gradient.h"
+#include "object/sp-pattern.h"
+#include "object/sp-radial-gradient.h"
+#include "style.h"
+
+#include "helper/action.h"
+
+#include "ui/widget/color-preview.h"
+#include "util/units.h"
+
+#include "widgets/spw-utilities.h"
+#include "widgets/widget-sizes.h"
+
+#include "xml/sp-css-attr.h"
 
 enum {
     SS_FILL,
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index 47e646c34..d2c338571 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -12,24 +12,26 @@
 #include <config.h>
 #endif
 
+#include "tolerance-slider.h"
+
+#include "registry.h"
+
 #include <gtkmm/adjustment.h>
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/scale.h>
 
-#include "xml/repr.h"
-#include "svg/stringstream.h"
-
 #include "inkscape.h"
 #include "document.h"
 #include "document-undo.h"
 #include "desktop.h"
 
-#include "sp-namedview.h"
+#include "object/sp-namedview.h"
 
-#include "registry.h"
-#include "tolerance-slider.h"
+#include "svg/stringstream.h"
+
+#include "xml/repr.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/tolerance-slider.h b/src/ui/widget/tolerance-slider.h
index 3d2548ebe..b77512c34 100644
--- a/src/ui/widget/tolerance-slider.h
+++ b/src/ui/widget/tolerance-slider.h
@@ -15,6 +15,8 @@
 namespace Gtk {
 class RadioButton;
 class Scale;
+class VBox;
+class HBox;
 }
 
 namespace Inkscape {
diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp
index d36220b74..8be0f4262 100644
--- a/src/ui/widget/unit-tracker.cpp
+++ b/src/ui/widget/unit-tracker.cpp
@@ -12,9 +12,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "style-internal.h"
 #include "unit-tracker.h"
-//#include "widgets/ege-select-one-action.h"
+
+#include <algorithm>
 
 #define COLUMN_STRING 0
 
diff --git a/src/ui/widget/unit-tracker.h b/src/ui/widget/unit-tracker.h
index 643ac4e51..8aefab1bb 100644
--- a/src/ui/widget/unit-tracker.h
+++ b/src/ui/widget/unit-tracker.h
@@ -16,7 +16,10 @@
 #define INKSCAPE_UI_WIDGET_UNIT_TRACKER_H
 
 #include <map>
+#include <vector>
+
 #include "util/units.h"
+
 #include "widgets/ege-select-one-action.h"
 
 using Inkscape::Util::Unit;