17 files changed, 120 insertions, 86 deletions
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;