Move classes derived from SPObject to own directory.

A lot of header clean-up.

3 files changed, 9 insertions, 6 deletions

diff --git a/src/trace/potrace/inkscape-potrace.cpp b/src/trace/potrace/inkscape-potrace.cpp
index a0b0df1f6..b438be248 100644
--- a/src/trace/potrace/inkscape-potrace.cpp
+++ b/src/trace/potrace/inkscape-potrace.cpp
@@ -27,7 +27,9 @@
 #include <inkscape.h>
 #include "desktop.h"
 #include "message-stack.h"
-#include <sp-path.h>
+
+#include "object/sp-path.h"
+
 #include <svg/path-string.h>
 #include "bitmap.h"
 
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index b93d8358f..5595b2544 100644
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -25,9 +25,6 @@
 #include "selection.h"
 #include "xml/repr.h"
 #include "xml/attribute-record.h"
-#include "sp-item.h"
-#include "sp-shape.h"
-#include "sp-image.h"
 #include <2geom/transforms.h>
 #include "verbs.h"
 
@@ -35,6 +32,10 @@
 #include "display/drawing.h"
 #include "display/drawing-shape.h"
 
+#include "object/sp-item.h"
+#include "object/sp-shape.h"
+#include "object/sp-image.h"
+
 #include "siox.h"
 #include "imagemap-gdk.h"
 
diff --git a/src/trace/trace.h b/src/trace/trace.h
index 4bf13123b..b6b7684d0 100644
--- a/src/trace/trace.h
+++ b/src/trace/trace.h
@@ -18,10 +18,10 @@
 #include <glibmm/refptr.h>
 #include <gdkmm/pixbuf.h>
 #include <vector>
-#include <sp-shape.h>
 
 class SPImage;
-class  SPItem;
+class SPItem;
+class SPShape;
 
 namespace Inkscape {