summaryrefslogtreecommitdiff
path: root/svgio
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2019-12-16 18:54:31 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-12-20 10:31:39 +0100
commitaa7a23f4f71853b7a256435404b7f73ddefc061e (patch)
treead1cbe828dc3857ccfbadfdbca2132eadbf17ef1 /svgio
parent8f4087138cb68d8dcdd06853df1a6deb53ee8844 (diff)
tdf#42949 Fix IWYU warnings in svgio/
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I66cde1ea02569cd8244b23be16a5550cac8adf12 Reviewed-on: https://gerrit.libreoffice.org/85237 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svgio')
-rw-r--r--svgio/IwyuFilter_svgio.yaml2
-rw-r--r--svgio/inc/svganode.hxx1
-rw-r--r--svgio/inc/svgcirclenode.hxx1
-rw-r--r--svgio/inc/svgclippathnode.hxx1
-rw-r--r--svgio/inc/svgellipsenode.hxx1
-rw-r--r--svgio/inc/svggnode.hxx1
-rw-r--r--svgio/inc/svgimagenode.hxx1
-rw-r--r--svgio/inc/svglinenode.hxx1
-rw-r--r--svgio/inc/svgmasknode.hxx1
-rw-r--r--svgio/inc/svgnode.hxx3
-rw-r--r--svgio/inc/svgpathnode.hxx2
-rw-r--r--svgio/inc/svgpatternnode.hxx1
-rw-r--r--svgio/inc/svgpolynode.hxx1
-rw-r--r--svgio/inc/svgrectnode.hxx1
-rw-r--r--svgio/inc/svgstyleattributes.hxx2
-rw-r--r--svgio/inc/svgsymbolnode.hxx1
-rw-r--r--svgio/inc/svgtextnode.hxx1
-rw-r--r--svgio/inc/svgtextpathnode.hxx1
-rw-r--r--svgio/inc/svgtools.hxx4
-rw-r--r--svgio/inc/svgtspannode.hxx1
-rw-r--r--svgio/inc/svgusenode.hxx1
-rw-r--r--svgio/qa/cppunit/SvgImportTest.cxx1
-rw-r--r--svgio/qa/cppunit/SvgRead.cxx20
-rw-r--r--svgio/source/svgreader/svgcharacternode.cxx1
-rw-r--r--svgio/source/svgreader/svgcirclenode.cxx1
-rw-r--r--svgio/source/svgreader/svgellipsenode.cxx1
-rw-r--r--svgio/source/svgreader/svgimagenode.cxx2
-rw-r--r--svgio/source/svgreader/svglinenode.cxx2
-rw-r--r--svgio/source/svgreader/svgnode.cxx1
-rw-r--r--svgio/source/svgreader/svgpolynode.cxx2
-rw-r--r--svgio/source/svgreader/svgrectnode.cxx1
-rw-r--r--svgio/source/svgreader/svgstyleattributes.cxx1
-rw-r--r--svgio/source/svgreader/svgsymbolnode.cxx2
-rw-r--r--svgio/source/svgreader/svgtextnode.cxx2
-rw-r--r--svgio/source/svgreader/svgtextpathnode.cxx2
-rw-r--r--svgio/source/svgreader/svgtools.cxx2
-rw-r--r--svgio/source/svgreader/svgvisitor.cxx3
-rw-r--r--svgio/source/svguno/xsvgparser.cxx2
-rw-r--r--svgio/source/svguno/xsvgparser.hxx1
39 files changed, 28 insertions, 48 deletions
diff --git a/svgio/IwyuFilter_svgio.yaml b/svgio/IwyuFilter_svgio.yaml
new file mode 100644
index 000000000000..c8d76fb67a7d
--- /dev/null
+++ b/svgio/IwyuFilter_svgio.yaml
@@ -0,0 +1,2 @@
+---
+assumeFilename: svgio/source/svgreader/svgdocument.cxx
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
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx
index c3605a16e09f..4f6c2a24a3e0 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -16,7 +16,6 @@
#include <comphelper/sequence.hxx>
#include <com/sun/star/graphic/SvgTools.hpp>
-#include <com/sun/star/graphic/Primitive2DTools.hpp>
#include <com/sun/star/graphic/XPrimitive2D.hpp>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
diff --git a/svgio/qa/cppunit/SvgRead.cxx b/svgio/qa/cppunit/SvgRead.cxx
index 45b0158a0240..127de19a7bbd 100644
--- a/svgio/qa/cppunit/SvgRead.cxx
+++ b/svgio/qa/cppunit/SvgRead.cxx
@@ -14,32 +14,14 @@
#include <memory>
#include <comphelper/seqstream.hxx>
-#include <comphelper/sequence.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/stream.hxx>
#include <com/sun/star/graphic/SvgTools.hpp>
-#include <com/sun/star/graphic/Primitive2DTools.hpp>
-#include <com/sun/star/graphic/XPrimitive2D.hpp>
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-
#include <com/sun/star/graphic/XSvgParser.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/xml/sax/XParser.hpp>
-#include <com/sun/star/xml/sax/Parser.hpp>
-#include <com/sun/star/xml/sax/InputSource.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/supportsservice.hxx>
-
-#include <svgdocumenthandler.hxx>
-#include <svgrectnode.hxx>
-#include <svgsvgnode.hxx>
-#include <svggnode.hxx>
#include <basegfx/DrawCommands.hxx>
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
namespace
{
diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx
index 2e88862cb2fb..ac91ade8094f 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -23,7 +23,6 @@
#include <drawinglayer/primitive2d/textprimitive2d.hxx>
#include <drawinglayer/primitive2d/textlayoutdevice.hxx>
#include <drawinglayer/primitive2d/textbreakuphelper.hxx>
-#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
#include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
namespace svgio
diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx
index 3684615691fb..c63ef0866901 100644
--- a/svgio/source/svgreader/svgcirclenode.cxx
+++ b/svgio/source/svgreader/svgcirclenode.cxx
@@ -20,6 +20,7 @@
#include <svgcirclenode.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
namespace svgio
{
diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx
index 4454b9d696f2..fbf507ad86cf 100644
--- a/svgio/source/svgreader/svgellipsenode.cxx
+++ b/svgio/source/svgreader/svgellipsenode.cxx
@@ -20,6 +20,7 @@
#include <svgellipsenode.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
namespace svgio
{
diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx
index 1e0861c86b03..63bf8539eb9e 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -19,13 +19,11 @@
#include <svgimagenode.hxx>
#include <svgdocument.hxx>
-#include <sax/tools/converter.hxx>
#include <tools/stream.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/graphicfilter.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/svgio/source/svgreader/svglinenode.cxx b/svgio/source/svgreader/svglinenode.cxx
index bb3eae92adee..9555660e96e4 100644
--- a/svgio/source/svgreader/svglinenode.cxx
+++ b/svgio/source/svgreader/svglinenode.cxx
@@ -19,7 +19,7 @@
#include <svglinenode.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
namespace svgio
{
diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index 3770efc6eea7..8f2e203a879a 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <svgdocument.hxx>
#include <svgnode.hxx>
#include <svgstyleattributes.hxx>
diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx
index adb37e69b7a2..ee7dc28d5162 100644
--- a/svgio/source/svgreader/svgpolynode.cxx
+++ b/svgio/source/svgreader/svgpolynode.cxx
@@ -19,8 +19,8 @@
#include <svgpolynode.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
namespace svgio
{
diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx
index d8c9ce6afb91..a434b605a1cc 100644
--- a/svgio/source/svgreader/svgrectnode.cxx
+++ b/svgio/source/svgreader/svgrectnode.cxx
@@ -20,6 +20,7 @@
#include <svgrectnode.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
namespace svgio
{
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index 502fe6991dd3..c5ee322e7cdc 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -37,7 +37,6 @@
#include <svgmasknode.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <svgmarkernode.hxx>
-#include <basegfx/curve/b2dcubicbezier.hxx>
#include <svgpatternnode.hxx>
#include <drawinglayer/primitive2d/patternfillprimitive2d.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/svgio/source/svgreader/svgsymbolnode.cxx b/svgio/source/svgreader/svgsymbolnode.cxx
index 45228cd8f37e..46190b2b1a52 100644
--- a/svgio/source/svgreader/svgsymbolnode.cxx
+++ b/svgio/source/svgreader/svgsymbolnode.cxx
@@ -18,8 +18,6 @@
*/
#include <svgsymbolnode.hxx>
-#include <drawinglayer/geometry/viewinformation2d.hxx>
-#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
namespace svgio
{
diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx
index bc6d824877df..fc6e2b3ab19c 100644
--- a/svgio/source/svgreader/svgtextnode.cxx
+++ b/svgio/source/svgreader/svgtextnode.cxx
@@ -23,8 +23,6 @@
#include <svgtrefnode.hxx>
#include <svgtextpathnode.hxx>
#include <svgtspannode.hxx>
-#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
-#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
namespace svgio
{
diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx
index 04c7cbbc9e9f..9cd35599df60 100644
--- a/svgio/source/svgreader/svgtextpathnode.cxx
+++ b/svgio/source/svgreader/svgtextpathnode.cxx
@@ -21,12 +21,10 @@
#include <svgstyleattributes.hxx>
#include <svgpathnode.hxx>
#include <svgdocument.hxx>
-#include <svgtrefnode.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <drawinglayer/primitive2d/textbreakuphelper.hxx>
#include <drawinglayer/primitive2d/textprimitive2d.hxx>
-#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
#include <basegfx/curve/b2dcubicbezier.hxx>
#include <basegfx/curve/b2dbeziertools.hxx>
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index 27d14eeda9f1..f64904b3d329 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -19,7 +19,7 @@
#include <svgtools.hxx>
#include <sal/log.hxx>
-#include <osl/thread.h>
+#include <osl/diagnose.h>
#include <tools/color.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svgio/source/svgreader/svgvisitor.cxx b/svgio/source/svgreader/svgvisitor.cxx
index 52247be8dd43..ee6102503b55 100644
--- a/svgio/source/svgreader/svgvisitor.cxx
+++ b/svgio/source/svgreader/svgvisitor.cxx
@@ -9,9 +9,7 @@
*/
#include <sal/config.h>
-#include <sal/log.hxx>
-#include <svgdocumenthandler.hxx>
#include <svgrectnode.hxx>
#include <svgsvgnode.hxx>
#include <svggnode.hxx>
@@ -19,7 +17,6 @@
#include <svggradientnode.hxx>
#include <svgvisitor.hxx>
-#include <tools/color.hxx>
namespace svgio
{
diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx
index 710ef636c89d..c96be4fb979d 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -18,7 +18,6 @@
*/
#include <sal/config.h>
-#include <sal/log.hxx>
#include <com/sun/star/graphic/XSvgParser.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -29,7 +28,6 @@
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
#include <com/sun/star/xml/sax/InputSource.hpp>
-#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <svgdocumenthandler.hxx>
#include <tools/diagnose_ex.h>
diff --git a/svgio/source/svguno/xsvgparser.hxx b/svgio/source/svguno/xsvgparser.hxx
index a02467589d1c..f7e0185b671a 100644
--- a/svgio/source/svguno/xsvgparser.hxx
+++ b/svgio/source/svguno/xsvgparser.hxx
@@ -24,7 +24,6 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <sal/types.h>
namespace com { namespace sun { namespace star {
namespace uno {