tdf#42949 Fix IWYU warnings in cppcanvas/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I3e6b35acf6266157d4cf634e2143e6e19a73102a
Reviewed-on: https://gerrit.libreoffice.org/81813
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

32 files changed, 18 insertions, 92 deletions

diff --git a/cppcanvas/IwyuFilter_cppcanvas.yaml b/cppcanvas/IwyuFilter_cppcanvas.yaml
new file mode 100644
index 000000000000..b4d186165fb0
--- /dev/null
+++ b/cppcanvas/IwyuFilter_cppcanvas.yaml
@@ -0,0 +1,6 @@
+---
+assumeFilename: cppcanvas/source/wrapper/implcanvas.cxx
+blacklist:
+    cppcanvas/source/wrapper/implcanvas.cxx:
+    # Actually used
+    - com/sun/star/rendering/XCanvas.hpp
diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx
index fb896ddedcc8..fbf6caf39147 100644
--- a/cppcanvas/qa/unit/test.cxx
+++ b/cppcanvas/qa/unit/test.cxx
@@ -11,15 +11,9 @@
 
 #include <test/bootstrapfixture.hxx>
 
-#include <osl/file.hxx>
-#include <osl/process.h>
-#include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/canvastools.hxx>
 
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
 #include <com/sun/star/rendering/XBitmap.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx
index ff1ccc8b6949..67e67c5aa4dd 100644
--- a/cppcanvas/source/inc/action.hxx
+++ b/cppcanvas/source/inc/action.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CPPCANVAS_SOURCE_INC_ACTION_HXX
 
 #include <sal/types.h>
-#include <memory>
 
 namespace basegfx
 {
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index e02b45d20a1a..c1224a40c212 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -22,9 +22,9 @@
 
 #include <sal/config.h>
 
-#include <basegfx/vector/b2dsize.hxx>
 #include <sal/types.h>
 #include <tools/stream.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <cppcanvas/renderer.hxx>
 #include <cppcanvas/canvas.hxx>
 
@@ -32,12 +32,8 @@
 #include "action.hxx"
 #include "outdevstate.hxx"
 
-#include <com/sun/star/rendering/FontRequest.hpp>
-#include <com/sun/star/rendering/StrokeAttributes.hpp>
 #include <osl/diagnose.h>
-#include <osl/endian.h>
 
-#include <map>
 #include <memory>
 #include <vector>
 
diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx
index 0c24d5f75366..5c1a4c0d9166 100644
--- a/cppcanvas/source/inc/outdevstate.hxx
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -23,16 +23,15 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <com/sun/star/rendering/StringContext.hpp>
-#include <com/sun/star/rendering/RenderState.hpp>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 #include <com/sun/star/rendering/XCanvasFont.hpp>
 #include <com/sun/star/rendering/TextDirection.hpp>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <tools/fontenum.hxx>
+#include <tools/gen.hxx>
 #include <vcl/fntstyle.hxx>
-#include <vcl/vclenum.hxx>
-#include <vcl/outdev.hxx>
+#include <vcl/outdevstate.hxx>
 
 
 namespace cppcanvas
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 6d2a64dac5ec..94489145faed 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -19,17 +19,15 @@
 
 
 #include <com/sun/star/rendering/XBitmap.hpp>
-#include <com/sun/star/rendering/RepaintResult.hpp>
+#include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XCachedPrimitive.hpp>
 #include <vcl/bitmapex.hxx>
 #include <tools/gen.hxx>
 #include <vcl/canvastools.hxx>
 #include <canvas/canvastools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/vector/b2dsize.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <basegfx/utils/canvastools.hxx>
 #include <sal/log.hxx>
 #include "cachedprimitivebase.hxx"
 #include "bitmapaction.hxx"
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index af587ae79ab0..072848202242 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -21,8 +21,9 @@
 #define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_CACHEDPRIMITIVEBASE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/rendering/XCanvas.hpp>
+#include <com/sun/star/rendering/XCachedPrimitive.hpp>
 
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <cppcanvas/canvas.hxx>
 
 #include <action.hxx>
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 9a6a823523d2..573ec4882eb3 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -20,19 +20,13 @@
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
-#include <comphelper/anytostring.hxx>
 #include <comphelper/propertysequence.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 #include <cppcanvas/canvas.hxx>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/TexturingMode.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/geometry/RealPoint2D.hpp>
 #include <com/sun/star/rendering/PanoseProportion.hpp>
-#include <com/sun/star/rendering/ViewState.hpp>
-#include <com/sun/star/rendering/RenderState.hpp>
 #include <com/sun/star/rendering/XCanvasFont.hpp>
-#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/PathCapType.hpp>
 #include <com/sun/star/rendering/PathJoinType.hpp>
@@ -49,7 +43,6 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
-#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <canvas/canvastools.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/gdimtf.hxx>
@@ -74,10 +67,8 @@
 #include <utility>
 #include <vector>
 #include <algorithm>
-#include <iterator>
 #include <memory>
 #include "mtftools.hxx"
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index e1eafbc82cf8..7b0ba2080cf3 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.cxx
@@ -23,9 +23,6 @@
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 
-#include <tools/gen.hxx>
-#include <vcl/canvastools.hxx>
-
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/utils/canvastools.hxx>
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index 1a561631939d..54ed0dbfaf3f 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -19,9 +19,7 @@
 
 
 #include <tools/diagnose_ex.h>
-#include <com/sun/star/rendering/RenderState.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
-#include <basegfx/numeric/ftools.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -29,14 +27,10 @@
 #include <basegfx/vector/b2dvector.hxx>
 #include <canvas/canvastools.hxx>
 #include <vcl/canvastools.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/metric.hxx>
-#include <tools/poly.hxx>
 #include "mtftools.hxx"
 #include <outdevstate.hxx>
-#include "polypolyaction.hxx"
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 19c75104f5fb..8fa1582b82c9 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -19,10 +19,8 @@
 
 
 #include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/TexturingMode.hpp>
 
 #include <sal/types.h>
-#include <vcl/canvastools.hxx>
 
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/utils/canvastools.hxx>
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 066cbb60f242..25d899e6e3d9 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XCanvasFont.hpp>
 
-#include <basegfx/numeric/ftools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/vector/b2dsize.hxx>
diff --git a/cppcanvas/source/mtfrenderer/textlineshelper.hxx b/cppcanvas/source/mtfrenderer/textlineshelper.hxx
index d00be8bfa791..be0cdfe9222c 100644
--- a/cppcanvas/source/mtfrenderer/textlineshelper.hxx
+++ b/cppcanvas/source/mtfrenderer/textlineshelper.hxx
@@ -11,8 +11,9 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/rendering/RenderState.hpp>
 #include <basegfx/vector/b2dsize.hxx>
-#include <canvasgraphichelper.hxx>
+#include <cppcanvas/canvas.hxx>
 
 namespace com
 {
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 3cbb946bf6ef..da046a8f1a04 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -29,16 +29,11 @@
 #include <com/sun/star/rendering/XBitmap.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
 
-#include <rtl/math.hxx>
-
 #include <vcl/metaact.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/canvastools.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
-#include <vcl/gradient.hxx>
 
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/point/b2dpoint.hxx>
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
index 165fc29b31cb..99e2ee8476d5 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TRANSPARENCYGROUPACTION_HXX
 
 #include <cppcanvas/canvas.hxx>
-#include <cppcanvas/renderer.hxx>
 #include <action.hxx>
 
 #include <memory>
diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx
index 592179f42364..d5ed22ee8ec9 100644
--- a/cppcanvas/source/tools/canvasgraphichelper.cxx
+++ b/cppcanvas/source/tools/canvasgraphichelper.cxx
@@ -20,17 +20,12 @@
 
 #include <canvasgraphichelper.hxx>
 
-#include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 
 #include <canvas/canvastools.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
-#include <cppcanvas/polypolygon.hxx>
-#include <tools.hxx>
-
 
 using namespace ::com::sun::star;
 
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx b/cppcanvas/source/uno/uno_mtfrenderer.cxx
index 557f5902f872..9dd906699bd6 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.cxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx
@@ -10,7 +10,6 @@
 #include "uno_mtfrenderer.hxx"
 #include <cppcanvas/vclfactory.hxx>
 #include <comphelper/servicedecl.hxx>
-#include <cppuhelper/factory.hxx>
 #include <o3tl/any.hxx>
 
 using namespace ::com::sun::star;
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.hxx b/cppcanvas/source/uno/uno_mtfrenderer.hxx
index 5b2594fc8bf8..6cb720a31d00 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.hxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.hxx
@@ -9,7 +9,7 @@
 
 #ifndef INCLUDED_CPPCANVAS_SOURCE_UNO_UNO_MTFRENDERER_HXX
 #define INCLUDED_CPPCANVAS_SOURCE_UNO_UNO_MTFRENDERER_HXX
-#include <com/sun/star/rendering/MtfRenderer.hpp>
+#include <com/sun/star/rendering/XMtfRenderer.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
diff --git a/cppcanvas/source/wrapper/basegfxfactory.cxx b/cppcanvas/source/wrapper/basegfxfactory.cxx
index f3b3babbbc0f..30410e75c66f 100644
--- a/cppcanvas/source/wrapper/basegfxfactory.cxx
+++ b/cppcanvas/source/wrapper/basegfxfactory.cxx
@@ -18,24 +18,14 @@
  */
 
 
-#include <rtl/instance.hxx>
-#include <osl/getglobalmutex.hxx>
 #include <osl/diagnose.h>
 
-#include <com/sun/star/rendering/InterpolationMode.hpp>
-
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/utils/canvastools.hxx>
 
 #include <cppcanvas/basegfxfactory.hxx>
 
-#include <com/sun/star/rendering/RenderState.hpp>
-#include <com/sun/star/rendering/StringContext.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/XCanvasFont.hpp>
-
-#include <canvasgraphichelper.hxx>
 
 #include "implpolypolygon.hxx"
 #include "implbitmap.hxx"
diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx
index adab03b81c1a..80d827de7105 100644
--- a/cppcanvas/source/wrapper/implbitmap.cxx
+++ b/cppcanvas/source/wrapper/implbitmap.cxx
@@ -21,8 +21,7 @@
 #include "implbitmap.hxx"
 #include "implbitmapcanvas.hxx"
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <canvas/canvastools.hxx>
+#include <osl/diagnose.h>
 
 
 using namespace ::com::sun::star;
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index 349e13a8188d..aa8677501dab 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XBitmap.hpp>
-#include <com/sun/star/rendering/XGraphicDevice.hpp>
 
 #include <cppcanvas/bitmap.hxx>
 #include <canvasgraphichelper.hxx>
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
index 67ca17a6e3c4..506af5d1f198 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
@@ -19,10 +19,7 @@
 
 
 #include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/XBitmapCanvas.hpp>
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <osl/diagnose.h>
 
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 628be99d0b38..afac7b9a8a65 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XBitmap.hpp>
-#include <basegfx/vector/b2dsize.hxx>
 #include <cppcanvas/bitmapcanvas.hxx>
 
 #include "implcanvas.hxx"
diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index d5adeb5a0257..102902b71a14 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <rtl/ustring.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/utils/canvastools.hxx>
@@ -26,7 +25,6 @@
 #include <com/sun/star/rendering/XCanvas.hpp>
 
 #include <canvas/canvastools.hxx>
-#include <cppcanvas/polypolygon.hxx>
 
 #include "implcanvas.hxx"
 
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 2f8da62e4f0e..e509e999678b 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -25,6 +25,7 @@
 #include <cppcanvas/canvas.hxx>
 
 #include <boost/optional.hpp>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 
 namespace basegfx
diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx
index 9aa56211474c..5d19a9e9987b 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.cxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <osl/diagnose.h>
 
 #include "implcustomsprite.hxx"
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index f8964a3f4763..0235e0a43803 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
 #define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
 
-#include <sal/types.h>
 #include <cppcanvas/canvas.hxx>
 #include <cppcanvas/customsprite.hxx>
 #include "implsprite.hxx"
diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx
index 755d87022529..d333d46a59d1 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.cxx
@@ -25,9 +25,6 @@
 #include <com/sun/star/rendering/PathJoinType.hpp>
 #include <com/sun/star/rendering/PathCapType.hpp>
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/utils/canvastools.hxx>
-
 #include "implpolypolygon.hxx"
 #include <tools.hxx>
 
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index d6747cdd5374..e19b63c5797a 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
-#include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/StrokeAttributes.hpp>
 
 #include <cppcanvas/polypolygon.hxx>
diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx
index aaff60db40ca..12a4a13e3b88 100644
--- a/cppcanvas/source/wrapper/implsprite.cxx
+++ b/cppcanvas/source/wrapper/implsprite.cxx
@@ -18,9 +18,6 @@
  */
 
 
-#include <com/sun/star/rendering/XSprite.hpp>
-#include <com/sun/star/rendering/XAnimatedSprite.hpp>
-
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <canvas/canvastools.hxx>
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx
index d9b6ee7075fc..6d42cf70f76f 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.cxx
@@ -19,8 +19,6 @@
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/utils/canvastools.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <com/sun/star/rendering/InterpolationMode.hpp>
 #include <osl/diagnose.h>
 
 #include "implspritecanvas.hxx"
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx
index 3cf795fe0c42..4fe30f4324b2 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.cxx
@@ -17,23 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/instance.hxx>
-#include <osl/getglobalmutex.hxx>
 #include <osl/diagnose.h>
-#include <com/sun/star/rendering/InterpolationMode.hpp>
 #include <vcl/window.hxx>
-#include <vcl/graph.hxx>
 #include <vcl/canvastools.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include <cppcanvas/vclfactory.hxx>
 
 #include "implbitmapcanvas.hxx"
 #include "implspritecanvas.hxx"
-#include "implpolypolygon.hxx"
 #include "implbitmap.hxx"
 #include <implrenderer.hxx>
-#include "implsprite.hxx"
 
 using namespace ::com::sun::star;