Move classes derived from SPObject to own directory.

A lot of header clean-up.

47 files changed, 135 insertions, 137 deletions

diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index b608ea59c..e475b58a0 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -13,7 +13,6 @@
 #include "helper/action.h"
 #include "ui/view/view.h"
 
-#include "sp-namedview.h"
 #include "desktop.h"
 #include "implementation/implementation.h"
 #include "effect.h"
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 588543a76..7e233d215 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -24,7 +24,7 @@
 #include "document.h"
 #include "document-undo.h"
 #include "desktop.h"
-#include "sp-namedview.h"
+#include "object/sp-namedview.h"
 
 #include "display/sp-canvas.h"
 
diff --git a/src/extension/find_extension_by_mime.h b/src/extension/find_extension_by_mime.h
index 1686c62e4..bc963001e 100644
--- a/src/extension/find_extension_by_mime.h
+++ b/src/extension/find_extension_by_mime.h
@@ -19,6 +19,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "input.h"
+
 namespace Inkscape {
 namespace Extension {
 static inline Inkscape::Extension::Extension *find_by_mime(const char *const mime)
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 260204cb0..69d4869ea 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -37,7 +37,8 @@
 #include "preferences.h"
 #include "script.h"
 #include "selection.h"
-#include "sp-namedview.h"
+#include "object/sp-namedview.h"
+#include "object/sp-path.h"
 #include "extension/system.h"
 #include "ui/view/view.h"
 #include "xml/node.h"
diff --git a/src/extension/internal/bitmap/crop.cpp b/src/extension/internal/bitmap/crop.cpp
index 8f6c503ca..99faef9d3 100644
--- a/src/extension/internal/bitmap/crop.cpp
+++ b/src/extension/internal/bitmap/crop.cpp
@@ -11,7 +11,8 @@
 
 #include "crop.h"
 #include "selection-chemistry.h"
-#include "sp-item-transform.h"
+#include "object/sp-item.h"
+#include "object/sp-item-transform.h"
 #include <Magick++.h>
 
 namespace Inkscape {
diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index 352271e26..636b9d6a4 100644
--- a/src/extension/internal/bitmap/imagemagick.cpp
+++ b/src/extension/internal/bitmap/imagemagick.cpp
@@ -23,7 +23,6 @@
 #include "desktop.h"
 
 #include "selection.h"
-#include "sp-object.h"
 
 #include "extension/effect.h"
 #include "extension/system.h"
diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index 1040ef194..f04007d00 100644
--- a/src/extension/internal/bluredge.cpp
+++ b/src/extension/internal/bluredge.cpp
@@ -20,7 +20,7 @@
 #include "helper/action-context.h"
 #include "preferences.h"
 #include "path-chemistry.h"
-#include "sp-item.h"
+#include "object/sp-item.h"
 
 #include "extension/effect.h"
 #include "extension/system.h"
diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp
index 956fcce9a..3cdbee8c1 100644
--- a/src/extension/internal/cairo-png-out.cpp
+++ b/src/extension/internal/cairo-png-out.cpp
@@ -31,10 +31,8 @@
 
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
-#include "sp-item.h"
-#include "style.h"
-#include "sp-root.h"
-#include "sp-shape.h"
+#include "object/sp-item.h"
+#include "object/sp-root.h"
 
 #include "io/sys.h"
 #include "document.h"
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 57169ed45..287cf636f 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -34,10 +34,8 @@
 
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
-#include "sp-item.h"
-#include "style.h"
-#include "sp-root.h"
-#include "sp-shape.h"
+#include "object/sp-item.h"
+#include "object/sp-root.h"
 
 #include "io/sys.h"
 #include "document.h"
diff --git a/src/extension/internal/cairo-ps-out.h b/src/extension/internal/cairo-ps-out.h
index b438b55b4..3c273f6d4 100644
--- a/src/extension/internal/cairo-ps-out.h
+++ b/src/extension/internal/cairo-ps-out.h
@@ -17,7 +17,6 @@
 #define EXTENSION_INTERNAL_CAIRO_PS_OUT_H
 
 #include "extension/implementation/implementation.h"
-#include "sp-item.h"
 
 #ifdef HAVE_CAIRO_PDF
 
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index b631f8c04..1878b2c89 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -36,16 +36,16 @@
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "display/cairo-utils.h"
-#include "sp-item.h"
-#include "sp-item-group.h"
-#include "style.h"
-#include "sp-hatch.h"
-#include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
-#include "sp-mesh-gradient.h"
-#include "sp-pattern.h"
-#include "sp-mask.h"
-#include "sp-clippath.h"
+#include "object/sp-item.h"
+#include "object/sp-item-group.h"
+#include "object/sp-hatch.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-mesh-gradient.h"
+#include "object/sp-pattern.h"
+#include "object/sp-mask.h"
+#include "object/sp-clippath.h"
+
 #include "util/units.h"
 #ifdef WIN32
 #include "libnrtype/FontFactory.h" // USE_PANGO_WIN32
diff --git a/src/extension/internal/cairo-render-context.h b/src/extension/internal/cairo-render-context.h
index f75d05ea7..401b06885 100644
--- a/src/extension/internal/cairo-render-context.h
+++ b/src/extension/internal/cairo-render-context.h
@@ -24,7 +24,7 @@
 #include <2geom/forward.h>
 #include <2geom/affine.h>
 
-#include "style.h"
+#include "style-internal.h" // SPIEnum
 
 #include <cairo.h>
 
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 865de1a07..5b9759c15 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -33,8 +33,8 @@
 
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
-#include "sp-item.h"
-#include "sp-root.h"
+#include "object/sp-item.h"
+#include "object/sp-root.h"
 
 #include <2geom/affine.h>
 #include "document.h"
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 116364739..b48be2ed7 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -38,23 +38,22 @@
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "display/cairo-utils.h"
-#include "sp-item.h"
-#include "sp-item-group.h"
-#include "style.h"
-#include "sp-marker.h"
-#include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
-#include "sp-root.h"
-#include "sp-shape.h"
-#include "sp-use.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
-#include "sp-hatch-path.h"
-#include "sp-image.h"
-#include "sp-symbol.h"
-#include "sp-pattern.h"
-#include "sp-mask.h"
-#include "sp-clippath.h"
+#include "object/sp-item.h"
+#include "object/sp-item-group.h"
+#include "object/sp-marker.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-root.h"
+#include "object/sp-shape.h"
+#include "object/sp-use.h"
+#include "object/sp-text.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-hatch-path.h"
+#include "object/sp-image.h"
+#include "object/sp-symbol.h"
+#include "object/sp-pattern.h"
+#include "object/sp-mask.h"
+#include "object/sp-clippath.h"
 
 #include "util/units.h"
 #include "helper/png-write.h"
diff --git a/src/extension/internal/cairo-renderer.h b/src/extension/internal/cairo-renderer.h
index abc0447d8..b069e5bfe 100644
--- a/src/extension/internal/cairo-renderer.h
+++ b/src/extension/internal/cairo-renderer.h
@@ -23,10 +23,9 @@
 #include <string>
 
 //#include "libnrtype/font-instance.h"
-#include "style.h"
-#include "sp-item.h"
 #include <cairo.h>
 
+class SPItem;
 class SPClipPath;
 class SPMask;
 class SPHatchPath;
diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp
index 7342ad48d..bfba67282 100644
--- a/src/extension/internal/cdr-input.cpp
+++ b/src/extension/internal/cdr-input.cpp
@@ -55,6 +55,8 @@
 
 #include "svg-view-widget.h"
 
+#include "object/sp-root.h"
+
 #include "util/units.h"
 
 namespace Inkscape {
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 69fcd3424..8da11fc98 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -33,8 +33,8 @@
 #include <libuemf/symbol_convert.h>
 
 #include "document.h"
-#include "sp-root.h" // even though it is included indirectly by wmf-inout.h
-#include "sp-path.h"
+#include "object/sp-root.h"
+#include "object/sp-path.h"
 #include "print.h"
 #include "extension/system.h"
 #include "extension/print.h"
diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index 58543b67e..539477a13 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -34,28 +34,29 @@
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
 #include <2geom/curves.h>
-#include <sp-clippath.h>
 
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
-#include "sp-item.h"
 #include "util/units.h"
 
-#include "style.h"
 #include "inkscape-version.h"
-#include "sp-root.h"
 
 #include "extension/system.h"
 #include "extension/print.h"
 #include "document.h"
 #include "path-prefix.h"
-#include "sp-pattern.h"
-#include "sp-image.h"
-#include "sp-gradient.h"
-#include "sp-radial-gradient.h"
-#include "sp-linear-gradient.h"
+
+#include "object/sp-pattern.h"
+#include "object/sp-image.h"
+#include "object/sp-gradient.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-item.h"
+#include "object/sp-root.h"
+#include "object/sp-shape.h"
+#include "object/sp-clippath.h"
+#include "style.h"
 #include "display/cairo-utils.h"
-#include "sp-shape.h"
 
 #include "splivarot.h"             // pieces for union on shapes
 #include "2geom/svg-path-parser.h" // to get from SVG text to Geom::Path
diff --git a/src/extension/internal/emf-print.h b/src/extension/internal/emf-print.h
index 5bad48de5..7ca602fec 100644
--- a/src/extension/internal/emf-print.h
+++ b/src/extension/internal/emf-print.h
@@ -19,7 +19,6 @@
 #include <libuemf/uemf.h>
 #include "extension/internal/metafile-print.h"
 
-#include "sp-gradient.h"
 #include "splivarot.h"             // pieces for union on shapes
 #include "display/canvas-bpath.h"  // for SPWindRule
 
diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index 0408d516e..166e5406f 100644
--- a/src/extension/internal/filter/filter.cpp
+++ b/src/extension/internal/filter/filter.cpp
@@ -10,13 +10,13 @@
 #include "desktop.h"
 #include "selection.h"
 #include "document-private.h"
-#include "sp-item.h"
 #include "extension/extension.h"
 #include "extension/effect.h"
 #include "extension/system.h"
 #include "xml/repr.h"
 #include "xml/simple-node.h"
 #include "xml/attribute-record.h"
+#include "object/sp-defs.h"
 
 #include "filter.h"
 
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index 26e6531dd..efac1a02e 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -14,7 +14,8 @@
 #include "gdkpixbuf-input.h"
 #include "preferences.h"
 #include "selection-chemistry.h"
-#include "sp-image.h"
+#include "object/sp-image.h"
+#include "object/sp-root.h"
 #include "util/units.h"
 #include <set>
 
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index 649859ee5..c7ebf2494 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -23,7 +23,6 @@
 
 #include "document.h"
 #include "selection.h"
-#include "sp-object.h"
 #include "2geom/geom.h"
 
 #include "svg/path-string.h"
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index 56ea46808..d4666fcee 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -25,10 +25,6 @@
 #include "javafx-out.h"
 #include <inkscape.h>
 #include <inkscape-version.h>
-#include <sp-path.h>
-#include <sp-linear-gradient.h>
-#include <sp-radial-gradient.h>
-#include <style.h>
 #include <display/curve.h>
 #include <display/canvas-bpath.h>
 #include <svg/svg.h>
@@ -39,7 +35,12 @@
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
 #include <io/sys.h>
-#include "sp-root.h"
+
+#include "object/sp-root.h"
+#include "object/sp-path.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-radial-gradient.h"
+#include "style.h"
 
 #include <string>
 #include <stdio.h>
diff --git a/src/extension/internal/javafx-out.h b/src/extension/internal/javafx-out.h
index 2e0f5a124..ec1cde032 100644
--- a/src/extension/internal/javafx-out.h
+++ b/src/extension/internal/javafx-out.h
@@ -17,8 +17,9 @@
 
 #include <glib.h>
 #include "extension/implementation/implementation.h"
-#include <document.h>
-#include <sp-gradient.h>
+#include "document.h"
+
+class SPGradient;
 
 namespace Inkscape
 {
diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp
index 3ce2c5531..0581f8edd 100644
--- a/src/extension/internal/latex-pstricks-out.cpp
+++ b/src/extension/internal/latex-pstricks-out.cpp
@@ -13,13 +13,12 @@
 # include <config.h>
 #endif
 #include "latex-pstricks-out.h"
-#include "sp-path.h"
 #include <print.h>
 #include "extension/system.h"
 #include "extension/print.h"
 #include "extension/db.h"
 #include "display/drawing.h"
-#include "sp-root.h"
+#include "object/sp-root.h"
 
 
 #include "document.h"
diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index 018c56d82..83100d11e 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -28,7 +28,6 @@
 #include "inkscape-version.h"
 #include "io/sys.h"
 #include "latex-pstricks.h"
-#include "sp-item.h"
 #include "style.h"
 #include "document.h"
 #include <cstring>
diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp
index 6904d2e6e..85426e376 100644
--- a/src/extension/internal/latex-text-renderer.cpp
+++ b/src/extension/internal/latex-text-renderer.cpp
@@ -27,16 +27,17 @@
 #include "libnrtype/Layout-TNG.h"
 #include <2geom/transforms.h>
 #include <2geom/rect.h>
-
 #include <glibmm/i18n.h>
-#include "sp-item.h"
-#include "sp-item-group.h"
+
+#include "object/sp-item.h"
+#include "object/sp-item-group.h"
+#include "object/sp-root.h"
+#include "object/sp-use.h"
+#include "object/sp-text.h"
+#include "object/sp-flowtext.h"
+#include "object/sp-rect.h"
 #include "style.h"
-#include "sp-root.h"
-#include "sp-use.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
-#include "sp-rect.h"
+
 #include "text-editing.h"
 
 #include "util/units.h"
diff --git a/src/extension/internal/metafile-inout.cpp b/src/extension/internal/metafile-inout.cpp
index 824934b3e..ae79c8a8a 100644
--- a/src/extension/internal/metafile-inout.cpp
+++ b/src/extension/internal/metafile-inout.cpp
@@ -17,25 +17,21 @@
 #include <glib.h>
 #include <glibmm/miscutils.h>
 
-#include "sp-root.h"
 #include "display/curve.h"
 #include "extension/internal/metafile-inout.h" // picks up PNG
 #include "extension/print.h"
 #include "path-prefix.h"
-#include "sp-gradient.h"
-#include "sp-image.h"
-#include "sp-linear-gradient.h"
-#include "sp-pattern.h"
-#include "sp-radial-gradient.h"
-#include "style.h"
 #include "document.h"
 #include "util/units.h"
 #include "ui/shape-editor.h"
-#include "sp-namedview.h"
 #include "document-undo.h"
 #include "inkscape.h"
 #include "preferences.h"
 
+#include "object/sp-root.h"
+#include "object/sp-namedview.h"
+#include "svg/stringstream.h"
+
 namespace Inkscape {
 namespace Extension {
 namespace Internal {
diff --git a/src/extension/internal/metafile-print.cpp b/src/extension/internal/metafile-print.cpp
index 68a425d85..fb44f8499 100644
--- a/src/extension/internal/metafile-print.cpp
+++ b/src/extension/internal/metafile-print.cpp
@@ -23,11 +23,11 @@
 #include "extension/internal/metafile-print.h"
 #include "extension/print.h"
 #include "path-prefix.h"
-#include "sp-gradient.h"
-#include "sp-image.h"
-#include "sp-linear-gradient.h"
-#include "sp-pattern.h"
-#include "sp-radial-gradient.h"
+#include "object/sp-gradient.h"
+#include "object/sp-image.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-pattern.h"
+#include "object/sp-radial-gradient.h"
 #include "style.h"
 
 namespace Inkscape {
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 091be8c7d..42c2bbae3 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -52,7 +52,6 @@
 //# Inkscape includes
 #include "clear-n_.h"
 #include "inkscape.h"
-#include <style.h>
 #include "display/curve.h"
 #include <2geom/pathvector.h>
 #include <2geom/curves.h>
@@ -63,20 +62,21 @@
 
 #include "xml/repr.h"
 #include "xml/attribute-record.h"
-#include "sp-image.h"
-#include "sp-gradient.h"
-#include "sp-stop.h"
-#include "gradient-chemistry.h"
-#include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
-#include "sp-path.h"
-#include "sp-text.h"
-#include "sp-flowtext.h"
+#include "object/sp-image.h"
+#include "object/sp-gradient.h"
+#include "object/sp-stop.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-path.h"
+#include "object/sp-text.h"
+#include "object/sp-flowtext.h"
+#include "object/uri.h"
+#include "style.h"
+
 #include "svg/svg.h"
 #include "text-editing.h"
 #include "util/units.h"
 
-#include "uri.h"
 
 #include "inkscape-version.h"
 #include "document.h"
diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h
index 9a1cfadf0..2e01d2e49 100644
--- a/src/extension/internal/odf.h
+++ b/src/extension/internal/odf.h
@@ -32,8 +32,8 @@
 #include <string>
 #include <map>
 
-#include "uri.h"
-#include "sp-item.h"
+#include "object/uri.h"
+class SPItem;
 
 #include <glibmm/ustring.h>
 
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 6e0ee75aa..552051eed 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -40,6 +40,12 @@
 
 #include <glibmm/convert.h>
 #include <glibmm/miscutils.h>
+#include <gtk/gtk.h>
+#include <glibmm/i18n.h>
+
+#include "ui/dialog-events.h"
+#include "ui/widget/spinbutton.h"
+#include "ui/widget/frame.h"
 
 #include "extension/system.h"
 #include "extension/input.h"
@@ -51,11 +57,8 @@
 #include "inkscape.h"
 #include "util/units.h"
 
-#include "ui/dialog-events.h"
-#include <gtk/gtk.h>
-#include "ui/widget/spinbutton.h"
-#include "ui/widget/frame.h"
-#include <glibmm/i18n.h>
+#include "object/sp-root.h"
+
 
 #include <gdkmm/general.h>
 
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index a448be639..6fad4c3eb 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -38,6 +38,7 @@
 #include "io/base64stream.h"
 #include "display/nr-filter-utils.h"
 #include "libnrtype/font-instance.h"
+#include "object/sp-defs.h"
 
 #include "Function.h"
 #include "GfxState.h"
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index 8df883069..15acb97ec 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -24,8 +24,6 @@
 #include "pov-out.h"
 #include <inkscape.h>
 #include <inkscape-version.h>
-#include <sp-path.h>
-#include <style.h>
 #include <display/curve.h>
 #include <extension/system.h>
 #include <2geom/pathvector.h>
@@ -34,7 +32,10 @@
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
 #include <io/sys.h>
-#include "sp-root.h"
+
+#include "object/sp-root.h"
+#include "object/sp-path.h"
+#include "style.h"
 
 #include <string>
 #include <stdio.h>
diff --git a/src/extension/internal/pov-out.h b/src/extension/internal/pov-out.h
index dddc7e6b2..3f7aa7e90 100644
--- a/src/extension/internal/pov-out.h
+++ b/src/extension/internal/pov-out.h
@@ -18,8 +18,9 @@
 
 #include <glib.h>
 #include "extension/implementation/implementation.h"
-#include <sp-path.h>
 
+class SPObject;
+class SPItem;
 
 namespace Inkscape
 {
diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp
index b05a7c19b..7bf4f34e6 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -21,14 +21,13 @@
 #include <vector>
 #include <giomm/file.h>
 
-#include "sp-object.h"
+
 #include "svg.h"
 #include "file.h"
 #include "extension/system.h"
 #include "extension/output.h"
 #include "xml/attribute-record.h"
 #include "xml/simple-document.h"
-#include "sp-root.h"
 #include "document.h"
 
 namespace Inkscape {
diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp
index cf5dd64f4..7c92a895d 100644
--- a/src/extension/internal/vsd-input.cpp
+++ b/src/extension/internal/vsd-input.cpp
@@ -54,6 +54,7 @@
 
 #include "svg-view-widget.h"
 
+#include "object/sp-root.h"
 
 #include "util/units.h"
 
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index e2d1433e4..a91725f6b 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -34,8 +34,8 @@
 #include <libuemf/symbol_convert.h>
 
 #include "document.h"
-#include "sp-root.h" // even though it is included indirectly by wmf-inout.h
-#include "sp-path.h"
+#include "object/sp-root.h" // even though it is included indirectly by wmf-inout.h
+#include "object/sp-path.h"
 #include "print.h"
 #include "extension/system.h"
 #include "extension/print.h"
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp
index 3df237ce3..ccf5ddd0b 100644
--- a/src/extension/internal/wmf-print.cpp
+++ b/src/extension/internal/wmf-print.cpp
@@ -38,11 +38,8 @@
 #include <2geom/curves.h>
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
-#include "sp-item.h"
 
-#include "style.h"
 #include "inkscape-version.h"
-#include "sp-root.h"
 
 #include "util/units.h"
 
@@ -50,17 +47,19 @@
 #include "extension/print.h"
 #include "document.h"
 #include "path-prefix.h"
-#include "sp-pattern.h"
-#include "sp-image.h"
-#include "sp-gradient.h"
-#include "sp-radial-gradient.h"
-#include "sp-linear-gradient.h"
-#include "display/cairo-utils.h"
+
+#include "object/sp-pattern.h"
+#include "object/sp-image.h"
+#include "object/sp-gradient.h"
+#include "object/sp-radial-gradient.h"
+#include "object/sp-linear-gradient.h"
+#include "object/sp-root.h"
+#include "object/sp-item.h"
 
 #include "splivarot.h"             // pieces for union on shapes
 #include <2geom/svg-path-parser.h> // to get from SVG text to Geom::Path
 #include "display/canvas-bpath.h"  // for SPWindRule
-#include "display/cairo-utils.h"  // for Inkscape::Pixbuf::PF_CAIRO
+#include "display/cairo-utils.h"   // for Inkscape::Pixbuf::PF_CAIRO
 
 #include "wmf-print.h"
 
diff --git a/src/extension/internal/wmf-print.h b/src/extension/internal/wmf-print.h
index e4cf19184..45b94441c 100644
--- a/src/extension/internal/wmf-print.h
+++ b/src/extension/internal/wmf-print.h
@@ -18,7 +18,6 @@
 #include <libuemf/uwmf.h>
 #include "extension/internal/metafile-print.h"
 
-#include "sp-gradient.h"
 #include "splivarot.h"             // pieces for union on shapes
 #include "display/canvas-bpath.h"  // for SPWindRule
 
diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index 37f26c4bb..2f3bfe27b 100644
--- a/src/extension/internal/wpg-input.cpp
+++ b/src/extension/internal/wpg-input.cpp
@@ -48,7 +48,7 @@
 #include "extension/system.h"
 #include "extension/input.h"
 #include "document.h"
-#include "sp-root.h"
+#include "object/sp-root.h"
 #include "util/units.h"
 #include <cstring>
 
diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp
index db34a6ef9..ddcbb358b 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/enum.cpp
@@ -25,7 +25,6 @@
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "document-private.h"
-#include "sp-object.h"
 #include "enum.h"
 #include "preferences.h"
 
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index 220d6eb32..e47644f45 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -28,7 +28,6 @@
 #include <extension/extension.h>
 #include "preferences.h"
 #include "document-private.h"
-#include "sp-object.h"
 
 #include "notebook.h"
 
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index 5c4fe591f..7220045c4 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -26,7 +26,7 @@
 
 #include <extension/extension.h>
 #include "document-private.h"
-#include "sp-object.h"
+#include "object/sp-defs.h"
 #include <color.h>
 
 #include "parameter.h"
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index ca6dbb31d..890b92219 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -27,7 +27,6 @@
 #include "extension/extension.h"
 #include "preferences.h"
 #include "document-private.h"
-#include "sp-object.h"
 
 #include "radiobutton.h"
 
diff --git a/src/extension/patheffect.cpp b/src/extension/patheffect.cpp
index e30ec97df..1e9e093ef 100644
--- a/src/extension/patheffect.cpp
+++ b/src/extension/patheffect.cpp
@@ -12,6 +12,8 @@
 #include "patheffect.h"
 #include "db.h"
 
+#include "object/sp-defs.h"
+
 namespace Inkscape {
 namespace Extension {
 
diff --git a/src/extension/print.h b/src/extension/print.h
index c1afe59b3..b5e6c1065 100644
--- a/src/extension/print.h
+++ b/src/extension/print.h
@@ -13,7 +13,8 @@
 
 #include "extension.h"
 
-#include "sp-item.h"
+class SPItem;
+class SPStyle;
 
 namespace Inkscape {