16 files changed, 35 insertions, 27 deletions
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"