20 files changed, 19 insertions, 8 deletions

diff --git a/svgio/inc/svganode.hxx b/svgio/inc/svganode.hxx
index 1af4316c7222..7da88306f277 100644
--- a/svgio/inc/svganode.hxx
+++ b/svgio/inc/svganode.hxx
@@ -22,6 +22,7 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>
 
 namespace svgio
diff --git a/svgio/inc/svgcirclenode.hxx b/svgio/inc/svgcirclenode.hxx
index 87105da64b42..7ae0f6751f4c 100644
--- a/svgio/inc/svgcirclenode.hxx
+++ b/svgio/inc/svgcirclenode.hxx
@@ -22,6 +22,7 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>
 
 namespace svgio
diff --git a/svgio/inc/svgclippathnode.hxx b/svgio/inc/svgclippathnode.hxx
index 5f88c4ff8888..1aeca2655967 100644
--- a/svgio/inc/svgclippathnode.hxx
+++ b/svgio/inc/svgclippathnode.hxx
@@ -22,6 +22,7 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>
 
 namespace svgio
diff --git a/svgio/inc/svgellipsenode.hxx b/svgio/inc/svgellipsenode.hxx
index 4960e4b50d5c..dfc2e9273152 100644
--- a/svgio/inc/svgellipsenode.hxx
+++ b/svgio/inc/svgellipsenode.hxx
@@ -22,6 +22,7 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>
 
 namespace svgio
diff --git a/svgio/inc/svggnode.hxx b/svgio/inc/svggnode.hxx
index 760887b3df02..8810659da221 100644
--- a/svgio/inc/svggnode.hxx
+++ b/svgio/inc/svggnode.hxx
@@ -22,6 +22,7 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>
 
 namespace svgio
diff --git a/svgio/inc/svgimagenode.hxx b/svgio/inc/svgimagenode.hxx
index 8295de58734e..f9a971a5f4cc 100644
--- a/svgio/inc/svgimagenode.hxx
+++ b/svgio/inc/svgimagenode.hxx
@@ -22,6 +22,7 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>
 
 namespace svgio
diff --git a/svgio/inc/svglinenode.hxx b/svgio/inc/svglinenode.hxx
index 54abc7d0e59a..ab7ab577ab9b 100644
--- a/svgio/inc/svglinenode.hxx
+++ b/svgio/inc/svglinenode.hxx
@@ -22,6 +22,7 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>
 
 namespace svgio
diff --git a/svgio/inc/svgmasknode.hxx b/svgio/inc/svgmasknode.hxx
index 0265c01d034a..5dc156912a1f 100644
--- a/svgio/inc/svgmasknode.hxx
+++ b/svgio/inc/svgmasknode.hxx
@@ -22,6 +22,7 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>
 
 namespace svgio
diff --git a/svgio/inc/svgnode.hxx b/svgio/inc/svgnode.hxx
index 9db4f4750a38..ecba14022f57 100644
--- a/svgio/inc/svgnode.hxx
+++ b/svgio/inc/svgnode.hxx
@@ -22,9 +22,8 @@
 
 #include "svgtools.hxx"
 #include "svgtoken.hxx"
-#include "svgpaint.hxx"
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <memory>
 #include <vector>
 #include <o3tl/optional.hxx>
diff --git a/svgio/inc/svgpathnode.hxx b/svgio/inc/svgpathnode.hxx
index a96910560b2e..62a9db60d759 100644
--- a/svgio/inc/svgpathnode.hxx
+++ b/svgio/inc/svgpathnode.hxx
@@ -22,7 +22,9 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 namespace svgio
 {
diff --git a/svgio/inc/svgpatternnode.hxx b/svgio/inc/svgpatternnode.hxx
index 79dc7581c590..1b9d9e1b250e 100644
--- a/svgio/inc/svgpatternnode.hxx
+++ b/svgio/inc/svgpatternnode.hxx
@@ -22,6 +22,7 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>
 
 namespace svgio
diff --git a/svgio/inc/svgpolynode.hxx b/svgio/inc/svgpolynode.hxx
index edb4553494d6..ad62baeaef97 100644
--- a/svgio/inc/svgpolynode.hxx
+++ b/svgio/inc/svgpolynode.hxx
@@ -22,6 +22,7 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
 namespace svgio
diff --git a/svgio/inc/svgrectnode.hxx b/svgio/inc/svgrectnode.hxx
index bb4837b1abe7..8eaf295ff35b 100644
--- a/svgio/inc/svgrectnode.hxx
+++ b/svgio/inc/svgrectnode.hxx
@@ -22,6 +22,7 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>
 
 namespace svgio
diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index 3a3ac670b962..bc668de1a5fb 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -22,9 +22,9 @@
 
 #include "svgpaint.hxx"
 #include "svgnode.hxx"
-#include <vcl/vclenum.hxx>
 #include <tools/fontenum.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
 
 // predefines
diff --git a/svgio/inc/svgsymbolnode.hxx b/svgio/inc/svgsymbolnode.hxx
index 555eabb2f99a..a7dfa4a45c1d 100644
--- a/svgio/inc/svgsymbolnode.hxx
+++ b/svgio/inc/svgsymbolnode.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVGIO_INC_SVGSYMBOLNODE_HXX
 
 #include "svgstyleattributes.hxx"
-#include <memory>
 
 namespace svgio
 {
diff --git a/svgio/inc/svgtextnode.hxx b/svgio/inc/svgtextnode.hxx
index 715912faadfb..8781e1fdc5ac 100644
--- a/svgio/inc/svgtextnode.hxx
+++ b/svgio/inc/svgtextnode.hxx
@@ -23,6 +23,7 @@
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
 #include "svgcharacternode.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>
 
 namespace svgio
diff --git a/svgio/inc/svgtextpathnode.hxx b/svgio/inc/svgtextpathnode.hxx
index b2d456cec48a..eb744cb16db9 100644
--- a/svgio/inc/svgtextpathnode.hxx
+++ b/svgio/inc/svgtextpathnode.hxx
@@ -22,7 +22,6 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
-#include "svgpathnode.hxx"
 
 namespace svgio
 {
diff --git a/svgio/inc/svgtools.hxx b/svgio/inc/svgtools.hxx
index a122e2d1b268..2f701ea30ba4 100644
--- a/svgio/inc/svgtools.hxx
+++ b/svgio/inc/svgtools.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_SVGIO_INC_SVGTOOLS_HXX
 #define INCLUDED_SVGIO_INC_SVGTOOLS_HXX
 
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/color/bcolor.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/vector/b2ivector.hxx>
 #include "svgpaint.hxx"
 #include <vector>
 
diff --git a/svgio/inc/svgtspannode.hxx b/svgio/inc/svgtspannode.hxx
index a96fbb062b42..1e50b2d4251d 100644
--- a/svgio/inc/svgtspannode.hxx
+++ b/svgio/inc/svgtspannode.hxx
@@ -22,7 +22,6 @@
 
 #include "svgcharacternode.hxx"
 #include "svgstyleattributes.hxx"
-#include "svgtools.hxx"
 
 namespace svgio
 {
diff --git a/svgio/inc/svgusenode.hxx b/svgio/inc/svgusenode.hxx
index fcf4a272c8ea..7ec02e39e8f4 100644
--- a/svgio/inc/svgusenode.hxx
+++ b/svgio/inc/svgusenode.hxx
@@ -22,6 +22,7 @@
 
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>
 
 namespace svgio