cui/source/dialogs/AdditionsDialog.cxx             |    1 +
 cui/source/dialogs/uitabpage.cxx                   |    1 +
 filter/source/graphic/GraphicExportFilter.cxx      |    1 +
 filter/source/msfilter/escherex.cxx                |    1 +
 filter/source/svg/svgfilter.cxx                    |    1 +
 framework/inc/uielement/menubarmanager.hxx         |    1 +
 include/IwyuFilter_include.yaml                    |    3 +++
 include/framework/addonsoptions.hxx                |    1 +
 include/vcl/GraphicObject.hxx                      |    3 +++
 include/vcl/alpha.hxx                              |    1 +
 include/vcl/animate/Animation.hxx                  |    3 +++
 include/vcl/bitmap.hxx                             |   10 ++++++++--
 include/vcl/builder.hxx                            |    4 ++--
 include/vcl/glyphitemcache.hxx                     |   14 ++++++++++++--
 include/vcl/graphicfilter.hxx                      |   15 +++++++++------
 include/vcl/menu.hxx                               |    8 ++++----
 include/vcl/opengl/OpenGLHelper.hxx                |    4 +++-
 include/vcl/vectorgraphicdata.hxx                  |    3 +--
 include/vcl/wall.hxx                               |    2 ++
 sd/source/filter/grf/sdgrffilter.cxx               |    1 +
 sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx  |    1 +
 sd/source/ui/slidesorter/inc/view/SlsTheme.hxx     |    1 +
 sd/source/ui/view/sdview4.cxx                      |    1 +
 sfx2/inc/sidebar/SidebarToolBox.hxx                |    1 +
 sfx2/inc/templatecontaineritem.hxx                 |    1 +
 sfx2/source/appl/shutdowniconaqua.mm               |    1 +
 sfx2/source/control/thumbnailview.cxx              |    1 +
 sfx2/source/sidebar/SidebarToolBox.cxx             |    1 +
 slideshow/source/engine/opengl/TransitionImpl.cxx  |    2 ++
 svgio/source/svgreader/svgfeimagenode.cxx          |    1 +
 svgio/source/svgreader/svgimagenode.cxx            |    2 ++
 svx/source/core/graphichelper.cxx                  |    2 ++
 svx/source/dialog/compressgraphicdialog.cxx        |    1 +
 svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx  |    1 +
 svx/source/xoutdev/_xoutbmp.cxx                    |    2 ++
 sw/source/uibase/config/SwBaselineGridConfig.cxx   |    2 ++
 sw/source/uibase/docvw/romenu.cxx                  |    1 +
 sw/source/uibase/lingu/olmenu.cxx                  |    2 ++
 vcl/inc/animate/AnimationRenderer.hxx              |    1 +
 vcl/inc/bitmap/Octree.hxx                          |    2 ++
 vcl/inc/implimagetree.hxx                          |    2 ++
 vcl/osx/a11yfocustracker.cxx                       |    1 +
 vcl/osx/salframeview.mm                            |    1 +
 vcl/osx/salinst.cxx                                |    1 +
 vcl/osx/salmenu.cxx                                |    1 +
 vcl/qa/cppunit/BitmapScaleTest.cxx                 |    1 +
 vcl/qa/cppunit/GraphicDescriptorTest.cxx           |    2 ++
 vcl/qa/cppunit/GraphicNativeMetadataTest.cxx       |    1 +
 vcl/qa/cppunit/GraphicTest.cxx                     |    1 +
 vcl/qa/cppunit/PDFiumLibraryTest.cxx               |    1 +
 vcl/qa/cppunit/TypeSerializerTest.cxx              |    1 +
 vcl/qa/cppunit/graphicfilter/filters-test.cxx      |    1 +
 vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx |    1 +
 vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx |    1 +
 vcl/qa/cppunit/jpeg/JpegReaderTest.cxx             |    2 ++
 vcl/qa/cppunit/jpeg/JpegWriterTest.cxx             |    2 ++
 vcl/qa/cppunit/png/PngFilterTest.cxx               |    1 +
 vcl/source/app/salvtables.cxx                      |    1 +
 vcl/source/control/FormattedField.cxx              |    1 +
 vcl/source/control/calendar.cxx                    |    1 +
 vcl/source/control/combobox.cxx                    |    1 +
 vcl/source/control/edit.cxx                        |    3 +++
 vcl/source/control/notebookbar.cxx                 |    1 +
 vcl/source/control/tabctrl.cxx                     |    2 ++
 vcl/source/filter/GraphicNativeTransform.cxx       |    2 ++
 vcl/source/filter/graphicfilter.cxx                |    1 +
 vcl/source/filter/png/PngImageReader.cxx           |    1 +
 vcl/source/filter/png/PngImageWriter.cxx           |    1 +
 vcl/source/filter/webp/writer.cxx                  |    2 ++
 vcl/source/gdi/impglyphitem.cxx                    |    1 +
 vcl/source/graphic/GraphicLoader.cxx               |    1 +
 vcl/source/graphic/UnoGraphicDescriptor.cxx        |    1 +
 vcl/source/pdf/pdfextoutdevdata.cxx                |    1 +
 vcl/source/window/NotebookBarAddonsMerger.cxx      |    2 ++
 vcl/source/window/builder.cxx                      |    1 +
 vcl/source/window/dockwin.cxx                      |    1 +
 vcl/source/window/menu.cxx                         |    1 +
 vcl/source/window/menubarwindow.cxx                |    1 +
 vcl/source/window/menufloatingwindow.cxx           |    1 +
 vcl/source/window/syswin.cxx                       |    2 ++
 vcl/unx/gtk3/gtkinst.cxx                           |    1 +
 vcl/unx/gtk3/gtksalmenu.cxx                        |    1 +
 vcl/win/app/salinst.cxx                            |    1 +
 xmlsecurity/workben/pdfverify.cxx                  |    2 ++
 84 files changed, 142 insertions(+), 19 deletions(-)

New commits:
commit 96cb87ca0194be82f8831c701a09b1c1ca623845
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Fri Jan 16 17:19:17 2026 +0100
Commit:     Gabor Kelemen <[email protected]>
CommitDate: Thu Jan 22 09:42:36 2026 +0100

    tdf#146619 Use more forward declarations in include/vcl/[a-o]
    
    these were skipped in previous runs, since they contain some code behind #if
    
    After inspecting these, it seems like the removals should not cause trouble.
    
    Change-Id: I867ffc53254057e4bae43690214a2ab7ce0caa8f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197493
    Reviewed-by: Gabor Kelemen <[email protected]>
    Tested-by: Jenkins

diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index 4f9c9544b4ca..56ce2131291d 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 
diff --git a/cui/source/dialogs/uitabpage.cxx b/cui/source/dialogs/uitabpage.cxx
index bd9890144006..cc322ff9d593 100644
--- a/cui/source/dialogs/uitabpage.cxx
+++ b/cui/source/dialogs/uitabpage.cxx
@@ -18,6 +18,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <unotools/confignode.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/EnumContext.hxx>
 
diff --git a/filter/source/graphic/GraphicExportFilter.cxx 
b/filter/source/graphic/GraphicExportFilter.cxx
index b6b670de01d9..e16cc64a0484 100644
--- a/filter/source/graphic/GraphicExportFilter.cxx
+++ b/filter/source/graphic/GraphicExportFilter.cxx
@@ -26,6 +26,7 @@
 
 #include <cppuhelper/supportsservice.hxx>
 #include <utility>
+#include <vcl/bitmap.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <svl/outstrm.hxx>
 #include <svtools/DocumentToGraphicRenderer.hxx>
diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 73bc255bd647..14ec082a4d1b 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -32,6 +32,7 @@
 #include <svx/sdtfsitm.hxx>
 #include <editeng/outlobj.hxx>
 #include <utility>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/svapp.hxx>
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 7cbebd0d82fe..dd395209610d 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -48,6 +48,7 @@
 
 #include <svx/unopage.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <vcl/window.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
diff --git a/framework/inc/uielement/menubarmanager.hxx 
b/framework/inc/uielement/menubarmanager.hxx
index 8b14158aee6e..9577df8ce61c 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 
 #include <rtl/ustring.hxx>
+#include <vcl/keycod.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/timer.hxx>
 #include <comphelper/compbase.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 1f3c852cf7ae..36423909a6b3 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -354,6 +354,9 @@ excludelist:
     - com/sun/star/frame/XTerminateListener.hpp
     - com/sun/star/datatransfer/dnd/XDragGestureListener.hpp
     - com/sun/star/datatransfer/dnd/XDropTargetListener.hpp
+    include/vcl/vectorgraphicdata.hxx:
+    # TODO Needed on Android NDK 27 for some reason
+    - com/sun/star/graphic/XPrimitive2D.hpp
     include/toolkit/awt/vclxwindow.hxx:
     # base class has to be a complete type
     - com/sun/star/awt/XWindow2.hpp
diff --git a/include/framework/addonsoptions.hxx 
b/include/framework/addonsoptions.hxx
index 11713e007ac3..ee40be90be16 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <framework/fwkdllapi.h>
 #include <memory>
+#include <vector>
 
 namespace osl { class Mutex; }
 
diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx
index 6af1a1fafa2d..b211115e49cb 100644
--- a/include/vcl/GraphicObject.hxx
+++ b/include/vcl/GraphicObject.hxx
@@ -21,9 +21,12 @@
 
 #include <memory>
 #include <string_view>
+#include <basegfx/vector/b2dvector.hxx>
+#include <tools/poly.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/dllapi.h>
 #include <o3tl/typed_flags_set.hxx>
+#include <com/sun/star/uno/XInterface.hpp>
 
 #include <vcl/GraphicAttributes.hxx>
 
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index e0942f04df0a..4952e18e6d6f 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -26,6 +26,7 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/bitmap.hxx>
+#include <vcl/region.hxx>
 
 class VCL_DLLPUBLIC AlphaMask final
 {
diff --git a/include/vcl/animate/Animation.hxx 
b/include/vcl/animate/Animation.hxx
index a9bd031205bd..c62d886a01a2 100644
--- a/include/vcl/animate/Animation.hxx
+++ b/include/vcl/animate/Animation.hxx
@@ -25,6 +25,9 @@
 #include <vcl/timer.hxx>
 #include <vcl/bitmap.hxx>
 
+#include <vector>
+
+class SvStream;
 struct AnimationFrame;
 
 #define ANIMATION_TIMEOUT_ON_CLICK 2147483647L
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 43a8bf9a32cb..e06693cf6c35 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -22,16 +22,16 @@
 #include <sal/config.h>
 
 #include <basegfx/numeric/ftools.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/degree.hxx>
+#include <tools/gen.hxx>
 #include <vcl/checksum.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/mapmod.hxx>
-#include <vcl/region.hxx>
 #include <vcl/bitmap/BitmapTypes.hxx>
 #include <config_vclplug.h>
 
 #include <o3tl/typed_flags_set.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 
 #include <memory>
 
@@ -40,6 +40,12 @@ namespace basegfx { class BColorModifierStack; }
 namespace com::sun::star::rendering {
     class XBitmapCanvas;
 }
+namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
+namespace com::sun::star::uno { template <typename> class Sequence; }
+namespace basegfx { class B2DHomMatrix; }
+namespace basegfx { class B2DRange; }
+namespace tools { class Polygon; }
+namespace vcl { class Region; }
 
 inline sal_uInt8 GAMMA(double _def_cVal, double _def_InvGamma)
 {
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 73fea3f62337..a3b25eead433 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -13,14 +13,12 @@
 #include <sal/log.hxx>
 #include <vcl/dllapi.h>
 #include <utility>
-#include <vcl/menu.hxx>
 #include <vcl/widgetbuilder.hxx>
 #include <vcl/window.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/toolboxid.hxx>
 #include <vcl/wintypes.hxx>
 #include <vcl/EnumContext.hxx>
-#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 
 #include <memory>
 #include <map>
@@ -36,12 +34,14 @@ class FormattedField;
 class ListBox;
 class MessageDialog;
 class NumericFormatter;
+class PopupMenu;
 class ScrollBar;
 class SvTabListBox;
 class Slider;
 class VclExpander;
 class VclMultiLineEdit;
 namespace com::sun::star::frame { class XFrame; }
+struct NotebookBarAddonsItem;
 
 /// Creates a hierarchy of vcl::Windows (widgets) from a .ui file for dialogs, 
sidebar, etc.
 class VCL_DLLPUBLIC VclBuilder final : public WidgetBuilder<vcl::Window, 
VclPtr<vcl::Window>, PopupMenu, VclPtr<PopupMenu>>
diff --git a/include/vcl/glyphitemcache.hxx b/include/vcl/glyphitemcache.hxx
index f6359639090f..c731cc5975c3 100644
--- a/include/vcl/glyphitemcache.hxx
+++ b/include/vcl/glyphitemcache.hxx
@@ -26,12 +26,22 @@
 #include <o3tl/lru_map.hxx>
 #include <vcl/glyphitem.hxx>
 #include <vcl/dropcache.hxx>
+#include <vcl/mapmod.hxx>
 #include <vcl/metric.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/vclptr.hxx>
 
 #include <optional>
 
+class OutputDevice;
+namespace vcl::text
+{
+class TextLayoutCache;
+}
+namespace vcl::text
+{
+enum class ComplexTextLayoutFlags : sal_uInt8;
+}
+template <class reference_type> class VclPtr;
+
 /**
 A cache for SalLayoutGlyphs objects.
 
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index ee808c0f2630..26b9ab60479c 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -20,28 +20,31 @@
 #ifndef INCLUDED_VCL_GRAPHICFILTER_HXX
 #define INCLUDED_VCL_GRAPHICFILTER_HXX
 
-#include <tools/gen.hxx>
 #include <tools/link.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/graph.hxx>
-#include <com/sun/star/task/XInteractionHandler.hpp>
 #include <comphelper/errcode.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <vcl/BinaryDataContainer.hxx>
 #include <vcl/graphic/GraphicMetadata.hxx>
-#include <vcl/gfxlink.hxx>
-#include <vcl/vectorgraphicdata.hxx>
+
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <memory>
+#include <vector>
 
 namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::uno { template <class E> class Sequence; }
+namespace com::sun::star::task { class XInteractionHandler; }
 
+class BinaryDataContainer;
+class Graphic;
 class INetURLObject;
 
 class FilterConfigCache;
+class Size;
 class SvStream;
 struct ConvertData;
+enum class GfxLinkType;
+enum class VectorGraphicDataType;
 
 #define ERRCODE_GRFILTER_OPENERROR    ErrCode(ErrCodeArea::Vcl, 
ErrCodeClass::General, 1)
 #define ERRCODE_GRFILTER_IOERROR      ErrCode(ErrCodeArea::Vcl, 
ErrCodeClass::General, 2)
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 82e88f8af36a..3f45295442f4 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -23,17 +23,14 @@
 #include <memory>
 #include <string_view>
 
-#include <comphelper/OAccessible.hxx>
+#include <rtl/ustring.hxx>
 #include <vcl/vclenum.hxx>
 #include <tools/link.hxx>
 #include <tools/long.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/keycod.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>
-#include <com/sun/star/uno/Reference.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <tools/json_writer.hxx>
 #include <list>
 
 class OutputDevice;
@@ -56,9 +53,12 @@ struct SystemMenuData;
 enum class VclEventId;
 
 namespace com::sun::star::awt { class XPopupMenu; }
+namespace comphelper { class OAccessible; }
+namespace tools { class JsonWriter; }
 
 namespace vcl
 {
+class KeyCode;
 class Window;
 struct MenuLayoutData;
 typedef OutputDevice RenderContext; // same as in include/vcl/outdev.hxx
diff --git a/include/vcl/opengl/OpenGLHelper.hxx 
b/include/vcl/opengl/OpenGLHelper.hxx
index 0938a5c797ec..8f96648304bb 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -12,13 +12,15 @@
 
 #include <epoxy/gl.h>
 #include <sal/detail/log.h>
+#include <tools/long.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/bitmap.hxx>
 
 #include <rtl/ustring.hxx>
 #include <sstream>
 #include <string_view>
 
+class Bitmap;
+
 /// Helper to do a SAL_INFO as well as a GL log.
 #define VCL_GL_INFO(stream) \
     do { \
diff --git a/include/vcl/vectorgraphicdata.hxx 
b/include/vcl/vectorgraphicdata.hxx
index c78c67293a90..63830a4ff7bd 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -27,8 +27,7 @@
 #include <algorithm>
 #include <optional>
 
-namespace com::sun::star::graphic { class XPrimitive2D; }
-
+#include <com/sun/star/graphic/XPrimitive2D.hpp>
 
 // helper to convert any Primitive2DSequence to a good quality Bitmap,
 // using default parameters and graphic::XPrimitive2DRenderer
diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx
index 7586fbf8f4cc..fe04ee3580b3 100644
--- a/include/vcl/wall.hxx
+++ b/include/vcl/wall.hxx
@@ -27,6 +27,8 @@
 #include <vcl/dllapi.h>
 #include <optional>
 
+class SvStream;
+
 enum class WallpaperStyle
 {
     NONE,
diff --git a/sd/source/filter/grf/sdgrffilter.cxx 
b/sd/source/filter/grf/sdgrffilter.cxx
index 4ad8ce9e6c87..b4927373fb39 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -35,6 +35,7 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx 
b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index d59049f554bd..b15398dd82fe 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -22,6 +22,7 @@
 #include <vcl/bitmap.hxx>
 #include <mutex>
 #include <memory>
+#include <vector>
 
 class SdrPage;
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx 
b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index cb80dfed746b..f650bb224e5b 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -23,6 +23,7 @@
 #include <tools/color.hxx>
 
 #include <memory>
+#include <vector>
 
 namespace vcl { class Font; }
 
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 6f908c92bc94..409d4694cc27 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxsids.hrc>
+#include <vcl/gfxlink.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/pdfread.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sfx2/inc/sidebar/SidebarToolBox.hxx 
b/sfx2/inc/sidebar/SidebarToolBox.hxx
index b543e0aaaa0e..3c1502026509 100644
--- a/sfx2/inc/sidebar/SidebarToolBox.hxx
+++ b/sfx2/inc/sidebar/SidebarToolBox.hxx
@@ -21,6 +21,7 @@
 
 #include <vcl/builder.hxx>
 #include <vcl/toolbox.hxx>
+#include <com/sun/star/lang/XComponent.hpp>
 #include <map>
 
 namespace com::sun::star::frame { class XToolbarController; }
diff --git a/sfx2/inc/templatecontaineritem.hxx 
b/sfx2/inc/templatecontaineritem.hxx
index 019c1b909762..8b54bf8764ad 100644
--- a/sfx2/inc/templatecontaineritem.hxx
+++ b/sfx2/inc/templatecontaineritem.hxx
@@ -10,6 +10,7 @@
 #pragma once
 
 #include <sfx2/templateproperties.hxx>
+#include <vector>
 
 class TemplateContainerItem final
 {
diff --git a/sfx2/source/appl/shutdowniconaqua.mm 
b/sfx2/source/appl/shutdowniconaqua.mm
index ea82d4b7e005..67bacb41c466 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -31,6 +31,7 @@
 #include <sal/macros.h>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/strings.hrc>
+#include <vcl/keycod.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/image.hxx>
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index f14dc192ab6f..b514042cc4ad 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -36,6 +36,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/event.hxx>
 #include <vcl/filter/PngImageReader.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/weld/weldutils.hxx>
 
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx 
b/sfx2/source/sidebar/SidebarToolBox.cxx
index 768262e3003f..eed5d01dbb58 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -24,6 +24,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/event.hxx>
+#include <vcl/image.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx 
b/slideshow/source/engine/opengl/TransitionImpl.cxx
index 1e9c661d6c09..b0eff35d5d67 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -34,6 +34,8 @@
 
 #include <algorithm>
 #include <array>
+#include <float.h>
+#include <math.h>
 
 #include <comphelper/random.hxx>
 
diff --git a/svgio/source/svgreader/svgfeimagenode.cxx 
b/svgio/source/svgreader/svgfeimagenode.cxx
index 2ae59a3511d2..15534e5b2239 100644
--- a/svgio/source/svgreader/svgfeimagenode.cxx
+++ b/svgio/source/svgreader/svgfeimagenode.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <svgfeimagenode.hxx>
diff --git a/svgio/source/svgreader/svgimagenode.cxx 
b/svgio/source/svgreader/svgimagenode.cxx
index af605ad400da..730e68cc851e 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -21,7 +21,9 @@
 #include <svgdocument.hxx>
 #include <tools/stream.hxx>
 #include <vcl/bitmap.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
diff --git a/svx/source/core/graphichelper.cxx 
b/svx/source/core/graphichelper.cxx
index 40309d6c9456..1834ae9d7566 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/gfxlink.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -26,6 +27,7 @@
 #include <svx/strings.hrc>
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <vcl/weld/weld.hxx>
 
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/dialog/compressgraphicdialog.cxx 
b/svx/source/dialog/compressgraphicdialog.cxx
index f9c1c36a5587..2d6b7a7be88a 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -20,6 +20,7 @@
 #include "dlgunit.hxx"
 #include <utility>
 #include <vcl/fieldvalues.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/virdev.hxx>
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx 
b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index a6fc701da389..ee0ccda1ebdb 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
@@ -25,6 +25,7 @@
 #include <sdr/primitive2d/sdrdecompositiontools.hxx>
 #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <utility>
 
 namespace drawinglayer::primitive2d
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index ccff5fcc567f..63dfd75c5eb3 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -25,6 +25,8 @@
 #include <tools/debug.hxx>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
+#include <vcl/gfxlink.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <vcl/virdev.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/svdpntv.hxx>
diff --git a/sw/source/uibase/config/SwBaselineGridConfig.cxx 
b/sw/source/uibase/config/SwBaselineGridConfig.cxx
index 11457ace3a5b..2a2c5d92537f 100644
--- a/sw/source/uibase/config/SwBaselineGridConfig.cxx
+++ b/sw/source/uibase/config/SwBaselineGridConfig.cxx
@@ -17,6 +17,8 @@
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>
 
+#include <com/sun/star/uno/Sequence.hxx>
+
 SwBaselineGridConfig::SwBaselineGridConfig(SwMasterUsrPref& rParent)
     : ConfigItem(u"Office.Writer/BaselineGrid"_ustr)
     , m_rParent(rParent)
diff --git a/sw/source/uibase/docvw/romenu.cxx 
b/sw/source/uibase/docvw/romenu.cxx
index c5b0eb271569..740aae04e4aa 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -21,6 +21,7 @@
 #include <hintids.hxx>
 
 #include <svl/eitem.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/transfer.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sw/source/uibase/lingu/olmenu.cxx 
b/sw/source/uibase/lingu/olmenu.cxx
index 85cc646ba7a2..4b90ee2155c7 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -46,6 +46,8 @@
 #include <linguistic/misc.hxx>
 #include <rtl/string.hxx>
 #include <vcl/commandinfoprovider.hxx>
+#include <vcl/image.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/vcl/inc/animate/AnimationRenderer.hxx 
b/vcl/inc/animate/AnimationRenderer.hxx
index d5cc7f423c85..20abef73006c 100644
--- a/vcl/inc/animate/AnimationRenderer.hxx
+++ b/vcl/inc/animate/AnimationRenderer.hxx
@@ -22,6 +22,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
+#include <vcl/region.hxx>
 #include <vcl/vclptr.hxx>
 
 class Animation;
diff --git a/vcl/inc/bitmap/Octree.hxx b/vcl/inc/bitmap/Octree.hxx
index 144ed6b85d12..b8dd2e2daa14 100644
--- a/vcl/inc/bitmap/Octree.hxx
+++ b/vcl/inc/bitmap/Octree.hxx
@@ -24,6 +24,8 @@
 #include <vcl/BitmapPalette.hxx>
 #include <tools/solar.h>
 
+#include <vector>
+
 struct OctreeNode
 {
     sal_uLong nCount = 0;
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index 8fd4e19c5961..261a62938121 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -32,6 +32,8 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <vcl/ImageTree.hxx>
 
+class SvStream;
+
 namespace com::sun::star::container {
     class XNameAccess;
 }
diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx
index c692bee571c0..4aeca3a32598 100644
--- a/vcl/osx/a11yfocustracker.cxx
+++ b/vcl/osx/a11yfocustracker.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <comphelper/OAccessible.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 62f62c6d56e7..17cc1cbeda49 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -23,6 +23,7 @@
 
 #include <basegfx/numeric/ftools.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <comphelper/OAccessible.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <sal/macros.h>
 #include <tools/helpers.hxx>
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 9c0acd6449b1..a02a08249208 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -48,6 +48,7 @@
 #include <vcl/opengl/OpenGLContext.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
+#include <vcl/themecolors.hxx>
 
 #include <osx/saldata.hxx>
 #include <osx/salinst.h>
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index f7217d1dfe64..e7f3fdc5dcd3 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -27,6 +27,7 @@
 #include <tools/debug.hxx>
 #include <tools/long.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/keycod.hxx>
 #include <vcl/toolkit/floatwin.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/qa/cppunit/BitmapScaleTest.cxx 
b/vcl/qa/cppunit/BitmapScaleTest.cxx
index 1a3b899a9bb6..03e20f376f9d 100644
--- a/vcl/qa/cppunit/BitmapScaleTest.cxx
+++ b/vcl/qa/cppunit/BitmapScaleTest.cxx
@@ -14,6 +14,7 @@
 #include <vcl/bitmap.hxx>
 
 #include <tools/stream.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 
 #include <BitmapSymmetryCheck.hxx>
diff --git a/vcl/qa/cppunit/GraphicDescriptorTest.cxx 
b/vcl/qa/cppunit/GraphicDescriptorTest.cxx
index 28fe9e29a25d..d72313d97c67 100644
--- a/vcl/qa/cppunit/GraphicDescriptorTest.cxx
+++ b/vcl/qa/cppunit/GraphicDescriptorTest.cxx
@@ -16,6 +16,8 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
+#include <vcl/bitmap.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <tools/color.hxx>
 #include <tools/mapunit.hxx>
diff --git a/vcl/qa/cppunit/GraphicNativeMetadataTest.cxx 
b/vcl/qa/cppunit/GraphicNativeMetadataTest.cxx
index 49bf55fa9f4d..592d04022bba 100644
--- a/vcl/qa/cppunit/GraphicNativeMetadataTest.cxx
+++ b/vcl/qa/cppunit/GraphicNativeMetadataTest.cxx
@@ -16,6 +16,7 @@
 #include <unotest/bootstrapfixturebase.hxx>
 
 #include <vcl/GraphicNativeMetadata.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <tools/stream.hxx>
 
diff --git a/vcl/qa/cppunit/GraphicTest.cxx b/vcl/qa/cppunit/GraphicTest.cxx
index a07a178324b8..896dc563eb3f 100644
--- a/vcl/qa/cppunit/GraphicTest.cxx
+++ b/vcl/qa/cppunit/GraphicTest.cxx
@@ -27,6 +27,7 @@
 #include <unotools/tempfile.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/metaactiontypes.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <vcl/wmf.hxx>
 #include "CommonTools.hxx"
 
diff --git a/vcl/qa/cppunit/PDFiumLibraryTest.cxx 
b/vcl/qa/cppunit/PDFiumLibraryTest.cxx
index 617a0ef049e2..8ac9463d9c0e 100644
--- a/vcl/qa/cppunit/PDFiumLibraryTest.cxx
+++ b/vcl/qa/cppunit/PDFiumLibraryTest.cxx
@@ -21,6 +21,7 @@
 #include <basegfx/vector/b2dsize.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <tools/stream.hxx>
 
 #include <vcl/filter/PDFiumLibrary.hxx>
diff --git a/vcl/qa/cppunit/TypeSerializerTest.cxx 
b/vcl/qa/cppunit/TypeSerializerTest.cxx
index 761969148cb2..344aae9efe5d 100644
--- a/vcl/qa/cppunit/TypeSerializerTest.cxx
+++ b/vcl/qa/cppunit/TypeSerializerTest.cxx
@@ -20,6 +20,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <comphelper/hash.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/vcompat.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx 
b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
index 8aba50e99fc9..dfb702254c6a 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@@ -18,6 +18,7 @@
 #include <comphelper/propertyvalue.hxx>
 
 #include <vcl/graphicfilter.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <tools/color.hxx>
 #include <tools/stream.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx 
b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
index 7ce03da6c599..2f921995a8ed 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
@@ -10,6 +10,7 @@
 #include <unotest/filters-test.hxx>
 #include <test/bootstrapfixture.hxx>
 #include <tools/stream.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx 
b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
index e534a304ba04..55323d8bf49c 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
@@ -12,6 +12,7 @@
 #include <vcl/alpha.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <tools/stream.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <graphic/GraphicFormatDetector.hxx>
diff --git a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx 
b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
index 3cf92baf1fee..06ead1461aa2 100644
--- a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
@@ -13,6 +13,8 @@
 #include <string_view>
 
 #include <unotest/bootstrapfixturebase.hxx>
+#include <vcl/gfxlink.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <tools/stream.hxx>
diff --git a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx 
b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
index 1c0a936039f3..f3c0f37d915b 100644
--- a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
@@ -13,6 +13,8 @@
 #include <string_view>
 
 #include <unotest/bootstrapfixturebase.hxx>
+#include <vcl/gfxlink.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/BitmapReadAccess.hxx>
 #include <tools/stream.hxx>
diff --git a/vcl/qa/cppunit/png/PngFilterTest.cxx 
b/vcl/qa/cppunit/png/PngFilterTest.cxx
index 66e000c85c44..339c503a65f6 100644
--- a/vcl/qa/cppunit/png/PngFilterTest.cxx
+++ b/vcl/qa/cppunit/png/PngFilterTest.cxx
@@ -29,6 +29,7 @@
 #include <vcl/BitmapWriteAccess.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/filter/ImportOutput.hxx>
 #include <unotools/tempfile.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index a73320880095..b415171a9c16 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -59,6 +59,7 @@
 #include <vcl/headbar.hxx>
 #include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/toolkit/MenuButton.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <slider.hxx>
diff --git a/vcl/source/control/FormattedField.cxx 
b/vcl/source/control/FormattedField.cxx
index 1789926354dd..fdba2f317146 100644
--- a/vcl/source/control/FormattedField.cxx
+++ b/vcl/source/control/FormattedField.cxx
@@ -24,6 +24,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <tools/debug.hxx>
+#include <tools/json_writer.hxx>
 
 #include <vcl/builder.hxx>
 #include <vcl/event.hxx>
diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx
index 7024e2a2be6a..a8bd6b6c6aff 100644
--- a/vcl/source/control/calendar.cxx
+++ b/vcl/source/control/calendar.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/json_writer.hxx>
 #include <vcl/help.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/event.hxx>
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 8b93f74cc46c..2e2a0284d4bb 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -33,6 +33,7 @@
 #include <accessibility/vclxaccessiblecombobox.hxx>
 #include <listbox.hxx>
 #include <comphelper/lok.hxx>
+#include <tools/json_writer.hxx>
 #include <o3tl/string_view.hxx>
 
 struct ComboBoxBounds
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 6898057e7f39..8bfc04d17b22 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -21,11 +21,14 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/string_view.hxx>
 #include <officecfg/Office/Common.hxx>
+#include <tools/json_writer.hxx>
 
 #include <vcl/builder.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/dndlistenercontainer.hxx>
 #include <vcl/event.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <vcl/specialchars.hxx>
 #include <vcl/toolkit/edit.hxx>
diff --git a/vcl/source/control/notebookbar.cxx 
b/vcl/source/control/notebookbar.cxx
index 724898cf5e2b..2f26ede4576d 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -15,6 +15,7 @@
 #include <vcl/builder.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/notebookbar/notebookbar.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/NotebookbarContextControl.hxx>
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 4805ca2c635f..bea117d71930 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <tools/json_writer.hxx>
 #include <tools/mapunit.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/help.hxx>
@@ -29,6 +30,7 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/toolkit/button.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolkit/lstbox.hxx>
 #include <vcl/uitest/uiobject.hxx>
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx 
b/vcl/source/filter/GraphicNativeTransform.cxx
index 5150932c1d2d..42e6211699ba 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -19,7 +19,9 @@
 
 #include <vcl/GraphicNativeTransform.hxx>
 
+#include <vcl/bitmap.hxx>
 #include <vcl/gfxlink.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 88f892e20b23..7a512c8d4c17 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -35,6 +35,7 @@
 #include <vcl/filter/PngImageReader.hxx>
 #include <vcl/filter/SvmWriter.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/vectorgraphicdata.hxx>
 #include <vcl/virdev.hxx>
 #include <impgraph.hxx>
diff --git a/vcl/source/filter/png/PngImageReader.cxx 
b/vcl/source/filter/png/PngImageReader.cxx
index 7bfeab6888a2..4e7ff1727288 100644
--- a/vcl/source/filter/png/PngImageReader.cxx
+++ b/vcl/source/filter/png/PngImageReader.cxx
@@ -17,6 +17,7 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
+#include <vcl/BinaryDataContainer.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <comphelper/configuration.hxx>
 #include <comphelper/scopeguard.hxx>
diff --git a/vcl/source/filter/png/PngImageWriter.cxx 
b/vcl/source/filter/png/PngImageWriter.cxx
index 9f4ff1ac2c33..d2909da530c6 100644
--- a/vcl/source/filter/png/PngImageWriter.cxx
+++ b/vcl/source/filter/png/PngImageWriter.cxx
@@ -22,6 +22,7 @@
 #include <rtl/crc.h>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
 
 namespace
 {
diff --git a/vcl/source/filter/webp/writer.cxx 
b/vcl/source/filter/webp/writer.cxx
index a935c082bf7a..35cd7afcd854 100644
--- a/vcl/source/filter/webp/writer.cxx
+++ b/vcl/source/filter/webp/writer.cxx
@@ -27,6 +27,8 @@
 
 #include <webp/encode.h>
 
+#include <vector>
+
 static int writerFunction(const uint8_t* data, size_t size, const WebPPicture* 
picture)
 {
     SvStream* stream = static_cast<SvStream*>(picture->custom_ptr);
diff --git a/vcl/source/gdi/impglyphitem.cxx b/vcl/source/gdi/impglyphitem.cxx
index a8e72bbc30f0..d0dc64e3aa19 100644
--- a/vcl/source/gdi/impglyphitem.cxx
+++ b/vcl/source/gdi/impglyphitem.cxx
@@ -20,6 +20,7 @@
 #include <impglyphitem.hxx>
 #include <utility>
 #include <vcl/glyphitemcache.hxx>
+#include <vcl/outdev.hxx>
 #include <vcl/vcllayout.hxx>
 #include <tools/lazydelete.hxx>
 #include <tools/stream.hxx>
diff --git a/vcl/source/graphic/GraphicLoader.cxx 
b/vcl/source/graphic/GraphicLoader.cxx
index 72274c9ac00a..8e50010f768b 100644
--- a/vcl/source/graphic/GraphicLoader.cxx
+++ b/vcl/source/graphic/GraphicLoader.cxx
@@ -12,6 +12,7 @@
 
 #include <com/sun/star/awt/XWindow.hpp>
 #include <unotools/ucbstreamhelper.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx 
b/vcl/source/graphic/UnoGraphicDescriptor.cxx
index a0990fc1498c..5256c8dea398 100644
--- a/vcl/source/graphic/UnoGraphicDescriptor.cxx
+++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx
@@ -22,6 +22,7 @@
 #include <cppuhelper/weakagg.hxx>
 #include <tools/mapunit.hxx>
 #include <unotools/ucbstreamhelper.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/vcl/source/pdf/pdfextoutdevdata.cxx 
b/vcl/source/pdf/pdfextoutdevdata.cxx
index 9801f7ff6def..66654cd2ec3a 100644
--- a/vcl/source/pdf/pdfextoutdevdata.cxx
+++ b/vcl/source/pdf/pdfextoutdevdata.cxx
@@ -34,6 +34,7 @@
 #include <osl/diagnose.h>
 #include <tools/stream.hxx>
 
+#include <deque>
 #include <memory>
 #include <map>
 #include <variant>
diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx 
b/vcl/source/window/NotebookBarAddonsMerger.cxx
index 105a5a5e4ba9..cb9627defe10 100644
--- a/vcl/source/window/NotebookBarAddonsMerger.cxx
+++ b/vcl/source/window/NotebookBarAddonsMerger.cxx
@@ -21,8 +21,10 @@
 
 #include <cstddef>
 
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/notebookbar/NotebookBarAddonsMerger.hxx>
 #include <vcl/commandinfoprovider.hxx>
+#include <vcl/image.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index b3f36d848961..9fe030a5caa1 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -38,6 +38,7 @@
 #include <vcl/toolkit/fixed.hxx>
 #include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/headbar.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/notebookbar/NotebookBarAddonsMerger.hxx>
 #include <vcl/toolkit/ivctrl.hxx>
 #include <vcl/layout.hxx>
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 47ede0831066..6ad4aa01a2d3 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -24,6 +24,7 @@
 #include <vcl/event.hxx>
 #include <vcl/toolkit/floatwin.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 1fbb5b2f3179..299d34fceb70 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -23,6 +23,7 @@
 
 #include <comphelper/diagnose_ex.hxx>
 #include <sal/log.hxx>
+#include <tools/json_writer.hxx>
 
 #include <comphelper/types.hxx>
 #include <comphelper/lok.hxx>
diff --git a/vcl/source/window/menubarwindow.cxx 
b/vcl/source/window/menubarwindow.cxx
index aab008e35206..8e458445ecb3 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -21,6 +21,7 @@
 #include "menuitemlist.hxx"
 #include "menufloatingwindow.hxx"
 
+#include <comphelper/OAccessible.hxx>
 #include <tools/mapunit.hxx>
 #include <vcl/dockingarea.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/source/window/menufloatingwindow.cxx 
b/vcl/source/window/menufloatingwindow.cxx
index 9c6359e6fb28..5103018d3e96 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -22,6 +22,7 @@
 #include "menubarwindow.hxx"
 #include "bufferdevice.hxx"
 
+#include <comphelper/OAccessible.hxx>
 #include <sal/log.hxx>
 #include <salframe.hxx>
 #include <svdata.hxx>
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 0334935e89cb..b938ad9d3424 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -22,6 +22,7 @@
 
 #include "menubarwindow.hxx"
 
+#include <comphelper/OAccessible.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <o3tl/safeint.hxx>
 #include <sal/config.h>
@@ -30,6 +31,7 @@
 #include <vcl/builder.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/mnemonic.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/menu.hxx>
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 43a4ba0dbf48..0eb7730c474f 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -75,6 +75,7 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/lok.hxx>
+#include <comphelper/OAccessible.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index 56774b6ad9f4..f063136d614a 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -12,6 +12,7 @@
 #include <unx/gtk/gtkdata.hxx>
 #include <unx/gtk/glomenu.h>
 #include <unx/gtk/gloactiongroup.h>
+#include <vcl/keycod.hxx>
 #include <vcl/toolkit/floatwin.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index a6334133c23c..e27e62419e3a 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -34,6 +34,7 @@
 #include <o3tl/temporary.hxx>
 
 #include <dndhelper.hxx>
+#include <vcl/keycod.hxx>
 #include <vcl/inputtypes.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
diff --git a/xmlsecurity/workben/pdfverify.cxx 
b/xmlsecurity/workben/pdfverify.cxx
index 053de93fab2f..f224c869f7dc 100644
--- a/xmlsecurity/workben/pdfverify.cxx
+++ b/xmlsecurity/workben/pdfverify.cxx
@@ -20,8 +20,10 @@
 #include <sal/log.hxx>
 #include <sal/main.h>
 #include <comphelper/diagnose_ex.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/filter/pdfdocument.hxx>
 #include <comphelper/scopeguard.hxx>

Reply via email to