diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index e537413629bc216b70932c1a6c9ed8a1d647f273..f7aa676b30add7b8296a6891db641611e23230d7 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -36,16 +36,16 @@
 //# 2geom includes
 #include <2geom/pathvector.h>
 #include <2geom/transforms.h>
+#include <2geom/affine.h>                 // for Affine
+#include <2geom/bezier-curve.h>           // for CubicBezier
+#include <2geom/coord.h>                  // for Dim2, X, Y
+#include <2geom/curve.h>                  // for Curve
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
 
 //# Inkscape includes
-#include "affine.h"                       // for Affine
 #include "attributes.h"                   // for SPAttr
-#include "bezier-curve.h"                 // for CubicBezier
 #include "color.h"                        // for SPColor
-#include "coord.h"                        // for Dim2, X, Y
-#include "curve.h"                        // for Curve
 #include "document.h"                     // for SPDocument
 #include "preferences.h"                  // for guint32
 #include "style-internal.h"               // for SPIPaint, SPIScale24, SPILe...
diff --git a/src/live_effects/lpe-curvestitch.cpp b/src/live_effects/lpe-curvestitch.cpp
index 6935549815df84bf1c45a6505dcf20c7016c554e..29b787c26df74d2dcf26757f7b61255866cd3fa1 100644
--- a/src/live_effects/lpe-curvestitch.cpp
+++ b/src/live_effects/lpe-curvestitch.cpp
@@ -17,7 +17,8 @@
 
 #include <glibmm/i18n.h>
 
-#include "sbasis-to-bezier.h"   // for path_from_piecewise
+#include <2geom/sbasis-to-bezier.h>   // for path_from_piecewise
+
 #include "object/sp-path.h"
 #include "svg/svg.h"
 #include "xml/node.h"
diff --git a/src/object/sp-linear-gradient.cpp b/src/object/sp-linear-gradient.cpp
index bf10719fe270f0a51befe92eee8ed1a74a279918..dee8fcc97f3db210c6f4dae582aece70fdd4d992 100644
--- a/src/object/sp-linear-gradient.cpp
+++ b/src/object/sp-linear-gradient.cpp
@@ -10,8 +10,9 @@
 
 #include "sp-linear-gradient.h"
 
+#include <2geom/rect.h>                   // for Rect
+
 #include "attributes.h"                   // for SPAttr
-#include "rect.h"                         // for Rect
 #include "style-internal.h"               // for SPIFontSize
 #include "style.h"                        // for SPStyle
 
diff --git a/src/object/sp-polygon.cpp b/src/object/sp-polygon.cpp
index 58e067d79dc92d8c424cfbc605645740494f6c9d..86062f0f134a0628316846912117f1ec5d329c44 100644
--- a/src/object/sp-polygon.cpp
+++ b/src/object/sp-polygon.cpp
@@ -16,15 +16,16 @@
 
 #include <glibmm/i18n.h>
 
+#include <2geom/curve.h>         // for Curve
+#include <2geom/path.h>          // for Path, BaseIterator
+#include <2geom/pathvector.h>    // for PathVector
+#include <2geom/point.h>         // for Point
+
 #include "attributes.h"          // for SPAttr
-#include "curve.h"               // for Curve
 #include "display/curve.h"       // for SPCurve
 #include "helper/geom-curves.h"  // for is_straight_curve
 #include "object/sp-object.h"    // for SP_OBJECT_WRITE_BUILD
 #include "object/sp-shape.h"     // for SPShape
-#include "path.h"                // for Path, BaseIterator
-#include "pathvector.h"          // for PathVector
-#include "point.h"               // for Point
 #include "svg/stringstream.h"    // for SVGOStringStream
 #include "xml/document.h"        // for Document
 #include "xml/node.h"            // for Node
diff --git a/src/object/sp-radial-gradient.cpp b/src/object/sp-radial-gradient.cpp
index 0dfa573d4e3504ca2b05c43fd965ac236995e854..e9350ab6368805fa68629b55878136f9b5cf2b21 100644
--- a/src/object/sp-radial-gradient.cpp
+++ b/src/object/sp-radial-gradient.cpp
@@ -10,8 +10,9 @@
 
 #include "sp-radial-gradient.h"
 
+#include <2geom/rect.h>                   // for Rect
+
 #include "attributes.h"                   // for SPAttr
-#include "rect.h"                         // for Rect
 #include "style.h"                        // for SPStyle
 
 #include "display/drawing-paintserver.h"  // for DrawingRadialGradient, Draw...
diff --git a/src/object/sp-root.cpp b/src/object/sp-root.cpp
index 761ec4d4e56015d2a5b4ca361da2f70e02856646..2dcd8831b1ecc2b47fe039d77cd452c8034fdea8 100644
--- a/src/object/sp-root.cpp
+++ b/src/object/sp-root.cpp
@@ -16,13 +16,14 @@
 
 #include "sp-root.h"
 
-#include "affine.h"                                  // for identity, Affine
+#include <2geom/affine.h>                            // for identity, Affine
+#include <2geom/rect.h>                              // for Rect
+
 #include "attributes.h"                              // for SPAttr
 #include "display/drawing-group.h"                   // for DrawingGroup
 #include "display/drawing-item-ptr.h"                // for DrawingItemPtr
 #include "document.h"                                // for SPDocument
 #include "print.h"                                   // for SPPrintContext
-#include "rect.h"                                    // for Rect
 #include "sp-defs.h"                                 // for SPDefs
 #include "sp-namedview.h"                            // for SPNamedView
 #include "sp-use.h"                                  // for SPUse