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 930ff2b830 - 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 <gabor.kelemen@collabora.com> Tested-by: Jenkins
2026-01-05 11:10:28 +01:00
parent 8b7d0c8a93
commit c0b14ab9aa
128 changed files with 237 additions and 36 deletions
@@ -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>
@@ -24,6 +24,7 @@
 #include <helpids.h>

 #include <vcl/taskpanelist.hxx>
+#include <vcl/weld/Builder.hxx>

 namespace basctl
 {
@@ -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>
@@ -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>
@@ -23,6 +23,7 @@

 #include "ChartTransferable.hxx"

+#include <tools/stream.hxx>
 #include <sot/exchange.hxx>
 #include <unotools/streamwrap.hxx>
 #include <vcl/graph.hxx>
@@ -32,6 +32,7 @@
 #include <o3tl/safeint.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/weld.hxx>

 namespace chart
 {
@@ -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>
@@ -40,6 +40,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>

 #include <memory>

@@ -31,6 +31,7 @@
 #include <comphelper/diagnose_ex.hxx>
 #include <osl/diagnose.h>
 #include <connectivity/dbmetadata.hxx>
+#include <vcl/weld/Builder.hxx>

 #include <algorithm>

@@ -19,6 +19,7 @@
 #pragma once

 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld/weld.hxx>

 namespace dbaui
 {
@@ -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;
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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"
@@ -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>
@@ -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>
@@ -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"
@@ -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
@@ -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>
@@ -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>
@@ -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;
@@ -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>
@@ -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;
@@ -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;
@@ -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>

@@ -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; }
@@ -10,6 +10,7 @@
 #pragma once

 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld/weld.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <svtools/svtdllapi.h>

@@ -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
 {
@@ -35,6 +35,7 @@
 #include <tools/link.hxx>
 #include <utility>
 #include <vcl/toolboxid.hxx>
+#include <vcl/weld/Builder.hxx>

 #include <unordered_map>

@@ -10,6 +10,7 @@
 #pragma once

 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld/weld.hxx>
 #include <svx/svxdllapi.h>

 enum class LabelItemWindowType
@@ -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
@@ -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
 {
@@ -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
 {
@@ -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;
@@ -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 {

@@ -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:
@@ -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.
@@ -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
 {
@@ -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
 {
@@ -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
 {
@@ -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
 {
@@ -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
 {
@@ -23,7 +23,8 @@
 #include <rtl/ustring.hxx>

 #include <vcl/dllapi.h>
-#include <vcl/prntypes.hxx>
+
+enum class PrintQueueFlags;

 class VCL_DLLPUBLIC QueueInfo
 {
@@ -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
 {
@@ -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)
 {
@@ -13,7 +13,11 @@
 #include <rtl/ustring.hxx>
 #include <vector>
 #include <deque>
-#include <osl/file.hxx>
+
+namespace osl
+{
+class FileStatus;
+}

 namespace vcl
 {
@@ -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,
@@ -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
@@ -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>
@@ -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)
@@ -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)
@@ -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>
@@ -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>

@@ -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>
@@ -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>
@@ -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)
@@ -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>

@@ -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>
@@ -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>
@@ -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>
@@ -18,6 +18,7 @@
 */

 #include <scitems.hxx>
+#include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>
 #include <comphelper/lok.hxx>

@@ -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>
@@ -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>
@@ -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>
@@ -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 ) :
@@ -49,6 +49,7 @@
 #include <postit.hxx>
 #include <spellcheckcontext.hxx>

+#include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>

 #include <comphelper/lok.hxx>
@@ -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>
@@ -47,6 +47,8 @@
 #include <cppuhelper/weakref.hxx>
 #include "sddllapi.h"

+#include <optional>
+
 namespace com::sun::star::i18n { class XForbiddenCharacters; }

 class SdDrawDocument;
@@ -23,6 +23,7 @@
 #include "framework/ConfigurationChangeListener.hxx"
 #include <comphelper/compbase.hxx>
 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld/weld.hxx>

 #include <vector>

@@ -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>
@@ -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>
@@ -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>
@@ -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)
@@ -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)
@@ -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)
@@ -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>
@@ -25,6 +25,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
+#include <vcl/weld/Builder.hxx>

 using namespace svx;

@@ -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>
@@ -19,6 +19,7 @@

 #include <svdpdf.hxx>

+#include <tools/stream.hxx>
 #include <tools/UnitConversion.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/embeddedfontsmanager.hxx>
@@ -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>
@@ -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
@@ -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"
@@ -21,7 +21,6 @@

 #include <tools/fldunit.hxx>
 #include <vcl/weld/ComboBox.hxx>
-#include <vcl/weld/weld.hxx>
 #include <swtypes.hxx>
 #include <swdllapi.h>

@@ -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>
@@ -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>
@@ -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>
@@ -12,6 +12,7 @@

 #include <tools/color.hxx>
 #include <vcl/BitmapPalette.hxx>
+#include <vcl/BitmapColor.hxx>

 namespace vcl::bitmap
 {
@@ -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>
@@ -9,6 +9,7 @@

 #pragma once

+#include <rtl/strbuf.hxx>
 #include <pdf/IPDFEncryptor.hxx>
 #include <vcl/pdfwriter.hxx>

@@ -32,6 +32,7 @@
 #include <premac.h>
 #include <CoreGraphics/CoreGraphics.h>
 #include <postmac.h>
+#include <tools/color.hxx>
 #endif

 struct BitmapBuffer;
@@ -26,6 +26,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/salgtype.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/weld.hxx>

 #include "displayconnectiondispatch.hxx"

@@ -20,6 +20,7 @@
 #pragma once

 #include <tools/long.hxx>
+#include <vcl/BitmapColor.hxx>
 #include <vcl/BitmapPalette.hxx>

 namespace vcl
@@ -10,6 +10,7 @@

 #include <test/bootstrapfixture.hxx>

+#include <vcl/alpha.hxx>
 #include <vcl/bitmap.hxx>
 #include <tools/stream.hxx>
 #include <vcl/graphicfilter.hxx>
@@ -11,6 +11,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>

+#include <tools/stream.hxx>
 #include <vcl/BinaryDataContainer.hxx>

 using namespace css;
@@ -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>
@@ -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);
@@ -32,6 +32,7 @@
 #include <rtl/ref.hxx>
 #include <sal/log.hxx>

+#include <vcl/alpha.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/bitmap.hxx>

--- a/Show More
+++ b/Show More