Move classes derived from SPObject to own directory.

A lot of header clean-up.

55 files changed, 173 insertions, 102 deletions

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index a1fe9855a..b827cff4b 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -67,7 +67,11 @@
 #include "live_effects/lpe-embrodery-stitch.h"
 #include "live_effects/lpe-bool.h"
 
+#include "live_effects/lpeobject.h"
+
 #include "xml/node-event-vector.h"
+#include "xml/sp-css-attr.h"
+
 #include "message-stack.h"
 #include "document-private.h"
 #include "ui/tools/pen-tool.h"
@@ -75,12 +79,14 @@
 #include "ui/tools-switch.h"
 #include "knotholder.h"
 #include "path-chemistry.h"
-#include "xml/sp-css-attr.h"
-#include "live_effects/lpeobject.h"
-#include <pangomm/layout.h>
 #include "display/curve.h"
+
+#include "object/sp-defs.h"
+#include "object/sp-shape.h"
+
 #include <stdio.h>
 #include <string.h>
+#include <pangomm/layout.h>
 #include <gtkmm/expander.h>
 
 namespace Inkscape {
diff --git a/src/live_effects/lpe-angle_bisector.cpp b/src/live_effects/lpe-angle_bisector.cpp
index 56d33eb4b..4b64f048e 100644
--- a/src/live_effects/lpe-angle_bisector.cpp
+++ b/src/live_effects/lpe-angle_bisector.cpp
@@ -10,7 +10,7 @@
 
 #include "live_effects/lpe-angle_bisector.h"
 #include "2geom/sbasis-to-bezier.h"
-#include "sp-lpe-item.h"
+
 #include "knot-holder-entity.h"
 #include "knotholder.h"
 // TODO due to internal breakage in glibmm headers, this must be last:
diff --git a/src/live_effects/lpe-attach-path.cpp b/src/live_effects/lpe-attach-path.cpp
index 302165719..ea2965c6a 100644
--- a/src/live_effects/lpe-attach-path.cpp
+++ b/src/live_effects/lpe-attach-path.cpp
@@ -7,8 +7,6 @@
 #include <math.h>
 #include "live_effects/lpe-attach-path.h"
 #include "display/curve.h"
-#include "sp-shape.h"
-#include "sp-text.h"
 #include "2geom/path-sink.h"
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp
index 1988f34f9..314ddc84c 100644
--- a/src/live_effects/lpe-bendpath.cpp
+++ b/src/live_effects/lpe-bendpath.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "live_effects/lpe-bendpath.h"
-#include "sp-item-group.h"
 #include "knot-holder-entity.h"
 #include "knotholder.h"
 #include "display/curve.h"
diff --git a/src/live_effects/lpe-bool.cpp b/src/live_effects/lpe-bool.cpp
index 6299b282b..259acba4e 100644
--- a/src/live_effects/lpe-bool.cpp
+++ b/src/live_effects/lpe-bool.cpp
@@ -14,19 +14,19 @@
 #include "live_effects/lpe-bool.h"
 
 #include "display/curve.h"
-#include "sp-item.h"
+
 #include "2geom/path.h"
-#include "sp-shape.h"
-#include "sp-text.h"
 #include "2geom/bezier-curve.h"
 #include "2geom/path-sink.h"
 #include "2geom/affine.h"
-#include "splivarot.h"
+#include "2geom/svg-path-parser.h"
+
 #include "helper/geom.h"
+
+#include "splivarot.h"
 #include "livarot/Path.h"
 #include "livarot/Shape.h"
 #include "livarot/path-description.h"
-#include "2geom/svg-path-parser.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/lpe-bounding-box.cpp b/src/live_effects/lpe-bounding-box.cpp
index c83d7e3bc..ba519f1c6 100644
--- a/src/live_effects/lpe-bounding-box.cpp
+++ b/src/live_effects/lpe-bounding-box.cpp
@@ -6,8 +6,7 @@
 #include "live_effects/lpe-bounding-box.h"
 
 #include "display/curve.h"
-#include "sp-shape.h"
-#include "sp-text.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp
index 721a4ecab..f00759921 100644
--- a/src/live_effects/lpe-bspline.cpp
+++ b/src/live_effects/lpe-bspline.cpp
@@ -6,7 +6,7 @@
 #include "ui/widget/scalar.h"
 #include "display/curve.h"
 #include "helper/geom-curves.h"
-#include "sp-path.h"
+#include "object/sp-path.h"
 #include "svg/svg.h"
 #include "xml/repr.h"
 #include "preferences.h"
diff --git a/src/live_effects/lpe-clone-original.cpp b/src/live_effects/lpe-clone-original.cpp
index 3da6dfbe6..413c18893 100644
--- a/src/live_effects/lpe-clone-original.cpp
+++ b/src/live_effects/lpe-clone-original.cpp
@@ -12,8 +12,12 @@
 #include "display/curve.h"
 #include "svg/path-string.h"
 #include "svg/svg.h"
-#include "sp-clippath.h"
-#include "sp-mask.h"
+
+#include "object/sp-clippath.h"
+#include "object/sp-mask.h"
+#include "object/sp-path.h"
+#include "object/sp-shape.h"
+
 #include "xml/sp-css-attr.h"
 
 // TODO due to internal breakage in glibmm headers, this must be last:
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 3abcbf217..ebcb95f0d 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -20,10 +20,13 @@
 #include "display/curve.h"
 #include "svg/path-string.h"
 #include "svg/svg.h"
-#include "style.h"
 #include "helper/geom.h"
 #include "xml/sp-css-attr.h"
 #include "path-chemistry.h"
+
+#include "object/sp-path.h"
+#include "object/sp-shape.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-curvestitch.cpp b/src/live_effects/lpe-curvestitch.cpp
index f8d2e56ca..1ee29bbaf 100644
--- a/src/live_effects/lpe-curvestitch.cpp
+++ b/src/live_effects/lpe-curvestitch.cpp
@@ -15,11 +15,13 @@
 #include "ui/widget/scalar.h"
 #include "live_effects/lpe-curvestitch.h"
 
-#include "sp-path.h"
+#include "object/sp-path.h"
+
 #include "svg/svg.h"
 #include "xml/repr.h"
 
 #include <2geom/bezier-to-sbasis.h>
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-extrude.cpp b/src/live_effects/lpe-extrude.cpp
index 4a3ad7508..0b144053e 100644
--- a/src/live_effects/lpe-extrude.cpp
+++ b/src/live_effects/lpe-extrude.cpp
@@ -12,7 +12,7 @@
  */
 
 #include "live_effects/lpe-extrude.h"
-#include "sp-item.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-fill-between-many.cpp b/src/live_effects/lpe-fill-between-many.cpp
index 7e2131f76..85b78f688 100644
--- a/src/live_effects/lpe-fill-between-many.cpp
+++ b/src/live_effects/lpe-fill-between-many.cpp
@@ -11,10 +11,12 @@
 #include "display/curve.h"
 #include "inkscape.h"
 #include "selection.h"
-#include "sp-shape.h"
-#include "sp-text.h"
-#include "sp-defs.h"
+
+#include "object/sp-defs.h"
+#include "object/sp-shape.h"
+
 #include "svg/svg.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-fill-between-strokes.cpp b/src/live_effects/lpe-fill-between-strokes.cpp
index f8d86ae99..37d13830c 100644
--- a/src/live_effects/lpe-fill-between-strokes.cpp
+++ b/src/live_effects/lpe-fill-between-strokes.cpp
@@ -6,9 +6,8 @@
 #include "live_effects/lpe-fill-between-strokes.h"
 
 #include "display/curve.h"
-#include "sp-shape.h"
-#include "sp-text.h"
 #include "svg/svg.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index fb78c2065..94a43b728 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -9,14 +9,18 @@
  */
 
 #include "live_effects/lpe-fillet-chamfer.h"
+
 #include "helper/geom.h"
-#include "display/curve.h"
 #include "helper/geom-curves.h"
 #include "helper/geom-satellite.h"
+
 #include <2geom/elliptical-arc.h>
 #include "knotholder.h"
+#include "display/curve.h"
 #include <boost/optional.hpp>
 
+#include "object/sp-shape.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-interpolate.cpp b/src/live_effects/lpe-interpolate.cpp
index db3faa307..f6b42cfb9 100644
--- a/src/live_effects/lpe-interpolate.cpp
+++ b/src/live_effects/lpe-interpolate.cpp
@@ -13,8 +13,10 @@
 
 #include <2geom/sbasis-to-bezier.h>
 
-#include "sp-path.h"
 #include "display/curve.h"
+
+#include "object/sp-path.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-jointype.cpp b/src/live_effects/lpe-jointype.cpp
index 0e1e46a94..b58fd01da 100644
--- a/src/live_effects/lpe-jointype.cpp
+++ b/src/live_effects/lpe-jointype.cpp
@@ -10,15 +10,21 @@
 #include "live_effects/parameter/enum.h"
 #include "helper/geom-pathstroke.h"
 
-#include "style.h"
-#include "svg/svg-color.h"
 #include "desktop-style.h"
-#include "svg/css-ostringstream.h"
+
 #include "display/curve.h"
 
+#include "object/sp-item-group.h"
+#include "object/sp-shape.h"
+#include "style.h"
+
+#include "svg/css-ostringstream.h"
+#include "svg/svg-color.h"
+
 #include <2geom/elliptical-arc.h>
 
 #include "lpe-jointype.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp
index b3918b6ab..d62965ca8 100644
--- a/src/live_effects/lpe-knot.cpp
+++ b/src/live_effects/lpe-knot.cpp
@@ -12,11 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "sp-shape.h"
-#include "sp-path.h"
 #include "display/curve.h"
 #include "live_effects/lpe-knot.h"
-#include "style.h"
 #include "knot-holder-entity.h"
 #include "knotholder.h"
 
@@ -27,6 +24,10 @@
 #include <2geom/basic-intersection.h>
 #include "helper/geom.h"
 
+#include "object/sp-shape.h"
+#include "object/sp-path.h"
+#include "style.h"
+
 // for change crossing undo
 #include "verbs.h"
 #include "document.h"
diff --git a/src/live_effects/lpe-knot.h b/src/live_effects/lpe-knot.h
index ac518b97c..c268b051a 100644
--- a/src/live_effects/lpe-knot.h
+++ b/src/live_effects/lpe-knot.h
@@ -13,7 +13,7 @@
 #ifndef INKSCAPE_LPE_KNOT_H
 #define INKSCAPE_LPE_KNOT_H
 
-#include "sp-item-group.h"
+
 #include "live_effects/effect.h"
 #include "live_effects/lpegroupbbox.h"
 #include "live_effects/parameter/parameter.h"
@@ -22,6 +22,8 @@
 #include "live_effects/parameter/bool.h"
 #include "2geom/crossing.h"
 
+class SPLPEItem;
+
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-measure-segments.cpp b/src/live_effects/lpe-measure-segments.cpp
index 57bff2034..9bfa2c52e 100644
--- a/src/live_effects/lpe-measure-segments.cpp
+++ b/src/live_effects/lpe-measure-segments.cpp
@@ -20,24 +20,25 @@
 #include "util/units.h"
 #include "svg/svg-length.h"
 #include "svg/svg-color.h"
+#include "svg/stringstream.h"
 #include "svg/svg.h"
 #include "display/curve.h"
 #include "helper/geom.h"
 #include "2geom/affine.h"
 #include "path-chemistry.h"
-#include "style.h"
-#include "sp-root.h"
-#include "sp-defs.h"
-#include "sp-item.h"
-#include "sp-shape.h"
-#include "sp-path.h"
-#include "sp-star.h"
-#include "sp-spiral.h"
 #include "document.h"
 #include "document-undo.h"
 #include <iomanip>
 #include <cmath>
 
+#include "object/sp-root.h"
+#include "object/sp-defs.h"
+#include "object/sp-item.h"
+#include "object/sp-shape.h"
+#include "object/sp-path.h"
+#include "object/sp-star.h"
+#include "object/sp-spiral.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index 5d80d65fe..926977a07 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -21,15 +21,18 @@
 #include "display/curve.h"
 #include "svg/path-string.h"
 #include "svg/svg.h"
-#include "sp-defs.h"
 #include "helper/geom.h"
 #include "2geom/intersection-graph.h"
 #include "2geom/path-intersection.h"
 #include "2geom/affine.h"
 #include "helper/geom.h"
-#include "sp-lpe-item.h"
 #include "path-chemistry.h"
+
+#include "object/sp-defs.h"
+#include "object/sp-path.h"
+#include "object/sp-lpe-item.h"
 #include "style.h"
+
 #include "xml/sp-css-attr.h"
 
 // TODO due to internal breakage in glibmm headers, this must be last:
diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp
index a5d1d23c8..8300fe755 100644
--- a/src/live_effects/lpe-offset.cpp
+++ b/src/live_effects/lpe-offset.cpp
@@ -12,7 +12,7 @@
  */
 
 #include "live_effects/lpe-offset.h"
-#include "sp-shape.h"
+#include "object/sp-shape.h"
 #include "display/curve.h"
 #include <2geom/elliptical-arc.h>
 // TODO due to internal breakage in glibmm headers, this must be last:
diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp
index 271442c7d..9c3b714cc 100644
--- a/src/live_effects/lpe-parallel.cpp
+++ b/src/live_effects/lpe-parallel.cpp
@@ -12,7 +12,7 @@
  */
 
 #include "live_effects/lpe-parallel.h"
-#include "sp-shape.h"
+#include "object/sp-shape.h"
 #include "display/curve.h"
 
 #include "knotholder.h"
diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index efd1aec2d..6e6f35f7d 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -4,15 +4,18 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cmath>
+#include <algorithm>
+
+#include <2geom/bezier-to-sbasis.h>
+
 #include "live_effects/lpe-patternalongpath.h"
 #include "live_effects/lpeobject.h"
 #include "display/curve.h"
 
-#include <2geom/bezier-to-sbasis.h>
+#include "object/sp-shape.h"
 
 #include "knotholder.h"
-#include <cmath>
-#include <algorithm>
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp
index dab169cfe..2819094e7 100644
--- a/src/live_effects/lpe-perp_bisector.cpp
+++ b/src/live_effects/lpe-perp_bisector.cpp
@@ -13,9 +13,10 @@
  */
 #include "live_effects/lpe-perp_bisector.h"
 #include "display/curve.h"
-#include "sp-path.h"
 #include "line-geometry.h"
 
+#include "object/sp-path.h"
+
 #include "knotholder.h"
 
 // TODO due to internal breakage in glibmm headers, this must be last:
diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp
index 4ec760e41..3484d00a5 100644
--- a/src/live_effects/lpe-perspective_path.cpp
+++ b/src/live_effects/lpe-perspective_path.cpp
@@ -11,7 +11,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include <gtkmm.h>
-#include "persp3d.h"
+
 //#include "transf_mat_3x4.h"
 #include "document-private.h"
 #include "live_effects/lpe-perspective_path.h"
@@ -20,6 +20,9 @@
 #include "knotholder.h"
 #include <util/units.h>
 
+#include "object/persp3d.h"
+#include "object/sp-defs.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-powerclip.cpp b/src/live_effects/lpe-powerclip.cpp
index 18276270d..2e90abfeb 100644
--- a/src/live_effects/lpe-powerclip.cpp
+++ b/src/live_effects/lpe-powerclip.cpp
@@ -6,16 +6,17 @@
 #include <2geom/intersection-graph.h>
 #include "display/curve.h"
 #include "helper/geom.h"
-#include "sp-clippath.h"
-#include "sp-path.h"
-#include "sp-shape.h"
-#include "sp-item-group.h"
 #include "ui/tools-switch.h"
 #include "path-chemistry.h"
-#include "uri.h"
 #include "extract-uri.h"
 #include <bad-uri-exception.h>
 
+#include "object/sp-clippath.h"
+#include "object/sp-path.h"
+#include "object/sp-shape.h"
+#include "object/sp-item-group.h"
+#include "object/uri.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-powermask.cpp b/src/live_effects/lpe-powermask.cpp
index f5a419bcb..947482c24 100644
--- a/src/live_effects/lpe-powermask.cpp
+++ b/src/live_effects/lpe-powermask.cpp
@@ -6,19 +6,22 @@
 #include <2geom/intersection-graph.h>
 #include "display/curve.h"
 #include "helper/geom.h"
-#include "sp-mask.h"
-#include "sp-path.h"
-#include "sp-shape.h"
-#include "sp-defs.h"
-#include "style.h"
-#include "sp-item-group.h"
 #include "svg/svg.h"
 #include "svg/svg-color.h"
+#include "svg/stringstream.h"
 #include "ui/tools-switch.h"
 #include "path-chemistry.h"
-#include "uri.h"
 #include "extract-uri.h"
 #include <bad-uri-exception.h>
+
+#include "object/sp-mask.h"
+#include "object/sp-path.h"
+#include "object/sp-shape.h"
+#include "object/sp-defs.h"
+#include "object/sp-item-group.h"
+#include "object/uri.h"
+
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-powerstroke.cpp b/src/live_effects/lpe-powerstroke.cpp
index 4e937c1e4..6d63ffa81 100644
--- a/src/live_effects/lpe-powerstroke.cpp
+++ b/src/live_effects/lpe-powerstroke.cpp
@@ -13,7 +13,6 @@
 #include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-powerstroke-interpolators.h"
 
-#include "style.h"
 #include "svg/svg-color.h"
 #include "desktop-style.h"
 #include "svg/css-ostringstream.h"
@@ -25,6 +24,9 @@
 #include <2geom/circle.h>
 #include "helper/geom.h"
 
+#include "object/sp-shape.h"
+#include "style.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index d832b3615..79ce89c9f 100644
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -15,8 +15,8 @@
 #include "ui/widget/scalar.h"
 #include "live_effects/lpe-rough-hatches.h"
 
-#include "sp-item.h"
-#include "sp-path.h"
+#include "object/sp-item.h"
+
 #include "xml/repr.h"
 
 #include <2geom/sbasis-math.h>
diff --git a/src/live_effects/lpe-show_handles.cpp b/src/live_effects/lpe-show_handles.cpp
index 2da570537..149425112 100644
--- a/src/live_effects/lpe-show_handles.cpp
+++ b/src/live_effects/lpe-show_handles.cpp
@@ -13,9 +13,11 @@
 #include "helper/geom.h"
 #include "desktop-style.h"
 #include "display/curve.h"
-#include "style.h"
 #include "svg/svg.h"
 
+#include "object/sp-shape.h"
+#include "style.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-tangent_to_curve.cpp b/src/live_effects/lpe-tangent_to_curve.cpp
index 69a4dfad9..3a225c0be 100644
--- a/src/live_effects/lpe-tangent_to_curve.cpp
+++ b/src/live_effects/lpe-tangent_to_curve.cpp
@@ -14,10 +14,12 @@
  */
 
 #include "live_effects/lpe-tangent_to_curve.h"
-#include "sp-path.h"
 #include "display/curve.h"
-
 #include "knotholder.h"
+
+#include "object/sp-shape.h"
+#include "object/sp-object-group.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-taperstroke.cpp b/src/live_effects/lpe-taperstroke.cpp
index 45394ae91..b5e440767 100644
--- a/src/live_effects/lpe-taperstroke.cpp
+++ b/src/live_effects/lpe-taperstroke.cpp
@@ -16,16 +16,21 @@
 #include <2geom/circle.h>
 #include <2geom/sbasis-to-bezier.h>
 
+#include "desktop-style.h"
+
 #include "helper/geom-nodetype.h"
 #include "helper/geom-pathstroke.h"
 #include "display/curve.h"
-#include "style.h"
 #include "svg/svg-color.h"
-#include "desktop-style.h"
 #include "svg/css-ostringstream.h"
 #include "svg/svg.h"
 
 #include "knotholder.h"
+
+#include "object/sp-shape.h"
+#include "object/sp-object-group.h"
+#include "style.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp
index ab05b880c..914d23e4b 100644
--- a/src/live_effects/lpe-transform_2pts.cpp
+++ b/src/live_effects/lpe-transform_2pts.cpp
@@ -17,6 +17,8 @@
 #include "ui/icon-names.h"
 #include "svg/svg.h"
 #include "verbs.h"
+#include "object/sp-path.h"
+
 // TODO due to internal breakage in glibmm headers, this must be last:
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/lpegroupbbox.cpp b/src/live_effects/lpegroupbbox.cpp
index 3862ebcc8..8a42fc8b6 100644
--- a/src/live_effects/lpegroupbbox.cpp
+++ b/src/live_effects/lpegroupbbox.cpp
@@ -7,6 +7,8 @@
 
 #include "live_effects/lpegroupbbox.h"
 
+#include "object/sp-lpe-item.h"
+
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpegroupbbox.h b/src/live_effects/lpegroupbbox.h
index cc14203d1..7d4ac3e78 100644
--- a/src/live_effects/lpegroupbbox.h
+++ b/src/live_effects/lpegroupbbox.h
@@ -8,7 +8,8 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-#include "sp-lpe-item.h"
+
+class SPLPEItem;
 
 #include <2geom/interval.h>
 
diff --git a/src/live_effects/lpeobject-reference.cpp b/src/live_effects/lpeobject-reference.cpp
index 89df843e8..e96054212 100644
--- a/src/live_effects/lpeobject-reference.cpp
+++ b/src/live_effects/lpeobject-reference.cpp
@@ -12,7 +12,7 @@
 
 #include "bad-uri-exception.h"
 #include "live_effects/lpeobject.h"
-#include "uri.h"
+#include "object/uri.h"
 
 namespace Inkscape {
 
diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h
index baee35614..f22bea2b5 100644
--- a/src/live_effects/lpeobject-reference.h
+++ b/src/live_effects/lpeobject-reference.h
@@ -11,9 +11,10 @@
 
 #include <sigc++/sigc++.h>
 
-#include "uri-references.h"
+#include "object/uri-references.h"
 
 namespace Inkscape {
+
 namespace XML {
 class Node;
 }
diff --git a/src/live_effects/lpeobject.cpp b/src/live_effects/lpeobject.cpp
index ca3ae46e0..bc5ff0576 100644
--- a/src/live_effects/lpeobject.cpp
+++ b/src/live_effects/lpeobject.cpp
@@ -15,6 +15,8 @@
 #include "document.h"
 #include "document-private.h"
 
+#include "object/sp-defs.h"
+
 //#define LIVEPATHEFFECT_VERBOSE
 
 static void livepatheffect_on_repr_attr_changed (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive, void * data);
diff --git a/src/live_effects/lpeobject.h b/src/live_effects/lpeobject.h
index e468b4080..9a95775aa 100644
--- a/src/live_effects/lpeobject.h
+++ b/src/live_effects/lpeobject.h
@@ -9,9 +9,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
  
-#include "sp-object.h"
+
 #include "effect-enum.h"
 
+#include "object/sp-object.h"
+
 namespace Inkscape {
     namespace XML {
         class Node;
diff --git a/src/live_effects/parameter/item-reference.cpp b/src/live_effects/parameter/item-reference.cpp
index a775d93b7..6540245d3 100644
--- a/src/live_effects/parameter/item-reference.cpp
+++ b/src/live_effects/parameter/item-reference.cpp
@@ -8,9 +8,9 @@
 
 #include "live_effects/parameter/item-reference.h"
 
-#include "sp-shape.h"
-#include "sp-text.h"
-#include "sp-item-group.h"
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
+#include "object/sp-item-group.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/parameter/item-reference.h b/src/live_effects/parameter/item-reference.h
index 91231455a..597e7ba51 100644
--- a/src/live_effects/parameter/item-reference.h
+++ b/src/live_effects/parameter/item-reference.h
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
-#include <uri-references.h>
+#include "object/uri-references.h"
 
 class SPItem;
 namespace Inkscape {
diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp
index bf7402d99..2107a5912 100644
--- a/src/live_effects/parameter/item.cpp
+++ b/src/live_effects/parameter/item.cpp
@@ -27,7 +27,7 @@
 // clipboard support
 #include "ui/clipboard.h"
 // required for linking to other paths
-#include "uri.h"
+#include "object/uri.h"
 
 #include "ui/icon-names.h"
 
diff --git a/src/live_effects/parameter/originalitem.cpp b/src/live_effects/parameter/originalitem.cpp
index e828e1800..52e4c2fd8 100644
--- a/src/live_effects/parameter/originalitem.cpp
+++ b/src/live_effects/parameter/originalitem.cpp
@@ -15,15 +15,15 @@
 #include <gtkmm/button.h>
 #include <gtkmm/label.h>
 
-#include "uri.h"
-#include "sp-shape.h"
-#include "sp-text.h"
 #include "display/curve.h"
 #include "live_effects/effect.h"
 
 #include "inkscape.h"
 #include "desktop.h"
 #include "selection.h"
+
+#include "object/uri.h"
+
 #include "ui/icon-names.h"
 
 namespace Inkscape {
diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp
index f45de4ad8..fe2dc0c8d 100644
--- a/src/live_effects/parameter/originalitemarray.cpp
+++ b/src/live_effects/parameter/originalitemarray.cpp
@@ -23,7 +23,8 @@
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 #include "originalitem.h"
-#include "uri.h"
+
+#include "object/uri.h"
 
 #include "live_effects/effect.h"
 
diff --git a/src/live_effects/parameter/originalitemarray.h b/src/live_effects/parameter/originalitemarray.h
index f93d865ec..ac5e486ea 100644
--- a/src/live_effects/parameter/originalitemarray.h
+++ b/src/live_effects/parameter/originalitemarray.h
@@ -22,7 +22,8 @@
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 #include "item-reference.h"
-#include "sp-object.h"
+
+class SPObject;
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp
index 3f833d2ac..b6a90671e 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -15,12 +15,13 @@
 #include <gtkmm/button.h>
 #include <gtkmm/label.h>
 
-#include "uri.h"
-#include "sp-shape.h"
-#include "sp-text.h"
 #include "display/curve.h"
 #include "live_effects/effect.h"
 
+#include "object/uri.h"
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
+
 #include "inkscape.h"
 #include "desktop.h"
 #include "selection.h"
diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp
index a98c91770..caec74a8b 100644
--- a/src/live_effects/parameter/originalpatharray.cpp
+++ b/src/live_effects/parameter/originalpatharray.cpp
@@ -27,13 +27,15 @@
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 #include "originalpath.h"
-#include "uri.h"
 #include "display/curve.h"
 
 #include <2geom/coord.h>
 #include <2geom/point.h>
-#include "sp-shape.h"
-#include "sp-text.h"
+
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
+#include "object/uri.h"
+
 #include "live_effects/effect.h"
 
 #include "verbs.h"
diff --git a/src/live_effects/parameter/originalpatharray.h b/src/live_effects/parameter/originalpatharray.h
index c80d5daf3..8c972fd96 100644
--- a/src/live_effects/parameter/originalpatharray.h
+++ b/src/live_effects/parameter/originalpatharray.h
@@ -22,7 +22,8 @@
 #include "svg/svg.h"
 #include "svg/stringstream.h"
 #include "path-reference.h"
-#include "sp-object.h"
+
+class SPObject;
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/path-reference.cpp b/src/live_effects/parameter/path-reference.cpp
index 42589b050..b169e5b32 100644
--- a/src/live_effects/parameter/path-reference.cpp
+++ b/src/live_effects/parameter/path-reference.cpp
@@ -8,8 +8,8 @@
 
 #include "live_effects/parameter/path-reference.h"
 
-#include "sp-shape.h"
-#include "sp-text.h"
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/parameter/path-reference.h b/src/live_effects/parameter/path-reference.h
index fafb880d3..c32d063f6 100644
--- a/src/live_effects/parameter/path-reference.h
+++ b/src/live_effects/parameter/path-reference.h
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
-#include <uri-references.h>
+#include "object/uri-references.h"
 
 class SPItem;
 namespace Inkscape {
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 88ba85b48..02075ee8e 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -39,9 +39,11 @@
 // clipboard support
 #include "ui/clipboard.h"
 // required for linking to other paths
-#include "uri.h"
-#include "sp-shape.h"
-#include "sp-text.h"
+
+#include "object/uri.h"
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
+
 #include "display/curve.h"
 
 #include "ui/tools/node-tool.h"
diff --git a/src/live_effects/parameter/powerstrokepointarray.cpp b/src/live_effects/parameter/powerstrokepointarray.cpp
index 459225bc6..cf4adc5fd 100644
--- a/src/live_effects/parameter/powerstrokepointarray.cpp
+++ b/src/live_effects/parameter/powerstrokepointarray.cpp
@@ -9,7 +9,7 @@
 
 #include "live_effects/effect.h"
 #include "knotholder.h"
-#include "sp-lpe-item.h"
+
 
 #include <2geom/piecewise.h>
 #include <2geom/sbasis-geometric.h>
diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp
index 6b50f8c09..c6f5492d1 100644
--- a/src/live_effects/parameter/satellitesarray.cpp
+++ b/src/live_effects/parameter/satellitesarray.cpp
@@ -10,7 +10,7 @@
 #include "ui/dialog/lpe-fillet-chamfer-properties.h"
 #include "live_effects/parameter/satellitesarray.h"
 #include "live_effects/effect.h"
-#include "sp-lpe-item.h"
+
 #include "inkscape.h"
 #include <preferences.h>
 // TODO due to internal breakage in glibmm headers,
diff --git a/src/live_effects/parameter/transformedpoint.cpp b/src/live_effects/parameter/transformedpoint.cpp
index 6ec2d0943..a010faf27 100644
--- a/src/live_effects/parameter/transformedpoint.cpp
+++ b/src/live_effects/parameter/transformedpoint.cpp
@@ -6,7 +6,7 @@
 
 #include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/transformedpoint.h"
-#include "sp-lpe-item.h"
+
 #include "knotholder.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index 6b565536e..ced93ef0d 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -8,7 +8,7 @@
 #include <glibmm/i18n.h>
 
 #include "live_effects/parameter/vector.h"
-#include "sp-lpe-item.h"
+
 #include "knotholder.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"