tdf#42949 Fix IWYU warnings in vcl/source/[f-i]*

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

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

96 files changed, 56 insertions, 265 deletions

diff --git a/vcl/IwyuFilter_vcl.yaml b/vcl/IwyuFilter_vcl.yaml
index f99cda446f51..67c871d904f7 100644
--- a/vcl/IwyuFilter_vcl.yaml
+++ b/vcl/IwyuFilter_vcl.yaml
@@ -33,3 +33,20 @@ blacklist:
     - desktop/exithelper.h
     vcl/source/filter/ipdf/pdfdocument.cxx:
     - comphelper/scopeguard.hxx
+    vcl/source/filter/jpeg/JpegWriter.hxx:
+    # Needed for direct member access
+    - vcl/bitmapaccess.hxx
+    vcl/source/fontsubset/sft.cxx:
+    # OSL_BIGENDIAN is being checked
+    - osl/endian.h
+    # Needed on WIN32 / MAC / IOS
+    - xlat.hxx
+    vcl/source/gdi/configsettings.cxx:
+    # Needed for OSL_DEBUG_LEVEL > 2
+    - sal/log.hxx
+    include/vcl/mtfxmldump.hxx:
+    # Silence warning about include/vcl/mtfxmldump.hxx
+    - vcl/metaactiontypes.hxx
+    vcl/source/gdi/salgdilayout.cxx:
+    # Needed on WIN32
+    - desktop/exithelper.h
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index 2623f814029b..e2cf35d510c7 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -27,6 +27,7 @@
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
index 5e6e3f1935db..ec1c2dc46743 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_VCL_SOURCE_FILTER_FILTERCONFIGCACHE_HXX
 #define INCLUDED_VCL_SOURCE_FILTER_FILTERCONFIGCACHE_HXX
 
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <rtl/ustring.hxx>
 #include <vector>
 
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx
index 85388fe94b91..d53256acfff3 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -21,8 +21,8 @@
 
 #include <vcl/gfxlink.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <tools/stream.hxx>
 
 #include "jpeg/Exif.hxx"
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 937ec3cf20e6..cb9b5768f047 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -27,11 +27,11 @@
 #include <cppuhelper/implbase.hxx>
 #include <tools/fract.hxx>
 #include <unotools/configmgr.hxx>
-#include <unotools/resmgr.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/zcodec.hxx>
 #include <vcl/dibtools.hxx>
+#include <vcl/fltcall.hxx>
 #include <vcl/salctype.hxx>
 #include <vcl/pngread.hxx>
 #include <vcl/pngwrite.hxx>
@@ -43,7 +43,6 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/wmf.hxx>
-#include <vcl/settings.hxx>
 #include "igif/gifread.hxx"
 #include <vcl/pdfread.hxx>
 #include "jpeg/jpeg.hxx"
@@ -53,10 +52,6 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/XWeak.hpp>
-#include <com/sun/star/uno/XAggregation.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/svg/XSVGWriter.hpp>
@@ -67,7 +62,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/instance.hxx>
-#include <vcl/metaact.hxx>
 #include <tools/svlibrary.h>
 #include <comphelper/string.hxx>
 #include <vector>
diff --git a/vcl/source/filter/graphicfilter_internal.hxx b/vcl/source/filter/graphicfilter_internal.hxx
index c44307ada6c9..cf8443f505ed 100644
--- a/vcl/source/filter/graphicfilter_internal.hxx
+++ b/vcl/source/filter/graphicfilter_internal.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_SOURCE_FILTER_GRAPHICFILTER_INTERNAL_HXX
 
 #include <tools/solar.h>
+#include <tools/stream.hxx>
 
 sal_uInt8* ImplSearchEntry( sal_uInt8*, sal_uInt8 const *, sal_uLong, sal_uLong );
 
diff --git a/vcl/source/filter/igif/decode.cxx b/vcl/source/filter/igif/decode.cxx
index 2aeccb335483..3aeed0d76560 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -19,7 +19,7 @@
 
 #include "decode.hxx"
 
-#include <rtl/alloc.h>
+#include <cstring>
 
 struct GIFLZWTableEntry
 {
diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/source/filter/igif/decode.hxx
index 24ba7dbe5701..a230e7c13150 100644
--- a/vcl/source/filter/igif/decode.hxx
+++ b/vcl/source/filter/igif/decode.hxx
@@ -20,7 +20,8 @@
 #ifndef INCLUDED_VCL_SOURCE_FILTER_IGIF_DECODE_HXX
 #define INCLUDED_VCL_SOURCE_FILTER_IGIF_DECODE_HXX
 
-#include <vcl/bitmapaccess.hxx>
+#include <tools/solar.h>
+#include <vcl/Scanline.hxx>
 #include <array>
 #include <memory>
 
diff --git a/vcl/source/filter/igif/gifread.hxx b/vcl/source/filter/igif/gifread.hxx
index 66bc169eb565..81dcddb5d712 100644
--- a/vcl/source/filter/igif/gifread.hxx
+++ b/vcl/source/filter/igif/gifread.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_SOURCE_FILTER_IGIF_GIFREAD_HXX
 
 #include <vcl/graph.hxx>
-#include <vcl/bitmapaccess.hxx>
 
 VCL_DLLPUBLIC bool ImportGIF( SvStream& rStream, Graphic& rGraphic );
 VCL_DLLPUBLIC bool IsGIFAnimated(SvStream& rStream);
diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx
index de95910e2eb9..6d9a7094b899 100644
--- a/vcl/source/filter/ixbm/xbmread.hxx
+++ b/vcl/source/filter/ixbm/xbmread.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_SOURCE_FILTER_IXBM_XBMREAD_HXX
 
 #include <vcl/graph.hxx>
-#include <vcl/bitmapaccess.hxx>
 
 VCL_DLLPUBLIC bool ImportXBM( SvStream& rStream, Graphic& rGraphic );
 
diff --git a/vcl/source/filter/ixpm/rgbtable.hxx b/vcl/source/filter/ixpm/rgbtable.hxx
index 2b2f71542658..1c47a891f356 100644
--- a/vcl/source/filter/ixpm/rgbtable.hxx
+++ b/vcl/source/filter/ixpm/rgbtable.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_VCL_SOURCE_FILTER_IXPM_RGBTABLE_HXX
 #define INCLUDED_VCL_SOURCE_FILTER_IXPM_RGBTABLE_HXX
 
+#include <sal/types.h>
+
 struct XPMRGBTab
 {
     const char* name;
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index d1e50944fd61..5b2ad3592703 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/bitmapaccess.hxx>
 #include <bitmapwriteaccess.hxx>
 #include <vcl/graph.hxx>
 #include <tools/stream.hxx>
diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx
index 4a399492b54f..1d7a071c3cf5 100644
--- a/vcl/source/filter/ixpm/xpmread.hxx
+++ b/vcl/source/filter/ixpm/xpmread.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_SOURCE_FILTER_IXPM_XPMREAD_HXX
 #define INCLUDED_VCL_SOURCE_FILTER_IXPM_XPMREAD_HXX
 
-#include <vcl/bitmap.hxx>
+#include <tools/stream.hxx>
 
 class Graphic;
 
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 45fd9ed23344..4bb43049f76d 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -19,6 +19,7 @@
 
 #include "Exif.hxx"
 #include <memory>
+#include <osl/endian.h>
 #include <tools/stream.hxx>
 
 Exif::Exif() :
diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx
index 046df028a891..d6d13c55877a 100644
--- a/vcl/source/filter/jpeg/Exif.hxx
+++ b/vcl/source/filter/jpeg/Exif.hxx
@@ -20,11 +20,7 @@
 #ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_EXIF_HXX
 #define INCLUDED_VCL_SOURCE_FILTER_JPEG_EXIF_HXX
 
-#include <osl/endian.h>
-#include <vcl/graph.hxx>
-#include <vcl/fltcall.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
+#include <tools/stream.hxx>
 
 enum Orientation {
     TOP_LEFT        = 1,
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index ba71938dc1ad..6e9d5421510c 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -24,8 +24,6 @@
 #include <jerror.h>
 
 #include "JpegReader.hxx"
-#include <vcl/bitmapaccess.hxx>
-#include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/outdev.hxx>
 #include <tools/fract.hxx>
diff --git a/vcl/source/filter/jpeg/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx
index 6772e1e3ec30..60d0cc85a09b 100644
--- a/vcl/source/filter/jpeg/JpegReader.hxx
+++ b/vcl/source/filter/jpeg/JpegReader.hxx
@@ -22,9 +22,6 @@
 
 #include <vcl/graph.hxx>
 #include <vcl/bitmap.hxx>
-#include <vcl/fltcall.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
 #include <bitmapwriteaccess.hxx>
 
 enum class GraphicFilterImportFlags;
diff --git a/vcl/source/filter/jpeg/JpegTransform.hxx b/vcl/source/filter/jpeg/JpegTransform.hxx
index efac42ff2218..cb6d3acbcec1 100644
--- a/vcl/source/filter/jpeg/JpegTransform.hxx
+++ b/vcl/source/filter/jpeg/JpegTransform.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX
 #define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX
 
-#include <vcl/graph.hxx>
+#include <tools/stream.hxx>
 
 class JpegTransform final
 {
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 94711f9473e5..d99e46e4d8b1 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -27,7 +27,6 @@
 #include "JpegWriter.hxx"
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/FilterConfigItem.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <tools/helpers.hxx>
 #include <tools/stream.hxx>
 
diff --git a/vcl/source/filter/jpeg/JpegWriter.hxx b/vcl/source/filter/jpeg/JpegWriter.hxx
index 94e3ee2df09e..a8e7f25664e3 100644
--- a/vcl/source/filter/jpeg/JpegWriter.hxx
+++ b/vcl/source/filter/jpeg/JpegWriter.hxx
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGWRITER_HXX
 #define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGWRITER_HXX
 
+#include <vcl/bitmap.hxx>
+#include <vcl/bitmapaccess.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/fltcall.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx
index 8739ed989a9a..58c18146eb99 100644
--- a/vcl/source/filter/jpeg/jpeg.cxx
+++ b/vcl/source/filter/jpeg/jpeg.cxx
@@ -21,8 +21,6 @@
 #include "JpegWriter.hxx"
 #include "jpeg.hxx"
 
-#include <vcl/bitmapaccess.hxx>
-#include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphicfilter.hxx>
 
 VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, GraphicFilterImportFlags nImportFlags, BitmapScopedWriteAccess* ppAccess )
diff --git a/vcl/source/filter/jpeg/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx
index 442de6898cea..e097ed40bc96 100644
--- a/vcl/source/filter/jpeg/jpeg.hxx
+++ b/vcl/source/filter/jpeg/jpeg.hxx
@@ -22,11 +22,7 @@
 
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/fltcall.hxx>
-#include <vcl/bitmap.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
 #include <bitmapwriteaccess.hxx>
 
 VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, GraphicFilterImportFlags nImportFlags, BitmapScopedWriteAccess* ppAccess );
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index f6e18a59461c..8a57f5559217 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -22,10 +22,8 @@
 #include <o3tl/safeint.hxx>
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <setjmp.h>
 #include <jpeglib.h>
-#include <jerror.h>
 
 #include <com/sun/star/task/XStatusIndicator.hpp>
 
@@ -38,7 +36,6 @@ extern "C" {
 #include "JpegWriter.hxx"
 #include <memory>
 #include <unotools/configmgr.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <vcl/graphicfilter.hxx>
 
 #ifdef _MSC_VER
diff --git a/vcl/source/filter/png/PngImageReader.cxx b/vcl/source/filter/png/PngImageReader.cxx
index e4024d80a598..958cae34eb46 100644
--- a/vcl/source/filter/png/PngImageReader.cxx
+++ b/vcl/source/filter/png/PngImageReader.cxx
@@ -11,7 +11,6 @@
 #include <vcl/filter/PngImageReader.hxx>
 #include <png.h>
 #include <tools/stream.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <bitmapwriteaccess.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/alpha.hxx>
diff --git a/vcl/source/filter/png/pngread.cxx b/vcl/source/filter/png/pngread.cxx
index 302491edc064..cd3213255d6c 100644
--- a/vcl/source/filter/png/pngread.cxx
+++ b/vcl/source/filter/png/pngread.cxx
@@ -28,11 +28,8 @@
 
 #include <cmath>
 #include <rtl/crc.h>
-#include <rtl/alloc.h>
 #include <tools/zcodec.hxx>
 #include <tools/stream.hxx>
-#include <vcl/bitmapaccess.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/alpha.hxx>
 #include <osl/endian.h>
 #include <bitmapwriteaccess.hxx>
diff --git a/vcl/source/filter/png/pngwrite.cxx b/vcl/source/filter/png/pngwrite.cxx
index 9a3954244cdf..1449ce8da9b5 100644
--- a/vcl/source/filter/png/pngwrite.cxx
+++ b/vcl/source/filter/png/pngwrite.cxx
@@ -23,14 +23,11 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <cmath>
 #include <limits>
 #include <rtl/crc.h>
-#include <rtl/alloc.h>
 #include <tools/zcodec.hxx>
 #include <tools/stream.hxx>
 #include <vcl/bitmapaccess.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/alpha.hxx>
 #include <osl/endian.h>
 #include <memory>
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 17d23f787aa9..0204999672dc 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -23,7 +23,6 @@
 #include <algorithm>
 
 #include "emfwr.hxx"
-#include <rtl/strbuf.hxx>
 #include <tools/helpers.hxx>
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
@@ -31,6 +30,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/dibtools.hxx>
+#include <vcl/metaact.hxx>
 #include <memory>
 
 #define WIN_EMR_POLYGON                     3
diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx
index 0e01db54dcf8..e227010ac925 100644
--- a/vcl/source/filter/wmf/emfwr.hxx
+++ b/vcl/source/filter/wmf/emfwr.hxx
@@ -20,11 +20,8 @@
 #ifndef INCLUDED_VCL_SOURCE_FILTER_WMF_EMFWR_HXX
 #define INCLUDED_VCL_SOURCE_FILTER_WMF_EMFWR_HXX
 
-#include <vcl/metaact.hxx>
-#include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/fltcall.hxx>
 
 class LineInfo;
 namespace basegfx { class B2DPolygon; }
diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx
index 05939e734483..d0fe5fa0ce22 100644
--- a/vcl/source/filter/wmf/wmf.cxx
+++ b/vcl/source/filter/wmf/wmf.cxx
@@ -21,7 +21,7 @@
 #include "wmfwr.hxx"
 #include <vcl/wmf.hxx>
 #include <vcl/gdimetafiletools.hxx>
-#include <comphelper/scopeguard.hxx>
+#include <vcl/graph.hxx>
 
 bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF )
 {
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 6b656970752f..1868c8087fcb 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -23,19 +23,16 @@
 #include <algorithm>
 
 #include "wmfwr.hxx"
-#include <unotools/fontcvt.hxx>
 #include "emfwr.hxx"
 #include <rtl/crc.h>
-#include <rtl/strbuf.hxx>
 #include <rtl/tencinfo.h>
 #include <tools/bigint.hxx>
 #include <tools/helpers.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
-#include <osl/endian.h>
 #include <vcl/dibtools.hxx>
-#include <vcl/metric.hxx>
+#include <vcl/metaact.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index acbc3e74beaf..49fef35322b0 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -20,11 +20,10 @@
 #ifndef INCLUDED_VCL_SOURCE_FILTER_WMF_WMFWR_HXX
 #define INCLUDED_VCL_SOURCE_FILTER_WMF_WMFWR_HXX
 
-#include <vcl/metaact.hxx>
-#include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/lineinfo.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/fltcall.hxx>
+#include <vcl/FilterConfigItem.hxx>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <tools/stream.hxx>
 
diff --git a/vcl/source/font/Feature.cxx b/vcl/source/font/Feature.cxx
index 7beb238a2d20..25a9e6b41fa3 100644
--- a/vcl/source/font/Feature.cxx
+++ b/vcl/source/font/Feature.cxx
@@ -10,7 +10,6 @@
 
 #include <utility>
 #include <vcl/font/Feature.hxx>
-#include <strings.hrc>
 #include <svdata.hxx>
 
 #include <hb.h>
diff --git a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx b/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
index 93b5e6d67550..422b2ecb34dc 100644
--- a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
+++ b/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
@@ -10,10 +10,11 @@
 
 #include <font/OpenTypeFeatureDefinitonList.hxx>
 #include <font/OpenTypeFeatureStrings.hrc>
-#include <svdata.hxx>
 
 #include <rtl/character.hxx>
 
+#include <algorithm>
+
 namespace vcl
 {
 namespace font
diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx
index ccf81781b982..b16488ddc88d 100644
--- a/vcl/source/font/PhysicalFontFace.cxx
+++ b/vcl/source/font/PhysicalFontFace.cxx
@@ -21,8 +21,8 @@
 #include <tools/fontenum.hxx>
 #include <unotools/fontdefs.hxx>
 
-#include <fontinstance.hxx>
 #include <fontattributes.hxx>
+#include <fontselect.hxx>
 
 #include <PhysicalFontFace.hxx>
 
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index c2bc28cf163e..914ea9880b82 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/macros.h>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/gen.hxx>
@@ -27,7 +26,6 @@
 #include <vcl/font.hxx>
 
 #include <impfont.hxx>
-#include <fontinstance.hxx>
 #include <fontattributes.hxx>
 #include <sft.hxx>
 
diff --git a/vcl/source/font/fontattributes.cxx b/vcl/source/font/fontattributes.cxx
index 52dfdc63a376..20e8e1b65edd 100644
--- a/vcl/source/font/fontattributes.cxx
+++ b/vcl/source/font/fontattributes.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sallayout.hxx>
-#include <svdata.hxx>
-
 #include <fontattributes.hxx>
 
 FontAttributes::FontAttributes()
diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx
index abcee2358c4b..67217acd0472 100644
--- a/vcl/source/font/fontcache.cxx
+++ b/vcl/source/font/fontcache.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svdata.hxx>
-
 #include <fontinstance.hxx>
 #include <impfontcache.hxx>
 #include <PhysicalFontCollection.hxx>
diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx
index 78c1c7112d09..b057a2056645 100644
--- a/vcl/source/font/fontcharmap.cxx
+++ b/vcl/source/font/fontcharmap.cxx
@@ -16,8 +16,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <vcl/fontcharmap.hxx>
-#include <fontinstance.hxx>
 #include <impfontcharmap.hxx>
+#include <rtl/textcvt.h>
+#include <rtl/textenc.h>
 #include <sal/log.hxx>
 
 #include <vector>
diff --git a/vcl/source/font/fontinstance.cxx b/vcl/source/font/fontinstance.cxx
index 0d5e6444a50c..58d72083f130 100644
--- a/vcl/source/font/fontinstance.cxx
+++ b/vcl/source/font/fontinstance.cxx
@@ -20,7 +20,6 @@
 
 #include <hb-ot.h>
 
-#include <svdata.hxx>
 #include <fontinstance.hxx>
 #include <impfontcache.hxx>
 
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 676e979208f8..47f91569e995 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -20,23 +20,18 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <unotools/configmgr.hxx>
-#include <vcl/fontcharmap.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <sal/log.hxx>
 
-#include <fontinstance.hxx>
 #include <fontselect.hxx>
 #include <impfontmetricdata.hxx>
-#include <PhysicalFontFace.hxx>
 #include <sft.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <comphelper/sequence.hxx>
 
 #include <vector>
-#include <set>
-#include <cstdio>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/vcl/source/font/fontselect.cxx b/vcl/source/font/fontselect.cxx
index e5b35bb24560..b9bf539d0f17 100644
--- a/vcl/source/font/fontselect.cxx
+++ b/vcl/source/font/fontselect.cxx
@@ -19,12 +19,10 @@
 
 #include <sal/config.h>
 #include <o3tl/safeint.hxx>
+#include <tools/gen.hxx>
+#include <vcl/font.hxx>
 
 #include <fontselect.hxx>
-#include <fontinstance.hxx>
-
-#include <PhysicalFontFace.hxx>
-#include <svdata.hxx>
 
 // These mustn't conflict with font name lists which use ; and ,
 const char FontSelectPattern::FEAT_PREFIX = ':';
diff --git a/vcl/source/fontsubset/list.cxx b/vcl/source/fontsubset/list.cxx
index 986cf5eb2633..5645386f5479 100644
--- a/vcl/source/fontsubset/list.cxx
+++ b/vcl/source/fontsubset/list.cxx
@@ -25,7 +25,6 @@
 /*|  Author: Alexander Gelfenbain                       |*/
 /*[]---------------------------------------------------[]*/
 
-#include <rtl/alloc.h>
 #include <assert.h>
 #include <cstdlib>
 
diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx
index 239b1bf0b454..b326ccaf0bb1 100644
--- a/vcl/source/fontsubset/xlat.cxx
+++ b/vcl/source/fontsubset/xlat.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <rtl/textcvt.h>
-#include <sal/log.hxx>
 #include "xlat.hxx"
 
 namespace {
diff --git a/vcl/source/fontsubset/xlat.hxx b/vcl/source/fontsubset/xlat.hxx
index ce79887b4b95..c9994b48fe18 100644
--- a/vcl/source/fontsubset/xlat.hxx
+++ b/vcl/source/fontsubset/xlat.hxx
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_VCL_SOURCE_FONTSUBSET_XLAT_HXX
 #define INCLUDED_VCL_SOURCE_FONTSUBSET_XLAT_HXX
 
-//####include "sft.hxx"
+#include <sal/types.h>
 
 namespace vcl
 {
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index eec3079074e0..7d67014031cc 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -31,13 +31,10 @@
 #include <vcl/font/FeatureParser.hxx>
 #include <scrptrun.h>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
-#include <i18nlangtag/mslangid.hxx>
-#include <limits>
 #include <salgdi.hxx>
 #include <unicode/uchar.h>
 
 #include <fontselect.hxx>
-#include <impfontcache.hxx>
 
 #if !HB_VERSION_ATLEAST(1, 1, 0)
 // Disabled Unicode compatibility decomposition, see fdo#66715
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 125fd677fe0d..e1e819203b99 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -25,8 +25,6 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/BitmapTools.hxx>
 
-#include <vcl/pngwrite.hxx>
-
 #include <comphelper/seqstream.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/lok.hxx>
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index a3b22ffa3f5c..3f3f36e86112 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <math.h>
-#include <stdlib.h>
 
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/bitmapex.hxx>
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 4bfbfeb5a2ff..d4f96bcd86f3 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -17,22 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/crc.h>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <o3tl/underlyingenumvalue.hxx>
 #include <osl/diagnose.h>
-#include <tools/debug.hxx>
-#include <tools/stream.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
-#include <unotools/resmgr.hxx>
 
 #include <vcl/ImageTree.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/dibtools.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/virdev.hxx>
@@ -43,9 +37,7 @@
 #include <salbmp.hxx>
 #include <salinst.hxx>
 #include <svdata.hxx>
-#include <BitmapFastScaleFilter.hxx>
 #include <bitmapwriteaccess.hxx>
-#include <image.h>
 
 #include <o3tl/any.hxx>
 
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx
index d85f50ea8ec2..f2fc66427e29 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/gdi/bmpacc3.cxx
@@ -17,11 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/poly.hxx>
-
 #include <vcl/bitmap.hxx>
-#include <vcl/region.hxx>
-#include <vcl/bitmapaccess.hxx>
 
 #include <bmpfast.hxx>
 #include <bitmapwriteaccess.hxx>
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 1b248601b505..32ff21c88076 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -22,7 +22,6 @@
 #include <vcl/salgtype.hxx>
 #include <bitmapwriteaccess.hxx>
 
-#include <stdlib.h>
 #include <sal/log.hxx>
 
 typedef unsigned char PIXBYTE;
diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx
index d7ee76ff1f89..9e9ecfb6eac2 100644
--- a/vcl/source/gdi/cvtgrf.cxx
+++ b/vcl/source/gdi/cvtgrf.cxx
@@ -17,11 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/metaact.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <tools/stream.hxx>
 
-#include <salinst.hxx>
 #include <svdata.hxx>
 
 // Callback
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index 672e5d3c2fb8..28cebf73d2c3 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -18,7 +18,6 @@
 #include <vcl/embeddedfontshelper.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 
-#include <fontsubset.hxx>
 #include <outdev.h>
 #include <PhysicalFontCollection.hxx>
 #include <salgdi.hxx>
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index ff8c07d2bbc1..f84b37c16539 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/crc.h>
 #include <cstdlib>
 #include <memory>
 #include <sal/log.hxx>
@@ -27,6 +26,7 @@
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/fract.hxx>
+#include <vcl/BitmapPalette.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/window.hxx>
@@ -34,27 +34,17 @@
 #include <vcl/svapp.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/graphictools.hxx>
-#include <comphelper/fileformat.h>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/mtfxmldump.hxx>
 
 #include <svmconverter.hxx>
 
-#include <salbmp.hxx>
-#include <salinst.hxx>
-#include <svdata.hxx>
-
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/rendering/MtfRenderer.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/awt/XGraphics.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/graphic/XGraphicRenderer.hpp>
 
 using namespace com::sun::star;
 
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index f76a0dd9ee16..d21736d0ba37 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -24,7 +24,6 @@
 #include <unotools/tempfile.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/gfxlink.hxx>
-#include <vcl/cvtgrf.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <memory>
 #include <o3tl/make_shared.hxx>
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 8d63a4ab8171..1cdf4e4c8825 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -21,13 +21,8 @@
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/metaact.hxx>
 #include <impgraph.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/graphic/GraphicProvider.hpp>
-#include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <graphic/UnoGraphic.hxx>
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 195e40d1a45a..c645e9d6cda6 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -26,7 +26,6 @@
 #include <tools/vcompat.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
-#include <tools/helpers.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/tempfile.hxx>
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index a27094c02f9a..52174a012c19 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -17,16 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdlib.h>
-
 #include <sal/log.hxx>
 #include <vcl/bitmapaccess.hxx>
+#include <tools/link.hxx>
 #include <tools/poly.hxx>
 #include <tools/helpers.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
 #include <vcl/virdev.hxx>
 #include "impvect.hxx"
 #include <array>
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 3864442342e7..a532a6cf8132 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 #include <tools/solar.h>
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 7813d1671846..63ab44c607bf 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <algorithm>
 #include <stdio.h>
 #include <string.h>
 #include <osl/thread.h>
@@ -29,7 +28,6 @@
 #include <vcl/outdev.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/graphictools.hxx>
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <unotools/fontdefs.hxx>
 
 namespace
diff --git a/vcl/source/gdi/mtfxmldump.cxx b/vcl/source/gdi/mtfxmldump.cxx
index 00ea60334b33..604092a2a8a7 100644
--- a/vcl/source/gdi/mtfxmldump.cxx
+++ b/vcl/source/gdi/mtfxmldump.cxx
@@ -14,10 +14,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
 #include <rtl/string.hxx>
-#include <rtl/strbuf.hxx>
 
-#include <memory>
-#include <numeric>
 #include <sstream>
 
 namespace
diff --git a/vcl/source/gdi/pdfbuildin_fonts.cxx b/vcl/source/gdi/pdfbuildin_fonts.cxx
index 3fa7a87517c1..ddf7e3bcb145 100644
--- a/vcl/source/gdi/pdfbuildin_fonts.cxx
+++ b/vcl/source/gdi/pdfbuildin_fonts.cxx
@@ -20,7 +20,6 @@
 #include "pdfbuildin_fonts.hxx"
 
 #include <rtl/strbuf.hxx>
-#include <vcl/settings.hxx>
 
 using namespace vcl;
 
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 8696fd259a0e..1abdb5244714 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -22,7 +22,6 @@
 #include <vcl/graph.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/gfxlink.hxx>
-#include <vcl/dllapi.h>
 #include <vcl/metaact.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -31,7 +30,6 @@
 #include <osl/diagnose.h>
 #include <tools/stream.hxx>
 
-#include <set>
 #include <memory>
 #include <map>
 
diff --git a/vcl/source/gdi/pdffontcache.cxx b/vcl/source/gdi/pdffontcache.cxx
index 2f18bcb81f38..b79753c0ffb4 100644
--- a/vcl/source/gdi/pdffontcache.cxx
+++ b/vcl/source/gdi/pdffontcache.cxx
@@ -21,10 +21,8 @@
 
 #include <sal/types.h>
 
-#include <fontinstance.hxx>
 #include <PhysicalFontFace.hxx>
 #include <salgdi.hxx>
-#include <sallayout.hxx>
 
 #include "pdffontcache.hxx"
 
diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx
index fd1b4848ec91..79d6e96f37d6 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.hxx
@@ -24,7 +24,6 @@
 
 #include <sal/types.h>
 
-#include <sallayout.hxx>
 #include <salgdi.hxx>
 
 namespace vcl
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index a50b0dd717a2..3a50ad3af042 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -19,7 +19,6 @@
 
 #include "pdfwriter_impl.hxx"
 #include <vcl/bitmapex.hxx>
-#include <vcl/image.hxx>
 
 using namespace vcl;
 
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index a00fe2767f9e..e31687a314a1 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -34,7 +34,6 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <memory>
 #include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <comphelper/processfactory.hxx>
@@ -44,12 +43,10 @@
 #include <o3tl/numeric.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.h>
-#include <rtl/crc.h>
 #include <rtl/digest.h>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <svl/urihelper.hxx>
-#include <tools/debug.hxx>
 #include <tools/fract.hxx>
 #include <tools/helpers.hxx>
 #include <tools/stream.hxx>
@@ -61,7 +58,6 @@
 #include <vcl/canvastools.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/fontcharmap.hxx>
-#include <vcl/image.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/settings.hxx>
@@ -72,10 +68,8 @@
 #include <comphelper/hash.hxx>
 
 #include <fontsubset.hxx>
-#include <outdev.h>
 #include <PhysicalFontFace.hxx>
 #include <salgdi.hxx>
-#include <sallayout.hxx>
 #include <textlayout.hxx>
 #include <textlineinfo.hxx>
 #include <bitmapwriteaccess.hxx>
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 50bfa5863a6b..fed7b1d39b28 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -44,7 +44,6 @@
 #include <comphelper/hash.hxx>
 #include <tools/stream.hxx>
 
-#include <sallayout.hxx>
 #include <outdata.hxx>
 #include "pdffontcache.hxx"
 #include "pdfbuildin_fonts.hxx"
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 63a369c177c9..a060cd580fe0 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -26,8 +26,6 @@
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/graph.hxx>
 
-#include <svdata.hxx>
-
 #include <unotools/streamwrap.hxx>
 
 #include <tools/helpers.hxx>
@@ -46,7 +44,6 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include <rtl/digest.h>
 #include <sal/log.hxx>
 #include <memory>
 
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 24253ca77609..c6c5bf021c67 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -36,7 +36,6 @@
 #include <salprn.hxx>
 #include <svdata.hxx>
 #include <print.hrc>
-#include <strings.hrc>
 #include <jobset.h>
 #include <outdev.h>
 #include <PhysicalFontCollection.hxx>
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 0a470003f2fc..8d01492af20e 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -17,13 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <functional>
-#include <algorithm>
 #include <utility>
 #include <list>
 #include <vector>
 
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <sal/log.hxx>
 #include <officecfg/Office/Common.hxx>
@@ -35,8 +32,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/bitmapaccess.hxx>
 
-#include <print.h>
-
 #include "pdfwriter_impl.hxx"
 
 #define MAX_TILE_WIDTH  1024
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 242dbfc79522..eefe65573270 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -22,7 +22,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/configsettings.hxx>
-#include <vcl/unohelp.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
@@ -36,14 +35,11 @@
 #include <salprn.hxx>
 #include <strings.hrc>
 
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ui/dialogs/FilePicker.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/view/DuplexMode.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/awt/Size.hpp>
 
 #include <unordered_map>
diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx
index 90af8e74da06..c4772110737e 100644
--- a/vcl/source/gdi/regband.cxx
+++ b/vcl/source/gdi/regband.cxx
@@ -17,10 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <algorithm>
-
 #include <tools/helpers.hxx>
-#include <osl/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <sal/log.hxx>
 
 #include <regband.hxx>
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 083f89a15395..e2fb96dae080 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -18,17 +18,14 @@
  */
 
 #include <memory>
-#include <limits.h>
 #include <tools/vcompat.hxx>
 #include <tools/stream.hxx>
-#include <tools/helpers.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/region.hxx>
 #include <regionband.hxx>
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index 0b7f13b4323c..adddd264c421 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <tools/stream.hxx>
-#include <tools/debug.hxx>
 #include <regionband.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 789e323f33de..22a0fb9c7137 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -30,7 +30,6 @@
 #endif
 #include <salgdi.hxx>
 #include <salframe.hxx>
-#include <basegfx/numeric/ftools.hxx> //for F_PI180
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <FileDefinitionWidgetDraw.hxx>
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index bcd8eaa74a77..eaa016ed1927 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -30,15 +30,12 @@
 #include <salgdi.hxx>
 #include <sallayout.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 #include <i18nlangtag/lang.h>
 
 #include <vcl/svapp.hxx>
 
-#include <limits.h>
-
 #include <unicode/ubidi.h>
 #include <unicode/uchar.h>
 
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 7cb35deed5c8..6611d8fa5d2e 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -20,17 +20,13 @@
 #include <algorithm>
 #include <string.h>
 #include <osl/thread.h>
-#include <tools/debug.hxx>
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
-#include <tools/helpers.hxx>
 #include <tools/GenericTypeSerializer.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/graph.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/metaact.hxx>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 5338acc2ad5b..bcd7c8cb204e 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -20,12 +20,9 @@
 #include <vcl/ctrl.hxx>
 #include <vcl/outdev.hxx>
 
-#include <fontinstance.hxx>
 #include <textlayout.hxx>
 
-#include <com/sun/star/i18n/ScriptDirection.hpp>
-
-#include <tools/diagnose_ex.h>
+#include <osl/diagnose.h>
 #include <tools/fract.hxx>
 #include <sal/log.hxx>
 
diff --git a/vcl/source/gdi/vectorgraphicdata.cxx b/vcl/source/gdi/vectorgraphicdata.cxx
index 3d32af0ee0e7..19de20690e06 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -22,7 +22,6 @@
 #include <sal/log.hxx>
 #include <vcl/vectorgraphicdata.hxx>
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/graphic/SvgTools.hpp>
 #include <com/sun/star/graphic/EmfTools.hpp>
 #include <com/sun/star/graphic/Primitive2DTools.hpp>
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 196ed44871cb..3d16815b2557 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -23,7 +23,6 @@
 #include <outdev.h>
 #include <PhysicalFontCollection.hxx>
 #include <svdata.hxx>
-#include <vcl/ITiledRenderable.hxx>
 #include <vcl/virdev.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
diff --git a/vcl/source/graphic/GraphicLoader.cxx b/vcl/source/graphic/GraphicLoader.cxx
index 8343b513942a..b1127f541515 100644
--- a/vcl/source/graphic/GraphicLoader.cxx
+++ b/vcl/source/graphic/GraphicLoader.cxx
@@ -13,7 +13,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/wmf.hxx>
 
 using namespace css;
 
diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx
index 8e1b50a2c0da..49334eb51837 100644
--- a/vcl/source/graphic/GraphicObject.cxx
+++ b/vcl/source/graphic/GraphicObject.cxx
@@ -21,20 +21,14 @@
 
 #include <algorithm>
 
-#include <officecfg/Office/Common.hxx>
-#include <osl/file.hxx>
-#include <tools/vcompat.hxx>
+#include <osl/diagnose.h>
 #include <tools/fract.hxx>
 #include <tools/helpers.hxx>
-#include <unotools/ucbstreamhelper.hxx>
-#include <unotools/tempfile.hxx>
-#include <unotools/configmgr.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/cvtgrf.hxx>
 #include <vcl/metaact.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <vcl/GraphicLoader.hxx>
+#include <vcl/outdev.hxx>
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/vcl/source/graphic/GraphicObject2.cxx b/vcl/source/graphic/GraphicObject2.cxx
index bfb31740def7..dc60db55dd3f 100644
--- a/vcl/source/graphic/GraphicObject2.cxx
+++ b/vcl/source/graphic/GraphicObject2.cxx
@@ -19,20 +19,11 @@
 
 #include <sal/config.h>
 
-#include <cstdlib>
-
-#include <vcl/bitmapaccess.hxx>
-#include <tools/poly.hxx>
+#include <tools/gen.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/metaact.hxx>
-#include <vcl/metric.hxx>
-#include <vcl/animate/Animation.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/GraphicObject.hxx>
-#include <bitmapwriteaccess.hxx>
 #include <memory>
 
 struct ImplTileInfo
@@ -188,7 +179,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
 //          rVDev.SetFillCOL_WHITE );
             rVDev.SetFillColor();
             rVDev.SetLineColor( Color( 255 * nExponent / nMSBFactor, 255 - 255 * nExponent / nMSBFactor, 128 - 255 * nExponent / nMSBFactor ) );
-            rVDev.DrawEllipse( Rectangle(aTileInfo.aNextTileTopLeft.X(), aTileInfo.aTileTopLeft.Y(),
+            rVDev.DrawEllipse( tools::Rectangle(aTileInfo.aNextTileTopLeft.X(), aTileInfo.aTileTopLeft.Y(),
                                          aTileInfo.aNextTileTopLeft.X() - 1 + (aTileInfo.nTilesEmptyX/nMSBFactor)*aTileInfo.aTileSizePixel.Width(),
                                          aTileInfo.aTileTopLeft.Y() + aTileInfo.aTileSizePixel.Height() - 1) );
 #endif
@@ -206,7 +197,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
             }
 
 #ifdef DBG_TEST
-            rVDev.DrawEllipse( Rectangle(aTileInfo.aTileTopLeft.X(), aTileInfo.aNextTileTopLeft.Y(),
+            rVDev.DrawEllipse( tools::Rectangle(aTileInfo.aTileTopLeft.X(), aTileInfo.aNextTileTopLeft.Y(),
                                          aTileInfo.aTileTopLeft.X() + aTileInfo.aTileSizePixel.Width() - 1,
                                          aTileInfo.aNextTileTopLeft.Y() - 1 + (aTileInfo.nTilesEmptyY/nMSBFactor)*aTileInfo.aTileSizePixel.Height()) );
 #endif
@@ -272,7 +263,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
 //  rVDev.SetFillCOL_WHITE );
     rVDev.SetFillColor();
     rVDev.SetLineColor( Color( 255 * nExponent / nMSBFactor, 255 - 255 * nExponent / nMSBFactor, 128 - 255 * nExponent / nMSBFactor ) );
-    rVDev.DrawRect( Rectangle((rTileInfo.aTileTopLeft.X())*rTileSizePixel.Width(),
+    rVDev.DrawRect( tools::Rectangle((rTileInfo.aTileTopLeft.X())*rTileSizePixel.Width(),
                               (rTileInfo.aTileTopLeft.Y())*rTileSizePixel.Height(),
                               (rTileInfo.aNextTileTopLeft.X())*rTileSizePixel.Width()-1,
                               (rTileInfo.aNextTileTopLeft.Y())*rTileSizePixel.Height()-1) );
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index 3ddec0ae280b..1370b15c0811 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -19,8 +19,6 @@
 
 #include <graphic/Manager.hxx>
 #include <impgraph.hxx>
-#include <vcl/lazydelete.hxx>
-#include <vcl/svapp.hxx>
 #include <sal/log.hxx>
 
 #include <officecfg/Office/Common.hxx>
diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx b/vcl/source/graphic/UnoGraphicDescriptor.cxx
index 8b4f1fa79d89..331e24167aff 100644
--- a/vcl/source/graphic/UnoGraphicDescriptor.cxx
+++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx
@@ -21,10 +21,8 @@
 
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <svl/itemprop.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/graphic/GraphicType.hpp>
diff --git a/vcl/source/graphic/UnoGraphicObject.cxx b/vcl/source/graphic/UnoGraphicObject.cxx
index fa03a52813bc..86bb100ed3f2 100644
--- a/vcl/source/graphic/UnoGraphicObject.cxx
+++ b/vcl/source/graphic/UnoGraphicObject.cxx
@@ -21,11 +21,9 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/graphic/XGraphicObject.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <vcl/GraphicObject.hxx>
-#include <rtl/ref.hxx>
 
 using namespace css;
 
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx b/vcl/source/graphic/UnoGraphicProvider.cxx
index eed36dbc0fe6..907b81316050 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -22,15 +22,11 @@
 #include <vcl/metaact.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/imagerepository.hxx>
-#include <unotools/resmgr.hxx>
 #include <tools/fract.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/wmf.hxx>
 #include <vcl/wmfexternal.hxx>
-#include <svl/solar.hrc>
 #include <vcl/virdev.hxx>
-#include <vcl/settings.hxx>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/graphic/XGraphicProvider2.hpp>
 #include <com/sun/star/io/XStream.hpp>
@@ -46,11 +42,9 @@
 #include <graphic/UnoGraphicDescriptor.hxx>
 #include <graphic/UnoGraphic.hxx>
 #include <rtl/ref.hxx>
-#include <vcl/GraphicObject.hxx>
 #include <vcl/dibtools.hxx>
 #include <comphelper/sequence.hxx>
 #include <memory>
-#include <svtools/ehdl.hxx>
 
 using namespace com::sun::star;
 
diff --git a/vcl/source/graphic/UnoGraphicTransformer.cxx b/vcl/source/graphic/UnoGraphicTransformer.cxx
index 13e1adbee114..30fd389b9485 100644
--- a/vcl/source/graphic/UnoGraphicTransformer.cxx
+++ b/vcl/source/graphic/UnoGraphicTransformer.cxx
@@ -21,16 +21,9 @@
 #include <graphic/UnoGraphicTransformer.hxx>
 
 #include <vcl/graph.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/image.hxx>
-#include <vcl/metaact.hxx>
-#include <svl/solar.hrc>
-#include <vcl/virdev.hxx>
-#include <vcl/bitmapaccess.hxx>
+#include <vcl/BitmapColor.hxx>
 #include <vcl/BitmapDuoToneFilter.hxx>
 
-#include <com/sun/star/text/GraphicCrop.hpp>
-
 using namespace com::sun::star;
 
 namespace unographic {
diff --git a/vcl/source/graphic/grfattr.cxx b/vcl/source/graphic/grfattr.cxx
index 923c2ea9e55a..88d0852afe60 100644
--- a/vcl/source/graphic/grfattr.cxx
+++ b/vcl/source/graphic/grfattr.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <tools/vcompat.hxx>
 #include <vcl/GraphicObject.hxx>
 
 
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index a18e7a9ffd84..8170e5118c48 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -17,44 +17,27 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/compbase.hxx>
-
 #include <com/sun/star/geometry/RealSize2D.hpp>
-#include <com/sun/star/geometry/RealPoint2D.hpp>
-#include <com/sun/star/geometry/RealRectangle2D.hpp>
 #include <com/sun/star/geometry/IntegerSize2D.hpp>
 #include <com/sun/star/geometry/IntegerPoint2D.hpp>
 #include <com/sun/star/geometry/IntegerRectangle2D.hpp>
-#include <com/sun/star/geometry/RealBezierSegment2D.hpp>
 
 #include <com/sun/star/rendering/ColorSpaceType.hpp>
 #include <com/sun/star/rendering/RenderingIntent.hpp>
 #include <com/sun/star/rendering/VolatileContentDestroyedException.hpp>
-#include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XBitmap.hpp>
-#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 #include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/rendering/ColorComponentTag.hpp>
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/vector/b2dsize.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/vector/b2isize.hxx>
 #include <basegfx/point/b2ipoint.hxx>
 #include <basegfx/range/b2irectangle.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/utils/canvastools.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include <sal/log.hxx>
 #include <tools/helpers.hxx>
-#include <tools/poly.hxx>
 #include <tools/diagnose_ex.h>
-#include <rtl/uuid.h>
 
-#include <vcl/bitmapaccess.hxx>
 #include <vcl/bitmapex.hxx>
 
 #include <canvasbitmap.hxx>
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx
index 05c6a316a789..6cd1e1b469ba 100644
--- a/vcl/source/helper/lazydelete.cxx
+++ b/vcl/source/helper/lazydelete.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/window.hxx>
-#include <vcl/menu.hxx>
 #include <vcl/lazydelete.hxx>
 #include <svdata.hxx>
 #include <sal/log.hxx>
diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx
index 60507cb3b188..bd5db6adb438 100644
--- a/vcl/source/helper/strhelper.cxx
+++ b/vcl/source/helper/strhelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <vcl/strhelper.hxx>
-#include <sal/alloca.h>
 
 namespace  {
 
diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index 4316f9145a16..01bce0514116 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -17,27 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/file.hxx>
-#include <tools/stream.hxx>
-#include <unotools/resmgr.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/image.hxx>
-#include <vcl/imagerepository.hxx>
-#include <vcl/ImageTree.hxx>
 #include <sal/types.h>
 #include <image.h>
 
-#include <BitmapDisabledImageFilter.hxx>
 #include <BitmapColorizeFilter.hxx>
 
-#if OSL_DEBUG_LEVEL > 0
-#include <rtl/strbuf.hxx>
-#endif
-
 using namespace css;
 
 Image::Image()
diff --git a/vcl/source/image/ImageTree.cxx b/vcl/source/image/ImageTree.cxx
index 826671e110ec..83e2962cbf8e 100644
--- a/vcl/source/image/ImageTree.cxx
+++ b/vcl/source/image/ImageTree.cxx
@@ -11,7 +11,6 @@
 #include <vcl/ImageTree.hxx>
 #include <implimagetree.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 
 ImageTree & ImageTree::get() {
diff --git a/vcl/source/image/ImplImage.cxx b/vcl/source/image/ImplImage.cxx
index 2658aac303b7..702426270cf3 100644
--- a/vcl/source/image/ImplImage.cxx
+++ b/vcl/source/image/ImplImage.cxx
@@ -19,22 +19,14 @@
 
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/outdev.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/alpha.hxx>
-#include <vcl/window.hxx>
-#include <vcl/bitmapaccess.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/image.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/BitmapFilter.hxx>
 #include <vcl/ImageTree.hxx>
-#include <vcl/imagerepository.hxx>
 #include <BitmapDisabledImageFilter.hxx>
 #include <comphelper/lok.hxx>
 
 #include <image.h>
-#include <memory>
 
 ImplImage::ImplImage(const BitmapEx &rBitmapEx)
     : maBitmapChecksum(0)
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index e1bf651e5b02..d90160c516eb 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -26,8 +26,6 @@
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/packages/zip/ZipFileAccess.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/uno/Exception.hpp>