Move more UI code into ui/

(bzr r13341.1.253)

64 files changed, 147 insertions, 125 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1cd2ff3a6..c77a9bf63 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -192,7 +192,6 @@ set(inkscape_SRC
 	document-undo.cpp
 	document.cpp
 	doxygen-main.cpp
-	draw-anchor.cpp
 	ege-color-prof-tracker.cpp
 	event-log.cpp
 	extract-uri.cpp
@@ -226,7 +225,6 @@ set(inkscape_SRC
 	message-context.cpp
 	message-stack.cpp
 	mod360.cpp
-	object-edit.cpp
 	object-hierarchy.cpp
 	object-snapper.cpp
 	path-chemistry.cpp
@@ -249,7 +247,6 @@ set(inkscape_SRC
 	selection.cpp
 	seltrans-handles.cpp
 	seltrans.cpp
-	shape-editor.cpp
 	shortcuts.cpp
 	snap-preferences.cpp
 	snap.cpp
@@ -263,7 +260,6 @@ set(inkscape_SRC
 	svg-view.cpp
 	text-chemistry.cpp
 	text-editing.cpp
-	tools-switch.cpp
 	transf_mat_3x4.cpp
 	unclump.cpp
 	unicoderange.cpp
@@ -309,7 +305,6 @@ set(inkscape_SRC
 	document-subset.h
 	document-undo.h
 	document.h
-	draw-anchor.h
 	ege-color-prof-tracker.h
 	enums.h
 	event-log.h
@@ -364,7 +359,6 @@ set(inkscape_SRC
 	mod360-test.h
 	mod360.h
 	number-opt-number.h
-	object-edit.h
 	object-hierarchy.h
 	object-snapper.h
 	path-chemistry.h
@@ -395,7 +389,6 @@ set(inkscape_SRC
 	selection.h
 	seltrans-handles.h
 	seltrans.h
-	shape-editor.h
 	shortcuts.h
 	snap-candidate.h
 	snap-enums.h
@@ -420,8 +413,6 @@ set(inkscape_SRC
 	text-chemistry.h
 	text-editing.h
 	text-tag-attributes.h
-	tool-factory.h
-	tools-switch.h
 	transf_mat_3x4.h
 	unclump.h
 	undo-stack-observer.h
diff --git a/src/Makefile_insert b/src/Makefile_insert
index 762535cb5..d6db76eea 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -37,7 +37,6 @@ ink_common_sources +=	\
 	document-subset.cpp document-subset.h				\
 	document-undo.cpp document-undo.h \
 	doxygen-main.cpp						\
-	draw-anchor.cpp	draw-anchor.h					\
 	ege-color-prof-tracker.cpp ege-color-prof-tracker.h		\
 	enums.h								\
 	event-log.cpp event-log.h event.h				\
@@ -84,7 +83,6 @@ ink_common_sources +=	\
 	message.h							\
 	message-stack.cpp message-stack.h				\
 	mod360.cpp mod360.h						\
-	object-edit.cpp object-edit.h					\
 	object-hierarchy.cpp object-hierarchy.h				\
 	object-snapper.cpp object-snapper.h				\
 	path-chemistry.cpp path-chemistry.h				\
@@ -111,7 +109,6 @@ ink_common_sources +=	\
 	selection-describer.cpp selection-describer.h			\
 	seltrans.cpp seltrans.h						\
 	seltrans-handles.cpp seltrans-handles.h				\
-	shape-editor.cpp shape-editor.h					\
 	shortcuts.cpp shortcuts.h					\
 	snap.cpp snap.h							\
 	snap-enums.h snap-candidate.h					\
@@ -214,8 +211,6 @@ ink_common_sources +=	\
 	text-chemistry.cpp text-chemistry.h	\
 	text-editing.cpp text-editing.h		\
 	text-tag-attributes.h			\
-	tool-factory.h				\
-	tools-switch.cpp tools-switch.h		\
 	transf_mat_3x4.cpp transf_mat_3x4.h	\
 	unclump.cpp unclump.h			\
 	undo-stack-observer.h			\
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 91023d213..5d8ea8b9f 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -40,7 +40,7 @@
 #include "display/sp-canvas.h"
 #include "sp-guide.h"
 #include "sp-namedview.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "verbs.h"
 #include "widgets/desktop-widget.h"
 #include "xml/repr.h"
diff --git a/src/desktop.cpp b/src/desktop.cpp
index b72e9c776..74dea3ca1 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -72,7 +72,7 @@
 #include "sp-namedview.h"
 #include "sp-root.h"
 #include "sp-defs.h"
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 #include "widgets/desktop-widget.h"
 #include "xml/repr.h"
 #include "helper/action.h" //sp_action_perform
diff --git a/src/display/snap-indicator.cpp b/src/display/snap-indicator.cpp
index 3a8358174..2632d69db 100644
--- a/src/display/snap-indicator.cpp
+++ b/src/display/snap-indicator.cpp
@@ -22,7 +22,7 @@
 #include "knot.h"
 #include "preferences.h"
 #include <glibmm/i18n.h>
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "enums.h"
 
 namespace Inkscape {
diff --git a/src/extension/internal/metafile-inout.cpp b/src/extension/internal/metafile-inout.cpp
index 162ad8b7d..534b33a30 100644
--- a/src/extension/internal/metafile-inout.cpp
+++ b/src/extension/internal/metafile-inout.cpp
@@ -30,7 +30,7 @@
 #include "style.h"
 #include "document.h"
 #include "util/units.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "sp-namedview.h"
 #include "document-undo.h"
 #include "inkscape.h"
@@ -202,7 +202,7 @@ void Metafile::setViewBoxIfMissing(SPDocument *doc) {
 
         // Scale and translate objects
         double scale = Inkscape::Util::Quantity::convert(1, "px", doc_unit);
-        ShapeEditor::blockSetItem(true);
+        Inkscape::UI::ShapeEditor::blockSetItem(true);
         double dh;
         if(SP_ACTIVE_DOCUMENT){ // for file menu open or import, or paste from clipboard
             dh = SP_ACTIVE_DOCUMENT->getHeight().value("px");
@@ -223,7 +223,7 @@ void Metafile::setViewBoxIfMissing(SPDocument *doc) {
         prefs->setBool("/options/transform/gradient", true);
         
         doc->getRoot()->scaleChildItemsRec(Geom::Scale(scale), Geom::Point(0, dh));
-        ShapeEditor::blockSetItem(false);
+        Inkscape::UI::ShapeEditor::blockSetItem(false);
 
         // restore options
         prefs->setBool("/options/transform/stroke",      transform_stroke);
diff --git a/src/knot.cpp b/src/knot.cpp
index 4476ad424..4118873c1 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -27,7 +27,7 @@
 #include "preferences.h"
 #include "message-stack.h"
 #include "message-context.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/tools/tool-base.h"
 #include "ui/tools/node-tool.h"
 #include <gtk/gtk.h>
diff --git a/src/knotholder.h b/src/knotholder.h
index d33adb610..f1bacebe5 100644
--- a/src/knotholder.h
+++ b/src/knotholder.h
@@ -22,6 +22,9 @@
 #include <sigc++/connection.h>
 
 namespace Inkscape {
+namespace UI {
+class ShapeEditor;
+}
 namespace XML {
 class Node;
 }
@@ -58,9 +61,9 @@ public:
 
     bool knot_mouseover() const;
 
-    friend class ShapeEditor;
-    friend class Inkscape::LivePathEffect::PowerStrokePointArrayParamKnotHolderEntity;
-    friend class Inkscape::LivePathEffect::FilletPointArrayParamKnotHolderEntity;
+    friend class Inkscape::UI::ShapeEditor; // FIXME why?
+    friend class Inkscape::LivePathEffect::PowerStrokePointArrayParamKnotHolderEntity; // why?
+    friend class Inkscape::LivePathEffect::FilletPointArrayParamKnotHolderEntity; // why?
 
 protected:
 
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 3e3f8540a..0885ad6f0 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -74,7 +74,7 @@
 #include "xml/document.h"
 #include <glibmm/i18n.h>
 #include "ui/tools/pen-tool.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "message-stack.h"
 #include "desktop.h"
 #include "knotholder.h"
diff --git a/src/live_effects/lpe-envelope-perspective.cpp b/src/live_effects/lpe-envelope-perspective.cpp
index f847dddc5..c62dbbf6a 100644
--- a/src/live_effects/lpe-envelope-perspective.cpp
+++ b/src/live_effects/lpe-envelope-perspective.cpp
@@ -19,7 +19,7 @@
 #include "helper/geom.h"
 #include "display/curve.h"
 #include "svg/svg.h"
-#include <tools-switch.h>
+#include "ui/tools-switch.h"
 #include <gsl/gsl_linalg.h>
 #include "desktop.h"
 
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 3f1fa382e..f15bf9215 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -29,7 +29,7 @@
 
 // for programmatically updating knots
 #include "selection.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/selectable-control-point.h"
 #include "ui/tool/node.h"
diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp
index 9dad78f6e..8fadd79ed 100644
--- a/src/live_effects/lpe-lattice2.cpp
+++ b/src/live_effects/lpe-lattice2.cpp
@@ -32,7 +32,7 @@
 #include <2geom/d2.h>
 #include <2geom/piecewise.h>
 #include <2geom/transforms.h>
-#include <tools-switch.h>
+#include "ui/tools-switch.h"
 
 #include "desktop.h" // TODO: should be factored out (see below)
 
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 8095056b7..74d99918a 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -28,8 +28,8 @@
 #include "document-undo.h"
 
 // needed for on-canvas editting:
-#include "tools-switch.h"
-#include "shape-editor.h"
+#include "ui/tools-switch.h"
+#include "ui/shape-editor.h"
 #include "desktop-handles.h"
 #include "selection.h"
 // clipboard support
diff --git a/src/live_effects/parameter/pointreseteable.cpp b/src/live_effects/parameter/pointreseteable.cpp
index ec36fc035..c0f8858b8 100644
--- a/src/live_effects/parameter/pointreseteable.cpp
+++ b/src/live_effects/parameter/pointreseteable.cpp
@@ -15,7 +15,7 @@
 #include "verbs.h"
 #include "knotholder.h"
 #include <glibmm/i18n.h>
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/tools/node-tool.h"
 
 // needed for on-canvas editting:
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index b87bc421f..b27d591b3 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -37,7 +37,7 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 #include "dir-util.h"
 #include "layer-model.h"
 #include "selection.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "desktop-handles.h"
 #include "message-stack.h"
 #include "sp-item-transform.h"
@@ -112,7 +112,7 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 #include "sp-item-group.h"
 
 // For clippath editing
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/tools/node-tool.h"
 
 #include "ui/clipboard.h"
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index f012d1df7..a2a935951 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -36,14 +36,14 @@
 #include "message-stack.h"
 #include "inkscape.h"
 #include "desktop.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "sp-ellipse.h"
 #include "display/curve.h"
 #include "svg/svg.h"
 #include <2geom/pathvector.h>
 #include "sp-clippath.h"
 #include "sp-mask.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/tools/node-tool.h"
 #include "ui/tools/tool-base.h"
 
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 0f6e560d2..8bae15fa5 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -3,8 +3,12 @@ set(ui_SRC
 	clipboard.cpp
 	control-manager.cpp
 	dialog-events.cpp
+	draw-anchor.cpp
 	interface.cpp
+	object-edit.cpp
 	previewholder.cpp
+	shape-editor.cpp
+	tools-switch.cpp
 	uxmanager.cpp
 
 	cache/svg_preview_cache.cpp
@@ -159,11 +163,15 @@ set(ui_SRC
 	control-manager.h
 	control-types.h
 	dialog-events.h
+	draw-anchor.h
 	icon-names.h
 	interface.h
+	object-edit.h
 	previewable.h
 	previewfillable.h
 	previewholder.h
+	shape-editor.h
+	tools-switch.h
 	uxmanager.h
 
 	cache/svg_preview_cache.h
diff --git a/src/ui/Makefile_insert b/src/ui/Makefile_insert
index 4c6b49ed6..7aeb4a83d 100644
--- a/src/ui/Makefile_insert
+++ b/src/ui/Makefile_insert
@@ -8,12 +8,21 @@ ink_common_sources +=		\
 	ui/control-types.h	\
 	ui/dialog-events.cpp    \
 	ui/dialog-events.h      \
+	ui/draw-anchor.cpp	\
+	ui/draw-anchor.h	\
 	ui/icon-names.h		\
 	ui/interface.cpp	\
 	ui/interface.h		\
+	ui/object-edit.cpp	\
+	ui/object-edit.h	\
 	ui/previewable.h	\
 	ui/previewfillable.h	\
 	ui/previewholder.cpp	\
 	ui/previewholder.h	\
+	ui/shape-editor.cpp	\
+	ui/shape-editor.h	\
+	ui/tool-factory.h	\
+	ui/tools-switch.cpp	\
+	ui/tools-switch.h	\
 	ui/uxmanager.cpp	\
 	ui/uxmanager.h
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 1209b19cd..40500cf15 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -76,7 +76,7 @@
 #include "svg/css-ostringstream.h" // used in copy
 #include "ui/tools/text-tool.h"
 #include "text-editing.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "path-chemistry.h"
 #include "util/units.h"
 #include "helper/png-write.h"
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 8352de1e3..431da7ad1 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -38,7 +38,7 @@
 #include "sp-item-transform.h"
 #include "sp-text.h"
 #include "text-editing.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/icon-names.h"
 #include "ui/tools/node-tool.h"
 #include "ui/tool/multi-path-manipulator.h"
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 2a3a1dd86..071ac037f 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -31,13 +31,13 @@
 #include "inkscape.h"
 #include "io/sys.h"
 #include "preferences.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "sp-namedview.h"
 #include "sp-root.h"
 #include "sp-script.h"
 #include "style.h"
 #include "svg/stringstream.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/widget/color-picker.h"
 #include "ui/widget/scalar-unit.h"
 #include "ui/dialog/filedialog.h"
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 07a27c96e..93d5dfbd5 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -43,7 +43,7 @@
 #include "sp-root.h"
 #include "sp-shape.h"
 #include "style.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/icon-names.h"
 #include "ui/widget/imagetoggler.h"
 #include "ui/widget/layertypeicon.h"
diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp
index b8436ebf1..9faa8a2cb 100644
--- a/src/ui/dialog/spellcheck.cpp
+++ b/src/ui/dialog/spellcheck.cpp
@@ -23,7 +23,7 @@
 #include "selection.h"
 #include "desktop.h"
 #include "desktop-handles.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/tools/text-tool.h"
 #include "ui/interface.h"
 #include "preferences.h"
diff --git a/src/draw-anchor.cpp b/src/ui/draw-anchor.cpp
index 6b02bb607..84c919018 100644
--- a/src/draw-anchor.cpp
+++ b/src/ui/draw-anchor.cpp
@@ -13,7 +13,7 @@
  */
 
 
-#include "draw-anchor.h"
+#include "ui/draw-anchor.h"
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "ui/tools/tool-base.h"
diff --git a/src/draw-anchor.h b/src/ui/draw-anchor.h
index 1f7b55920..1f7b55920 100644
--- a/src/draw-anchor.h
+++ b/src/ui/draw-anchor.h
diff --git a/src/object-edit.cpp b/src/ui/object-edit.cpp
index 14a5bd3d5..cc96727f8 100644
--- a/src/object-edit.cpp
+++ b/src/ui/object-edit.cpp
@@ -33,7 +33,7 @@
 #include "sp-pattern.h"
 #include "sp-path.h"
 #include <glibmm/i18n.h>
-#include "object-edit.h"
+#include "ui/object-edit.h"
 #include "xml/repr.h"
 #include <2geom/math-utils.h>
 #include "knot-holder-entity.h"
@@ -55,6 +55,7 @@ static KnotHolder *sp_lpe_knot_holder(SPItem *item, SPDesktop *desktop)
 } // namespace
 
 namespace Inkscape {
+namespace UI {
 
 KnotHolder *createKnotHolder(SPItem *item, SPDesktop *desktop)
 {
@@ -88,7 +89,8 @@ KnotHolder *createKnotHolder(SPItem *item, SPDesktop *desktop)
     return knotholder;
 }
 
-} // Inkscape
+}
+} // namespace Inkscape
 
 /* SPRect */
 
diff --git a/src/object-edit.h b/src/ui/object-edit.h
index ba59e46cd..75f3ce12b 100644
--- a/src/object-edit.h
+++ b/src/ui/object-edit.h
@@ -14,12 +14,13 @@
 
 #include "knotholder.h"
 
-namespace Inkscape
-{
+namespace Inkscape {
+namespace UI {
 
 KnotHolder *createKnotHolder(SPItem *item, SPDesktop *desktop);
 
 }
+}
 
 class RectKnotHolder : public KnotHolder {
 public:
diff --git a/src/shape-editor.cpp b/src/ui/shape-editor.cpp
index 7915fe533..0b9fc24c5 100644
--- a/src/shape-editor.cpp
+++ b/src/ui/shape-editor.cpp
@@ -18,13 +18,16 @@
 #include "document.h"
 #include "gc-anchored.h"
 #include "knotholder.h"
-#include "object-edit.h"
+#include "ui/object-edit.h"
 #include "sp-item.h"
 #include "sp-object.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "xml/node-event-vector.h"
 
-using Inkscape::createKnotHolder;
+//using Inkscape::createKnotHolder;
+
+namespace Inkscape {
+namespace UI {
 
 bool ShapeEditor::_blockSetItem = false;
 
@@ -159,6 +162,9 @@ bool ShapeEditor::knot_mouseover() const {
     return false;
 }
 
+} // namespace UI
+} // namespace Inkscape
+
 /*
   Local Variables:
   mode:c++
diff --git a/src/shape-editor.h b/src/ui/shape-editor.h
index d2611b111..142a2493b 100644
--- a/src/shape-editor.h
+++ b/src/ui/shape-editor.h
@@ -12,13 +12,14 @@
  *
  */
 
-namespace Inkscape { namespace XML { class Node; } }
-
 class KnotHolder;
 class LivePathEffectObject;
 class SPDesktop;
 class SPItem;
 
+namespace Inkscape { namespace XML { class Node; }
+namespace UI {
+
 class ShapeEditor {
 public:
 
@@ -51,6 +52,9 @@ private:
     Inkscape::XML::Node *knotholder_listener_attached_for;
 };
 
+} // namespace UI
+} // namespace Inkscape
+
 #endif // SEEN_SHAPE_EDITOR_H
 
 
diff --git a/src/tool-factory.h b/src/ui/tool-factory.h
index 726706732..726706732 100644
--- a/src/tool-factory.h
+++ b/src/ui/tool-factory.h
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 5d6e96588..4abc901d2 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -28,7 +28,7 @@
 #include "ui/tool/node.h"
 #include "ui/tool/path-manipulator.h"
 #include "ui/tools/node-tool.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include <gdk/gdkkeysyms.h>
 #include <cmath>
 
diff --git a/src/tools-switch.cpp b/src/ui/tools-switch.cpp
index fe9d32f43..048252788 100644
--- a/src/tools-switch.cpp
+++ b/src/ui/tools-switch.cpp
@@ -10,10 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <gtkmm.h> // prevents deprecation warnings
 
 #include <cstring>
 #include <string>
@@ -25,40 +22,42 @@
 
 #include <xml/repr.h>
 
-#include "ui/tools/select-tool.h"
-#include "ui/tools/node-tool.h"
-#include "ui/tools/tweak-tool.h"
-#include "ui/tools/spray-tool.h"
-#include "sp-path.h"
-#include "ui/tools/rect-tool.h"
-#include "sp-rect.h"
-#include "ui/tools/box3d-tool.h"
+#include "ui/tools-switch.h"
+
 #include "box3d.h"
-#include "ui/tools/arc-tool.h"
 #include "sp-ellipse.h"
-#include "ui/tools/tweak-tool.h"
+#include "sp-flowtext.h"
+#include "sp-offset.h"
+#include "sp-path.h"
+#include "sp-rect.h"
 #include "sp-star.h"
-#include "ui/tools/spiral-tool.h"
 #include "sp-spiral.h"
+#include "sp-text.h"
+
+// TODO: How many of these are actually needed?
+#include "ui/tools/arc-tool.h"
+#include "ui/tools/box3d-tool.h"
 #include "ui/tools/calligraphic-tool.h"
+#include "ui/tools/connector-tool.h"
+#include "ui/tools/dropper-tool.h"
 #include "ui/tools/eraser-tool.h"
+#include "ui/tools/flood-tool.h"
+#include "ui/tools/gradient-tool.h"
+#include "ui/tools/lpe-tool.h"
+#include "ui/tools/measure-tool.h"
+#include "ui/tools/mesh-tool.h"
+#include "ui/tools/node-tool.h"
 #include "ui/tools/pen-tool.h"
 #include "ui/tools/pencil-tool.h"
-#include "ui/tools/lpe-tool.h"
+#include "ui/tools/rect-tool.h"
+#include "ui/tools/select-tool.h"
+#include "ui/tools/spiral-tool.h"
+#include "ui/tools/spray-tool.h"
 #include "ui/tools/text-tool.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
-#include "ui/tools/gradient-tool.h"
-#include "ui/tools/mesh-tool.h"
+#include "ui/tools/tweak-tool.h"
 #include "ui/tools/zoom-tool.h"
-#include "ui/tools/measure-tool.h"
-#include "ui/tools/dropper-tool.h"
-#include "ui/tools/connector-tool.h"
-#include "ui/tools/flood-tool.h"
-#include "sp-offset.h"
-#include "message-context.h"
 
-#include "tools-switch.h"
+#include "message-context.h"
 
 static char const *const tool_names[] = {
     NULL,
@@ -86,6 +85,8 @@ static char const *const tool_names[] = {
     "/tools/lpetool",
     NULL
 };
+
+// TODO: HEY! these belong to the tools themselves!
 static char const *const tool_msg[] = {
     NULL,
     N_("<b>Click</b> to Select and Transform objects, <b>Drag</b> to select many objects."),
diff --git a/src/tools-switch.h b/src/ui/tools-switch.h
index 280837e87..280837e87 100644
--- a/src/tools-switch.h
+++ b/src/ui/tools-switch.h
diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index 9fd68f1b9..4f64ade25 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -40,7 +40,7 @@
 #include "desktop-style.h"
 #include "context-fns.h"
 #include "verbs.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "ui/tools/tool-base.h"
 
 #include "ui/tools/arc-tool.h"
@@ -48,7 +48,7 @@
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index b998267c2..0a20a0842 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -47,12 +47,12 @@
 #include "box3d-side.h"
 #include "document-private.h"
 #include "line-geometry.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "verbs.h"
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index 64097e834..d297fe5e1 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -82,7 +82,7 @@ using Inkscape::DocumentUndo;
 
 #define DYNA_MIN_WIDTH 1.0e-6
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index d1355e807..7b5c84c16 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -109,7 +109,7 @@
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index 99d42a211..6c55f7484 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -52,7 +52,7 @@ using Inkscape::DocumentUndo;
 static GdkCursor *cursor_dropper_fill = NULL;
 static GdkCursor *cursor_dropper_stroke = NULL;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index 4106785e7..bf4015b4c 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -84,7 +84,7 @@ using Inkscape::DocumentUndo;
 #define DRAG_DEFAULT 1.0
 #define DRAG_MAX 1.0
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index 3fb56b2ad..5745fc9cc 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -50,7 +50,7 @@
 #include "preferences.h"
 #include "rubberband.h"
 #include "selection.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "sp-defs.h"
 #include "sp-item.h"
 #include "splivarot.h"
@@ -74,7 +74,7 @@ using Inkscape::Display::ExtractARGB32;
 using Inkscape::Display::ExtractRGB32;
 using Inkscape::Display::AssembleARGB32;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 46ab53eef..6434c30d2 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -30,7 +30,7 @@
 #include "desktop-handles.h"
 #include "desktop-style.h"
 #include "document.h"
-#include "draw-anchor.h"
+#include "ui/draw-anchor.h"
 #include "macros.h"
 #include "message-stack.h"
 #include "ui/tools/pen-tool.h"
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index 4f9a7b59b..9c853917e 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -51,7 +51,7 @@
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp
index e9b9421f1..1fd1ebf8c 100644
--- a/src/ui/tools/lpe-tool.cpp
+++ b/src/ui/tools/lpe-tool.cpp
@@ -28,7 +28,7 @@
 #include "desktop.h"
 #include "message-context.h"
 #include "preferences.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "selection.h"
 #include "desktop-handles.h"
 #include "document.h"
@@ -59,7 +59,7 @@ SubtoolEntry lpesubtools[] = {
 };
 
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index feeb68288..6b5cbeccd 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -49,7 +49,7 @@ using Inkscape::ControlManager;
 using Inkscape::CTLINE_SECONDARY;
 using Inkscape::Util::unit_table;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index 7d6d3bc23..8a1fb7c72 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -53,7 +53,7 @@
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 0b98bacc1..e2bb85d11 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -23,7 +23,7 @@
 #include "live_effects/lpeobject.h"
 #include "message-context.h"
 #include "selection.h"
-#include "shape-editor.h" // temporary!
+#include "ui/shape-editor.h" // temporary!
 #include "live_effects/effect.h"
 #include "display/curve.h"
 #include "sp-clippath.h"
@@ -107,7 +107,7 @@
 
 using Inkscape::ControlManager;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 2c5ffc182..92937a135 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -26,7 +26,7 @@
 #include "desktop-handles.h"
 #include "selection.h"
 #include "selection-chemistry.h"
-#include "draw-anchor.h"
+#include "ui/draw-anchor.h"
 #include "message-stack.h"
 #include "message-context.h"
 #include "preferences.h"
@@ -40,7 +40,7 @@
 #include <glibmm/i18n.h>
 #include "macros.h"
 #include "context-fns.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/control-manager.h"
 // we include the necessary files for BSpline & Spiro
 #include "live_effects/effect.h"
@@ -70,7 +70,7 @@
 #include "live_effects/lpe-bspline.h"
 #include <2geom/nearest-point.h>
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 #include "live_effects/effect.h"
 
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index ca6dffc12..3ea2ae843 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -23,7 +23,7 @@
 #include "desktop-handles.h"
 #include "selection.h"
 #include "selection-chemistry.h"
-#include "draw-anchor.h"
+#include "ui/draw-anchor.h"
 #include "message-stack.h"
 #include "message-context.h"
 #include "sp-path.h"
@@ -43,7 +43,7 @@
 #include "display/sp-canvas.h"
 #include "display/curve.h"
 #include "livarot/Path.h"
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 #include "ui/tool/event-utils.h"
 
 namespace Inkscape {
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index 819671dd6..de91dcff4 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -40,13 +40,13 @@
 #include "xml/node-event-vector.h"
 #include "preferences.h"
 #include "context-fns.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "verbs.h"
 #include "display/sp-canvas-item.h"
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index 83bef17c9..394b0b369 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -41,7 +41,7 @@
 #include "desktop-handles.h"
 #include "sp-root.h"
 #include "preferences.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "message-stack.h"
 #include "selection-describer.h"
 #include "seltrans.h"
@@ -49,7 +49,7 @@
 #include "display/sp-canvas.h"
 #include "display/sp-canvas-item.h"
 #include "display/drawing-item.h"
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp
index 83712457a..18c3e4e2d 100644
--- a/src/ui/tools/spiral-tool.cpp
+++ b/src/ui/tools/spiral-tool.cpp
@@ -39,13 +39,13 @@
 #include "xml/node-event-vector.h"
 #include "preferences.h"
 #include "context-fns.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "verbs.h"
 #include "display/sp-canvas-item.h"
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 29f1b9a73..933da6fb1 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -84,7 +84,7 @@ using namespace std;
 // Please enable again when working on 1.0
 #define ENABLE_SPRAY_MODE_SINGLE_PATH
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index ed28c0a8d..7604ba04e 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -41,7 +41,7 @@
 #include "xml/repr.h"
 #include "xml/node-event-vector.h"
 #include "context-fns.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "verbs.h"
 #include "display/sp-canvas-item.h"
 
@@ -49,7 +49,7 @@
 
 using Inkscape::DocumentUndo;
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index b60a39e5d..a72748733 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -40,7 +40,7 @@
 #include "rubberband.h"
 #include "selection-chemistry.h"
 #include "selection.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "sp-flowtext.h"
 #include "sp-namedview.h"
 #include "sp-text.h"
@@ -52,7 +52,7 @@
 #include "xml/node-event-vector.h"
 #include "xml/repr.h"
 #include <gtk/gtk.h>
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 using Inkscape::ControlManager;
 using Inkscape::DocumentUndo;
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 150e899ce..37ca5eeea 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -46,7 +46,7 @@
 #include "selection.h"
 #include "ui/interface.h"
 #include "macros.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "preferences.h"
 #include "message-context.h"
 #include "gradient-drag.h"
@@ -55,7 +55,7 @@
 #include "selcue.h"
 #include "ui/tools/lpe-tool.h"
 #include "ui/tool/control-point.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "sp-guide.h"
 #include "color.h"
 #include "knot.h"
diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h
index b27de9030..7a6ab83e7 100644
--- a/src/ui/tools/tool-base.h
+++ b/src/ui/tools/tool-base.h
@@ -30,7 +30,6 @@ namespace Glib {
 class GrDrag;
 class SPDesktop;
 class SPItem;
-class ShapeEditor;
 
 namespace Inkscape {
     class MessageContext;
@@ -42,6 +41,9 @@ namespace Inkscape {
 
 namespace Inkscape {
 namespace UI {
+
+class ShapeEditor;
+
 namespace Tools {
 
 class ToolBase;
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 75650d3af..340f64a0b 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -91,7 +91,7 @@ using Inkscape::DocumentUndo;
 
 #define DYNA_MIN_WIDTH 1.0e-6
 
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp
index 9f99cfe2e..b3fb78c8f 100644
--- a/src/ui/tools/zoom-tool.cpp
+++ b/src/ui/tools/zoom-tool.cpp
@@ -25,7 +25,7 @@
 #include "selection-chemistry.h"
 
 #include "ui/tools/zoom-tool.h"
-#include "tool-factory.h"
+#include "ui/tool-factory.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/vanishing-point.cpp b/src/vanishing-point.cpp
index bb6a2c4d7..d1c8083de 100644
--- a/src/vanishing-point.cpp
+++ b/src/vanishing-point.cpp
@@ -22,7 +22,7 @@
 #include "ui/tools/tool-base.h"
 #include "xml/repr.h"
 #include "perspective-line.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "snap.h"
 #include "sp-namedview.h"
 #include "ui/control-manager.h"
diff --git a/src/verbs.cpp b/src/verbs.cpp
index ea4c336d7..580883646 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -62,7 +62,7 @@
 #include "ui/tools/select-tool.h"
 #include "selection-chemistry.h"
 #include "seltrans.h"
-#include "shape-editor.h"
+#include "ui/shape-editor.h"
 #include "shortcuts.h"
 #include "sp-defs.h"
 #include "sp-flowtext.h"
@@ -70,7 +70,7 @@
 #include "splivarot.h"
 #include "sp-namedview.h"
 #include "text-chemistry.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/dialog/align-and-distribute.h"
 #include "ui/dialog/clonetiler.h"
 #include "ui/dialog/dialog-manager.h"
diff --git a/src/widgets/lpe-toolbar.cpp b/src/widgets/lpe-toolbar.cpp
index 485a4289d..a85f3ae78 100644
--- a/src/widgets/lpe-toolbar.cpp
+++ b/src/widgets/lpe-toolbar.cpp
@@ -41,7 +41,7 @@
 #include "preferences.h"
 #include "selection.h"
 #include "sp-namedview.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/tools/lpe-tool.h"
 #include "ui/widget/unit-tracker.h"
 #include "util/units.h"
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index c387d9f78..f44229fec 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -38,7 +38,7 @@
 #include "widgets/ink-action.h"
 #include "preferences.h"
 #include "toolbox.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/icon-names.h"
 #include "ui/tools/pen-tool.h"
 #include "ui/uxmanager.h"
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 87cb7cae3..c7fa96efd 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -38,7 +38,7 @@
 #include "../profile-manager.h"
 #include "color-profile.h"
 #include "cms-system.h"
-#include "tools-switch.h"
+#include "ui/tools-switch.h"
 #include "ui/tools/tool-base.h"
 
 using Inkscape::CMSSystem;
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 45aa01dd1..9e55d1cf6 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -56,7 +56,7 @@
 #include "ui/interface.h"
 #include "../shortcuts.h"
 #include "../sp-namedview.h"
-#include "../tools-switch.h"
+#include "ui/tools-switch.h"
 #include "../ui/icon-names.h"
 #include "../ui/widget/style-swatch.h"
 #include "../verbs.h"