tdf#42949 Fix IWYU warnings in canvas/source/*/*hxx

Except directx/

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

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

56 files changed, 66 insertions, 122 deletions

diff --git a/canvas/IwyuFilter_canvas.yaml b/canvas/IwyuFilter_canvas.yaml
new file mode 100644
index 000000000000..d00a67dbd3a8
--- /dev/null
+++ b/canvas/IwyuFilter_canvas.yaml
@@ -0,0 +1,2 @@
+---
+assumeFilename: canvas/source/cairo/cairo_canvas.cxx
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index 1a5e215171ac..21033fb8889d 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -24,6 +24,7 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/utils/canvastools.hxx>
+#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx
index 6de087c61894..934b9edccd63 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -20,33 +20,26 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVAS_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVAS_HXX
 
-#include <rtl/ref.hxx>
-
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
-#include <com/sun/star/awt/XWindowListener.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
-#include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XBufferController.hpp>
+#include <com/sun/star/rendering/XBitmapCanvas.hpp>
 
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
-#include <canvas/base/spritecanvasbase.hxx>
 #include <canvas/base/basemutexhelper.hxx>
-#include <canvas/base/bufferedgraphicdevicebase.hxx>
-
-#include <basegfx/vector/b2isize.hxx>
+#include <canvas/base/bitmapcanvasbase.hxx>
+#include <canvas/base/graphicdevicebase.hxx>
+#include <canvas/base/integerbitmapbase.hxx>
 
+#include "cairo_canvashelper.hxx"
 #include "cairo_devicehelper.hxx"
 #include "cairo_repainttarget.hxx"
 #include "cairo_surfaceprovider.hxx"
-#include "cairo_spritecanvashelper.hxx"
 
 #define CANVAS_SERVICE_NAME        "com.sun.star.rendering.Canvas.Cairo"
 #define CANVAS_IMPLEMENTATION_NAME "com.sun.star.comp.rendering.Canvas.Cairo"
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 938f1b3bdd2e..9be8470f66c8 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -26,6 +26,7 @@
 #include <vcl/BitmapTools.hxx>
 
 #include <canvas/canvastools.hxx>
+#include <cairo.h>
 
 #include "cairo_canvasbitmap.hxx"
 
diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx
index 355a5b9e5de2..2c6f788d078a 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.hxx
@@ -28,14 +28,12 @@
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <comphelper/uno3.hxx>
 
-#include <basegfx/vector/b2isize.hxx>
-
+#include <canvas/base/bitmapcanvasbase.hxx>
 #include <canvas/base/basemutexhelper.hxx>
 #include <canvas/base/integerbitmapbase.hxx>
 
 #include "cairo_canvashelper.hxx"
 #include "cairo_repainttarget.hxx"
-#include "cairo_spritecanvas.hxx"
 
 
 /* Definition of CanvasBitmap class */
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx
index eb166588c7eb..ec63efa6aaa1 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.cxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx
@@ -27,6 +27,7 @@
 #include <tools/diagnose_ex.h>
 
 #include <canvas/canvastools.hxx>
+#include <cairo.h>
 
 #include "cairo_canvascustomsprite.hxx"
 #include "cairo_spritecanvas.hxx"
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx
index 95f5bf91ef0c..16ff0c105c7c 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.hxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx
@@ -24,14 +24,11 @@
 #include <comphelper/uno3.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
-#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2isize.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 
 #include <canvas/base/basemutexhelper.hxx>
 #include <canvas/base/canvascustomspritebase.hxx>
diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx
index 20bc51b18df3..f35f6f455d11 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -32,8 +32,7 @@
 
 #include <canvas/vclwrapper.hxx>
 
-#include "cairo_spritecanvas.hxx"
-
+#include "cairo_surfaceprovider.hxx"
 
 
 /* Definition of CanvasFont class */
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 3aa7ad8d0a5d..a9ad255166bd 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -55,6 +55,7 @@
 
 #include <canvas/canvastools.hxx>
 #include <canvas/parametricpolypolygon.hxx>
+#include <cairo.h>
 
 #include "cairo_cachedbitmap.hxx"
 #include "cairo_canvasbitmap.hxx"
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx
index 0e7cef1b75ba..645be63f1a80 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -20,13 +20,10 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
 
+#include <com/sun/star/geometry/IntegerPoint2D.hpp>
+#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
+#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/XBitmapCanvas.hpp>
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
-
-#include <basegfx/vector/b2isize.hxx>
-#include <basegfx/vector/b2dsize.hxx>
-#include <com/sun/star/rendering/XLinePolyPolygon2D.hpp>
 
 #include <vcl/vclptr.hxx>
 #include <vcl/virdev.hxx>
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index 805a30f7eaa1..498e02c4ff04 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -19,6 +19,8 @@
 
 #include <sal/config.h>
 
+#include <com/sun/star/rendering/TextDirection.hpp>
+
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/utils/canvastools.hxx>
@@ -28,6 +30,8 @@
 #include <vcl/virdev.hxx>
 
 #include <canvas/canvastools.hxx>
+#include <canvas/verifyinput.hxx>
+#include <cairo.h>
 
 #include "cairo_canvasfont.hxx"
 #include "cairo_canvashelper.hxx"
diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx
index 6e59615c32b8..4eeae58eeeae 100644
--- a/canvas/source/cairo/cairo_devicehelper.hxx
+++ b/canvas/source/cairo/cairo_devicehelper.hxx
@@ -20,11 +20,9 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX
 
-#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XBufferController.hpp>
 
-#include <vcl/window.hxx>
+#include <vcl/outdev.hxx>
 
 #include "cairo_surfaceprovider.hxx"
 
diff --git a/canvas/source/cairo/cairo_repainttarget.hxx b/canvas/source/cairo/cairo_repainttarget.hxx
index 56fa7cb3da59..2ec114901f9e 100644
--- a/canvas/source/cairo/cairo_repainttarget.hxx
+++ b/canvas/source/cairo/cairo_repainttarget.hxx
@@ -20,7 +20,8 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
 
-#include <rtl/ref.hxx>
+#include <com/sun/star/rendering/RenderState.hpp>
+#include <com/sun/star/rendering/ViewState.hpp>
 
 #include <vcl/cairo.hxx>
 
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index cf5a5f4e57ab..1ea4d14f233e 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -22,8 +22,6 @@
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/awt/XWindowListener.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
@@ -40,8 +38,6 @@
 #include <canvas/base/disambiguationhelper.hxx>
 #include <canvas/base/bufferedgraphicdevicebase.hxx>
 
-#include <basegfx/vector/b2isize.hxx>
-
 #include "cairo_spritedevicehelper.hxx"
 #include "cairo_repainttarget.hxx"
 #include "cairo_surfaceprovider.hxx"
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index b964db61eed9..0a03088cceb3 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -30,6 +30,8 @@
 
 #include <canvas/canvastools.hxx>
 
+#include <cairo.h>
+
 #include "cairo_canvascustomsprite.hxx"
 #include "cairo_spritecanvashelper.hxx"
 
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.hxx b/canvas/source/cairo/cairo_spritecanvashelper.hxx
index 1c71b4878a5a..e8ebb515bb4c 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.hxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.hxx
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
 
-#include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
+#include <com/sun/star/rendering/XAnimatedSprite.hpp>
+#include <com/sun/star/rendering/XAnimation.hpp>
+#include <com/sun/star/rendering/XCustomSprite.hpp>
 
 #include <canvas/spriteredrawmanager.hxx>
 
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index bbff8d026263..39efd2302159 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -29,6 +29,8 @@
 
 #include <canvas/canvastools.hxx>
 
+#include <cairo.h>
+
 #include "cairo_canvasbitmap.hxx"
 #include "cairo_devicehelper.hxx"
 #include "cairo_spritecanvas.hxx"
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index f7ad11205a67..795a9daa4d07 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEDEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XBufferController.hpp>
 
 #include <vcl/window.hxx>
 #include <vcl/cairo.hxx>
diff --git a/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx
index 60e5f07c5e95..6bff2f60259f 100644
--- a/canvas/source/cairo/cairo_spritehelper.cxx
+++ b/canvas/source/cairo/cairo_spritehelper.cxx
@@ -32,6 +32,7 @@
 #include <tools/diagnose_ex.h>
 
 #include <canvas/canvastools.hxx>
+#include <cairo.h>
 
 #include "cairo_canvascustomsprite.hxx"
 #include "cairo_spritehelper.hxx"
diff --git a/canvas/source/cairo/cairo_spritehelper.hxx b/canvas/source/cairo/cairo_spritehelper.hxx
index e66a00d70c8e..ceacd3e3168e 100644
--- a/canvas/source/cairo/cairo_spritehelper.hxx
+++ b/canvas/source/cairo/cairo_spritehelper.hxx
@@ -20,13 +20,9 @@
 #ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
 
-#include <com/sun/star/rendering/XCustomSprite.hpp>
-
 #include <canvas/base/canvascustomspritehelper.hxx>
 
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2isize.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 
 #include "cairo_spritecanvas.hxx"
 
diff --git a/canvas/source/cairo/cairo_surfaceprovider.hxx b/canvas/source/cairo/cairo_surfaceprovider.hxx
index 8b7159f12e7f..0824450726c8 100644
--- a/canvas/source/cairo/cairo_surfaceprovider.hxx
+++ b/canvas/source/cairo/cairo_surfaceprovider.hxx
@@ -23,8 +23,8 @@
 #include <rtl/ref.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
 
+#include <basegfx/vector/b2isize.hxx>
 #include <vcl/cairo.hxx>
-#include <cairo.h>
 
 class OutputDevice;
 class Bitmap;
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 8cfa4d40a38e..89339783273f 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -35,6 +35,8 @@
 #include "cairo_spritecanvas.hxx"
 #include "cairo_textlayout.hxx"
 
+#include <cairo.h>
+
 #if defined CAIRO_HAS_FT_FONT
 # include <cairo-ft.h>
 #else
diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index 13d31a7077a1..b5ba2d84bb21 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -24,10 +24,10 @@
 #include <cppuhelper/basemutex.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/rendering/RenderState.hpp>
+#include <com/sun/star/rendering/ViewState.hpp>
 #include <com/sun/star/rendering/XTextLayout.hpp>
 
-#include <basegfx/vector/b2isize.hxx>
-
 #include <vcl/outdev.hxx>
 
 #include <vcl/cairo.hxx>
diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
index d6e3e9695065..08258174b923 100644
--- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
+++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
@@ -10,11 +10,10 @@
 #ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX
 
-#include <com/sun/star/rendering/XBitmapCanvas.hpp>
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
+#include <com/sun/star/geometry/IntegerPoint2D.hpp>
+#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
+#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
 
-#include <basegfx/vector/b2isize.hxx>
-#include <basegfx/vector/b2dsize.hxx>
 #include "ogl_canvashelper.hxx"
 
 namespace oglcanvas
diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx
index 3d5954e4c723..fa7b8de20af6 100644
--- a/canvas/source/opengl/ogl_canvasbitmap.hxx
+++ b/canvas/source/opengl/ogl_canvasbitmap.hxx
@@ -17,7 +17,7 @@
 
 #include <canvas/base/integerbitmapbase.hxx>
 #include <canvas/base/basemutexhelper.hxx>
-#include <basegfx/vector/b2isize.hxx>
+#include <canvas/base/bitmapcanvasbase.hxx>
 
 #include "ogl_bitmapcanvashelper.hxx"
 #include "ogl_spritecanvas.hxx"
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx
index e01a7d87f7eb..2f603af40d11 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.hxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx
@@ -12,13 +12,10 @@
 
 #include <cppuhelper/compbase.hxx>
 
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2isize.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 
 #include <canvas/base/basemutexhelper.hxx>
 
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index eb2307a7720e..c7d44b8637b7 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -13,8 +13,8 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
-#include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XCanvasFont.hpp>
+#include <com/sun/star/geometry/Matrix2D.hpp>
 
 #include <rtl/ref.hxx>
 
diff --git a/canvas/source/opengl/ogl_canvashelper.hxx b/canvas/source/opengl/ogl_canvashelper.hxx
index 2323f0dab1cb..26ec3f71eb63 100644
--- a/canvas/source/opengl/ogl_canvashelper.hxx
+++ b/canvas/source/opengl/ogl_canvashelper.hxx
@@ -12,9 +12,6 @@
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 
-#include <basegfx/vector/b2isize.hxx>
-#include <basegfx/vector/b2dsize.hxx>
-
 #include <o3tl/cow_wrapper.hxx>
 #include <vector>
 
diff --git a/canvas/source/opengl/ogl_canvastools.hxx b/canvas/source/opengl/ogl_canvastools.hxx
index 0378626571d5..878b586f9c9e 100644
--- a/canvas/source/opengl/ogl_canvastools.hxx
+++ b/canvas/source/opengl/ogl_canvastools.hxx
@@ -13,6 +13,8 @@
 #include <sal/config.h>
 #include <vector>
 
+#include <epoxy/gl.h>
+
 namespace com { namespace sun { namespace star { namespace rendering {
     struct ARGBColor;
 }}}}
diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx
index ae6697cc85e2..d7635cda6ca5 100644
--- a/canvas/source/opengl/ogl_spritecanvas.hxx
+++ b/canvas/source/opengl/ogl_spritecanvas.hxx
@@ -24,7 +24,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
-#include <canvas/base/spritecanvasbase.hxx>
+#include <canvas/base/canvasbase.hxx>
 #include <canvas/base/disambiguationhelper.hxx>
 #include <canvas/base/bufferedgraphicdevicebase.hxx>
 
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 285afa973574..0041c42c411c 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -10,6 +10,7 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/utils/unopolypolygon.hxx>
 #include <com/sun/star/awt/XTopWindow.hpp>
diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx
index b92b023d9949..8c7a289d6ab9 100644
--- a/canvas/source/opengl/ogl_textlayout.hxx
+++ b/canvas/source/opengl/ogl_textlayout.hxx
@@ -15,8 +15,6 @@
 
 #include <com/sun/star/rendering/XTextLayout.hpp>
 
-#include <basegfx/vector/b2isize.hxx>
-
 #include "ogl_canvasfont.hxx"
 
 
diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx
index 634114719487..a811a10f3a62 100644
--- a/canvas/source/tools/pagemanager.hxx
+++ b/canvas/source/tools/pagemanager.hxx
@@ -22,7 +22,6 @@
 
 #include <basegfx/vector/b2isize.hxx>
 #include <canvas/rendering/irendermodule.hxx>
-#include <canvas/rendering/isurface.hxx>
 
 #include "page.hxx"
 
diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx
index b941e9d09618..66d4fe3120c4 100644
--- a/canvas/source/tools/surface.hxx
+++ b/canvas/source/tools/surface.hxx
@@ -26,11 +26,8 @@
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <canvas/rendering/irendermodule.hxx>
 #include <canvas/rendering/icolorbuffer.hxx>
-#include <canvas/rendering/isurface.hxx>
 
-#include "surfacerect.hxx"
 #include "pagemanager.hxx"
 
 namespace canvas
diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index 739583a14bdc..291842dfda11 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.cxx
@@ -19,6 +19,8 @@
 
 #include <sal/config.h>
 
+#include <vcl/svapp.hxx>
+
 #include "backbuffer.hxx"
 
 
diff --git a/canvas/source/vcl/backbuffer.hxx b/canvas/source/vcl/backbuffer.hxx
index 926b25a8fe96..e6df6d857aaf 100644
--- a/canvas/source/vcl/backbuffer.hxx
+++ b/canvas/source/vcl/backbuffer.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/virdev.hxx>
 
-#include <canvas/vclwrapper.hxx>
 #include "outdevprovider.hxx"
 
 #include <memory>
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index 1eee73282329..db9e7c4b9f8c 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVAS_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_CANVAS_HXX
 
-#include <rtl/ref.hxx>
-
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
@@ -29,12 +27,9 @@
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XBufferController.hpp>
 
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/types.hxx>
-#include <cppu/unotype.hxx>
 
 #include <canvas/base/basemutexhelper.hxx>
 #include <canvas/base/bitmapcanvasbase.hxx>
diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx
index d632366bed55..934044b59beb 100644
--- a/canvas/source/vcl/canvasbitmap.hxx
+++ b/canvas/source/vcl/canvasbitmap.hxx
@@ -27,18 +27,15 @@
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 
-#include <vcl/virdev.hxx>
 #include <vcl/bitmapex.hxx>
 
-#include <canvas/vclwrapper.hxx>
-
+#include <canvas/base/bitmapcanvasbase.hxx>
 #include <canvas/base/basemutexhelper.hxx>
 #include <canvas/base/integerbitmapbase.hxx>
 #include "canvasbitmaphelper.hxx"
 
 #include "impltools.hxx"
 #include "repainttarget.hxx"
-#include "spritecanvas.hxx"
 
 
 /* Definition of CanvasBitmap class */
diff --git a/canvas/source/vcl/canvasbitmaphelper.hxx b/canvas/source/vcl/canvasbitmaphelper.hxx
index 31a20d8db795..328f96ca96fa 100644
--- a/canvas/source/vcl/canvasbitmaphelper.hxx
+++ b/canvas/source/vcl/canvasbitmaphelper.hxx
@@ -21,12 +21,10 @@
 #define INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAPHELPER_HXX
 
 #include "canvashelper.hxx"
-#include <canvas/vclwrapper.hxx>
 
 #include <vcl/bitmapex.hxx>
 
 #include "bitmapbackbuffer.hxx"
-#include "spritecanvas.hxx"
 
 
 namespace vclcanvas
diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx
index b3f6d3202b91..91de9c253cd0 100644
--- a/canvas/source/vcl/canvascustomsprite.hxx
+++ b/canvas/source/vcl/canvascustomsprite.hxx
@@ -22,17 +22,12 @@
 
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/types.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
-#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 
-#include <vcl/virdev.hxx>
-
-#include <canvas/vclwrapper.hxx>
 #include <canvas/base/basemutexhelper.hxx>
 #include <canvas/base/spritesurface.hxx>
 #include <canvas/base/canvascustomspritebase.hxx>
@@ -40,9 +35,7 @@
 #include "sprite.hxx"
 #include "canvashelper.hxx"
 #include "spritehelper.hxx"
-#include "backbuffer.hxx"
 #include "impltools.hxx"
-#include "spritecanvas.hxx"
 #include "repainttarget.hxx"
 
 
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index 5609cb3334d5..173203a85bdf 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@@ -20,11 +20,13 @@
 #include <sal/config.h>
 
 #include <basegfx/numeric/ftools.hxx>
+#include <canvas/canvastools.hxx>
 #include <com/sun/star/rendering/PanoseProportion.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <rtl/math.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/virdev.hxx>
 
 #include "canvasfont.hxx"
 #include "textlayout.hxx"
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index 1a953447aaff..70d546171a41 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -33,8 +33,7 @@
 
 #include <canvas/vclwrapper.hxx>
 
-#include "spritecanvas.hxx"
-#include "impltools.hxx"
+#include "outdevprovider.hxx"
 
 
 /* Definition of CanvasFont class */
diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx
index 888b6de3a543..c09d8c81d636 100644
--- a/canvas/source/vcl/canvashelper.hxx
+++ b/canvas/source/vcl/canvashelper.hxx
@@ -20,13 +20,10 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_CANVASHELPER_HXX
 
+#include <com/sun/star/geometry/IntegerPoint2D.hpp>
+#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
+#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/XBitmapCanvas.hpp>
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
-
-#include <vcl/outdev.hxx>
-
-#include <canvas/vclwrapper.hxx>
 
 #include "cachedbitmap.hxx"
 #include "outdevprovider.hxx"
diff --git a/canvas/source/vcl/devicehelper.hxx b/canvas/source/vcl/devicehelper.hxx
index 040fda5ebebb..bcb08119752f 100644
--- a/canvas/source/vcl/devicehelper.hxx
+++ b/canvas/source/vcl/devicehelper.hxx
@@ -20,13 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_DEVICEHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_DEVICEHELPER_HXX
 
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XBufferController.hpp>
-
-#include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
 
 #include "outdevprovider.hxx"
 
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 71501e744040..7030c166dd1d 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -50,6 +50,7 @@
 
 #include "canvasbitmap.hxx"
 #include "impltools.hxx"
+#include "spritecanvas.hxx"
 
 
 using namespace ::com::sun::star;
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index b69067a7cf5c..db74b533a7d6 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -28,9 +28,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 
-#include <canvas/vclwrapper.hxx>
 #include "outdevprovider.hxx"
 
 
diff --git a/canvas/source/vcl/outdevprovider.hxx b/canvas/source/vcl/outdevprovider.hxx
index c09b580cf4f9..10cab044f53e 100644
--- a/canvas/source/vcl/outdevprovider.hxx
+++ b/canvas/source/vcl/outdevprovider.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX
 
-#include <sal/types.h>
 #include <memory>
 
 class OutputDevice;
diff --git a/canvas/source/vcl/repainttarget.hxx b/canvas/source/vcl/repainttarget.hxx
index 692310b60012..b5ee27542f8a 100644
--- a/canvas/source/vcl/repainttarget.hxx
+++ b/canvas/source/vcl/repainttarget.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_REPAINTTARGET_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_REPAINTTARGET_HXX
 
-#include <rtl/ref.hxx>
-
 #include "cachedbitmap.hxx"
 
 class Point;
diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index 08c6d9bb2e1d..7681835df2a4 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -34,7 +34,6 @@
 
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/types.hxx>
 
 #include <canvas/base/spritecanvasbase.hxx>
 #include <canvas/base/spritesurface.hxx>
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 98f40a5087a7..33c578c2feca 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -34,6 +34,7 @@
 
 #include "canvascustomsprite.hxx"
 #include "spritecanvashelper.hxx"
+#include "spritecanvas.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/canvas/source/vcl/spritecanvashelper.hxx b/canvas/source/vcl/spritecanvashelper.hxx
index d2186da26dda..f32c5f955fdf 100644
--- a/canvas/source/vcl/spritecanvashelper.hxx
+++ b/canvas/source/vcl/spritecanvashelper.hxx
@@ -20,17 +20,16 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITECANVASHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_SPRITECANVASHELPER_HXX
 
-#include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
+#include <com/sun/star/rendering/XAnimatedSprite.hpp>
+#include <com/sun/star/rendering/XAnimation.hpp>
+#include <com/sun/star/rendering/XCustomSprite.hpp>
 
 #include <vcl/vclptr.hxx>
 #include <vcl/virdev.hxx>
 
 #include <canvas/spriteredrawmanager.hxx>
 #include <canvas/elapsedtime.hxx>
-#include <canvas/vclwrapper.hxx>
 #include "canvashelper.hxx"
-#include "impltools.hxx"
 
 
 namespace vclcanvas
diff --git a/canvas/source/vcl/spritedevicehelper.hxx b/canvas/source/vcl/spritedevicehelper.hxx
index 8c5d7271c5d6..8db1b115eed3 100644
--- a/canvas/source/vcl/spritedevicehelper.hxx
+++ b/canvas/source/vcl/spritedevicehelper.hxx
@@ -21,12 +21,6 @@
 #define INCLUDED_CANVAS_SOURCE_VCL_SPRITEDEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/awt/XWindow2.hpp>
-#include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <com/sun/star/rendering/XBufferController.hpp>
-
-#include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
 
 #include "backbuffer.hxx"
 #include "devicehelper.hxx"
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 569f3171fef6..5c30571c78a7 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -42,6 +42,7 @@
 #include <canvas/canvastools.hxx>
 #include <config_features.h>
 
+#include "impltools.hxx"
 #include "spritehelper.hxx"
 
 using namespace ::com::sun::star;
diff --git a/canvas/source/vcl/spritehelper.hxx b/canvas/source/vcl/spritehelper.hxx
index 70770dbec8d9..d25bdc4166f3 100644
--- a/canvas/source/vcl/spritehelper.hxx
+++ b/canvas/source/vcl/spritehelper.hxx
@@ -20,17 +20,13 @@
 #ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITEHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_VCL_SPRITEHELPER_HXX
 
-#include <com/sun/star/rendering/XCustomSprite.hpp>
-
-#include <vcl/virdev.hxx>
+#include <vcl/bitmapex.hxx>
 
 #include <canvas/base/canvascustomspritehelper.hxx>
 #include <canvas/base/spritesurface.hxx>
 #include <canvas/vclwrapper.hxx>
 
 #include "backbuffer.hxx"
-#include "impltools.hxx"
-#include "spritecanvas.hxx"
 
 
 namespace vclcanvas
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 48e6aaac79dc..555f9445ba2d 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -26,7 +26,10 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
+#include <com/sun/star/rendering/RenderState.hpp>
 #include <com/sun/star/rendering/TextDirection.hpp>
+#include <com/sun/star/rendering/ViewState.hpp>
+#include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/virdev.hxx>
diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx
index 8f5cd1772a4e..f7378f6116cd 100644
--- a/canvas/source/vcl/textlayout.hxx
+++ b/canvas/source/vcl/textlayout.hxx
@@ -27,8 +27,6 @@
 #include <com/sun/star/rendering/StringContext.hpp>
 #include <com/sun/star/rendering/XTextLayout.hpp>
 
-#include <canvas/vclwrapper.hxx>
-
 #include "canvasfont.hxx"
 #include "impltools.hxx"