Move classes derived from SPObject to own directory.

A lot of header clean-up.

1 files changed, 14 insertions, 10 deletions

diff --git a/src/style.cpp b/src/style.cpp
index d84e41e42..3298cb0c9 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -31,22 +31,26 @@
 
 #include <glibmm/regex.h>
 
+#include "attributes.h"
 #include "bad-uri-exception.h"
+#include "document.h"
+#include "preferences.h"
+
+#include "display/canvas-bpath.h"
+
 #include "libcroco/cr-sel-eng.h"
-#include "xml/croco-node-iface.h"
 
-#include "svg/svg.h"
+#include "object/sp-paint-server.h"
+#include "object/uri-references.h"
+#include "object/uri.h"
 
-#include "display/canvas-bpath.h"
-#include "attributes.h"
-#include "document.h"
-#include "uri-references.h"
-#include "uri.h"
-#include "sp-paint-server.h"
 #include "svg/css-ostringstream.h"
-#include "xml/simple-document.h"
+#include "svg/svg.h"
+
 #include "util/units.h"
-#include "preferences.h"
+
+#include "xml/croco-node-iface.h"
+#include "xml/simple-document.h"
 
 using Inkscape::CSSOStringStream;
 using std::vector;