Move classes derived from SPObject to own directory.

A lot of header clean-up.

4 files changed, 21 insertions, 9 deletions

diff --git a/src/xml/helper-observer.cpp b/src/xml/helper-observer.cpp
index 6f1094e53..022cad965 100644
--- a/src/xml/helper-observer.cpp
+++ b/src/xml/helper-observer.cpp
@@ -1,5 +1,8 @@
+
 #include "helper-observer.h"
 
+#include "object/sp-object.h"
+
 namespace Inkscape {
 namespace XML {
 
diff --git a/src/xml/helper-observer.h b/src/xml/helper-observer.h
index b06b61e9c..4b728d295 100644
--- a/src/xml/helper-observer.h
+++ b/src/xml/helper-observer.h
@@ -6,7 +6,8 @@
 
 #include "node-observer.h"
 #include "node.h"
-#include "sp-object.h"
+
+class SPObject;
 
 namespace Inkscape {
 namespace XML {
diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index e2af1afe2..072a9b6e4 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -1,13 +1,18 @@
-#include "xml/rebase-hrefs.h"
-#include "dir-util.h"
+
+#include <glibmm/convert.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/uriutils.h>
+
 #include "../document.h"  /* Unfortunately there's a separate xml/document.h. */
-#include "io/sys.h"
-#include "sp-object.h"
+#include "dir-util.h"
 #include "streq.h"
+
+#include "io/sys.h"
+
+#include "object/sp-object.h"
+
 #include "xml/node.h"
-#include <glibmm/miscutils.h>
-#include <glibmm/convert.h>
-#include <glibmm/uriutils.h>
+#include "xml/rebase-hrefs.h"
 
 using Inkscape::XML::AttributeRecord;
 
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index 9121acaad..11c8bcf60 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -21,13 +21,16 @@
 #include <cstring>
 #include <string>
 #include <sstream>
+
 #include <glibmm/ustring.h>
+
+#include "libcroco/cr-declaration.h"
+
 #include "svg/css-ostringstream.h"
 
 #include "xml/repr.h"
 #include "xml/simple-document.h"
 #include "xml/sp-css-attr.h"
-#include "style.h"
 
 using Inkscape::Util::List;
 using Inkscape::XML::AttributeRecord;