6 files changed, 50 insertions, 24 deletions
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