Move classes derived from SPObject to own directory.

A lot of header clean-up.

219 files changed, 590 insertions, 134 deletions

diff --git a/src/object-hierarchy.cpp b/src/object-hierarchy.cpp
index 87b7ac570..15afbb59d 100644
--- a/src/object-hierarchy.cpp
+++ b/src/object-hierarchy.cpp
@@ -11,9 +11,10 @@
 
 #include <cstdio>
 
-#include "sp-object.h"
 #include "object-hierarchy.h"
 
+#include "object/sp-object.h"
+
 namespace Inkscape {
 
 ObjectHierarchy::ObjectHierarchy(SPObject *top) {
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index b4f4024cc..7ef053f9b 100644
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -12,25 +12,30 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "svg/svg.h"
-#include <2geom/path-intersection.h>
-#include <2geom/line.h>
 #include <2geom/circle.h>
+#include <2geom/line.h>
+#include <2geom/path-intersection.h>
 #include <2geom/path-sink.h>
+
+#include "desktop.h"
 #include "document.h"
-#include "sp-namedview.h"
-#include "sp-image.h"
-#include "sp-item-group.h"
-#include "sp-use.h"
 #include "inkscape.h"
 #include "preferences.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
 #include "text-editing.h"
-#include "sp-clippath.h"
-#include "sp-mask.h"
-#include "desktop.h"
-#include "sp-root.h"
+
+#include "object/sp-clippath.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-image.h"
+#include "object/sp-item-group.h"
+#include "object/sp-mask.h"
+#include "object/sp-namedview.h"
+#include "object/sp-path.h"
+#include "object/sp-root.h"
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
+#include "object/sp-use.h"
+
+#include "svg/svg.h"
 
 Inkscape::ObjectSnapper::ObjectSnapper(SnapManager *sm, Geom::Coord const d)
     : Snapper(sm, d)
diff --git a/src/object-snapper.h b/src/object-snapper.h
index c0dab5c58..8cffd147e 100644
--- a/src/object-snapper.h
+++ b/src/object-snapper.h
@@ -11,13 +11,13 @@
  */
 
 #include "snapper.h"
-#include "sp-path.h"
 #include "splivarot.h"
 #include "snap-candidate.h"
 
 class SPNamedView;
-class  SPItem;
-class  SPObject;
+class SPItem;
+class SPObject;
+class SPPath;
 
 namespace Inkscape
 {
diff --git a/src/object/CMakeLists.txt b/src/object/CMakeLists.txt
new file mode 100644
index 000000000..3c347ce03
--- /dev/null
+++ b/src/object/CMakeLists.txt
@@ -0,0 +1,180 @@
+
+
+set(object_SRC
+  box3d-side.cpp
+  box3d.cpp
+  color-profile.cpp
+  object-set.cpp
+  persp3d-reference.cpp
+  persp3d.cpp
+  sp-anchor.cpp
+  sp-clippath.cpp
+  sp-conn-end-pair.cpp
+  sp-conn-end.cpp
+  sp-defs.cpp
+  sp-desc.cpp
+  sp-dimensions.cpp
+  sp-ellipse.cpp
+  sp-factory.cpp
+  sp-filter-reference.cpp
+  sp-filter.cpp
+  sp-flowdiv.cpp
+  sp-flowregion.cpp
+  sp-flowtext.cpp
+  sp-font-face.cpp
+  sp-font.cpp
+  sp-glyph-kerning.cpp
+  sp-glyph.cpp
+  sp-gradient-reference.cpp
+  sp-gradient.cpp
+  sp-guide.cpp
+  sp-hatch-path.cpp
+  sp-hatch.cpp
+  sp-image.cpp
+  sp-item-group.cpp
+  sp-item-rm-unsatisfied-cns.cpp
+  sp-item-transform.cpp
+  sp-item-update-cns.cpp
+  sp-item.cpp
+  sp-line.cpp
+  sp-linear-gradient.cpp
+  sp-lpe-item.cpp
+  sp-marker.cpp
+  sp-mask.cpp
+  sp-mesh-array.cpp
+  sp-mesh-gradient.cpp
+  sp-mesh-patch.cpp
+  sp-mesh-row.cpp
+  sp-metadata.cpp
+  sp-missing-glyph.cpp
+  sp-namedview.cpp
+  sp-object-group.cpp
+  sp-object.cpp
+  sp-offset.cpp
+  sp-paint-server.cpp
+  sp-path.cpp
+  sp-pattern.cpp
+  sp-polygon.cpp
+  sp-polyline.cpp
+  sp-radial-gradient.cpp
+  sp-rect.cpp
+  sp-root.cpp
+  sp-script.cpp
+  sp-shape.cpp
+  sp-solid-color.cpp
+  sp-spiral.cpp
+  sp-star.cpp
+  sp-stop.cpp
+  sp-string.cpp
+  sp-style-elem.cpp
+  sp-switch.cpp
+  sp-symbol.cpp
+  sp-tag-use-reference.cpp
+  sp-tag-use.cpp
+  sp-tag.cpp
+  sp-text.cpp
+  sp-title.cpp
+  sp-tref-reference.cpp
+  sp-tref.cpp
+  sp-tspan.cpp
+  sp-use-reference.cpp
+  sp-use.cpp
+  uri-references.cpp
+  uri.cpp
+  viewbox.cpp
+
+  # -------
+  # Headers
+  box3d-side.h
+  box3d.h
+  color-profile.h
+  object-set.h
+  persp3d-reference.h
+  persp3d.h
+  sp-anchor.h
+  sp-clippath.h
+  sp-conn-end-pair.h
+  sp-conn-end.h
+  sp-defs.h
+  sp-desc.h
+  sp-dimensions.h
+  sp-ellipse.h
+  sp-factory.h
+  sp-filter-reference.h
+  sp-filter-units.h
+  sp-filter.h
+  sp-flowdiv.h
+  sp-flowregion.h
+  sp-flowtext.h
+  sp-font-face.h
+  sp-font.h
+  sp-glyph-kerning.h
+  sp-glyph.h
+  sp-gradient-reference.h
+  sp-gradient-spread.h
+  sp-gradient-units.h
+  sp-gradient-vector.h
+  sp-gradient.h
+  sp-guide.h
+  sp-hatch-path.h
+  sp-hatch.h
+  sp-image.h
+  sp-item-group.h
+  sp-item-rm-unsatisfied-cns.h
+  sp-item-transform.h
+  sp-item-update-cns.h
+  sp-item.h
+  sp-line.h
+  sp-linear-gradient.h
+  sp-lpe-item.h
+  sp-marker-loc.h
+  sp-marker.h
+  sp-mask.h
+  sp-mesh-array.h
+  sp-mesh-gradient.h
+  sp-mesh-patch.h
+  sp-mesh-row.h
+  sp-metadata.h
+  sp-missing-glyph.h
+  sp-namedview.h
+  sp-object-group.h
+  sp-object.h
+  sp-offset.h
+  sp-paint-server-reference.h
+  sp-paint-server.h
+  sp-path.h
+  sp-pattern.h
+  sp-polygon.h
+  sp-polyline.h
+  sp-radial-gradient.h
+  sp-rect.h
+  sp-root.h
+  sp-script.h
+  sp-shape.h
+  sp-solid-color.h
+  sp-spiral.h
+  sp-star.h
+  sp-stop.h
+  sp-string.h
+  sp-style-elem.h
+  sp-switch.h
+  sp-symbol.h
+  sp-tag.h
+  sp-tag-use.h
+  sp-tag-use-reference.h
+  sp-text.h
+  sp-textpath.h
+  sp-title.h
+  sp-tref-reference.h
+  sp-tref.h
+  sp-tspan.h
+  sp-use-reference.h
+  sp-use.h
+  uri-references.h
+  uri.h
+  viewbox.h
+)
+
+add_inkscape_source("${object_SRC}")
+
+add_subdirectory(filters)
diff --git a/src/object/README b/src/object/README
new file mode 100644
index 000000000..f0b8c5eb1
--- /dev/null
+++ b/src/object/README
@@ -0,0 +1,118 @@
+
+This directory contains classes that are derived from SPObject as well as closely related code.
+
+The object tree implements an XML-to-display primitive mapping, and
+provides an object hierarchy that can be modified using the
+GUI. Changes in the XML tree are automatically propagated to the
+object tree via observers, but not the other way around — a function
+called updateRepr() must be explicitly called. Relevant nodes of the
+object tree contains fully cascaded CSS style information. The object
+tree also includes clones of objects that are referenced by the <use>
+element in the XML tree (this is needed as clones may have different
+styling due to inheritance).
+
+See: http://wiki.inkscape.org/wiki/index.php/Object_tree
+
+Object class inheritance:
+
+sp-object.h:
+  color-profile.h:    class ColorProfile
+  persp3d.h:          class Persp3D
+  sp-defs.h:          class SPDefs
+  sp-desc.h:          class SPDesc
+  sp-filter.h:        class SPFilter
+  sp-flowdiv.h:       class SPFlowline
+  sp-flowdiv.h:       class SPFlowregionbreak
+  sp-font-face.h:     class SPFontFace
+  sp-font.h:          class SPFont
+  sp-glyph.h:         class SPGlyph
+  sp-glyph-kerning.h: class SPGlyphKerning
+    sp-glyph-kerning.h: class SPHkern
+    sp-glyph-kerning.h: class SPVkern
+  sp-guide.h:         class SPGuide
+  sp-hatch-path.h:    class SPHatchPath
+  sp-item.h:          class SPItem
+    sp-flowdiv.h:       class SPFlowdiv
+    sp-flowdiv.h:       class SPFlowtspan
+    sp-flowdiv.h:       class SPFlowpara
+    sp-flowregion.h:    class SPFlowregion
+    sp-flowregion.h:    class SPFlowregionExclude
+    sp-flowtext.h:      class SPFlowtext
+    sp-image.h:         class SPImage
+    sp-lpe-item.h:      class SPLPEItem
+      sp-item-group.h:    class SPGroup
+        box3d.h:            class SPBox3D
+        sp-anchor.h:        class SPAnchor
+        sp-marker.h:        class SPMarker
+        sp-root.h:          class SPRoot
+        sp-switch.h:        class SPSwitch
+        sp-symbol.h:        class SPSymbol
+      sp-shape.h:         class SPShape
+        sp-ellipse.h:       class SPGenericEllipse
+        sp-line.h:          class SPLine
+        sp-offset.h:        class SPOffset
+        sp-path.h:          class SPPath
+        sp-polygon.h:       class SPPolygon
+          sp-star.h:          class SPStar
+        sp-polyline.h:      class SPPolyLine
+          box3d-side.h:       class Box3DSide
+        sp-rect.h:          class SPRect
+        sp-spiral.h:        class SPSpiral
+    sp-text.h:          class SPText
+    sp-textpath.h:      class SPTextPath
+    sp-tref.h:          class SPTRef
+    sp-tspan.h:         class SPTSpan
+    sp-use.h:           class SPUse
+  sp-mesh-patch.h:    class SPMeshpatch
+  sp-mesh-row.h:      class SPMeshrow
+  sp-metadata.h:      class SPMetadata
+  sp-missing-glyph.h: class SPMissingGlyph
+  sp-object-group.h:  class SPObjectGroup
+    sp-clippath.h:      class SPClipPath
+    sp-mask.h:          class SPMask
+    sp-namedview.h:     class SPNamedView
+  sp-paint-server.h:  class SPPaintServer
+    sp-gradient.h:      class SPGradient
+      sp-linear-gradient.h: class SPLinearGradient
+      sp-mesh-gradient.h:   class SPMeshGradient
+      sp-radial-gradient.h: class SPRadialGradient
+    sp-hatch.h:         class SPHatch
+    sp-pattern.h:       class SPPattern
+    sp-solid-color.h:   class SPSolidColor
+  sp-script.h:        class SPScript
+  sp-stop.h:          class SPStop
+  sp-string.h:        class SPString
+  sp-style-elem.h:    class SPStyleElem
+  sp-tag.h:           class SPTag
+  sp-tag-use.h:       class SPTagUse
+  sp-title.h:         class SPTitle
+
+Other related files:
+
+  object-set.h:
+  persp3d-reference.h
+  sp-conn-end-pair.h
+  sp-conn-end.h
+  sp-dimensions.h
+  sp-factory.h
+  sp-filter-reference.h
+  sp-filter-units.h
+  sp-gradient-reference.h
+  sp-gradient-spread.h
+  sp-gradient-units.h
+  sp-gradient-vector.h
+  sp-item-rm-unsatisfied-cns.h
+  sp-item-transform.h
+  sp-item-update-cns.h
+  sp-marker-loc.h
+  sp-mesh-array.h
+  sp-paint-server-reference.h
+  sp-tag-use-reference.h
+  sp-tref-reference.h
+  sp-use-reference.h
+  style-enums.h
+  style-internal.h
+  style.h
+  uri.h
+  uri-references.h
+  viewbox.h
diff --git a/src/box3d-side.cpp b/src/object/box3d-side.cpp
index 3eea8855c..3eea8855c 100644
--- a/src/box3d-side.cpp
+++ b/src/object/box3d-side.cpp
diff --git a/src/box3d-side.h b/src/object/box3d-side.h
index 29f17b8f3..29f17b8f3 100644
--- a/src/box3d-side.h
+++ b/src/object/box3d-side.h
diff --git a/src/box3d.cpp b/src/object/box3d.cpp
index af1d00b0f..af1d00b0f 100644
--- a/src/box3d.cpp
+++ b/src/object/box3d.cpp
diff --git a/src/box3d.h b/src/object/box3d.h
index 85f481e5b..85f481e5b 100644
--- a/src/box3d.h
+++ b/src/object/box3d.h
diff --git a/src/color-profile.cpp b/src/object/color-profile.cpp
index 7bdde9b6d..7bdde9b6d 100644
--- a/src/color-profile.cpp
+++ b/src/object/color-profile.cpp
diff --git a/src/color-profile.h b/src/object/color-profile.h
index 0d27facfb..4c5222843 100644
--- a/src/color-profile.h
+++ b/src/object/color-profile.h
@@ -3,10 +3,12 @@
 
 #include <set>
 #include <vector>
-#include <sp-object.h>
+
 #include <glibmm/ustring.h>
 #include "cms-color-types.h"
 
+#include "sp-object.h"
+
 struct SPColor;
 
 namespace Inkscape {
diff --git a/src/object/filters/CMakeLists.txt b/src/object/filters/CMakeLists.txt
new file mode 100644
index 000000000..04c23abe7
--- /dev/null
+++ b/src/object/filters/CMakeLists.txt
@@ -0,0 +1,53 @@
+
+set(filters_SRC
+  sp-filter-primitive.cpp
+  blend.cpp
+  colormatrix.cpp
+  componenttransfer-funcnode.cpp
+  componenttransfer.cpp
+  composite.cpp
+  convolvematrix.cpp
+  diffuselighting.cpp
+  displacementmap.cpp
+  distantlight.cpp
+  flood.cpp
+  gaussian-blur.cpp
+  image.cpp
+  merge.cpp
+  mergenode.cpp
+  morphology.cpp
+  offset.cpp
+  pointlight.cpp
+  specularlighting.cpp
+  spotlight.cpp
+  tile.cpp
+  turbulence.cpp
+
+
+  # -------
+  # Headers
+  sp-filter-primitive.h
+  blend.h
+  colormatrix.h
+  componenttransfer-funcnode.h
+  componenttransfer.h
+  composite.h
+  convolvematrix.h
+  diffuselighting.h
+  displacementmap.h
+  distantlight.h
+  flood.h
+  gaussian-blur.h
+  image.h
+  merge.h
+  mergenode.h
+  morphology.h
+  offset.h
+  pointlight.h
+  specularlighting.h
+  spotlight.h
+  tile.h
+  turbulence.h
+)
+
+add_inkscape_source("${filters_SRC}")
diff --git a/src/filters/blend.cpp b/src/object/filters/blend.cpp
index 9ef544828..e23b2aa57 100644
--- a/src/filters/blend.cpp
+++ b/src/object/filters/blend.cpp
@@ -15,13 +15,17 @@
 
 #include <string.h>
 
-#include "sp-filter.h"
-#include "filters/blend.h"
+#include "blend.h"
+
 #include "attributes.h"
-#include "xml/repr.h"
 
 #include "display/nr-filter.h"
 
+#include "object/sp-filter.h"
+
+#include "xml/repr.h"
+
+
 SPFeBlend::SPFeBlend()
     : SPFilterPrimitive(), blend_mode(Inkscape::Filters::BLEND_NORMAL),
       in2(Inkscape::Filters::NR_FILTER_SLOT_NOT_SET)
diff --git a/src/filters/blend.h b/src/object/filters/blend.h
index d5af9fe7d..d5af9fe7d 100644
--- a/src/filters/blend.h
+++ b/src/object/filters/blend.h
diff --git a/src/filters/colormatrix.cpp b/src/object/filters/colormatrix.cpp
index 0e8398ace..0e8398ace 100644
--- a/src/filters/colormatrix.cpp
+++ b/src/object/filters/colormatrix.cpp
diff --git a/src/filters/colormatrix.h b/src/object/filters/colormatrix.h
index 2a1c403f1..2a1c403f1 100644
--- a/src/filters/colormatrix.h
+++ b/src/object/filters/colormatrix.h
diff --git a/src/filters/componenttransfer-funcnode.cpp b/src/object/filters/componenttransfer-funcnode.cpp
index 23c8dbd96..23c8dbd96 100644
--- a/src/filters/componenttransfer-funcnode.cpp
+++ b/src/object/filters/componenttransfer-funcnode.cpp
diff --git a/src/filters/componenttransfer-funcnode.h b/src/object/filters/componenttransfer-funcnode.h
index 4f9b8de2e..f4bb88594 100644
--- a/src/filters/componenttransfer-funcnode.h
+++ b/src/object/filters/componenttransfer-funcnode.h
@@ -15,7 +15,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "sp-object.h"
+#include "../sp-object.h"
 #include "display/nr-filter-component-transfer.h"
 
 #define SP_FEFUNCNODE(obj) (dynamic_cast<SPFeFuncNode*>((SPObject*)obj))
diff --git a/src/filters/componenttransfer.cpp b/src/object/filters/componenttransfer.cpp
index 19843eebd..dd13d85d1 100644
--- a/src/filters/componenttransfer.cpp
+++ b/src/object/filters/componenttransfer.cpp
@@ -12,13 +12,17 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "document.h"
 #include "attributes.h"
-#include "filters/componenttransfer.h"
-#include "filters/componenttransfer-funcnode.h"
-#include "xml/repr.h"
+#include "document.h"
+
+// In same directory
+#include "componenttransfer.h"
+#include "componenttransfer-funcnode.h"
+
 #include "display/nr-filter.h"
 
+#include "xml/repr.h"
+
 SPFeComponentTransfer::SPFeComponentTransfer()
     : SPFilterPrimitive(), renderer(NULL)
 {
diff --git a/src/filters/componenttransfer.h b/src/object/filters/componenttransfer.h
index 8dbe91db1..8dbe91db1 100644
--- a/src/filters/componenttransfer.h
+++ b/src/object/filters/componenttransfer.h
diff --git a/src/filters/composite.cpp b/src/object/filters/composite.cpp
index 42f06915f..bca67774b 100644
--- a/src/filters/composite.cpp
+++ b/src/object/filters/composite.cpp
@@ -12,14 +12,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "composite.h"
+
 #include "attributes.h"
-#include "svg/svg.h"
-#include "filters/composite.h"
 #include "helper-fns.h"
-#include "xml/repr.h"
+
 #include "display/nr-filter.h"
 #include "display/nr-filter-composite.h"
-#include "sp-filter.h"
+
+#include "object/sp-filter.h"
+
+#include "svg/svg.h"
+
+#include "xml/repr.h"
 
 SPFeComposite::SPFeComposite()
     : SPFilterPrimitive(), composite_operator(COMPOSITE_DEFAULT),
diff --git a/src/filters/composite.h b/src/object/filters/composite.h
index 12f7b5344..12f7b5344 100644
--- a/src/filters/composite.h
+++ b/src/object/filters/composite.h
diff --git a/src/filters/convolvematrix.cpp b/src/object/filters/convolvematrix.cpp
index 1b1e58407..e856690ff 100644
--- a/src/filters/convolvematrix.cpp
+++ b/src/object/filters/convolvematrix.cpp
@@ -16,12 +16,16 @@
 #include <string.h>
 #include <math.h>
 #include <vector>
+
+#include "convolvematrix.h"
+
 #include "attributes.h"
-#include "filters/convolvematrix.h"
 #include "helper-fns.h"
-#include "xml/repr.h"
+
 #include "display/nr-filter.h"
 
+#include "xml/repr.h"
+
 SPFeConvolveMatrix::SPFeConvolveMatrix() : SPFilterPrimitive() {
 	this->bias = 0;
 	this->divisorIsSet = 0;
diff --git a/src/filters/convolvematrix.h b/src/object/filters/convolvematrix.h
index 9783eaa47..9783eaa47 100644
--- a/src/filters/convolvematrix.h
+++ b/src/object/filters/convolvematrix.h
diff --git a/src/filters/diffuselighting.cpp b/src/object/filters/diffuselighting.cpp
index a46b367ec..f23817993 100644
--- a/src/filters/diffuselighting.cpp
+++ b/src/object/filters/diffuselighting.cpp
@@ -14,20 +14,23 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "strneq.h"
+// Same directory
+#include "diffuselighting.h"
+#include "distantlight.h"
+#include "pointlight.h"
+#include "spotlight.h"
 
+#include "strneq.h"
 #include "attributes.h"
+
+#include "display/nr-filter.h"
+#include "display/nr-filter-diffuselighting.h"
+
 #include "svg/svg.h"
-#include "sp-object.h"
 #include "svg/svg-color.h"
 #include "svg/svg-icc-color.h"
-#include "filters/diffuselighting.h"
-#include "filters/distantlight.h"
-#include "filters/pointlight.h"
-#include "filters/spotlight.h"
-#include "display/nr-filter.h"
+
 #include "xml/repr.h"
-#include "display/nr-filter-diffuselighting.h"
 
 /* FeDiffuseLighting base class */
 static void sp_feDiffuseLighting_children_modified(SPFeDiffuseLighting *sp_diffuselighting);
diff --git a/src/filters/diffuselighting.h b/src/object/filters/diffuselighting.h
index f41c6c056..f41c6c056 100644
--- a/src/filters/diffuselighting.h
+++ b/src/object/filters/diffuselighting.h
diff --git a/src/filters/displacementmap.cpp b/src/object/filters/displacementmap.cpp
index f0ca36079..978fd517b 100644
--- a/src/filters/displacementmap.cpp
+++ b/src/object/filters/displacementmap.cpp
@@ -12,14 +12,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "displacementmap.h"
+
 #include "attributes.h"
-#include "svg/svg.h"
-#include "filters/displacementmap.h"
-#include "xml/repr.h"
-#include "sp-filter.h"
 #include "helper-fns.h"
-#include "display/nr-filter.h"
+
 #include "display/nr-filter-displacement-map.h"
+#include "display/nr-filter.h"
+
+#include "object/sp-filter.h"
+
+#include "svg/svg.h"
+
+#include "xml/repr.h"
 
 SPFeDisplacementMap::SPFeDisplacementMap() : SPFilterPrimitive() {
     this->scale=0;
diff --git a/src/filters/displacementmap.h b/src/object/filters/displacementmap.h
index 85a6beaaa..85a6beaaa 100644
--- a/src/filters/displacementmap.h
+++ b/src/object/filters/displacementmap.h
diff --git a/src/filters/distantlight.cpp b/src/object/filters/distantlight.cpp
index 617f53121..076a7aab5 100644
--- a/src/filters/distantlight.cpp
+++ b/src/object/filters/distantlight.cpp
@@ -15,11 +15,14 @@
 
 #include <glib.h>
 
+// In same dirctory
+#include "distantlight.h"
+#include "diffuselighting.h"
+#include "specularlighting.h"
+
 #include "attributes.h"
 #include "document.h"
-#include "filters/distantlight.h"
-#include "filters/diffuselighting.h"
-#include "filters/specularlighting.h"
+
 #include "xml/repr.h"
 
 #define SP_MACROS_SILENT
diff --git a/src/filters/distantlight.h b/src/object/filters/distantlight.h
index 6490d987c..1aa68a1d0 100644
--- a/src/filters/distantlight.h
+++ b/src/object/filters/distantlight.h
@@ -15,7 +15,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "sp-object.h"
+#include "../sp-object.h"
 
 #define SP_FEDISTANTLIGHT(obj) (dynamic_cast<SPFeDistantLight*>((SPObject*)obj))
 #define SP_IS_FEDISTANTLIGHT(obj) (dynamic_cast<const SPFeDistantLight*>((SPObject*)obj) != NULL)
diff --git a/src/filters/flood.cpp b/src/object/filters/flood.cpp
index cbcaa83eb..9132b2028 100644
--- a/src/filters/flood.cpp
+++ b/src/object/filters/flood.cpp
@@ -12,16 +12,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "strneq.h"
+#include "flood.h"
 
+#include "strneq.h"
 #include "attributes.h"
+
 #include "svg/svg.h"
 #include "svg/svg-color.h"
-#include "filters/flood.h"
-#include "xml/repr.h"
+
 #include "display/nr-filter.h"
 #include "display/nr-filter-flood.h"
 
+#include "xml/repr.h"
+
 SPFeFlood::SPFeFlood() : SPFilterPrimitive() {
 	this->color = 0;
 
diff --git a/src/filters/flood.h b/src/object/filters/flood.h
index 75e332b73..75e332b73 100644
--- a/src/filters/flood.h
+++ b/src/object/filters/flood.h
diff --git a/src/filters/gaussian-blur.cpp b/src/object/filters/gaussian-blur.cpp
index 814224ab1..81addb8e1 100644
--- a/src/filters/gaussian-blur.cpp
+++ b/src/object/filters/gaussian-blur.cpp
@@ -17,14 +17,17 @@
 #include <config.h>
 #endif
 
+#include "gaussian-blur.h"
+
 #include "attributes.h"
-#include "svg/svg.h"
-#include "filters/gaussian-blur.h"
-#include "xml/repr.h"
 
 #include "display/nr-filter.h"
 #include "display/nr-filter-gaussian.h"
 
+#include "svg/svg.h"
+
+#include "xml/repr.h"
+
 SPGaussianBlur::SPGaussianBlur() : SPFilterPrimitive() {
 }
 
diff --git a/src/filters/gaussian-blur.h b/src/object/filters/gaussian-blur.h
index 00de8a95f..00de8a95f 100644
--- a/src/filters/gaussian-blur.h
+++ b/src/object/filters/gaussian-blur.h
diff --git a/src/filters/image.cpp b/src/object/filters/image.cpp
index 3dedb28ad..1eeb32111 100644
--- a/src/filters/image.cpp
+++ b/src/object/filters/image.cpp
@@ -18,14 +18,20 @@
 
 #include <sigc++/bind.h>
 
+#include "attributes.h"
+#include "enums.h"
+
 #include "bad-uri-exception.h"
+
+#include "object/sp-image.h"
+#include "object/uri.h"
+#include "object/uri-references.h"
+
 #include "display/nr-filter-image.h"
-#include "uri.h"
-#include "uri-references.h"
-#include "attributes.h"
+#include "display/nr-filter.h"
+
 #include "xml/repr.h"
 
-#include "display/nr-filter.h"
 
 SPFeImage::SPFeImage() : SPFilterPrimitive() {
 	this->href = NULL;
diff --git a/src/filters/image.h b/src/object/filters/image.h
index 9299f259e..26524c166 100644
--- a/src/filters/image.h
+++ b/src/object/filters/image.h
@@ -14,13 +14,16 @@
 #define SP_FEIMAGE_H_SEEN
 
 #include "sp-filter-primitive.h"
-#include "svg/svg-length.h"
-#include "sp-item.h"
-#include "uri-references.h"
 
 #define SP_FEIMAGE(obj) (dynamic_cast<SPFeImage*>((SPObject*)obj))
 #define SP_IS_FEIMAGE(obj) (dynamic_cast<const SPFeImage*>((SPObject*)obj) != NULL)
 
+class SPItem;
+
+namespace Inkscape {
+class URIReference;
+}
+
 class SPFeImage : public SPFilterPrimitive {
 public:
 	SPFeImage();
diff --git a/src/filters/merge.cpp b/src/object/filters/merge.cpp
index 8ec40cb46..8ec40cb46 100644
--- a/src/filters/merge.cpp
+++ b/src/object/filters/merge.cpp
diff --git a/src/filters/merge.h b/src/object/filters/merge.h
index 68257c38e..68257c38e 100644
--- a/src/filters/merge.h
+++ b/src/object/filters/merge.h
diff --git a/src/filters/mergenode.cpp b/src/object/filters/mergenode.cpp
index 691184eb5..04ab2af95 100644
--- a/src/filters/mergenode.cpp
+++ b/src/object/filters/mergenode.cpp
@@ -13,12 +13,15 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "mergenode.h"
+#include "merge.h"
+
 #include "attributes.h"
-#include "xml/repr.h"
-#include "filters/mergenode.h"
-#include "filters/merge.h"
+
 #include "display/nr-filter-types.h"
 
+#include "xml/repr.h"
+
 SPFeMergeNode::SPFeMergeNode()
     : SPObject(), input(Inkscape::Filters::NR_FILTER_SLOT_NOT_SET) {
 }
diff --git a/src/filters/mergenode.h b/src/object/filters/mergenode.h
index 408b3bbb8..f2d204ad4 100644
--- a/src/filters/mergenode.h
+++ b/src/object/filters/mergenode.h
@@ -15,7 +15,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "sp-object.h"
+#include "object/sp-object.h"
 
 #define SP_FEMERGENODE(obj) (dynamic_cast<SPFeMergeNode*>((SPObject*)obj))
 #define SP_IS_FEMERGENODE(obj) (dynamic_cast<const SPFeMergeNode*>((SPObject*)obj) != NULL)
diff --git a/src/filters/morphology.cpp b/src/object/filters/morphology.cpp
index b3cfa0697..b3cfa0697 100644
--- a/src/filters/morphology.cpp
+++ b/src/object/filters/morphology.cpp
diff --git a/src/filters/morphology.h b/src/object/filters/morphology.h
index f84a7271e..f84a7271e 100644
--- a/src/filters/morphology.h
+++ b/src/object/filters/morphology.h
diff --git a/src/filters/offset.cpp b/src/object/filters/offset.cpp
index c35649dcc..a0057d722 100644
--- a/src/filters/offset.cpp
+++ b/src/object/filters/offset.cpp
@@ -13,14 +13,18 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "offset.h"
+
 #include "attributes.h"
-#include "svg/svg.h"
-#include "filters/offset.h"
 #include "helper-fns.h"
-#include "xml/repr.h"
+
 #include "display/nr-filter.h"
 #include "display/nr-filter-offset.h"
 
+#include "svg/svg.h"
+
+#include "xml/repr.h"
+
 SPFeOffset::SPFeOffset() : SPFilterPrimitive() {
     this->dx = 0;
     this->dy = 0;
diff --git a/src/filters/offset.h b/src/object/filters/offset.h
index 0d26f6f90..0d26f6f90 100644
--- a/src/filters/offset.h
+++ b/src/object/filters/offset.h
diff --git a/src/filters/pointlight.cpp b/src/object/filters/pointlight.cpp
index e42d21999..942140c1b 100644
--- a/src/filters/pointlight.cpp
+++ b/src/object/filters/pointlight.cpp
@@ -13,14 +13,17 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "filters/pointlight.h"
+// Same directory
+#include "pointlight.h"
+#include "diffuselighting.h"
+#include "specularlighting.h"
 
 #include <glib.h>
 
 #include "attributes.h"
 #include "document.h"
-#include "filters/diffuselighting.h"
-#include "filters/specularlighting.h"
+
+
 #include "xml/node.h"
 #include "xml/repr.h"
 
diff --git a/src/filters/pointlight.h b/src/object/filters/pointlight.h
index 1d60895c4..2bd5496e1 100644
--- a/src/filters/pointlight.h
+++ b/src/object/filters/pointlight.h
@@ -15,7 +15,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "sp-object.h"
+#include "object/sp-object.h"
 
 #define SP_FEPOINTLIGHT(obj) (dynamic_cast<SPFePointLight*>((SPObject*)obj))
 #define SP_IS_FEPOINTLIGHT(obj) (dynamic_cast<const SPFePointLight*>((SPObject*)obj) != NULL)
diff --git a/src/sp-filter-primitive.cpp b/src/object/filters/sp-filter-primitive.cpp
index 7ced52e11..e5381373d 100644
--- a/src/sp-filter-primitive.cpp
+++ b/src/object/filters/sp-filter-primitive.cpp
@@ -19,11 +19,13 @@
 
 #include <string.h>
 
-#include "display/nr-filter-primitive.h"
+#include "sp-filter-primitive.h"
 
 #include "attributes.h"
+
+#include "display/nr-filter-primitive.h"
+
 #include "style.h"
-#include "sp-filter-primitive.h"
 
 
 // CPPIFY: Make pure virtual.
diff --git a/src/sp-filter-primitive.h b/src/object/filters/sp-filter-primitive.h
index 0ecb8af62..cebac8b1c 100644
--- a/src/sp-filter-primitive.h
+++ b/src/object/filters/sp-filter-primitive.h
@@ -14,9 +14,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "sp-object.h"
-#include "sp-dimensions.h"
-#include "svg/svg-length.h"
+#include "../sp-object.h"
+#include "../sp-dimensions.h"
 
 #define SP_FILTER_PRIMITIVE(obj) (dynamic_cast<SPFilterPrimitive*>((SPObject*)obj))
 #define SP_IS_FILTER_PRIMITIVE(obj) (dynamic_cast<const SPFilterPrimitive*>((SPObject*)obj) != NULL)
diff --git a/src/filters/specularlighting.cpp b/src/object/filters/specularlighting.cpp
index ac7253ad9..c46a21080 100644
--- a/src/filters/specularlighting.cpp
+++ b/src/object/filters/specularlighting.cpp
@@ -14,20 +14,25 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "strneq.h"
+// Same directory
+#include "specularlighting.h"
+#include "distantlight.h"
+#include "pointlight.h"
+#include "spotlight.h"
 
 #include "attributes.h"
+#include "strneq.h"
+
+#include "display/nr-filter.h"
+#include "display/nr-filter-specularlighting.h"
+
+#include "object/sp-object.h"
+
 #include "svg/svg.h"
-#include "sp-object.h"
 #include "svg/svg-color.h"
 #include "svg/svg-icc-color.h"
-#include "filters/specularlighting.h"
-#include "filters/distantlight.h"
-#include "filters/pointlight.h"
-#include "filters/spotlight.h"
+
 #include "xml/repr.h"
-#include "display/nr-filter.h"
-#include "display/nr-filter-specularlighting.h"
 
 /* FeSpecularLighting base class */
 static void sp_feSpecularLighting_children_modified(SPFeSpecularLighting *sp_specularlighting);
diff --git a/src/filters/specularlighting.h b/src/object/filters/specularlighting.h
index 1de32ec58..1de32ec58 100644
--- a/src/filters/specularlighting.h
+++ b/src/object/filters/specularlighting.h
diff --git a/src/filters/spotlight.cpp b/src/object/filters/spotlight.cpp
index a1e7207f3..a05691196 100644
--- a/src/filters/spotlight.cpp
+++ b/src/object/filters/spotlight.cpp
@@ -13,13 +13,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
+// Same directory
+#include "spotlight.h"
+#include "diffuselighting.h"
+#include "specularlighting.h"
 
 #include "attributes.h"
 #include "document.h"
-#include "filters/spotlight.h"
-#include "filters/diffuselighting.h"
-#include "filters/specularlighting.h"
+
 #include "xml/repr.h"
 
 #define SP_MACROS_SILENT
diff --git a/src/filters/spotlight.h b/src/object/filters/spotlight.h
index 7d5f6dd30..c82d24301 100644
--- a/src/filters/spotlight.h
+++ b/src/object/filters/spotlight.h
@@ -15,7 +15,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "sp-object.h"
+#include "object/sp-object.h"
 
 #define SP_FESPOTLIGHT(obj) (dynamic_cast<SPFeSpotLight*>((SPObject*)obj))
 #define SP_IS_FESPOTLIGHT(obj) (dynamic_cast<const SPFeSpotLight*>((SPObject*)obj) != NULL)
diff --git a/src/filters/tile.cpp b/src/object/filters/tile.cpp
index 623f3ab37..82e63c220 100644
--- a/src/filters/tile.cpp
+++ b/src/object/filters/tile.cpp
@@ -11,13 +11,17 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "tile.h"
+
 #include "attributes.h"
-#include "svg/svg.h"
-#include "filters/tile.h"
-#include "xml/repr.h"
+
 #include "display/nr-filter.h"
 #include "display/nr-filter-tile.h"
 
+#include "svg/svg.h"
+
+#include "xml/repr.h"
+
 SPFeTile::SPFeTile() : SPFilterPrimitive() {
 }
 
diff --git a/src/filters/tile.h b/src/object/filters/tile.h
index cc1a006dd..cc1a006dd 100644
--- a/src/filters/tile.h
+++ b/src/object/filters/tile.h
diff --git a/src/filters/turbulence.cpp b/src/object/filters/turbulence.cpp
index 9af51892e..9af51892e 100644
--- a/src/filters/turbulence.cpp
+++ b/src/object/filters/turbulence.cpp
diff --git a/src/filters/turbulence.h b/src/object/filters/turbulence.h
index 89e6d4a19..89e6d4a19 100644
--- a/src/filters/turbulence.h
+++ b/src/object/filters/turbulence.h
diff --git a/src/object-set.cpp b/src/object/object-set.cpp
index 36ddac350..36ddac350 100644
--- a/src/object-set.cpp
+++ b/src/object/object-set.cpp
diff --git a/src/object-set.h b/src/object/object-set.h
index f9f02a213..f9f02a213 100644
--- a/src/object-set.h
+++ b/src/object/object-set.h
diff --git a/src/persp3d-reference.cpp b/src/object/persp3d-reference.cpp
index 49510764e..49510764e 100644
--- a/src/persp3d-reference.cpp
+++ b/src/object/persp3d-reference.cpp
diff --git a/src/persp3d-reference.h b/src/object/persp3d-reference.h
index 871b29623..871b29623 100644
--- a/src/persp3d-reference.h
+++ b/src/object/persp3d-reference.h
diff --git a/src/persp3d.cpp b/src/object/persp3d.cpp
index ff00f9441..ca39447a1 100644
--- a/src/persp3d.cpp
+++ b/src/object/persp3d.cpp
@@ -13,6 +13,9 @@
 
 #include "persp3d.h"
 #include "perspective-line.h"
+#include "sp-root.h"
+#include "sp-defs.h"
+
 #include "attributes.h"
 #include "document-private.h"
 #include "document-undo.h"
diff --git a/src/persp3d.h b/src/object/persp3d.h
index ce0e3c120..a6ca43177 100644
--- a/src/persp3d.h
+++ b/src/object/persp3d.h
@@ -22,6 +22,7 @@
 #include "transf_mat_3x4.h"
 #include "document.h"
 #include "inkscape.h" // for SP_ACTIVE_DOCUMENT
+
 #include "sp-object.h"
 
 class SPBox3D;
diff --git a/src/sp-anchor.cpp b/src/object/sp-anchor.cpp
index b40f53ee1..b40f53ee1 100644
--- a/src/sp-anchor.cpp
+++ b/src/object/sp-anchor.cpp
diff --git a/src/sp-anchor.h b/src/object/sp-anchor.h
index 2dd81f74c..2dd81f74c 100644
--- a/src/sp-anchor.h
+++ b/src/object/sp-anchor.h
diff --git a/src/sp-clippath.cpp b/src/object/sp-clippath.cpp
index d3a3810cb..4f69bd026 100644
--- a/src/sp-clippath.cpp
+++ b/src/object/sp-clippath.cpp
@@ -28,6 +28,8 @@
 #include <2geom/transforms.h>
 
 #include "sp-clippath.h"
+#include "sp-item.h"
+#include "sp-defs.h"
 
 struct SPClipPathView {
     SPClipPathView *next;
diff --git a/src/sp-clippath.h b/src/object/sp-clippath.h
index 87b5be92c..87b5be92c 100644
--- a/src/sp-clippath.h
+++ b/src/object/sp-clippath.h
diff --git a/src/sp-conn-end-pair.cpp b/src/object/sp-conn-end-pair.cpp
index daadd0cdd..daadd0cdd 100644
--- a/src/sp-conn-end-pair.cpp
+++ b/src/object/sp-conn-end-pair.cpp
diff --git a/src/sp-conn-end-pair.h b/src/object/sp-conn-end-pair.h
index a1ee4f885..a1ee4f885 100644
--- a/src/sp-conn-end-pair.h
+++ b/src/object/sp-conn-end-pair.h
diff --git a/src/sp-conn-end.cpp b/src/object/sp-conn-end.cpp
index 996d8499a..996d8499a 100644
--- a/src/sp-conn-end.cpp
+++ b/src/object/sp-conn-end.cpp
diff --git a/src/sp-conn-end.h b/src/object/sp-conn-end.h
index 2b89a159d..2b89a159d 100644
--- a/src/sp-conn-end.h
+++ b/src/object/sp-conn-end.h
diff --git a/src/sp-defs.cpp b/src/object/sp-defs.cpp
index 619a27c0f..619a27c0f 100644
--- a/src/sp-defs.cpp
+++ b/src/object/sp-defs.cpp
diff --git a/src/sp-defs.h b/src/object/sp-defs.h
index c122cb2a9..c122cb2a9 100644
--- a/src/sp-defs.h
+++ b/src/object/sp-defs.h
diff --git a/src/sp-desc.cpp b/src/object/sp-desc.cpp
index 3c75d087a..3c75d087a 100644
--- a/src/sp-desc.cpp
+++ b/src/object/sp-desc.cpp
diff --git a/src/sp-desc.h b/src/object/sp-desc.h
index 40888bee4..40888bee4 100644
--- a/src/sp-desc.h
+++ b/src/object/sp-desc.h
diff --git a/src/sp-dimensions.cpp b/src/object/sp-dimensions.cpp
index f39b98945..f39b98945 100644
--- a/src/sp-dimensions.cpp
+++ b/src/object/sp-dimensions.cpp
diff --git a/src/sp-dimensions.h b/src/object/sp-dimensions.h
index eb76df739..eb76df739 100644
--- a/src/sp-dimensions.h
+++ b/src/object/sp-dimensions.h
diff --git a/src/sp-ellipse.cpp b/src/object/sp-ellipse.cpp
index c32e3012c..c32e3012c 100644
--- a/src/sp-ellipse.cpp
+++ b/src/object/sp-ellipse.cpp
diff --git a/src/sp-ellipse.h b/src/object/sp-ellipse.h
index a31b571d8..a31b571d8 100644
--- a/src/sp-ellipse.h
+++ b/src/object/sp-ellipse.h
diff --git a/src/sp-factory.cpp b/src/object/sp-factory.cpp
index 9d46c9a84..a540399c7 100644
--- a/src/sp-factory.cpp
+++ b/src/object/sp-factory.cpp
@@ -43,6 +43,7 @@
 #include "sp-missing-glyph.h"
 #include "sp-namedview.h"
 #include "sp-offset.h"
+#include "sp-path.h"
 #include "sp-pattern.h"
 #include "sp-polyline.h"
 #include "sp-radial-gradient.h"
@@ -64,6 +65,7 @@
 #include "sp-title.h"
 #include "sp-tref.h"
 #include "sp-tspan.h"
+#include "sp-use.h"
 #include "live_effects/lpeobject.h"
 
 // filters
diff --git a/src/sp-factory.h b/src/object/sp-factory.h
index 040fd14ae..040fd14ae 100644
--- a/src/sp-factory.h
+++ b/src/object/sp-factory.h
diff --git a/src/sp-filter-reference.cpp b/src/object/sp-filter-reference.cpp
index afb014820..afb014820 100644
--- a/src/sp-filter-reference.cpp
+++ b/src/object/sp-filter-reference.cpp
diff --git a/src/sp-filter-reference.h b/src/object/sp-filter-reference.h
index 5901dca07..5901dca07 100644
--- a/src/sp-filter-reference.h
+++ b/src/object/sp-filter-reference.h
diff --git a/src/sp-filter-units.h b/src/object/sp-filter-units.h
index 415b89365..415b89365 100644
--- a/src/sp-filter-units.h
+++ b/src/object/sp-filter-units.h
diff --git a/src/sp-filter.cpp b/src/object/sp-filter.cpp
index aa5fe2942..6cb4f8e5d 100644
--- a/src/sp-filter.cpp
+++ b/src/object/sp-filter.cpp
@@ -29,7 +29,7 @@
 #include "display/nr-filter.h"
 #include "document.h"
 #include "sp-filter-reference.h"
-#include "sp-filter-primitive.h"
+#include "filters/sp-filter-primitive.h"
 #include "uri.h"
 #include "xml/repr.h"
 
diff --git a/src/sp-filter.h b/src/object/sp-filter.h
index 054562d39..054562d39 100644
--- a/src/sp-filter.h
+++ b/src/object/sp-filter.h
diff --git a/src/sp-flowdiv.cpp b/src/object/sp-flowdiv.cpp
index 002fcff85..002fcff85 100644
--- a/src/sp-flowdiv.cpp
+++ b/src/object/sp-flowdiv.cpp
diff --git a/src/sp-flowdiv.h b/src/object/sp-flowdiv.h
index 4a3690726..4a3690726 100644
--- a/src/sp-flowdiv.h
+++ b/src/object/sp-flowdiv.h
diff --git a/src/sp-flowregion.cpp b/src/object/sp-flowregion.cpp
index 6640d93c2..6640d93c2 100644
--- a/src/sp-flowregion.cpp
+++ b/src/object/sp-flowregion.cpp
diff --git a/src/sp-flowregion.h b/src/object/sp-flowregion.h
index 024a298b8..024a298b8 100644
--- a/src/sp-flowregion.h
+++ b/src/object/sp-flowregion.h
diff --git a/src/sp-flowtext.cpp b/src/object/sp-flowtext.cpp
index 2425dada3..5cab62c83 100644
--- a/src/sp-flowtext.cpp
+++ b/src/object/sp-flowtext.cpp
@@ -16,14 +16,16 @@
 
 #include "desktop.h"
 
+#include "text-tag-attributes.h"
+#include "text-editing.h"
+
 #include "sp-flowdiv.h"
 #include "sp-flowregion.h"
 #include "sp-flowtext.h"
-#include "sp-string.h"
 #include "sp-rect.h"
-#include "text-tag-attributes.h"
-#include "text-editing.h"
+#include "sp-string.h"
 #include "sp-text.h"
+#include "sp-use.h"
 
 #include "libnrtype/font-instance.h"
 
diff --git a/src/sp-flowtext.h b/src/object/sp-flowtext.h
index d0b0a19a4..d0b0a19a4 100644
--- a/src/sp-flowtext.h
+++ b/src/object/sp-flowtext.h
diff --git a/src/sp-font-face.cpp b/src/object/sp-font-face.cpp
index 52fc09ddd..52fc09ddd 100644
--- a/src/sp-font-face.cpp
+++ b/src/object/sp-font-face.cpp
diff --git a/src/sp-font-face.h b/src/object/sp-font-face.h
index 669b93197..669b93197 100644
--- a/src/sp-font-face.h
+++ b/src/object/sp-font-face.h
diff --git a/src/sp-font.cpp b/src/object/sp-font.cpp
index a0193224c..a0193224c 100644
--- a/src/sp-font.cpp
+++ b/src/object/sp-font.cpp
diff --git a/src/sp-font.h b/src/object/sp-font.h
index 6e26a02b2..6e26a02b2 100644
--- a/src/sp-font.h
+++ b/src/object/sp-font.h
diff --git a/src/sp-glyph-kerning.cpp b/src/object/sp-glyph-kerning.cpp
index 66de5aed9..66de5aed9 100644
--- a/src/sp-glyph-kerning.cpp
+++ b/src/object/sp-glyph-kerning.cpp
diff --git a/src/sp-glyph-kerning.h b/src/object/sp-glyph-kerning.h
index c96c0b6e4..c96c0b6e4 100644
--- a/src/sp-glyph-kerning.h
+++ b/src/object/sp-glyph-kerning.h
diff --git a/src/sp-glyph.cpp b/src/object/sp-glyph.cpp
index 6284cbfa1..6284cbfa1 100644
--- a/src/sp-glyph.cpp
+++ b/src/object/sp-glyph.cpp
diff --git a/src/sp-glyph.h b/src/object/sp-glyph.h
index 297ac930e..297ac930e 100644
--- a/src/sp-glyph.h
+++ b/src/object/sp-glyph.h
diff --git a/src/sp-gradient-reference.cpp b/src/object/sp-gradient-reference.cpp
index 216ac73de..216ac73de 100644
--- a/src/sp-gradient-reference.cpp
+++ b/src/object/sp-gradient-reference.cpp
diff --git a/src/sp-gradient-reference.h b/src/object/sp-gradient-reference.h
index 96980fd6f..96980fd6f 100644
--- a/src/sp-gradient-reference.h
+++ b/src/object/sp-gradient-reference.h
diff --git a/src/sp-gradient-spread.h b/src/object/sp-gradient-spread.h
index 60e33b7c0..60e33b7c0 100644
--- a/src/sp-gradient-spread.h
+++ b/src/object/sp-gradient-spread.h
diff --git a/src/sp-gradient-units.h b/src/object/sp-gradient-units.h
index 2f58897b0..2f58897b0 100644
--- a/src/sp-gradient-units.h
+++ b/src/object/sp-gradient-units.h
diff --git a/src/sp-gradient-vector.h b/src/object/sp-gradient-vector.h
index e57820b56..e57820b56 100644
--- a/src/sp-gradient-vector.h
+++ b/src/object/sp-gradient-vector.h
diff --git a/src/sp-gradient.cpp b/src/object/sp-gradient.cpp
index feaa04e0f..feaa04e0f 100644
--- a/src/sp-gradient.cpp
+++ b/src/object/sp-gradient.cpp
diff --git a/src/sp-gradient.h b/src/object/sp-gradient.h
index 9a0d5070f..9a0d5070f 100644
--- a/src/sp-gradient.h
+++ b/src/object/sp-gradient.h
diff --git a/src/sp-guide.cpp b/src/object/sp-guide.cpp
index fe6d0b64a..25bcee92b 100644
--- a/src/sp-guide.cpp
+++ b/src/object/sp-guide.cpp
@@ -30,7 +30,7 @@
 #include "svg/stringstream.h"
 #include "attributes.h"
 #include "sp-guide.h"
-#include <sp-item-notify-moveto.h>
+#include "sp-item-notify-moveto.h"
 #include <glibmm/i18n.h>
 #include <xml/repr.h>
 #include <remove-last.h>
diff --git a/src/sp-guide.h b/src/object/sp-guide.h
index 25a0e5af8..25a0e5af8 100644
--- a/src/sp-guide.h
+++ b/src/object/sp-guide.h
diff --git a/src/sp-hatch-path.cpp b/src/object/sp-hatch-path.cpp
index b40f66064..4497b6911 100644
--- a/src/sp-hatch-path.cpp
+++ b/src/object/sp-hatch-path.cpp
@@ -25,6 +25,7 @@
 #include "helper/geom.h"
 #include "attributes.h"
 #include "document-private.h"
+#include "sp-item.h"
 #include "sp-hatch-path.h"
 #include "svg/css-ostringstream.h"
 
diff --git a/src/sp-hatch-path.h b/src/object/sp-hatch-path.h
index 11fc274ec..11fc274ec 100644
--- a/src/sp-hatch-path.h
+++ b/src/object/sp-hatch-path.h
diff --git a/src/sp-hatch.cpp b/src/object/sp-hatch.cpp
index f1958a53b..f1958a53b 100644
--- a/src/sp-hatch.cpp
+++ b/src/object/sp-hatch.cpp
diff --git a/src/sp-hatch.h b/src/object/sp-hatch.h
index 546f06a1e..546f06a1e 100644
--- a/src/sp-hatch.h
+++ b/src/object/sp-hatch.h
diff --git a/src/sp-image.cpp b/src/object/sp-image.cpp
index 6736efdec..6736efdec 100644
--- a/src/sp-image.cpp
+++ b/src/object/sp-image.cpp
diff --git a/src/sp-image.h b/src/object/sp-image.h
index 9cd5faa8b..9cd5faa8b 100644
--- a/src/sp-image.h
+++ b/src/object/sp-image.h
diff --git a/src/sp-item-group.cpp b/src/object/sp-item-group.cpp
index e9a52d3ca..73c1dcb6c 100644
--- a/src/sp-item-group.cpp
+++ b/src/object/sp-item-group.cpp
@@ -22,14 +22,25 @@
 #include <cstring>
 #include <string>
 
+#include "attributes.h"
+#include "document.h"
+#include "document-undo.h"
+#include "selection-chemistry.h"
+#include "verbs.h"
+
 #include "display/drawing-group.h"
 #include "display/curve.h"
-#include "xml/repr.h"
+#include "live_effects/effect.h"
+#include "live_effects/lpeobject.h"
+#include "live_effects/lpeobject-reference.h"
 #include "svg/svg.h"
-#include "document.h"
-#include "document-undo.h"
-#include "style.h"
-#include "attributes.h"
+#include "svg/css-ostringstream.h"
+#include "xml/repr.h"
+#include "xml/sp-css-attr.h"
+
+#include "box3d.h"
+#include "persp3d.h"
+#include "sp-defs.h"
 #include "sp-item-transform.h"
 #include "sp-root.h"
 #include "sp-rect.h"
@@ -37,22 +48,13 @@
 #include "sp-clippath.h"
 #include "sp-mask.h"
 #include "sp-path.h"
-#include "box3d.h"
-#include "persp3d.h"
-
-#include "live_effects/effect.h"
-#include "live_effects/lpeobject.h"
-#include "live_effects/lpeobject-reference.h"
+#include "sp-use.h"
 #include "sp-title.h"
 #include "sp-desc.h"
 #include "sp-switch.h"
-#include "sp-defs.h"
-#include "verbs.h"
 #include "sp-textpath.h"
 #include "sp-flowtext.h"
-#include "selection-chemistry.h"
-#include "xml/sp-css-attr.h"
-#include "svg/css-ostringstream.h"
+#include "style.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/sp-item-group.h b/src/object/sp-item-group.h
index a96d77aa9..a96d77aa9 100644
--- a/src/sp-item-group.h
+++ b/src/object/sp-item-group.h
diff --git a/src/sp-item-rm-unsatisfied-cns.cpp b/src/object/sp-item-rm-unsatisfied-cns.cpp
index 516c88672..516c88672 100644
--- a/src/sp-item-rm-unsatisfied-cns.cpp
+++ b/src/object/sp-item-rm-unsatisfied-cns.cpp
diff --git a/src/sp-item-rm-unsatisfied-cns.h b/src/object/sp-item-rm-unsatisfied-cns.h
index 62f688b51..62f688b51 100644
--- a/src/sp-item-rm-unsatisfied-cns.h
+++ b/src/object/sp-item-rm-unsatisfied-cns.h
diff --git a/src/sp-item-transform.cpp b/src/object/sp-item-transform.cpp
index 3675323ca..3675323ca 100644
--- a/src/sp-item-transform.cpp
+++ b/src/object/sp-item-transform.cpp
diff --git a/src/sp-item-transform.h b/src/object/sp-item-transform.h
index d563c9768..d563c9768 100644
--- a/src/sp-item-transform.h
+++ b/src/object/sp-item-transform.h
diff --git a/src/sp-item-update-cns.cpp b/src/object/sp-item-update-cns.cpp
index 9aef336c5..077931d52 100644
--- a/src/sp-item-update-cns.cpp
+++ b/src/object/sp-item-update-cns.cpp
@@ -1,5 +1,7 @@
 
+
 #include "satisfied-guide-cns.h"
+
 #include "sp-item-update-cns.h"
 #include "sp-guide.h"
 
diff --git a/src/sp-item-update-cns.h b/src/object/sp-item-update-cns.h
index d0b080552..d0b080552 100644
--- a/src/sp-item-update-cns.h
+++ b/src/object/sp-item-update-cns.h
diff --git a/src/sp-item.cpp b/src/object/sp-item.cpp
index 3fef28e5b..f7a4ff672 100644
--- a/src/sp-item.cpp
+++ b/src/object/sp-item.cpp
@@ -26,26 +26,32 @@
 #include "display/drawing-item.h"
 #include "attributes.h"
 #include "document.h"
-#include "uri.h"
+
 #include "inkscape.h"
 #include "desktop.h"
-#include "style.h"
-#include "sp-root.h"
-#include "sp-clippath.h"
-#include "sp-mask.h"
-#include "sp-rect.h"
-#include "sp-text.h"
-#include "sp-textpath.h"
-#include "sp-item-rm-unsatisfied-cns.h"
-#include "sp-pattern.h"
-#include "sp-switch.h"
+
 #include "gradient-chemistry.h"
 #include "conn-avoid-ref.h"
 #include "conditions.h"
 #include "filter-chemistry.h"
+
+#include "sp-clippath.h"
+#include "sp-desc.h"
 #include "sp-guide.h"
+#include "sp-item-rm-unsatisfied-cns.h"
+#include "sp-mask.h"
+#include "sp-pattern.h"
+#include "sp-root.h"
+#include "sp-rect.h"
+#include "sp-switch.h"
+#include "sp-text.h"
+#include "sp-textpath.h"
 #include "sp-title.h"
-#include "sp-desc.h"
+#include "sp-use.h"
+
+#include "style.h"
+#include "uri.h"
+
 
 #include "util/find-last-if.h"
 #include "util/reverse-list.h"
diff --git a/src/sp-item.h b/src/object/sp-item.h
index 36af02edc..36af02edc 100644
--- a/src/sp-item.h
+++ b/src/object/sp-item.h
diff --git a/src/sp-line.cpp b/src/object/sp-line.cpp
index 09ffd1f17..09ffd1f17 100644
--- a/src/sp-line.cpp
+++ b/src/object/sp-line.cpp
diff --git a/src/sp-line.h b/src/object/sp-line.h
index 6c720d403..6c720d403 100644
--- a/src/sp-line.h
+++ b/src/object/sp-line.h
diff --git a/src/sp-linear-gradient.cpp b/src/object/sp-linear-gradient.cpp
index 29579b617..29579b617 100644
--- a/src/sp-linear-gradient.cpp
+++ b/src/object/sp-linear-gradient.cpp
diff --git a/src/sp-linear-gradient.h b/src/object/sp-linear-gradient.h
index a152e7fe2..a152e7fe2 100644
--- a/src/sp-linear-gradient.h
+++ b/src/object/sp-linear-gradient.h
diff --git a/src/sp-lpe-item.cpp b/src/object/sp-lpe-item.cpp
index f3cc841fb..f3cc841fb 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/object/sp-lpe-item.cpp
diff --git a/src/sp-lpe-item.h b/src/object/sp-lpe-item.h
index 82f3940c1..82f3940c1 100644
--- a/src/sp-lpe-item.h
+++ b/src/object/sp-lpe-item.h
diff --git a/src/sp-marker-loc.h b/src/object/sp-marker-loc.h
index b6877e5aa..b6877e5aa 100644
--- a/src/sp-marker-loc.h
+++ b/src/object/sp-marker-loc.h
diff --git a/src/sp-marker.cpp b/src/object/sp-marker.cpp
index 01a0d5e61..e5ddb91b5 100644
--- a/src/sp-marker.cpp
+++ b/src/object/sp-marker.cpp
@@ -23,11 +23,13 @@
 #include "display/drawing-group.h"
 #include "xml/repr.h"
 #include "attributes.h"
-#include "sp-marker.h"
 #include "document.h"
 #include "document-private.h"
 #include "preferences.h"
 
+#include "sp-marker.h"
+#include "sp-defs.h"
+
 class SPMarkerView {
 
 public:
diff --git a/src/sp-marker.h b/src/object/sp-marker.h
index bae13243b..bae13243b 100644
--- a/src/sp-marker.h
+++ b/src/object/sp-marker.h
diff --git a/src/sp-mask.cpp b/src/object/sp-mask.cpp
index 0597d29f7..b65c145fc 100644
--- a/src/sp-mask.cpp
+++ b/src/object/sp-mask.cpp
@@ -25,6 +25,9 @@
 #include "document-private.h"
 #include "style.h"
 #include "attributes.h"
+
+#include "sp-defs.h"
+#include "sp-item.h"
 #include "sp-mask.h"
 
 struct SPMaskView {
diff --git a/src/sp-mask.h b/src/object/sp-mask.h
index 02d37b82b..02d37b82b 100644
--- a/src/sp-mask.h
+++ b/src/object/sp-mask.h
diff --git a/src/sp-mesh-array.cpp b/src/object/sp-mesh-array.cpp
index d958427f2..d958427f2 100644
--- a/src/sp-mesh-array.cpp
+++ b/src/object/sp-mesh-array.cpp
diff --git a/src/sp-mesh-array.h b/src/object/sp-mesh-array.h
index df43638db..df43638db 100644
--- a/src/sp-mesh-array.h
+++ b/src/object/sp-mesh-array.h
diff --git a/src/sp-mesh-gradient.cpp b/src/object/sp-mesh-gradient.cpp
index 572131c60..572131c60 100644
--- a/src/sp-mesh-gradient.cpp
+++ b/src/object/sp-mesh-gradient.cpp
diff --git a/src/sp-mesh-gradient.h b/src/object/sp-mesh-gradient.h
index a221554a3..a221554a3 100644
--- a/src/sp-mesh-gradient.h
+++ b/src/object/sp-mesh-gradient.h
diff --git a/src/sp-mesh-patch.cpp b/src/object/sp-mesh-patch.cpp
index 04a121c7a..04a121c7a 100644
--- a/src/sp-mesh-patch.cpp
+++ b/src/object/sp-mesh-patch.cpp
diff --git a/src/sp-mesh-patch.h b/src/object/sp-mesh-patch.h
index e018b81ea..e018b81ea 100644
--- a/src/sp-mesh-patch.h
+++ b/src/object/sp-mesh-patch.h
diff --git a/src/sp-mesh-row.cpp b/src/object/sp-mesh-row.cpp
index 8204aff65..8204aff65 100644
--- a/src/sp-mesh-row.cpp
+++ b/src/object/sp-mesh-row.cpp
diff --git a/src/sp-mesh-row.h b/src/object/sp-mesh-row.h
index 40335e2b9..40335e2b9 100644
--- a/src/sp-mesh-row.h
+++ b/src/object/sp-mesh-row.h
diff --git a/src/sp-metadata.cpp b/src/object/sp-metadata.cpp
index e7907e4f0..e7907e4f0 100644
--- a/src/sp-metadata.cpp
+++ b/src/object/sp-metadata.cpp
diff --git a/src/sp-metadata.h b/src/object/sp-metadata.h
index a89020390..a89020390 100644
--- a/src/sp-metadata.h
+++ b/src/object/sp-metadata.h
diff --git a/src/sp-missing-glyph.cpp b/src/object/sp-missing-glyph.cpp
index f441b66d2..f441b66d2 100644
--- a/src/sp-missing-glyph.cpp
+++ b/src/object/sp-missing-glyph.cpp
diff --git a/src/sp-missing-glyph.h b/src/object/sp-missing-glyph.h
index 06bc92231..06bc92231 100644
--- a/src/sp-missing-glyph.h
+++ b/src/object/sp-missing-glyph.h
diff --git a/src/sp-namedview.cpp b/src/object/sp-namedview.cpp
index 59c7129f6..59c7129f6 100644
--- a/src/sp-namedview.cpp
+++ b/src/object/sp-namedview.cpp
diff --git a/src/sp-namedview.h b/src/object/sp-namedview.h
index 20d762bc4..20d762bc4 100644
--- a/src/sp-namedview.h
+++ b/src/object/sp-namedview.h
diff --git a/src/sp-object-group.cpp b/src/object/sp-object-group.cpp
index f8ef855e3..f8ef855e3 100644
--- a/src/sp-object-group.cpp
+++ b/src/object/sp-object-group.cpp
diff --git a/src/sp-object-group.h b/src/object/sp-object-group.h
index dcaa8a1d0..dcaa8a1d0 100644
--- a/src/sp-object-group.h
+++ b/src/object/sp-object-group.h
diff --git a/src/sp-object.cpp b/src/object/sp-object.cpp
index bc930a430..bc930a430 100644
--- a/src/sp-object.cpp
+++ b/src/object/sp-object.cpp
diff --git a/src/sp-object.h b/src/object/sp-object.h
index ee092aa7b..ee092aa7b 100644
--- a/src/sp-object.h
+++ b/src/object/sp-object.h
diff --git a/src/sp-offset.cpp b/src/object/sp-offset.cpp
index 82e0b4947..82e0b4947 100644
--- a/src/sp-offset.cpp
+++ b/src/object/sp-offset.cpp
diff --git a/src/sp-offset.h b/src/object/sp-offset.h
index 117a3308e..117a3308e 100644
--- a/src/sp-offset.h
+++ b/src/object/sp-offset.h
diff --git a/src/sp-paint-server-reference.h b/src/object/sp-paint-server-reference.h
index bbd9c25fa..bbd9c25fa 100644
--- a/src/sp-paint-server-reference.h
+++ b/src/object/sp-paint-server-reference.h
diff --git a/src/sp-paint-server.cpp b/src/object/sp-paint-server.cpp
index 958078012..958078012 100644
--- a/src/sp-paint-server.cpp
+++ b/src/object/sp-paint-server.cpp
diff --git a/src/sp-paint-server.h b/src/object/sp-paint-server.h
index 7f3bfcba0..7f3bfcba0 100644
--- a/src/sp-paint-server.h
+++ b/src/object/sp-paint-server.h
diff --git a/src/sp-path.cpp b/src/object/sp-path.cpp
index 513e67810..513e67810 100644
--- a/src/sp-path.cpp
+++ b/src/object/sp-path.cpp
diff --git a/src/sp-path.h b/src/object/sp-path.h
index 572fd648d..572fd648d 100644
--- a/src/sp-path.h
+++ b/src/object/sp-path.h
diff --git a/src/sp-pattern.cpp b/src/object/sp-pattern.cpp
index 9ecfe8baa..ebe78d63c 100644
--- a/src/sp-pattern.cpp
+++ b/src/object/sp-pattern.cpp
@@ -35,6 +35,9 @@
 
 #include "sp-factory.h"
 
+#include "sp-defs.h"
+#include "sp-item.h"
+
 SPPattern::SPPattern()
     : SPPaintServer()
     , SPViewBox()
diff --git a/src/sp-pattern.h b/src/object/sp-pattern.h
index a5e7be1d4..a5e7be1d4 100644
--- a/src/sp-pattern.h
+++ b/src/object/sp-pattern.h
diff --git a/src/sp-polygon.cpp b/src/object/sp-polygon.cpp
index 14fd104b3..14fd104b3 100644
--- a/src/sp-polygon.cpp
+++ b/src/object/sp-polygon.cpp
diff --git a/src/sp-polygon.h b/src/object/sp-polygon.h
index 438fdf794..438fdf794 100644
--- a/src/sp-polygon.h
+++ b/src/object/sp-polygon.h
diff --git a/src/sp-polyline.cpp b/src/object/sp-polyline.cpp
index 29054f934..29054f934 100644
--- a/src/sp-polyline.cpp
+++ b/src/object/sp-polyline.cpp
diff --git a/src/sp-polyline.h b/src/object/sp-polyline.h
index 1ca102a9e..1ca102a9e 100644
--- a/src/sp-polyline.h
+++ b/src/object/sp-polyline.h
diff --git a/src/sp-radial-gradient.cpp b/src/object/sp-radial-gradient.cpp
index fa6355478..fa6355478 100644
--- a/src/sp-radial-gradient.cpp
+++ b/src/object/sp-radial-gradient.cpp
diff --git a/src/sp-radial-gradient.h b/src/object/sp-radial-gradient.h
index f90c8c7a9..f90c8c7a9 100644
--- a/src/sp-radial-gradient.h
+++ b/src/object/sp-radial-gradient.h
diff --git a/src/sp-rect.cpp b/src/object/sp-rect.cpp
index 88dad5354..88dad5354 100644
--- a/src/sp-rect.cpp
+++ b/src/object/sp-rect.cpp
diff --git a/src/sp-rect.h b/src/object/sp-rect.h
index 757229724..757229724 100644
--- a/src/sp-rect.h
+++ b/src/object/sp-rect.h
diff --git a/src/sp-root.cpp b/src/object/sp-root.cpp
index 3f31588cc..3f31588cc 100644
--- a/src/sp-root.cpp
+++ b/src/object/sp-root.cpp
diff --git a/src/sp-root.h b/src/object/sp-root.h
index 4a37840d9..4a37840d9 100644
--- a/src/sp-root.h
+++ b/src/object/sp-root.h
diff --git a/src/sp-script.cpp b/src/object/sp-script.cpp
index 144c8d76a..144c8d76a 100644
--- a/src/sp-script.cpp
+++ b/src/object/sp-script.cpp
diff --git a/src/sp-script.h b/src/object/sp-script.h
index cdacb8493..cdacb8493 100644
--- a/src/sp-script.h
+++ b/src/object/sp-script.h
diff --git a/src/sp-shape.cpp b/src/object/sp-shape.cpp
index 9edf03cbf..9edf03cbf 100644
--- a/src/sp-shape.cpp
+++ b/src/object/sp-shape.cpp
diff --git a/src/sp-shape.h b/src/object/sp-shape.h
index fe9d03275..fe9d03275 100644
--- a/src/sp-shape.h
+++ b/src/object/sp-shape.h
diff --git a/src/sp-solid-color.cpp b/src/object/sp-solid-color.cpp
index 89858c18c..89858c18c 100644
--- a/src/sp-solid-color.cpp
+++ b/src/object/sp-solid-color.cpp
diff --git a/src/sp-solid-color.h b/src/object/sp-solid-color.h
index 4dbb573b0..4dbb573b0 100644
--- a/src/sp-solid-color.h
+++ b/src/object/sp-solid-color.h
diff --git a/src/sp-spiral.cpp b/src/object/sp-spiral.cpp
index a84fc6041..a84fc6041 100644
--- a/src/sp-spiral.cpp
+++ b/src/object/sp-spiral.cpp
diff --git a/src/sp-spiral.h b/src/object/sp-spiral.h
index ebf4c9e28..ebf4c9e28 100644
--- a/src/sp-spiral.h
+++ b/src/object/sp-spiral.h
diff --git a/src/sp-star.cpp b/src/object/sp-star.cpp
index 9844df98a..9844df98a 100644
--- a/src/sp-star.cpp
+++ b/src/object/sp-star.cpp
diff --git a/src/sp-star.h b/src/object/sp-star.h
index 4519de869..4519de869 100644
--- a/src/sp-star.h
+++ b/src/object/sp-star.h
diff --git a/src/sp-stop.cpp b/src/object/sp-stop.cpp
index 58746c951..58746c951 100644
--- a/src/sp-stop.cpp
+++ b/src/object/sp-stop.cpp
diff --git a/src/sp-stop.h b/src/object/sp-stop.h
index f7b3a677a..f7b3a677a 100644
--- a/src/sp-stop.h
+++ b/src/object/sp-stop.h
diff --git a/src/sp-string.cpp b/src/object/sp-string.cpp
index 0a959abea..0a959abea 100644
--- a/src/sp-string.cpp
+++ b/src/object/sp-string.cpp
diff --git a/src/sp-string.h b/src/object/sp-string.h
index b80b4b8bf..b80b4b8bf 100644
--- a/src/sp-string.h
+++ b/src/object/sp-string.h
diff --git a/src/sp-style-elem.cpp b/src/object/sp-style-elem.cpp
index da02d4ef1..da02d4ef1 100644
--- a/src/sp-style-elem.cpp
+++ b/src/object/sp-style-elem.cpp
diff --git a/src/sp-style-elem.h b/src/object/sp-style-elem.h
index a3f4bdc70..a3f4bdc70 100644
--- a/src/sp-style-elem.h
+++ b/src/object/sp-style-elem.h
diff --git a/src/sp-switch.cpp b/src/object/sp-switch.cpp
index d6ab1e904..d6ab1e904 100644
--- a/src/sp-switch.cpp
+++ b/src/object/sp-switch.cpp
diff --git a/src/sp-switch.h b/src/object/sp-switch.h
index 57ce8b236..57ce8b236 100644
--- a/src/sp-switch.h
+++ b/src/object/sp-switch.h
diff --git a/src/sp-symbol.cpp b/src/object/sp-symbol.cpp
index 55b5101af..55b5101af 100644
--- a/src/sp-symbol.cpp
+++ b/src/object/sp-symbol.cpp
diff --git a/src/sp-symbol.h b/src/object/sp-symbol.h
index 6b46a8c1a..6b46a8c1a 100644
--- a/src/sp-symbol.h
+++ b/src/object/sp-symbol.h
diff --git a/src/sp-tag-use-reference.cpp b/src/object/sp-tag-use-reference.cpp
index bb03c120a..bb03c120a 100644
--- a/src/sp-tag-use-reference.cpp
+++ b/src/object/sp-tag-use-reference.cpp
diff --git a/src/sp-tag-use-reference.h b/src/object/sp-tag-use-reference.h
index 2a59fd6bd..0895be010 100644
--- a/src/sp-tag-use-reference.h
+++ b/src/object/sp-tag-use-reference.h
@@ -9,12 +9,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
+#include <stddef.h>
+#include <sigc++/sigc++.h>
 #include <glib.h>
+
 #include "sp-object.h"
 #include "sp-item.h"
-#include <uri-references.h>
-#include <stddef.h>
-#include <sigc++/sigc++.h>
+#include "uri-references.h"
 
 class Path;
 
diff --git a/src/sp-tag-use.cpp b/src/object/sp-tag-use.cpp
index 1312b923f..1312b923f 100644
--- a/src/sp-tag-use.cpp
+++ b/src/object/sp-tag-use.cpp
diff --git a/src/sp-tag-use.h b/src/object/sp-tag-use.h
index 651c8f045..651c8f045 100644
--- a/src/sp-tag-use.h
+++ b/src/object/sp-tag-use.h
diff --git a/src/sp-tag.cpp b/src/object/sp-tag.cpp
index d331e6b18..d331e6b18 100644
--- a/src/sp-tag.cpp
+++ b/src/object/sp-tag.cpp
diff --git a/src/sp-tag.h b/src/object/sp-tag.h
index 36459a04b..36459a04b 100644
--- a/src/sp-tag.h
+++ b/src/object/sp-tag.h
diff --git a/src/sp-text.cpp b/src/object/sp-text.cpp
index 075536d5f..17723a5c9 100644
--- a/src/sp-text.cpp
+++ b/src/object/sp-text.cpp
@@ -39,10 +39,12 @@
 #include "inkscape.h"
 #include "xml/quote.h"
 #include "mod360.h"
+
 #include "sp-title.h"
 #include "sp-desc.h"
 #include "sp-text.h"
 
+#include "sp-shape.h"
 #include "sp-textpath.h"
 #include "sp-tref.h"
 #include "sp-tspan.h"
diff --git a/src/sp-text.h b/src/object/sp-text.h
index 67613d043..67613d043 100644
--- a/src/sp-text.h
+++ b/src/object/sp-text.h
diff --git a/src/sp-textpath.h b/src/object/sp-textpath.h
index 4457cb8cf..4457cb8cf 100644
--- a/src/sp-textpath.h
+++ b/src/object/sp-textpath.h
diff --git a/src/sp-title.cpp b/src/object/sp-title.cpp
index ba5ae754a..ba5ae754a 100644
--- a/src/sp-title.cpp
+++ b/src/object/sp-title.cpp
diff --git a/src/sp-title.h b/src/object/sp-title.h
index 04f3829c6..04f3829c6 100644
--- a/src/sp-title.h
+++ b/src/object/sp-title.h
diff --git a/src/sp-tref-reference.cpp b/src/object/sp-tref-reference.cpp
index d683e34ed..d683e34ed 100644
--- a/src/sp-tref-reference.cpp
+++ b/src/object/sp-tref-reference.cpp
diff --git a/src/sp-tref-reference.h b/src/object/sp-tref-reference.h
index 516e125c1..516e125c1 100644
--- a/src/sp-tref-reference.h
+++ b/src/object/sp-tref-reference.h
diff --git a/src/sp-tref.cpp b/src/object/sp-tref.cpp
index dd44c5855..dd44c5855 100644
--- a/src/sp-tref.cpp
+++ b/src/object/sp-tref.cpp
diff --git a/src/sp-tref.h b/src/object/sp-tref.h
index 1727620cd..1727620cd 100644
--- a/src/sp-tref.h
+++ b/src/object/sp-tref.h
diff --git a/src/sp-tspan.cpp b/src/object/sp-tspan.cpp
index d8c655c06..d8c655c06 100644
--- a/src/sp-tspan.cpp
+++ b/src/object/sp-tspan.cpp
diff --git a/src/sp-tspan.h b/src/object/sp-tspan.h
index 1aef4cd0c..1aef4cd0c 100644
--- a/src/sp-tspan.h
+++ b/src/object/sp-tspan.h
diff --git a/src/sp-use-reference.cpp b/src/object/sp-use-reference.cpp
index ea8bc5e86..ea8bc5e86 100644
--- a/src/sp-use-reference.cpp
+++ b/src/object/sp-use-reference.cpp
diff --git a/src/sp-use-reference.h b/src/object/sp-use-reference.h
index 297bdc26c..297bdc26c 100644
--- a/src/sp-use-reference.h
+++ b/src/object/sp-use-reference.h
diff --git a/src/sp-use.cpp b/src/object/sp-use.cpp
index 0af7c7ebc..2837e56f1 100644
--- a/src/sp-use.cpp
+++ b/src/object/sp-use.cpp
@@ -34,6 +34,8 @@
 #include "svg/svg.h"
 #include "preferences.h"
 #include "style.h"
+
+#include "sp-use.h"
 #include "sp-symbol.h"
 #include "sp-root.h"
 #include "sp-use-reference.h"
diff --git a/src/sp-use.h b/src/object/sp-use.h
index bcf0a8513..bcf0a8513 100644
--- a/src/sp-use.h
+++ b/src/object/sp-use.h
diff --git a/src/uri-references.cpp b/src/object/uri-references.cpp
index 7d6abd10a..7d6abd10a 100644
--- a/src/uri-references.cpp
+++ b/src/object/uri-references.cpp
diff --git a/src/uri-references.h b/src/object/uri-references.h
index ce0f5f2ae..4c57709a0 100644
--- a/src/uri-references.h
+++ b/src/object/uri-references.h
@@ -20,9 +20,8 @@
 #include <sigc++/connection.h>
 #include <sigc++/trackable.h>
 
-#include "sp-object.h"
-#include "sp-item.h"
-#include "sp-use.h"
+class SPObject;
+class SPDocument;
 
 namespace Inkscape {
 
diff --git a/src/uri.cpp b/src/object/uri.cpp
index 881b322b4..881b322b4 100644
--- a/src/uri.cpp
+++ b/src/object/uri.cpp
diff --git a/src/uri.h b/src/object/uri.h
index f0b59780e..f0b59780e 100644
--- a/src/uri.h
+++ b/src/object/uri.h
diff --git a/src/viewbox.cpp b/src/object/viewbox.cpp
index 1b50fe71c..1b50fe71c 100644
--- a/src/viewbox.cpp
+++ b/src/object/viewbox.cpp
diff --git a/src/viewbox.h b/src/object/viewbox.h
index c71abb610..c71abb610 100644
--- a/src/viewbox.h
+++ b/src/object/viewbox.h