avmedia/source/framework/mediacontrol.cxx                   |    1 
 basctl/source/basicide/ObjectCatalog.cxx                    |    1 
 basctl/source/basicide/bastype2.cxx                         |    1 
 basctl/source/basicide/objectbrowser.cxx                    |    1 
 chart2/source/controller/main/ChartTransferable.cxx         |    1 
 chart2/source/controller/main/ElementSelector.cxx           |    1 
 cppcanvas/source/mtfrenderer/implrenderer.cxx               |    1 
 dbaccess/source/ui/control/dbtreelistbox.cxx                |    1 
 dbaccess/source/ui/control/tabletree.cxx                    |    1 
 dbaccess/source/ui/inc/TableWindowTitle.hxx                 |    1 
 dbaccess/source/ui/querydesign/TableWindowListBox.cxx       |    1 
 dbaccess/source/ui/querydesign/TableWindowTitle.cxx         |    1 
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx       |    1 
 drawinglayer/source/primitive2d/sceneprimitive2d.cxx        |    1 
 drawinglayer/source/tools/wmfemfhelper.cxx                  |    1 
 editeng/qa/unit/core-test.cxx                               |    1 
 extensions/source/bibliography/general.cxx                  |    1 
 extensions/source/bibliography/general.hxx                  |    2 +
 extensions/source/bibliography/toolbar.hxx                  |    1 
 filter/source/graphicfilter/icgm/bitmap.cxx                 |    2 +
 filter/source/msfilter/msdffimp.cxx                         |    1 
 filter/source/msfilter/util.cxx                             |    2 +
 framework/source/uielement/FixedImageToolbarController.cxx  |    2 +
 framework/source/uielement/FixedTextToolbarController.cxx   |    2 +
 framework/source/uielement/comboboxtoolbarcontroller.cxx    |    2 +
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx |    1 
 framework/source/uielement/edittoolbarcontroller.cxx        |    1 
 framework/source/uielement/spinfieldtoolbarcontroller.cxx   |    2 +
 include/sfx2/sidebar/TabBar.hxx                             |    2 +
 include/svtools/recorditemwindow.hxx                        |    1 
 include/svtools/scrolladaptor.hxx                           |    1 
 include/svtools/toolboxcontroller.hxx                       |    1 
 include/svx/labelitemwindow.hxx                             |    1 
 include/vcl/BinaryDataContainer.hxx                         |   17 +++++++++---
 include/vcl/BinaryDataContainerTools.hxx                    |   13 +++++++--
 include/vcl/BitmapPalette.hxx                               |    2 -
 include/vcl/BitmapReadAccess.hxx                            |    4 ++
 include/vcl/BitmapTools.hxx                                 |   11 ++++++-
 include/vcl/BitmapWriteAccess.hxx                           |   11 ++++++-
 include/vcl/ColorDialog.hxx                                 |    5 ++-
 include/vcl/GraphicLoader.hxx                               |    5 ++-
 include/vcl/GraphicNativeMetadata.hxx                       |    6 ++--
 include/vcl/ITiledRenderable.hxx                            |   13 ++++-----
 include/vcl/IconThemeInfo.hxx                               |    2 -
 include/vcl/InterimItemWindow.hxx                           |   15 +++++++++-
 include/vcl/QueueInfo.hxx                                   |    3 +-
 include/vcl/RawBitmap.hxx                                   |    5 ++-
 include/vcl/TypeSerializer.hxx                              |    9 ++++--
 include/vcl/UserResourceScanner.hxx                         |    6 +++-
 include/vcl/VectorGraphicSearch.hxx                         |    8 ++++-
 include/vcl/WeldedTabbedNotebookbar.hxx                     |    6 +++-
 sc/source/ui/app/inputwin.cxx                               |    1 
 sc/source/ui/cctrl/cbnumberformat.cxx                       |    1 
 sc/source/ui/drawfunc/fuconarc.cxx                          |    1 
 sc/source/ui/drawfunc/fuconcustomshape.cxx                  |    1 
 sc/source/ui/drawfunc/fuconpol.cxx                          |    1 
 sc/source/ui/drawfunc/fuconrec.cxx                          |    1 
 sc/source/ui/drawfunc/fuconstr.cxx                          |    1 
 sc/source/ui/drawfunc/fuconuno.cxx                          |    1 
 sc/source/ui/drawfunc/fudraw.cxx                            |    1 
 sc/source/ui/drawfunc/futext.cxx                            |    1 
 sc/source/ui/unoobj/docuno.cxx                              |    1 
 sc/source/ui/view/gridwin.cxx                               |    1 
 sc/source/ui/view/gridwin2.cxx                              |    1 
 sc/source/ui/view/gridwin3.cxx                              |    1 
 sc/source/ui/view/hdrcont.cxx                               |    1 
 sc/source/ui/view/preview.cxx                               |    1 
 sc/source/ui/view/tabsplit.cxx                              |    1 
 sc/source/ui/view/tabview5.cxx                              |    1 
 sc/source/ui/view/tabvwsha.cxx                              |    1 
 sd/inc/unomodel.hxx                                         |    2 +
 sd/source/ui/inc/ViewTabBar.hxx                             |    1 
 sd/source/ui/unoidl/unomodel.cxx                            |    1 
 sd/source/ui/view/ViewTabBar.cxx                            |    2 +
 svtools/source/brwbox/brwbox1.cxx                           |    1 
 svtools/source/brwbox/recorditemwindow.cxx                  |    1 
 svtools/source/control/scrolladaptor.cxx                    |    1 
 svx/source/form/labelitemwindow.cxx                         |    1 
 svx/source/sdr/primitive2d/sdrprimitivetools.cxx            |    2 +
 svx/source/sidebar/paragraph/ParaSpacingWindow.cxx          |    1 
 svx/source/styles/ColorSets.cxx                             |    1 
 svx/source/svdraw/svdpdf.cxx                                |    1 
 sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx      |    1 
 sw/source/uibase/docvw/UnfloatTableButton.cxx               |    1 
 sw/source/uibase/inc/FrameControl.hxx                       |    1 
 sw/source/uibase/inc/uitool.hxx                             |    1 
 sw/source/uibase/uno/unotxdoc.cxx                           |    1 
 test/source/text/baseindex.cxx                              |    2 +
 vcl/backendtest/outputdevice/bitmap.cxx                     |    1 
 vcl/inc/bitmap/ScanlineTools.hxx                            |    1 
 vcl/inc/headless/CairoCommon.hxx                            |    1 
 vcl/inc/pdf/COSWriter.hxx                                   |    1 
 vcl/inc/salbmp.hxx                                          |    1 
 vcl/inc/salinst.hxx                                         |    1 
 vcl/inc/scanlinewriter.hxx                                  |    1 
 vcl/qa/cppunit/BackendTest.cxx                              |    1 
 vcl/qa/cppunit/BinaryDataContainerTest.cxx                  |    1 
 vcl/qa/cppunit/BitmapExTest.cxx                             |    1 
 vcl/qa/cppunit/CommonTools.hxx                              |    5 +++
 vcl/qa/cppunit/canvasbitmaptest.cxx                         |    1 
 vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx          |    1 
 vcl/qa/cppunit/skia/skia.cxx                                |    1 
 vcl/qa/cppunit/svm/svmtest.cxx                              |    1 
 vcl/qt5/QtBitmap.cxx                                        |    1 
 vcl/source/app/ITiledRenderable.cxx                         |    1 
 vcl/source/app/IconThemeInfo.cxx                            |    1 
 vcl/source/bitmap/BitmapTools.cxx                           |    2 +
 vcl/source/bitmap/bitmap.cxx                                |    1 
 vcl/source/bitmap/bitmappalette.cxx                         |    1 
 vcl/source/bitmap/dibtools.cxx                              |    1 
 vcl/source/bitmap/salbmp.cxx                                |    1 
 vcl/source/control/InterimItemWindow.cxx                    |    2 +
 vcl/source/filter/GraphicNativeMetadata.cxx                 |    1 
 vcl/source/filter/ieps/ieps.cxx                             |    1 
 vcl/source/filter/igif/gifread.cxx                          |    1 
 vcl/source/filter/ipbm/ipbm.cxx                             |    2 +
 vcl/source/filter/ipcd/ipcd.cxx                             |    1 
 vcl/source/filter/ipcx/ipcx.cxx                             |    2 +
 vcl/source/filter/ipict/ipict.cxx                           |    1 
 vcl/source/filter/ipsd/ipsd.cxx                             |    1 
 vcl/source/filter/iras/iras.cxx                             |    2 +
 vcl/source/filter/itga/itga.cxx                             |    2 +
 vcl/source/filter/svm/SvmWriter.cxx                         |    1 
 vcl/source/gdi/TypeSerializer.cxx                           |    1 
 vcl/source/gdi/gdimtf.cxx                                   |    1 
 vcl/source/printer/QueueInfo.cxx                            |    1 
 vcl/source/window/mouse.cxx                                 |    1 
 vcl/workben/vcldemo.cxx                                     |    1 
 128 files changed, 237 insertions(+), 36 deletions(-)

New commits:
commit c0b14ab9aa4d713a6b718ef07b9e0379b88e97d3
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Fri Dec 26 21:43:34 2025 +0100
Commit:     Gabor Kelemen <[email protected]>
CommitDate: Mon Jan 5 11:10:28 2026 +0100

    tdf#146619 Use more forward declarations in include/vcl/[A-Z]*
    
    Found after running bin/find-unneeded-includes --headersfwd 
include/vcl/[A-Z]*
    
    This shaves off about 100M input, not bad for such a small amount
    of files checked
    
    This time --headersfwd skips files that contain #if defs,
    in hope of not breaking builds that are not checked by CI
    
    (...except for include/vcl/BitmapTools.hxx - this was cleaned accidentally,
    due to a bug in the bin/find-unneeded-includes script that is fixed
    by the previous commit 930ff2b830ebaf44b8db6fd0d6be9342da814b0a
    - but let's keep this anyway, it seems fine)
    
    Change-Id: Ia8e49d94f6adb3cdbedbc40ffa56dbf846c9b6e4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196235
    Reviewed-by: Gabor Kelemen <[email protected]>
    Tested-by: Jenkins

diff --git a/avmedia/source/framework/mediacontrol.cxx 
b/avmedia/source/framework/mediacontrol.cxx
index d05d77feab95..f7e65ee5e209 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -23,6 +23,7 @@
 #include <avmedia/mediawindow.hxx>
 #include <helpids.h>
 #include <vcl/weld/weld.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <avmedia/MediaControlBase.hxx>
 
 #include <com/sun/star/media/ZoomLevel.hpp>
diff --git a/basctl/source/basicide/ObjectCatalog.cxx 
b/basctl/source/basicide/ObjectCatalog.cxx
index 170ee4f74791..800251a83542 100644
--- a/basctl/source/basicide/ObjectCatalog.cxx
+++ b/basctl/source/basicide/ObjectCatalog.cxx
@@ -24,6 +24,7 @@
 #include <helpids.h>
 
 #include <vcl/taskpanelist.hxx>
+#include <vcl/weld/Builder.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index c39bc363cfbd..1d0b3c009c49 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -37,6 +37,7 @@
 #include <sfx2/sfxsids.hrc>
 #include <svl/itemset.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 
 #include <initializer_list>
 #include <memory>
diff --git a/basctl/source/basicide/objectbrowser.cxx 
b/basctl/source/basicide/objectbrowser.cxx
index 20869cf97aae..a3b426df3f24 100644
--- a/basctl/source/basicide/objectbrowser.cxx
+++ b/basctl/source/basicide/objectbrowser.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/taskpanelist.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <vcl/weld/weld.hxx>
 
 #include <com/sun/star/system/XSystemShellExecute.hpp>
diff --git a/chart2/source/controller/main/ChartTransferable.cxx 
b/chart2/source/controller/main/ChartTransferable.cxx
index 100effb23938..dae30cf0b2d8 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -23,6 +23,7 @@
 
 #include "ChartTransferable.hxx"
 
+#include <tools/stream.hxx>
 #include <sot/exchange.hxx>
 #include <unotools/streamwrap.hxx>
 #include <vcl/graph.hxx>
diff --git a/chart2/source/controller/main/ElementSelector.cxx 
b/chart2/source/controller/main/ElementSelector.cxx
index 993674e75b7d..89e7f54d017b 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -32,6 +32,7 @@
 #include <o3tl/safeint.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/weld.hxx>
 
 namespace chart
 {
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx 
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index e7b04397507b..e8bd10291ba6 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -54,6 +54,7 @@
 #include <vcl/metric.hxx>
 #include <vcl/graphictools.hxx>
 #include <vcl/BitmapPalette.hxx>
+#include <vcl/BitmapColor.hxx>
 #include <tools/poly.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <implrenderer.hxx>
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx 
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 129ce752e42d..54605ad590b3 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -40,6 +40,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 
 #include <memory>
 
diff --git a/dbaccess/source/ui/control/tabletree.cxx 
b/dbaccess/source/ui/control/tabletree.cxx
index d1090a9aae0f..db2d087412d5 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -31,6 +31,7 @@
 #include <comphelper/diagnose_ex.hxx>
 #include <osl/diagnose.h>
 #include <connectivity/dbmetadata.hxx>
+#include <vcl/weld/Builder.hxx>
 
 #include <algorithm>
 
diff --git a/dbaccess/source/ui/inc/TableWindowTitle.hxx 
b/dbaccess/source/ui/inc/TableWindowTitle.hxx
index 0a3779bd8873..d06d621f1763 100644
--- a/dbaccess/source/ui/inc/TableWindowTitle.hxx
+++ b/dbaccess/source/ui/inc/TableWindowTitle.hxx
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld/weld.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx 
b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 13242b0c609b..163c9f285f8e 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <vcl/svapp.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <o3tl/string_view.hxx>
 
 using namespace dbaui;
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx 
b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 90f2c615dcba..841212e55d04 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -21,6 +21,7 @@
 #include <TableWindow.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <TableWindowListBox.hxx>
 #include <TableConnection.hxx>
 #include <JoinController.hxx>
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx 
b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index b43c43b685a3..53e5220c40be 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -20,6 +20,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/ComboBox.hxx>
 #include <vcl/window.hxx>
+#include <vcl/weld/weld.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <core_resource.hxx>
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx 
b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index 65cd3d1f0373..fbc651acf11e 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -34,6 +34,7 @@
 #include <basegfx/raster/bzpixelraster.hxx>
 #include <utility>
 #include <vcl/BitmapTools.hxx>
+#include <vcl/RawBitmap.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
 #include <comphelper/threadpool.hxx>
 #include <comphelper/lok.hxx>
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx 
b/drawinglayer/source/tools/wmfemfhelper.cxx
index ea6ac967af87..f8016abd037d 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -20,6 +20,7 @@
 #include <wmfemfhelper.hxx>
 #include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
 #include <vcl/alpha.hxx>
+#include <vcl/BitmapColor.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/metaact.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index c68727f575af..5d9736592280 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -32,6 +32,7 @@
 #include <editeng/udlnitem.hxx>
 #include <svl/srchitem.hxx>
 #include <svl/voiditem.hxx>
+#include <tools/stream.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <vcl/salgtype.hxx>
diff --git a/extensions/source/bibliography/general.cxx 
b/extensions/source/bibliography/general.cxx
index faf3b15ebcd3..49d5d1f994e8 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -34,6 +34,7 @@
 #include <utility>
 #include <vcl/event.hxx>
 #include <vcl/mnemonic.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <vcl/weld/ComboBox.hxx>
 #include "general.hxx"
 #include "bibresid.hxx"
diff --git a/extensions/source/bibliography/general.hxx 
b/extensions/source/bibliography/general.hxx
index 6fbf71f6de92..891d1cbf3477 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -22,6 +22,8 @@
 #include <sal/config.h>
 
 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld/weld.hxx>
+#include <vcl/weld/ComboBox.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/ScrolledWindow.hxx>
 #include <vcl/weld/SpinButton.hxx>
diff --git a/extensions/source/bibliography/toolbar.hxx 
b/extensions/source/bibliography/toolbar.hxx
index a6f627030621..21ac5114574b 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -25,6 +25,7 @@
 #include <vcl/InterimItemWindow.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/timer.hxx>
+#include <vcl/weld/weld.hxx>
 #include <vcl/weld/ComboBox.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx 
b/filter/source/graphicfilter/icgm/bitmap.cxx
index d30fb932e4fd..192e3e459c4c 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -20,7 +20,9 @@
 
 #include <sal/log.hxx>
 #include <comphelper/configuration.hxx>
+#include <tools/color.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <vcl/RawBitmap.hxx>
 #include <memory>
 
 #include "bitmap.hxx"
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index f7aa83bbd619..85881010d323 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -49,6 +49,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <vcl/RawBitmap.hxx>
 #include "viscache.hxx"
 
 // SvxItem-Mapping. Is needed to successfully include the SvxItem-Header
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 04507ebc2ef6..0081e8b29344 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -12,9 +12,11 @@
 #include <rtl/ustring.hxx>
 #include <rtl/character.hxx>
 #include <comphelper/string.hxx>
+#include <tools/color.hxx>
 #include <unotools/fontcvt.hxx>
 #include <unotools/fontdefs.hxx>
 #include <utility>
+#include <vcl/BitmapColor.hxx>
 #include <vcl/BitmapPalette.hxx>
 #include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/util.hxx>
diff --git a/framework/source/uielement/FixedImageToolbarController.cxx 
b/framework/source/uielement/FixedImageToolbarController.cxx
index 11064db044fa..1603fd111574 100644
--- a/framework/source/uielement/FixedImageToolbarController.cxx
+++ b/framework/source/uielement/FixedImageToolbarController.cxx
@@ -23,6 +23,8 @@
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld/weld.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/imgdef.hxx>
 #include <framework/addonsoptions.hxx>
diff --git a/framework/source/uielement/FixedTextToolbarController.cxx 
b/framework/source/uielement/FixedTextToolbarController.cxx
index 9e97aba09198..994a3f707840 100644
--- a/framework/source/uielement/FixedTextToolbarController.cxx
+++ b/framework/source/uielement/FixedTextToolbarController.cxx
@@ -23,6 +23,8 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/InterimItemWindow.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/weld.hxx>
+#include <vcl/weld/Builder.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx 
b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index cac7a98ce4d7..7a0eaf0335d8 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -23,6 +23,8 @@
 
 #include <comphelper/propertyvalue.hxx>
 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld/weld.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <svtools/toolboxcontroller.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx 
b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 6e1654bbaa77..462549b31c09 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -26,6 +26,7 @@
 #include <svtools/toolboxcontroller.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
+#include <vcl/weld/weld.hxx>
 #include <vcl/weld/ComboBox.hxx>
 
 using namespace ::com::sun::star;
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx 
b/framework/source/uielement/edittoolbarcontroller.cxx
index e07d03627e36..ef3ca8ef6e29 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -27,6 +27,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/event.hxx>
+#include <vcl/weld/weld.hxx>
 #include <vcl/weld/Entry.hxx>
 
 using namespace ::com::sun::star;
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx 
b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index f0b86ff3fbb7..68b401235573 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -32,6 +32,8 @@
 #include <vcl/formatter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
+#include <vcl/weld/weld.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <vcl/weld/FormattedSpinButton.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
 
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 2d25cd47c14d..4a81c171567c 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -23,6 +23,8 @@
 #include <vcl/InterimItemWindow.hxx>
 #include <vcl/weld/Builder.hxx>
 
+#include <com/sun/star/graphic/XGraphic.hpp>
+
 #include <functional>
 
 namespace com::sun::star::frame { class XFrame; }
diff --git a/include/svtools/recorditemwindow.hxx 
b/include/svtools/recorditemwindow.hxx
index 7573874004f5..ddb9d2ab5706 100644
--- a/include/svtools/recorditemwindow.hxx
+++ b/include/svtools/recorditemwindow.hxx
@@ -10,6 +10,7 @@
 #pragma once
 
 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld/weld.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <svtools/svtdllapi.h>
 
diff --git a/include/svtools/scrolladaptor.hxx 
b/include/svtools/scrolladaptor.hxx
index 4b6c18dfca3f..040773ded963 100644
--- a/include/svtools/scrolladaptor.hxx
+++ b/include/svtools/scrolladaptor.hxx
@@ -23,6 +23,7 @@
 
 #include <vcl/InterimItemWindow.hxx>
 #include <vcl/scrollable.hxx>
+#include <vcl/weld/weld.hxx>
 
 class SVT_DLLPUBLIC ScrollAdaptor : public InterimItemWindow, public Scrollable
 {
diff --git a/include/svtools/toolboxcontroller.hxx 
b/include/svtools/toolboxcontroller.hxx
index 39163e39e26d..c53aca7dc979 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -35,6 +35,7 @@
 #include <tools/link.hxx>
 #include <utility>
 #include <vcl/toolboxid.hxx>
+#include <vcl/weld/Builder.hxx>
 
 #include <unordered_map>
 
diff --git a/include/svx/labelitemwindow.hxx b/include/svx/labelitemwindow.hxx
index f453dee742d9..23554e20d8e6 100644
--- a/include/svx/labelitemwindow.hxx
+++ b/include/svx/labelitemwindow.hxx
@@ -10,6 +10,7 @@
 #pragma once
 
 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld/weld.hxx>
 #include <svx/svxdllapi.h>
 
 enum class LabelItemWindowType
diff --git a/include/vcl/BinaryDataContainer.hxx 
b/include/vcl/BinaryDataContainer.hxx
index 71a6b278e3e6..59991a670d51 100644
--- a/include/vcl/BinaryDataContainer.hxx
+++ b/include/vcl/BinaryDataContainer.hxx
@@ -12,14 +12,25 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <tools/stream.hxx>
 #include <vcl/dllapi.h>
 
 #include <memory>
 #include <vector>
 
+class SvStream;
+namespace com::sun::star::io
+{
+class XInputStream;
+}
+namespace com::sun::star::uno
+{
+template <class E> class Sequence;
+}
+namespace com::sun::star::uno
+{
+template <class interface_type> class Reference;
+}
+
 /** Container for the binary data, whose responsibility is to manage the
  *  make it as simple as possible to manage the binary data. The binary
  *  data can be anything, but typically it is a in-memory data from
diff --git a/include/vcl/BinaryDataContainerTools.hxx 
b/include/vcl/BinaryDataContainerTools.hxx
index 3d50379a82d3..1a63ad31bedc 100644
--- a/include/vcl/BinaryDataContainerTools.hxx
+++ b/include/vcl/BinaryDataContainerTools.hxx
@@ -11,8 +11,17 @@
 #pragma once
 
 #include <vcl/dllapi.h>
-#include <vcl/BinaryDataContainer.hxx>
-#include <com/sun/star/util/XBinaryDataContainer.hpp>
+#include <sal/types.h>
+
+class BinaryDataContainer;
+namespace com::sun::star::uno
+{
+template <class interface_type> class Reference;
+}
+namespace com::sun::star::util
+{
+class XBinaryDataContainer;
+}
 
 namespace vcl
 {
diff --git a/include/vcl/BitmapPalette.hxx b/include/vcl/BitmapPalette.hxx
index 41a944353606..8d3a3b6323f1 100644
--- a/include/vcl/BitmapPalette.hxx
+++ b/include/vcl/BitmapPalette.hxx
@@ -20,13 +20,13 @@
 #pragma once
 
 #include <vcl/dllapi.h>
-#include <vcl/BitmapColor.hxx>
 #include <vcl/checksum.hxx>
 #include <o3tl/cow_wrapper.hxx>
 
 #include <array>
 
 class ImplBitmapPalette;
+class BitmapColor;
 
 class VCL_DLLPUBLIC BitmapPalette
 {
diff --git a/include/vcl/BitmapReadAccess.hxx b/include/vcl/BitmapReadAccess.hxx
index e7df1ead89ce..e08a1b7bc775 100644
--- a/include/vcl/BitmapReadAccess.hxx
+++ b/include/vcl/BitmapReadAccess.hxx
@@ -19,13 +19,15 @@
 #pragma once
 
 #include <vcl/dllapi.h>
-#include <vcl/bitmap.hxx>
 #include <vcl/Scanline.hxx>
 #include <vcl/BitmapBuffer.hxx>
 #include <vcl/BitmapColor.hxx>
 #include <vcl/BitmapAccessMode.hxx>
 #include <vcl/BitmapInfoAccess.hxx>
 
+class AlphaMask;
+class Bitmap;
+
 class SAL_DLLPUBLIC_RTTI BitmapReadAccess : public BitmapInfoAccess
 {
     friend class BitmapWriteAccess;
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index a1e5ed307408..fd1d0efc3b5d 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -13,18 +13,25 @@
 #include <config_cairo_canvas.h>
 #include <config_wasm_strip.h>
 
-#include <vcl/bitmap.hxx>
+#include <tools/long.hxx>
 #include <vcl/ImageTree.hxx>
 #if ENABLE_CAIRO_CANVAS
 #include <vcl/cairo.hxx>
 #endif
 #include <basegfx/range/b2drectangle.hxx>
 #include <array>
-#include <vcl/RawBitmap.hxx>
 
+class AlphaMask;
+class BitmapColor;
+class Color;
+class Point;
+class Size;
 class SvStream;
 namespace basegfx { class B2DHomMatrix; }
+namespace basegfx { class B2DPolyPolygon; }
 namespace com::sun::star::geometry { struct IntegerRectangle2D; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
+namespace vcl::bitmap { class RawBitmap; }
 
 namespace vcl::bitmap {
 
diff --git a/include/vcl/BitmapWriteAccess.hxx 
b/include/vcl/BitmapWriteAccess.hxx
index 97611b30d96f..387e102cb2dd 100644
--- a/include/vcl/BitmapWriteAccess.hxx
+++ b/include/vcl/BitmapWriteAccess.hxx
@@ -9,11 +9,18 @@
  */
 #pragma once
 
-#include <vcl/alpha.hxx>
-#include <vcl/bitmap.hxx>
 #include <vcl/BitmapReadAccess.hxx>
 #include <optional>
 
+class AlphaMask;
+class Bitmap;
+class Color;
+class Point;
+namespace tools
+{
+class Rectangle;
+}
+
 class VCL_DLLPUBLIC BitmapWriteAccess final : public BitmapReadAccess
 {
 public:
diff --git a/include/vcl/ColorDialog.hxx b/include/vcl/ColorDialog.hxx
index 0a3a32ff2360..ef7e3fa7d484 100644
--- a/include/vcl/ColorDialog.hxx
+++ b/include/vcl/ColorDialog.hxx
@@ -19,13 +19,14 @@
 
 #pragma once
 
-#include <tools/color.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/weld/DialogController.hxx>
-#include <vcl/weld/weld.hxx>
 
 #include <functional>
 
+class Color;
+namespace weld { class Window; }
+
 namespace vcl
 {
     // Select is the default.
diff --git a/include/vcl/GraphicLoader.hxx b/include/vcl/GraphicLoader.hxx
index d99c54731354..baa3c29ce7ce 100644
--- a/include/vcl/GraphicLoader.hxx
+++ b/include/vcl/GraphicLoader.hxx
@@ -10,7 +10,10 @@
 #ifndef INCLUDED_VCL_GRAPHIC_LOADER_HXX
 #define INCLUDED_VCL_GRAPHIC_LOADER_HXX
 
-#include <vcl/graph.hxx>
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
+
+class Graphic;
 
 namespace weld
 {
diff --git a/include/vcl/GraphicNativeMetadata.hxx 
b/include/vcl/GraphicNativeMetadata.hxx
index 7ef2adee8bbc..9cee1beadffd 100644
--- a/include/vcl/GraphicNativeMetadata.hxx
+++ b/include/vcl/GraphicNativeMetadata.hxx
@@ -19,9 +19,11 @@
 
 #pragma once
 
-#include <vcl/graph.hxx>
-#include <tools/stream.hxx>
 #include <tools/degree.hxx>
+#include <vcl/dllapi.h>
+
+class Graphic;
+class SvStream;
 
 class VCL_DLLPUBLIC GraphicNativeMetadata final
 {
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 1adcc3b2395d..32e4925f0940 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -10,24 +10,23 @@
 
 #pragma once
 
-#include <sfx2/viewsh.hxx>
 #include <tools/gen.hxx>
 #include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/ptrstyle.hxx>
-#include <vcl/vclptr.hxx>
 #include <map>
-#include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <basegfx/range/b2drange.hxx>
 
 namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::datatransfer { class XTransferable; }
 namespace com::sun::star::datatransfer::clipboard { class XClipboard; }
 namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
 namespace com::sun::star::uno { template <typename > class Sequence; }
-namespace vcl { class Window; }
-namespace tools { class JsonWriter; }
-
+class SfxViewShell;
 class VirtualDevice;
+enum class PointerStyle;
+namespace tools { class JsonWriter; }
+namespace vcl { class Window; }
+template <class reference_type> class VclPtr;
 
 namespace vcl
 {
diff --git a/include/vcl/IconThemeInfo.hxx b/include/vcl/IconThemeInfo.hxx
index 5d1fa4a68b1e..8ea7346471f9 100644
--- a/include/vcl/IconThemeInfo.hxx
+++ b/include/vcl/IconThemeInfo.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_VCL_ICONTHEMEINFO_HXX
 
 #include <vcl/dllapi.h>
-#include <tools/gen.hxx>
 #include <rtl/ustring.hxx>
 
 #include <vector>
@@ -20,6 +19,7 @@
 class IconThemeInfoTest;
 class IconThemeSelectorTest;
 class IconThemeScannerTest;
+class Size;
 
 namespace vcl
 {
diff --git a/include/vcl/InterimItemWindow.hxx 
b/include/vcl/InterimItemWindow.hxx
index a91d08849bcd..4d21244df6c1 100644
--- a/include/vcl/InterimItemWindow.hxx
+++ b/include/vcl/InterimItemWindow.hxx
@@ -12,8 +12,19 @@
 #include <vcl/dllapi.h>
 #include <vcl/ctrl.hxx>
 #include <vcl/idle.hxx>
-#include <vcl/weld/Builder.hxx>
-#include <vcl/weld/weld.hxx>
+
+namespace weld
+{
+class Builder;
+}
+namespace weld
+{
+class Container;
+}
+namespace weld
+{
+class Widget;
+}
 
 class VCL_DLLPUBLIC InterimItemWindow : public Control
 {
diff --git a/include/vcl/QueueInfo.hxx b/include/vcl/QueueInfo.hxx
index bec365043ff0..5c3c30cd1335 100644
--- a/include/vcl/QueueInfo.hxx
+++ b/include/vcl/QueueInfo.hxx
@@ -23,7 +23,8 @@
 #include <rtl/ustring.hxx>
 
 #include <vcl/dllapi.h>
-#include <vcl/prntypes.hxx>
+
+enum class PrintQueueFlags;
 
 class VCL_DLLPUBLIC QueueInfo
 {
diff --git a/include/vcl/RawBitmap.hxx b/include/vcl/RawBitmap.hxx
index 9b8c5bfbbc3b..8da900a0231e 100644
--- a/include/vcl/RawBitmap.hxx
+++ b/include/vcl/RawBitmap.hxx
@@ -10,8 +10,11 @@
 #pragma once
 
 #include <o3tl/safeint.hxx>
+#include <tools/gen.hxx>
+#include <tools/long.hxx>
 #include <vcl/BitmapColor.hxx>
-#include <vcl/bitmap.hxx>
+
+class Bitmap;
 
 namespace vcl::bitmap
 {
diff --git a/include/vcl/TypeSerializer.hxx b/include/vcl/TypeSerializer.hxx
index 433dbc058eb1..d1d0c36c3dc3 100644
--- a/include/vcl/TypeSerializer.hxx
+++ b/include/vcl/TypeSerializer.hxx
@@ -22,9 +22,12 @@
 
 #include <vcl/dllapi.h>
 #include <tools/GenericTypeSerializer.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/gfxlink.hxx>
-#include <vcl/graph.hxx>
+
+class GfxLink;
+class Gradient;
+class Graphic;
+class MapMode;
+class SvStream;
 
 constexpr sal_uInt32 createMagic(char char1, char char2, char char3, char 
char4)
 {
diff --git a/include/vcl/UserResourceScanner.hxx 
b/include/vcl/UserResourceScanner.hxx
index a4719ab861b1..a285fb03bbd4 100644
--- a/include/vcl/UserResourceScanner.hxx
+++ b/include/vcl/UserResourceScanner.hxx
@@ -13,7 +13,11 @@
 #include <rtl/ustring.hxx>
 #include <vector>
 #include <deque>
-#include <osl/file.hxx>
+
+namespace osl
+{
+class FileStatus;
+}
 
 namespace vcl
 {
diff --git a/include/vcl/VectorGraphicSearch.hxx 
b/include/vcl/VectorGraphicSearch.hxx
index fe1fcd5d739a..e4262dc1dc00 100644
--- a/include/vcl/VectorGraphicSearch.hxx
+++ b/include/vcl/VectorGraphicSearch.hxx
@@ -11,14 +11,18 @@
 #pragma once
 
 #include <vcl/graph.hxx>
-#include <vcl/vectorgraphicdata.hxx>
 #include <vcl/dllapi.h>
 
 #include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/vector/b2dsize.hxx>
 
 #include <memory>
 
+class VectorGraphicData;
+namespace basegfx
+{
+class B2DSize;
+}
+
 enum class SearchStartPosition
 {
     Begin,
diff --git a/include/vcl/WeldedTabbedNotebookbar.hxx 
b/include/vcl/WeldedTabbedNotebookbar.hxx
index 6540cfb33bf2..acbad1cd49a9 100644
--- a/include/vcl/WeldedTabbedNotebookbar.hxx
+++ b/include/vcl/WeldedTabbedNotebookbar.hxx
@@ -15,7 +15,11 @@
 #include <rtl/ustring.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/weld.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
+
+namespace com::sun::star::frame
+{
+class XFrame;
+}
 
 /**
  * Welded wrapper for NotebookBar used for online
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 483ab0e73a49..e27f6ca4eec9 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -40,6 +40,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/help.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/cctrl/cbnumberformat.cxx 
b/sc/source/ui/cctrl/cbnumberformat.cxx
index e340f3bf63f4..ff64c2fd71e6 100644
--- a/sc/source/ui/cctrl/cbnumberformat.cxx
+++ b/sc/source/ui/cctrl/cbnumberformat.cxx
@@ -25,6 +25,7 @@
 #include <sfx2/viewsh.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itemset.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <sc.hrc>
 
 ScNumberFormat::ScNumberFormat(vcl::Window* pParent)
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx 
b/sc/source/ui/drawfunc/fuconarc.cxx
index ec184240cf53..a6ceb6bd5b42 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -26,6 +26,7 @@
 #include <svx/svxids.hrc>
 #include <svx/sxciaitm.hxx>
 #include <osl/diagnose.h>
+#include <vcl/ptrstyle.hxx>
 
 FuConstArc::FuConstArc(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* 
pViewP,
                        SdrModel& rDoc, const SfxRequest& rReq)
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx 
b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 7e1eb0961f88..19fb390f4710 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -28,6 +28,7 @@
 #include <svx/xfillit0.hxx>
 #include <editeng/eeitem.hxx>
 #include <svx/sdtagitm.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <tabvwsh.hxx>
 #include <drawview.hxx>
 #include <editeng/adjustitem.hxx>
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx 
b/sc/source/ui/drawfunc/fuconpol.cxx
index d9f09189bf98..49a2e4ca055e 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -25,6 +25,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/svxids.hrc>
 #include <osl/diagnose.h>
+#include <vcl/ptrstyle.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx 
b/sc/source/ui/drawfunc/fuconrec.cxx
index 1b5ab78496ce..2a69e202d273 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -29,6 +29,7 @@
 #include <svx/svxids.hrc>
 #include <svx/svdomeas.hxx>
 #include <osl/diagnose.h>
+#include <vcl/ptrstyle.hxx>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx 
b/sc/source/ui/drawfunc/fuconstr.cxx
index 7f18781588f8..cf41533747e7 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -21,6 +21,7 @@
 #include <svx/svdouno.hxx>
 #include <svx/svxids.hrc>
 #include <sfx2/dispatch.hxx>
+#include <vcl/ptrstyle.hxx>
 
 #include <fuconstr.hxx>
 #include <fudraw.hxx>
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx 
b/sc/source/ui/drawfunc/fuconuno.cxx
index 2f1db46198b5..01fc06a257bc 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -22,6 +22,7 @@
 #include <drawview.hxx>
 
 #include <svx/svxids.hrc>
+#include <vcl/ptrstyle.hxx>
 
 FuConstUnoControl::FuConstUnoControl(ScTabViewShell& rViewSh, vcl::Window* 
pWin, ScDrawView* pViewP,
                                      SdrModel& rDoc, const SfxRequest& rReq)
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 76c1824d7398..6608c8258c8c 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -25,6 +25,7 @@
 #include <svx/ImageMapInfo.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/uitest/logger.hxx>
 #include <vcl/uitest/eventdescription.hxx>
 
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index f9022e05a2b3..1792346a4403 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -33,6 +33,7 @@
 #include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
 #include <osl/diagnose.h>
+#include <vcl/ptrstyle.hxx>
 
 #include <futext.hxx>
 #include <drwlayer.hxx>
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 2924e0615b60..4aba2cd121a8 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -51,6 +51,7 @@
 #include <svx/unopage.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
 #include <vcl/print.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/json_writer.hxx>
 #include <tools/multisel.hxx>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 2bc6effb1cfc..44e4aa0a785c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -45,6 +45,7 @@
 #include <vcl/cursor.hxx>
 #include <vcl/dialoghelper.hxx>
 #include <vcl/inputctx.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld/weldutils.hxx>
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index ed4761c4e4d5..e7be8abde6e1 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <scitems.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>
 #include <comphelper/lok.hxx>
 
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index baabd504fc7a..a463fea5cba8 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/bindings.hxx>
 #include <svl/ptitem.hxx>
 #include <osl/diagnose.h>
+#include <vcl/ptrstyle.hxx>
 
 #include <tabvwsh.hxx>
 #include <gridwin.hxx>
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 6c938a8919c8..e9d9f398fbd3 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -20,6 +20,7 @@
 #include <sfx2/dispatch.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/help.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>
 #include <svtools/colorcfg.hxx>
 #include <osl/diagnose.h>
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 081050d01e6f..7411c0b8fa85 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -31,6 +31,7 @@
 #include <svl/itemset.hxx>
 #include <tools/multisel.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>
 #include <o3tl/deleter.hxx>
 #include <o3tl/unit_conversion.hxx>
diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx
index f74bde7c17ff..bd140ede83dc 100644
--- a/sc/source/ui/view/tabsplit.cxx
+++ b/sc/source/ui/view/tabsplit.cxx
@@ -20,6 +20,7 @@
 #include <tabsplit.hxx>
 #include <viewdata.hxx>
 
+#include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>
 
 ScTabSplitter::ScTabSplitter( vcl::Window* pParent, WinBits nWinStyle, 
ScViewData& rData ) :
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 54f83fd6cecd..4f1a3f182d26 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -49,6 +49,7 @@
 #include <postit.hxx>
 #include <spellcheckcontext.hxx>
 
+#include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>
 
 #include <comphelper/lok.hxx>
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 1bf49c1ddd2f..d32d5433b7fc 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -50,6 +50,7 @@
 #include <svx/xflftrit.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/zoomslideritem.hxx>
+#include <vcl/ptrstyle.hxx>
 
 #include <global.hxx>
 #include <appoptio.hxx>
diff --git a/sd/inc/unomodel.hxx b/sd/inc/unomodel.hxx
index 95cfafc10b02..c23aeddd8cd3 100644
--- a/sd/inc/unomodel.hxx
+++ b/sd/inc/unomodel.hxx
@@ -47,6 +47,8 @@
 #include <cppuhelper/weakref.hxx>
 #include "sddllapi.h"
 
+#include <optional>
+
 namespace com::sun::star::i18n { class XForbiddenCharacters; }
 
 class SdDrawDocument;
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index 71f769c5ae52..04286881b001 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -23,6 +23,7 @@
 #include "framework/ConfigurationChangeListener.hxx"
 #include <comphelper/compbase.hxx>
 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld/weld.hxx>
 
 #include <vector>
 
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index ea6ce5b9cec3..da79918751bc 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -85,6 +85,7 @@
 #include "unopool.hxx"
 #include <sfx2/lokhelper.hxx>
 #include <sfx2/dispatch.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/svapp.hxx>
 #include <Outliner.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 21ea4832e1f3..f584dc780876 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -29,8 +29,10 @@
 
 #include <Client.hxx>
 #include <utility>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/svtools/source/brwbox/brwbox1.cxx 
b/svtools/source/brwbox/brwbox1.cxx
index ba53d094fdfc..f10662a304d4 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -32,6 +32,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/weld.hxx>
+#include <vcl/weld/Builder.hxx>
 
 #include <algorithm>
 #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
diff --git a/svtools/source/brwbox/recorditemwindow.cxx 
b/svtools/source/brwbox/recorditemwindow.cxx
index b62460499d90..3ce35d26cb56 100644
--- a/svtools/source/brwbox/recorditemwindow.cxx
+++ b/svtools/source/brwbox/recorditemwindow.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <svtools/recorditemwindow.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <vcl/event.hxx>
 
 RecordItemWindowBase::RecordItemWindowBase(std::unique_ptr<weld::Entry> xEntry)
diff --git a/svtools/source/control/scrolladaptor.cxx 
b/svtools/source/control/scrolladaptor.cxx
index 38424001b306..a65bb82a9389 100644
--- a/svtools/source/control/scrolladaptor.cxx
+++ b/svtools/source/control/scrolladaptor.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <svtools/scrolladaptor.hxx>
+#include <vcl/weld/Builder.hxx>
 
 ScrollAdaptor::ScrollAdaptor(vcl::Window* pWin, bool bHoriz)
     : InterimItemWindow(pWin, u"svt/ui/scrollbars.ui"_ustr, u"ScrollBars"_ustr)
diff --git a/svx/source/form/labelitemwindow.cxx 
b/svx/source/form/labelitemwindow.cxx
index 2a32fe90f185..bd4c8e15e162 100644
--- a/svx/source/form/labelitemwindow.cxx
+++ b/svx/source/form/labelitemwindow.cxx
@@ -9,6 +9,7 @@
 
 #include <svx/labelitemwindow.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 
 LabelItemWindow::LabelItemWindow(vcl::Window* pParent, const OUString& rLabel)
     : InterimItemWindow(pParent, u"svx/ui/labelbox.ui"_ustr, u"LabelBox"_ustr)
diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx 
b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index 9e08eab103b5..8a255482eec3 100644
--- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
@@ -18,6 +18,8 @@
  */
 
 #include <sdr/primitive2d/sdrprimitivetools.hxx>
+#include <basegfx/color/bcolor.hxx>
+#include <tools/color.hxx>
 #include <tools/lazydelete.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <mutex>
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx 
b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index 01ccd794d642..875d64d10dd7 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -25,6 +25,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
+#include <vcl/weld/Builder.hxx>
 
 using namespace svx;
 
diff --git a/svx/source/styles/ColorSets.cxx b/svx/source/styles/ColorSets.cxx
index 61e2014a0d55..6bbf851107b4 100644
--- a/svx/source/styles/ColorSets.cxx
+++ b/svx/source/styles/ColorSets.cxx
@@ -18,6 +18,7 @@
 #include <docmodel/theme/ColorSet.hxx>
 #include <docmodel/theme/ThemeColorType.hxx>
 #include <o3tl/numeric.hxx>
+#include <osl/file.hxx>
 #include <tools/stream.hxx>
 #include <tools/XmlWalker.hxx>
 #include <tools/XmlWriter.hxx>
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index 90d354b1176e..59f907486657 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -19,6 +19,7 @@
 
 #include <svdpdf.hxx>
 
+#include <tools/stream.hxx>
 #include <tools/UnitConversion.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/embeddedfontsmanager.hxx>
diff --git a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx 
b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
index f524fe6bb20f..52b2c1e0a961 100644
--- a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
+++ b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
@@ -18,6 +18,7 @@
 #include <vcl/InterimItemWindow.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <strings.hrc>
 
 #include <viewopt.hxx>
diff --git a/sw/source/uibase/docvw/UnfloatTableButton.cxx 
b/sw/source/uibase/docvw/UnfloatTableButton.cxx
index 10a7cff1538e..43e08fa6ee70 100644
--- a/sw/source/uibase/docvw/UnfloatTableButton.cxx
+++ b/sw/source/uibase/docvw/UnfloatTableButton.cxx
@@ -39,6 +39,7 @@
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <svl/grabbagitem.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <doc.hxx>
 
 #define TEXT_PADDING 3
diff --git a/sw/source/uibase/inc/FrameControl.hxx 
b/sw/source/uibase/inc/FrameControl.hxx
index b6a761feef6a..39e74de38fad 100644
--- a/sw/source/uibase/inc/FrameControl.hxx
+++ b/sw/source/uibase/inc/FrameControl.hxx
@@ -10,6 +10,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROL_HXX
 
 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld/weld.hxx>
 #include <vcl/virdev.hxx>
 
 #include "edtwin.hxx"
diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx
index 8a27972d289c..a807cd7b33e8 100644
--- a/sw/source/uibase/inc/uitool.hxx
+++ b/sw/source/uibase/inc/uitool.hxx
@@ -21,7 +21,6 @@
 
 #include <tools/fldunit.hxx>
 #include <vcl/weld/ComboBox.hxx>
-#include <vcl/weld/weld.hxx>
 #include <swtypes.hxx>
 #include <swdllapi.h>
 
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 554f042eac55..95deb0aa9efc 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -27,6 +27,7 @@
 #include <o3tl/any.hxx>
 #include <utility>
 #include <vcl/virdev.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/print.hxx>
diff --git a/test/source/text/baseindex.cxx b/test/source/text/baseindex.cxx
index f0381196e682..a8db182eac79 100644
--- a/test/source/text/baseindex.cxx
+++ b/test/source/text/baseindex.cxx
@@ -15,8 +15,10 @@
 #include <com/sun/star/text/XTextSection.hpp>
 
 #include <vcl/BitmapTools.hxx>
+#include <vcl/RawBitmap.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
 #include <unotools/tempfile.hxx>
+#include <tools/color.hxx>
 #include <tools/stream.hxx>
 
 #include <test/unoapi_property_testers.hxx>
diff --git a/vcl/backendtest/outputdevice/bitmap.cxx 
b/vcl/backendtest/outputdevice/bitmap.cxx
index 75e4638c5097..89c3612372a1 100644
--- a/vcl/backendtest/outputdevice/bitmap.cxx
+++ b/vcl/backendtest/outputdevice/bitmap.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <test/outputdevice.hxx>
+#include <vcl/alpha.hxx>
 #include <vcl/bitmap.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
diff --git a/vcl/inc/bitmap/ScanlineTools.hxx b/vcl/inc/bitmap/ScanlineTools.hxx
index 311b96cff95b..0ec7b55e5d27 100644
--- a/vcl/inc/bitmap/ScanlineTools.hxx
+++ b/vcl/inc/bitmap/ScanlineTools.hxx
@@ -12,6 +12,7 @@
 
 #include <tools/color.hxx>
 #include <vcl/BitmapPalette.hxx>
+#include <vcl/BitmapColor.hxx>
 
 namespace vcl::bitmap
 {
diff --git a/vcl/inc/headless/CairoCommon.hxx b/vcl/inc/headless/CairoCommon.hxx
index 7643b5f4e9d5..8002f7511ed5 100644
--- a/vcl/inc/headless/CairoCommon.hxx
+++ b/vcl/inc/headless/CairoCommon.hxx
@@ -23,6 +23,7 @@
 #include <config_options.h>
 #include <cairo.h>
 
+#include <tools/color.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/region.hxx>
 #include <vcl/salgtype.hxx>
diff --git a/vcl/inc/pdf/COSWriter.hxx b/vcl/inc/pdf/COSWriter.hxx
index 178d154f0770..5c676da1ac02 100644
--- a/vcl/inc/pdf/COSWriter.hxx
+++ b/vcl/inc/pdf/COSWriter.hxx
@@ -9,6 +9,7 @@
 
 #pragma once
 
+#include <rtl/strbuf.hxx>
 #include <pdf/IPDFEncryptor.hxx>
 #include <vcl/pdfwriter.hxx>
 
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index da0a742129e2..44b7526525e8 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -32,6 +32,7 @@
 #include <premac.h>
 #include <CoreGraphics/CoreGraphics.h>
 #include <postmac.h>
+#include <tools/color.hxx>
 #endif
 
 struct BitmapBuffer;
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 65b64125697b..eabea20b23ce 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -26,6 +26,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/salgtype.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/weld.hxx>
 
 #include "displayconnectiondispatch.hxx"
 
diff --git a/vcl/inc/scanlinewriter.hxx b/vcl/inc/scanlinewriter.hxx
index 1e797a87c51c..89426b03e524 100644
--- a/vcl/inc/scanlinewriter.hxx
+++ b/vcl/inc/scanlinewriter.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <tools/long.hxx>
+#include <vcl/BitmapColor.hxx>
 #include <vcl/BitmapPalette.hxx>
 
 namespace vcl
diff --git a/vcl/qa/cppunit/BackendTest.cxx b/vcl/qa/cppunit/BackendTest.cxx
index ecdcf1246c01..ce88052cd8de 100644
--- a/vcl/qa/cppunit/BackendTest.cxx
+++ b/vcl/qa/cppunit/BackendTest.cxx
@@ -10,6 +10,7 @@
 
 #include <test/bootstrapfixture.hxx>
 
+#include <vcl/alpha.hxx>
 #include <vcl/bitmap.hxx>
 #include <tools/stream.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/vcl/qa/cppunit/BinaryDataContainerTest.cxx 
b/vcl/qa/cppunit/BinaryDataContainerTest.cxx
index 2f72a9d18214..9f48d2fe8562 100644
--- a/vcl/qa/cppunit/BinaryDataContainerTest.cxx
+++ b/vcl/qa/cppunit/BinaryDataContainerTest.cxx
@@ -11,6 +11,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
+#include <tools/stream.hxx>
 #include <vcl/BinaryDataContainer.hxx>
 
 using namespace css;
diff --git a/vcl/qa/cppunit/BitmapExTest.cxx b/vcl/qa/cppunit/BitmapExTest.cxx
index b36765003210..c5eadc478b6b 100644
--- a/vcl/qa/cppunit/BitmapExTest.cxx
+++ b/vcl/qa/cppunit/BitmapExTest.cxx
@@ -11,6 +11,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
+#include <vcl/alpha.hxx>
 #include <vcl/bitmap.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
diff --git a/vcl/qa/cppunit/CommonTools.hxx b/vcl/qa/cppunit/CommonTools.hxx
index f5170358f9e5..cfc1dc52bab8 100644
--- a/vcl/qa/cppunit/CommonTools.hxx
+++ b/vcl/qa/cppunit/CommonTools.hxx
@@ -9,6 +9,11 @@
 
 #pragma once
 
+#include <tools/stream.hxx>
+#include <vcl/BinaryDataContainer.hxx>
+
+#include <vector>
+
 static std::vector<unsigned char> calculateHash(SvStream& rStream)
 {
     rStream.Seek(STREAM_SEEK_TO_BEGIN);
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx 
b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 0ecf950f5f40..fa6752456cac 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -32,6 +32,7 @@
 #include <rtl/ref.hxx>
 #include <sal/log.hxx>
 
+#include <vcl/alpha.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/bitmap.hxx>
 
diff --git a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx 
b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
index b5973e0f444b..e534a304ba04 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
@@ -9,6 +9,7 @@
 
 #include <unotest/filters-test.hxx>
 #include <test/bootstrapfixture.hxx>
+#include <vcl/alpha.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <tools/stream.hxx>
 #include <vcl/graph.hxx>
diff --git a/vcl/qa/cppunit/skia/skia.cxx b/vcl/qa/cppunit/skia/skia.cxx
index 4c591117ac7e..4d36b0244a7e 100644
--- a/vcl/qa/cppunit/skia/skia.cxx
+++ b/vcl/qa/cppunit/skia/skia.cxx
@@ -11,6 +11,7 @@
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
+#include <vcl/alpha.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
 
diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index c00d7400775b..cdc842157220 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -15,6 +15,7 @@
 #include <osl/endian.h>
 #include <test/bootstrapfixture.hxx>
 #include <test/xmltesttools.hxx>
+#include <vcl/alpha.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/hatch.hxx>
diff --git a/vcl/qt5/QtBitmap.cxx b/vcl/qt5/QtBitmap.cxx
index 3837820becb7..096c63fe3481 100644
--- a/vcl/qt5/QtBitmap.cxx
+++ b/vcl/qt5/QtBitmap.cxx
@@ -25,6 +25,7 @@
 #include <QtCore/QVector>
 #include <QtGui/QColor>
 
+#include <vcl/BitmapColor.hxx>
 #include <svdata.hxx>
 #include <salinst.hxx>
 
diff --git a/vcl/source/app/ITiledRenderable.cxx 
b/vcl/source/app/ITiledRenderable.cxx
index 52a4ab0f50d4..8ed396aba3ee 100644
--- a/vcl/source/app/ITiledRenderable.cxx
+++ b/vcl/source/app/ITiledRenderable.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <vcl/ITiledRenderable.hxx>
+#include <vcl/ptrstyle.hxx>
 
 namespace vcl
 {
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 4166ae0845dd..89054bd68ad7 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -9,6 +9,7 @@
 
 #include <vcl/IconThemeInfo.hxx>
 #include <rtl/character.hxx>
+#include <tools/gen.hxx>
 
 #include <stdexcept>
 #include <algorithm>
diff --git a/vcl/source/bitmap/BitmapTools.cxx 
b/vcl/source/bitmap/BitmapTools.cxx
index 5acb3321e487..58170eff5e03 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -29,6 +29,7 @@
 
 #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
 
+#include <vcl/alpha.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
@@ -40,6 +41,7 @@
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
+#include <vcl/RawBitmap.hxx>
 
 using namespace css;
 
diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index 5064e38ccfba..9473f9cd9dce 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -25,6 +25,7 @@
 #include <tools/helpers.hxx>
 
 #include <utility>
+#include <vcl/alpha.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/outdev.hxx>
 
diff --git a/vcl/source/bitmap/bitmappalette.cxx 
b/vcl/source/bitmap/bitmappalette.cxx
index 0a2688e212c4..613cc477906a 100644
--- a/vcl/source/bitmap/bitmappalette.cxx
+++ b/vcl/source/bitmap/bitmappalette.cxx
@@ -24,6 +24,7 @@
 #include <rtl/crc.h>
 #include <tools/helpers.hxx>
 
+#include <vcl/BitmapColor.hxx>
 #include <vcl/BitmapPalette.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/outdev.hxx>
diff --git a/vcl/source/bitmap/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx
index 53c4a180a009..154fb0760761 100644
--- a/vcl/source/bitmap/dibtools.cxx
+++ b/vcl/source/bitmap/dibtools.cxx
@@ -31,6 +31,7 @@
 #include <tools/helpers.hxx>
 #include <tools/GenericTypeSerializer.hxx>
 #include <comphelper/configuration.hxx>
+#include <vcl/alpha.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
diff --git a/vcl/source/bitmap/salbmp.cxx b/vcl/source/bitmap/salbmp.cxx
index 7afed17ebf0e..b8020c06ed80 100644
--- a/vcl/source/bitmap/salbmp.cxx
+++ b/vcl/source/bitmap/salbmp.cxx
@@ -19,6 +19,7 @@
 
 #include <salbmp.hxx>
 #include <o3tl/enumarray.hxx>
+#include <vcl/BitmapColor.hxx>
 #include <rtl/crc.h>
 
 static BitmapChecksum scanlineChecksum(BitmapChecksum nCrc, const sal_uInt8* 
bits, int lineBitsCount, sal_uInt8 extraBitsMask)
diff --git a/vcl/source/control/InterimItemWindow.cxx 
b/vcl/source/control/InterimItemWindow.cxx
index 4ecb503a8ae6..d95e05ce5278 100644
--- a/vcl/source/control/InterimItemWindow.cxx
+++ b/vcl/source/control/InterimItemWindow.cxx
@@ -9,6 +9,8 @@
 
 #include <vcl/InterimItemWindow.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/weld/Builder.hxx>
+#include <vcl/weld/weld.hxx>
 #include <salobj.hxx>
 #include <svdata.hxx>
 #include <window.h>
diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx 
b/vcl/source/filter/GraphicNativeMetadata.cxx
index 5b11fcc7826a..dbe30763e80a 100644
--- a/vcl/source/filter/GraphicNativeMetadata.cxx
+++ b/vcl/source/filter/GraphicNativeMetadata.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/GraphicNativeMetadata.hxx>
 #include <vcl/gfxlink.hxx>
+#include <vcl/graph.hxx>
 #include "jpeg/Exif.hxx"
 #include <memory>
 
diff --git a/vcl/source/filter/ieps/ieps.cxx b/vcl/source/filter/ieps/ieps.cxx
index 27ae56efd483..892390427a4c 100644
--- a/vcl/source/filter/ieps/ieps.cxx
+++ b/vcl/source/filter/ieps/ieps.cxx
@@ -26,6 +26,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <vcl/RawBitmap.hxx>
 #include <comphelper/configuration.hxx>
 #include <unotools/tempfile.hxx>
 #include <osl/process.h>
diff --git a/vcl/source/filter/igif/gifread.cxx 
b/vcl/source/filter/igif/gifread.cxx
index a4ce576e0eba..50597c1e5b0b 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -22,6 +22,7 @@
 #include "decode.hxx"
 #include "gifread.hxx"
 #include <memory>
+#include <vcl/alpha.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 namespace {
diff --git a/vcl/source/filter/ipbm/ipbm.cxx b/vcl/source/filter/ipbm/ipbm.cxx
index 9c42e4300117..3f7e1c255e76 100644
--- a/vcl/source/filter/ipbm/ipbm.cxx
+++ b/vcl/source/filter/ipbm/ipbm.cxx
@@ -22,6 +22,8 @@
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/filter/ImportOutput.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <vcl/RawBitmap.hxx>
+#include <tools/color.hxx>
 #include <tools/stream.hxx>
 #include <filter/PbmReader.hxx>
 
diff --git a/vcl/source/filter/ipcd/ipcd.cxx b/vcl/source/filter/ipcd/ipcd.cxx
index 3589edbfb9d7..104dce566aaa 100644
--- a/vcl/source/filter/ipcd/ipcd.cxx
+++ b/vcl/source/filter/ipcd/ipcd.cxx
@@ -23,6 +23,7 @@
 
 #include <vcl/filter/ImportOutput.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <vcl/RawBitmap.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <tools/stream.hxx>
 #include <filter/PcdReader.hxx>
diff --git a/vcl/source/filter/ipcx/ipcx.cxx b/vcl/source/filter/ipcx/ipcx.cxx
index 202c134bac28..a71005db09b4 100644
--- a/vcl/source/filter/ipcx/ipcx.cxx
+++ b/vcl/source/filter/ipcx/ipcx.cxx
@@ -21,6 +21,8 @@
 #include <memory>
 #include <vcl/filter/ImportOutput.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <vcl/RawBitmap.hxx>
+#include <tools/color.hxx>
 #include <tools/stream.hxx>
 #include <filter/PcxReader.hxx>
 
diff --git a/vcl/source/filter/ipict/ipict.cxx 
b/vcl/source/filter/ipict/ipict.cxx
index 8da3fd76d87b..dba81bc750bf 100644
--- a/vcl/source/filter/ipict/ipict.cxx
+++ b/vcl/source/filter/ipict/ipict.cxx
@@ -22,6 +22,7 @@
 #include <osl/thread.h>
 #include <sal/log.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <vcl/RawBitmap.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
 #include <tools/poly.hxx>
diff --git a/vcl/source/filter/ipsd/ipsd.cxx b/vcl/source/filter/ipsd/ipsd.cxx
index 4b376255c4f4..27254a9fcad8 100644
--- a/vcl/source/filter/ipsd/ipsd.cxx
+++ b/vcl/source/filter/ipsd/ipsd.cxx
@@ -20,6 +20,7 @@
 
 #include <vcl/graph.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <vcl/RawBitmap.hxx>
 #include <vcl/outdev.hxx>
 #include <sal/log.hxx>
 #include <tools/fract.hxx>
diff --git a/vcl/source/filter/iras/iras.cxx b/vcl/source/filter/iras/iras.cxx
index 49cfe2bef2cc..6c6b059c114d 100644
--- a/vcl/source/filter/iras/iras.cxx
+++ b/vcl/source/filter/iras/iras.cxx
@@ -20,7 +20,9 @@
 
 #include <vcl/graph.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <vcl/RawBitmap.hxx>
 #include <sal/log.hxx>
+#include <tools/color.hxx>
 #include <tools/stream.hxx>
 #include <filter/RasReader.hxx>
 
diff --git a/vcl/source/filter/itga/itga.cxx b/vcl/source/filter/itga/itga.cxx
index e73a04f1ab4d..e4c364358fc8 100644
--- a/vcl/source/filter/itga/itga.cxx
+++ b/vcl/source/filter/itga/itga.cxx
@@ -19,6 +19,8 @@
 
 #include <vcl/filter/ImportOutput.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <vcl/RawBitmap.hxx>
+#include <tools/color.hxx>
 #include <tools/stream.hxx>
 #include <memory>
 #include <filter/TgaReader.hxx>
diff --git a/vcl/source/filter/svm/SvmWriter.cxx 
b/vcl/source/filter/svm/SvmWriter.cxx
index 93ff80ce4b86..793fa1b3286c 100644
--- a/vcl/source/filter/svm/SvmWriter.cxx
+++ b/vcl/source/filter/svm/SvmWriter.cxx
@@ -21,6 +21,7 @@
 #include <vcl/TypeSerializer.hxx>
 #include <vcl/dibtools.hxx>
 #include <rtl/crc.h>
+#include <tools/solar.h>
 #include <tools/vcompat.hxx>
 
 #include <osl/thread.h>
diff --git a/vcl/source/gdi/TypeSerializer.cxx 
b/vcl/source/gdi/TypeSerializer.cxx
index 0edf74bba537..116c849d598b 100644
--- a/vcl/source/gdi/TypeSerializer.cxx
+++ b/vcl/source/gdi/TypeSerializer.cxx
@@ -24,6 +24,7 @@
 #include <comphelper/fileformat.h>
 #include <vcl/filter/SvmReader.hxx>
 #include <vcl/filter/SvmWriter.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/dibtools.hxx>
 
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index b461a484b448..3690568f61d4 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -27,6 +27,7 @@
 #include <tools/vcompat.hxx>
 #include <tools/fract.hxx>
 #include <vcl/alpha.hxx>
+#include <vcl/BitmapColor.hxx>
 #include <vcl/BitmapPalette.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/outdev.hxx>
diff --git a/vcl/source/printer/QueueInfo.cxx b/vcl/source/printer/QueueInfo.cxx
index 8ec787cbd1c5..81b266ec6571 100644
--- a/vcl/source/printer/QueueInfo.cxx
+++ b/vcl/source/printer/QueueInfo.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/prntypes.hxx>
 #include <vcl/QueueInfo.hxx>
 
 QueueInfo::QueueInfo()
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index aa639fa4e774..bed2e403bf09 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -27,6 +27,7 @@
 
 #include <vcl/ITiledRenderable.hxx>
 #include <vcl/dndlistenercontainer.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/cursor.hxx>
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index e73ce99c9bba..11c14f172f32 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <o3tl/safeint.hxx>
 #include <osl/time.h>
+#include <vcl/alpha.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/vclmain.hxx>
 #include <vcl/layout.hxx>

Reply via email to