diff --git a/basctl/source/basicide/textwindowaccessibility.cxx b/basctl/source/basicide/textwindowaccessibility.cxx
index 1250a18220d7..a812ffe0407e 100644
--- a/basctl/source/basicide/textwindowaccessibility.cxx
+++ b/basctl/source/basicide/textwindowaccessibility.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index fcb16f3298fc..ecbb158b4646 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -25,6 +25,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
 #include <com/sun/star/rendering/PathCapType.hpp>
 #include <com/sun/star/rendering/PathJoinType.hpp>
diff --git a/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx b/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx
index 477728f39259..412e6a1cd313 100644
--- a/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx
+++ b/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <memory>
+#include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/virdev.hxx>
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 2ea0421bfe4e..8ae72f00372b 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -21,6 +21,7 @@
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
+#include <vcl/wintypes.hxx>
 #include <dialmgr.hxx>
 #include <sfx2/app.hxx>
 #include <svx/fmsrccfg.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 6f2545c2797b..ecf7154e6fd7 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -30,6 +30,7 @@
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
+#include <vcl/wintypes.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <vcl/stdtext.hxx>
 #include <sqlmessage.hxx>
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 056102944edf..9d98e168736a 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -28,6 +28,7 @@
 #include <vcl/weld/TextView.hxx>
 #include <vcl/weld/TreeView.hxx>
 #include <vcl/weld/weld.hxx>
+#include <vcl/wintypes.hxx>
 #include <osl/diagnose.h>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/sqlerror.hxx>
diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx
index c08fde1c7ed5..33186c31a95a 100644
--- a/dbaccess/source/ui/misc/datasourceconnector.cxx
+++ b/dbaccess/source/ui/misc/datasourceconnector.cxx
@@ -34,6 +34,7 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/weld/weld.hxx>
+#include <vcl/wintypes.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <strings.hrc>
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 510277fae19d..0e94ac64d368 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -32,6 +32,7 @@
 #include <i18nutil/transliteration.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
+#include <vcl/keycodes.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svl/fstathelper.hxx>
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index 208c624608d8..dc8eac314d48 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -42,6 +42,7 @@
 #include <comphelper/DirectoryHelper.hxx>
 
 #include <vcl/svapp.hxx>
+#include <vcl/wintypes.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/sequenceashashmap.hxx>
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 7b82bdab8f7d..75ffcbc5163f 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -32,6 +32,7 @@
 #include <svtools/miscopt.hxx>
 #include <svtools/imgdef.hxx>
 #include <utility>
+#include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/mnemonic.hxx>
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index f9f881aa404c..faac9a13f33c 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -52,6 +52,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/weld/weld.hxx>
+#include <vcl/wintypes.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <comphelper/container.hxx>
 #include <comphelper/property.hxx>
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 7a0eaf0335d8..285f4b4858b2 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -23,6 +23,7 @@
 
 #include <comphelper/propertyvalue.hxx>
 #include <vcl/InterimItemWindow.hxx>
+#include <vcl/keycodes.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <svtools/toolboxcontroller.hxx>
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 0aeb18be085a..d4f811c5be18 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -21,12 +21,14 @@
 
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 #include <com/sun/star/frame/ControlCommand.hpp>
 
 #include <comphelper/propertyvalue.hxx>
+#include <vcl/image.hxx>
 #include <svl/imageitm.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/svapp.hxx>
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index afe6d6584281..33d1aacbdc00 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -30,6 +30,7 @@
 #include <tools/urlobj.hxx>
 #include <utility>
 #include <vcl/commandinfoprovider.hxx>
+#include <vcl/image.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx
index 5c83e778b959..8a25a4eb0d2c 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -25,6 +25,7 @@
 #include <svtools/toolbarmenu.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/gen.hxx>
+#include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/commandinfoprovider.hxx>
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index d7cdfad6bdc0..c9baa48a5a6d 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -67,6 +67,7 @@
 #include <utility>
 #include <vcl/event.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/syswin.hxx>
diff --git a/include/vcl/notebookbar/NotebookBarAddonsItem.hxx b/include/vcl/notebookbar/NotebookBarAddonsItem.hxx
index 08c864b6c564..8ab5eb24d1d8 100644
--- a/include/vcl/notebookbar/NotebookBarAddonsItem.hxx
+++ b/include/vcl/notebookbar/NotebookBarAddonsItem.hxx
@@ -20,10 +20,14 @@
 #pragma once
 
 #include <vcl/image.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <vector>
 
+namespace com::sun::star::beans
+{
+struct PropertyValue;
+}
+
 struct NotebookBarAddonsItem
 {
     std::vector<Image> aImageValues;
diff --git a/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx b/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx
index 1d209d5826f4..352d4cd3961b 100644
--- a/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx
+++ b/include/vcl/notebookbar/NotebookBarAddonsMerger.hxx
@@ -21,12 +21,18 @@
 #define INCLUDED_VCL_NOTEBOOKBARADDONSMERGER_HXX
 
 #include <vcl/builder.hxx>
-#include <vcl/window.hxx>
-#include <vcl/image.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
-#include "NotebookBarAddonsItem.hxx"
 
 class Menu;
+namespace com::sun::star::uno
+{
+template <class interface_type> class Reference;
+}
+namespace vcl
+{
+class Window;
+}
+struct NotebookBarAddonsItem;
 
 struct AddonNotebookBarItem
 {
diff --git a/include/vcl/notebookbar/notebookbar.hxx b/include/vcl/notebookbar/notebookbar.hxx
index f8cc71cbbecc..c393c86098ae 100644
--- a/include/vcl/notebookbar/notebookbar.hxx
+++ b/include/vcl/notebookbar/notebookbar.hxx
@@ -11,13 +11,13 @@
 
 #include <vcl/syswin.hxx>
 #include <vcl/ctrl.hxx>
-#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/settings.hxx>
 #include <vector>
 
 class NotebookBarContextChangeEventListener;
 class NotebookbarContextControl;
 class SfxViewShell;
+struct NotebookBarAddonsItem;
 
 /// This implements Widget Layout-based notebook-like menu bar.
 class UNLESS_MERGELIBS(VCL_DLLPUBLIC) NotebookBar final : public Control, public VclBuilderContainer
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 8cb5faa30d92..b3a5edaa9c9e 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -10,14 +10,14 @@
 #pragma once
 
 #include <vcl/dllapi.h>
-#include <vcl/sysdata.hxx>
 #include <vcl/vclptr.hxx>
-#include <rtl/ref.hxx>
 
 class Point;
 class Size;
 class SystemChildWindow;
 namespace vcl { class Window; }
+namespace rtl { template <class reference_type> class Reference; }
+struct SystemWindowData;
 
 /// Holds the information of our new child window
 struct VCL_DLLPUBLIC GLWindow
diff --git a/include/vcl/scrollable.hxx b/include/vcl/scrollable.hxx
index 03757fb8290a..dc701b83993d 100644
--- a/include/vcl/scrollable.hxx
+++ b/include/vcl/scrollable.hxx
@@ -19,10 +19,11 @@
 
 #pragma once
 
-#include <tools/gen.hxx>
 #include <tools/long.hxx>
 #include <vcl/dllapi.h>
 
+class Range;
+
 class VCL_DLLPUBLIC Scrollable
 {
 public:
diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx
index 5f5498a6caec..64d94e325d96 100644
--- a/include/vcl/seleng.hxx
+++ b/include/vcl/seleng.hxx
@@ -23,7 +23,6 @@
 #include <vcl/dllapi.h>
 #include <vcl/timer.hxx>
 #include <vcl/event.hxx>
-#include <vcl/vclenum.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 class CommandEvent;
@@ -31,6 +30,7 @@ class CommandEvent;
 namespace vcl {
     class Window;
 }
+enum class SelectionMode;
 
 // Timerticks
 constexpr sal_uInt64 SELENG_DRAGDROP_TIMEOUT = 400;
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 5c57fe8d9eba..0a8cc7fb3f30 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -23,8 +23,7 @@
 #include <config_options.h>
 
 #include <vcl/dllapi.h>
-#include <vcl/themecolors.hxx>
-#include <tools/color.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/typed_flags_set.hxx>
@@ -33,6 +32,7 @@
 #include <vector>
 
 class Bitmap;
+class Color;
 class LanguageTag;
 class SvtSysLocale;
 
@@ -43,6 +43,7 @@ struct ImplHelpData;
 struct ImplStyleData;
 struct ImplAllSettingsData;
 enum class ConfigurationHints;
+enum class AppearanceMode;
 
 namespace vcl {
     class Font;
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index 4d8624c49b2e..65fa7f8e96b5 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -21,9 +21,10 @@
 #define INCLUDED_VCL_SPLIT_HXX
 
 #include <vcl/dllapi.h>
-#include <vcl/keycod.hxx>
 #include <vcl/window.hxx>
 
+namespace vcl { class KeyCode; }
+
 #define SPLITTER_DEFAULTSTEPSIZE 0xFFFF
 
 class VCL_DLLPUBLIC Splitter : public vcl::Window
diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx
index 561bbd18cb1d..0f978394a422 100644
--- a/include/vcl/stdtext.hxx
+++ b/include/vcl/stdtext.hxx
@@ -25,11 +25,11 @@
 #include <string_view>
 
 #include <rtl/ustring.hxx>
-#include <vcl/wintypes.hxx>
 #include <vcl/dllapi.h>
 
 class Image;
 namespace weld { class Widget; }
+enum class StandardButtonType;
 
 void VCL_DLLPUBLIC ShowServiceNotAvailableError(weld::Widget* pParent, std::u16string_view rServiceName, bool bError);
 
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 8051520bd43e..90147f5b1d25 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -23,7 +23,6 @@
 #include <vcl/idle.hxx>
 #include <vcl/window.hxx>
 #include <vcl/windowstate.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <memory>
 
 class SalInstanceBuilder;
@@ -35,6 +34,8 @@ class TaskPaneList;
 class VclBuilder;
 struct NotebookBarAddonsItem;
 
+namespace com::sun::star::frame { class XFrame; }
+
 #define ICON_LO_DEFAULT                 1
 #define ICON_TEXT_DOCUMENT              2
 #define ICON_SPREADSHEET_DOCUMENT       4
diff --git a/include/vcl/taskpanelist.hxx b/include/vcl/taskpanelist.hxx
index b0a7101ead16..46c69d26017d 100644
--- a/include/vcl/taskpanelist.hxx
+++ b/include/vcl/taskpanelist.hxx
@@ -23,12 +23,11 @@
 #include <vcl/dllapi.h>
 
 #include <vector>
-#include <vcl/keycod.hxx>
-#include <vcl/vclptr.hxx>
 
 class KeyEvent;
-
+namespace vcl { class KeyCode; }
 namespace vcl { class Window; }
+template <class reference_type> class VclPtr;
 
 class VCL_DLLPUBLIC TaskPaneList
 {
diff --git a/include/vcl/test/GraphicsRenderTests.hxx b/include/vcl/test/GraphicsRenderTests.hxx
index d8242b953039..53a48061106d 100644
--- a/include/vcl/test/GraphicsRenderTests.hxx
+++ b/include/vcl/test/GraphicsRenderTests.hxx
@@ -12,10 +12,14 @@
 #include <utility>
 #include <vcl/bitmap.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/test/TestResult.hxx>
 
 #include <vector>
 
+namespace vcl::test
+{
+enum class TestResult;
+}
+
 class VCL_PLUGIN_PUBLIC VclTestResult
 {
     OUString m_aTestName;
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 065561ed8670..55c81ec83743 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -34,7 +34,6 @@
 #include <tools/gen.hxx>
 #include <tools/color.hxx>
 #include <vcl/font.hxx>
-#include <vcl/vclenum.hxx>
 
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Reference.hxx>
@@ -63,6 +62,7 @@ namespace com::sun::star::i18n {
 }
 
 class LocaleDataWrapper;
+enum class TxtAlign;
 
 typedef std::vector<TextView*> TextViews;
 
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index 31673087dbeb..7612cd8f2d12 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -25,19 +25,19 @@
 #include <tools/gen.hxx>
 #include <tools/lineend.hxx>
 #include <tools/stream.hxx>
-#include <vcl/cursor.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/dndhelp.hxx>
-#include <vcl/seleng.hxx>
 #include <vcl/textdata.hxx>
 #include <vcl/outdev.hxx>
 #include <memory>
 
 class TextEngine;
+class SelectionEngine;
 
 class KeyEvent;
 class MouseEvent;
 class CommandEvent;
+namespace vcl { class Cursor; }
 namespace vcl { class Window; }
 
 namespace com::sun::star::datatransfer::clipboard {
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 264641aa6652..2bf4d98f2011 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -23,8 +23,6 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/dockwin.hxx>
-#include <vcl/image.hxx>
-#include <vcl/keycod.hxx>
 #include <vcl/toolboxid.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <tools/degree.hxx>
@@ -34,7 +32,9 @@
 #include <vector>
 
 namespace com::sun::star::frame { class XFrame; }
+namespace vcl { class KeyCode; }
 
+class Image;
 class Timer;
 struct ImplToolItem;
 struct ImplToolBoxPrivateData;
diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx
index 7f49e279a0a9..a5e1077b4f8e 100644
--- a/include/vcl/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -24,13 +24,11 @@
 #include <tools/globname.hxx>
 #include <tools/gen.hxx>
 #include <tools/solar.h>
-#include <sot/formats.hxx>
 #include <sot/exchange.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/datatransfer/XTransferable2.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
@@ -44,11 +42,13 @@
 #include <mutex>
 #include <utility>
 
+namespace com::sun::star::datatransfer::clipboard { class XClipboard; }
 namespace com::sun::star::datatransfer::dnd { class XDragGestureRecognizer; }
 namespace com::sun::star::io { class XInputStream; }
 namespace com::sun::star::datatransfer::dnd { class XDropTarget; }
 
 template <typename Arg, typename Ret> class Link;
+enum class SotClipboardFormatId : sal_uInt32;
 
 class Bitmap;
 class GDIMetaFile;
diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index d7ec17775f24..825758a53ace 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -17,11 +17,16 @@
 #include <vcl/dllapi.h>
 
 #include <tools/stream.hxx>
-#include <vcl/vclevent.hxx>
 
 struct EventDescription;
 class Control;
 class KeyEvent;
+enum class VclEventId;
+namespace vcl
+{
+class Window;
+}
+template <class reference_type> class VclPtr;
 
 class UITEST_DLLPUBLIC UITestLogger
 {
diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx
index 5061320d68af..0d6e98a5aaaa 100644
--- a/include/vcl/uitest/uitest.hxx
+++ b/include/vcl/uitest/uitest.hxx
@@ -11,11 +11,12 @@
 #define INCLUDED_VCL_UITEST_UITEST_HXX
 
 #include <rtl/ustring.hxx>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 
 #include <memory>
 
 namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::frame { class XDispatchProvider; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 namespace com::sun::star::uno { template <typename > class Sequence; }
 
 class UIObject;
diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx
index aaf4c0f313a8..6fc6416535eb 100644
--- a/include/vcl/unohelp.hxx
+++ b/include/vcl/unohelp.hxx
@@ -20,19 +20,25 @@
 #ifndef INCLUDED_VCL_UNOHELP_HXX
 #define INCLUDED_VCL_UNOHELP_HXX
 
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/awt/FontSlant.hpp>
-#include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/awt/Size.hpp>
 #include <tools/fontenum.hxx>
-#include <tools/gen.hxx>
 #include <vcl/dllapi.h>
 
+class Point;
+class PointTemplateBase;
+class RectangleTemplateBase;
+class Size;
+
 namespace com::sun::star::i18n {
     class XBreakIterator;
     class XCharacterClassification;
 }
+namespace com::sun::star::awt { enum class FontSlant; }
+namespace com::sun::star::awt { struct Point; }
+namespace com::sun::star::awt { struct Rectangle; }
+namespace com::sun::star::awt { struct Size; }
+namespace com::sun::star::uno { template <typename> class Reference; }
+
+namespace tools { class Rectangle; }
 
 namespace vcl::unohelper
 {
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index 69037ed5cf0f..e6c7ecbf3ed6 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -24,12 +24,15 @@
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/IDialogRenderable.hxx>
 
 namespace com::sun::star::datatransfer::clipboard
 {
 class XClipboard;
 }
+namespace vcl
+{
+class ILibreOfficeKitNotifier;
+}
 
 namespace vcl::unohelper
 {
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
index 23daba62693a..7ecd4a9d810b 100644
--- a/include/vcl/vcllayout.hxx
+++ b/include/vcl/vcllayout.hxx
@@ -23,10 +23,8 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/range/b2drectangle.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <tools/gen.hxx>
 #include <tools/degree.hxx>
 
-#include <vcl/glyphitem.hxx>
 #include <vcl/dllapi.h>
 
 class LogicalFontInstance;
@@ -34,6 +32,9 @@ namespace vcl::text { class ImplLayoutArgs; }
 namespace basegfx { class BColor; }
 class SalGraphics;
 class GlyphItem;
+class SalLayoutGlyphs;
+class SalLayoutGlyphsImpl;
+namespace tools { class Rectangle; }
 
 // all positions/widths are in font units
 // one exception: drawposition is in pixel units
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 7ae169381417..1451d1554eb6 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -25,13 +25,9 @@
 #include <tools/link.hxx>
 #include <vcl/wintypes.hxx>
 #include <vcl/vclenum.hxx>
-#include <vcl/keycodes.hxx>
-#include <vcl/region.hxx>
 #include <vcl/uitest/factory.hxx>
 #include <vcl/IDialogRenderable.hxx>
-#include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
 struct ImplSVEvent;
@@ -63,6 +59,7 @@ class InputContext;
 class VclEventListeners;
 class EditView;
 enum class ImplPaintFlags;
+enum class KeyIndicatorState;
 enum class VclEventId;
 enum class PointerStyle;
 
@@ -85,7 +82,10 @@ namespace comphelper
 class OAccessible;
 }
 
+namespace rtl { template <class reference_type> class Reference; }
+
 namespace vcl {
+    class Region;
     struct ControlLayoutData;
 }
 
diff --git a/include/vcl/wmfexternal.hxx b/include/vcl/wmfexternal.hxx
index dc2855b4f236..83c55b83b66e 100644
--- a/include/vcl/wmfexternal.hxx
+++ b/include/vcl/wmfexternal.hxx
@@ -21,12 +21,15 @@
 #define INCLUDED_VCL_WMFEXTERNAL_HXX
 
 #include <vcl/dllapi.h>
-#include <com/sun/star/uno/Sequence.hxx>
 
 namespace com::sun::star::beans
 {
 struct PropertyValue;
 }
+namespace com::sun::star::uno
+{
+template <typename> class Sequence;
+}
 
 struct VCL_DLLPUBLIC WmfExternal
 {
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index e27f6ca4eec9..82236fc27044 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/image.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <vcl/settings.hxx>
 #include <svl/stritem.hxx>
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 93a4ce402a2a..cdf7ce098c3b 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -53,6 +53,7 @@
 #include <vcl/print.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/themecolors.hxx>
 #include <tools/json_writer.hxx>
 #include <tools/multisel.hxx>
 #include <tools/UnitConversion.hxx>
diff --git a/sd/source/ui/dlg/titledockwin.cxx b/sd/source/ui/dlg/titledockwin.cxx
index 2b9ce41be675..2f44c333fd39 100644
--- a/sd/source/ui/dlg/titledockwin.cxx
+++ b/sd/source/ui/dlg/titledockwin.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/event.hxx>
+#include <vcl/image.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/splitwin.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index ff119c630bc4..517c5bf5190c 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -86,6 +86,7 @@
 #include <sfx2/lokhelper.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/ptrstyle.hxx>
+#include <vcl/themecolors.hxx>
 #include <vcl/svapp.hxx>
 #include <Outliner.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
diff --git a/sfx2/inc/sidebar/ControllerFactory.hxx b/sfx2/inc/sidebar/ControllerFactory.hxx
index c30cec61425b..b4f748cebaab 100644
--- a/sfx2/inc/sidebar/ControllerFactory.hxx
+++ b/sfx2/inc/sidebar/ControllerFactory.hxx
@@ -25,6 +25,7 @@ namespace com::sun::star::awt { class XWindow; }
 namespace com::sun::star::frame { class XController; }
 namespace com::sun::star::frame { class XFrame; }
 namespace com::sun::star::frame { class XToolbarController; }
+namespace com::sun::star::lang { class XComponent; }
 
 class ToolBox;
 
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 02f76c082c87..3f917b040807 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -73,6 +73,7 @@
 #include <osl/file.hxx>
 #include <vcl/EnumContext.hxx>
 #include <vcl/toolbox.hxx>
+#include <vcl/themecolors.hxx>
 
 #include <unotools/moduleoptions.hxx>
 #include <unotools/securityoptions.hxx>
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 866d99800ed8..0cdf2a17ff40 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -32,6 +32,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
+#include <vcl/wintypes.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/opengrf.hxx>
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index ba91f3982fcb..bd1c795c9c83 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -22,6 +22,7 @@
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
+#include <vcl/wintypes.hxx>
 #include <sal/log.hxx>
 
 #include <svtools/ehdl.hxx>
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index b5d03ec8a694..bbb137329746 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -33,6 +33,7 @@
 #include <vcl/imappoly.hxx>
 #include <svl/urihelper.hxx>
 #include <rtl/character.hxx>
+#include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <o3tl/string_view.hxx>
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index 34139868ea03..0bdd5e0bad89 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -25,6 +25,7 @@
 
 #include <svtools/popupwindowcontroller.hxx>
 #include <svtools/toolbarmenu.hxx>
+#include <com/sun/star/frame/XFrame.hpp>
 
 using namespace ::com::sun::star;
 using namespace css::uno;
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 08675b54bfc4..81ccc19bbce6 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -22,6 +22,8 @@
 #include <vcl/canvastools.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/themecolors.hxx>
+#include <tools/color.hxx>
 #include <tools/fract.hxx>
 #include <svx/pageitem.hxx>
 #include <svx/pagectrl.hxx>
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 49ad03128597..b309a65d061c 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -34,6 +34,7 @@
 #include <tools/mapunit.hxx>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
 
 // namespaces
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index d9b42813dc76..0632f40c1bdd 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -35,6 +35,7 @@
 
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
 
 
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index da44e07acf17..a2fcf6c5bdfb 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -30,6 +30,7 @@
 #include <utility>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 2c022e0c85f1..de77cd9d7e30 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -31,6 +31,7 @@
 #include <svx/ruler.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/event.hxx>
+#include <vcl/image.hxx>
 #include <vcl/weld/weldutils.hxx>
 
 #include <swtypes.hxx>
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 7b3a48752c8a..6a43f75eaf56 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -31,6 +31,7 @@
 #include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/print.hxx>
+#include <vcl/themecolors.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/lokhelper.hxx>
diff --git a/test/source/a11y/XAccessibleComponentTester.cxx b/test/source/a11y/XAccessibleComponentTester.cxx
index cba6ee936569..a910afc794ad 100644
--- a/test/source/a11y/XAccessibleComponentTester.cxx
+++ b/test/source/a11y/XAccessibleComponentTester.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 
 #include <tools/color.hxx>
+#include <tools/gen.hxx>
 #include <vcl/unohelp.hxx>
 
 #include <test/a11y/AccessibilityTools.hxx>
diff --git a/test/source/a11y/accessibletestbase.cxx b/test/source/a11y/accessibletestbase.cxx
index 665da17b4c99..6e7e96039f12 100644
--- a/test/source/a11y/accessibletestbase.cxx
+++ b/test/source/a11y/accessibletestbase.cxx
@@ -16,6 +16,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/XDialog2.hpp>
 #include <com/sun/star/awt/XExtendedToolkit.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index 7c387d8b7a7c..f2d0ad37371b 100644
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.cxx
@@ -22,6 +22,7 @@
 #include <unotools/resmgr.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/wintypes.hxx>
 
 AlreadyOpenQueryBox::AlreadyOpenQueryBox(weld::Window* pParent, const std::locale& rLocale, const OUString& rMessage, bool bIsStoring)
     : m_xQueryBox(Application::CreateMessageDialog(pParent, VclMessageType::Question, VclButtonsType::NONE, rMessage))
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 23db10450b86..5aba4538dc2f 100644
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
@@ -21,6 +21,7 @@
 #include <unotools/resmgr.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/wintypes.hxx>
 #include "filechanged.hxx"
 
 FileChangedQueryBox::FileChangedQueryBox(weld::Window* pParent, const std::locale& rLocale)
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index c2ec31d55315..72d3e3e2bed2 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -21,6 +21,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/weld/weld.hxx>
+#include <vcl/wintypes.hxx>
 
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionApprove.hpp>
diff --git a/uui/source/lockcorrupt.cxx b/uui/source/lockcorrupt.cxx
index d3abee07a185..0853c76f8ee1 100644
--- a/uui/source/lockcorrupt.cxx
+++ b/uui/source/lockcorrupt.cxx
@@ -22,6 +22,7 @@
 #include <unotools/resmgr.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/wintypes.hxx>
 
 LockCorruptQueryBox::LockCorruptQueryBox(weld::Window* pParent, const std::locale& rResLocale)
     : m_xQueryBox(Application::CreateMessageDialog(pParent, VclMessageType::Question,
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index 340cc9638806..4b968f8f181a 100644
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.cxx
@@ -22,6 +22,7 @@
 #include <unotools/resmgr.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/wintypes.hxx>
 
 LockFailedQueryBox::LockFailedQueryBox(weld::Window* pParent, const std::locale& rLocale)
     : m_xQueryBox(Application::CreateMessageDialog(pParent, VclMessageType::Error,
diff --git a/uui/source/reloadeditable.cxx b/uui/source/reloadeditable.cxx
index e665c9a8efc7..09a2474510b0 100644
--- a/uui/source/reloadeditable.cxx
+++ b/uui/source/reloadeditable.cxx
@@ -22,6 +22,7 @@
 #include <unotools/resmgr.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/wintypes.hxx>
 
 ReloadEditableQueryBox::ReloadEditableQueryBox(weld::Window* pParent, const std::locale& rResLocale,
                                                const OUString& rMessage)
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index 1150613940d8..bf83f14cc01a 100644
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.cxx
@@ -20,6 +20,7 @@
 #include <unotools/resmgr.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/wintypes.hxx>
 #include <strings.hrc>
 #include "trylater.hxx"
 
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 3cddf7ebe020..db8ce4d64f6e 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -28,6 +28,7 @@
 #include <salsys.hxx>
 
 #include <basegfx/vector/b2ivector.hxx>
+#include <vcl/keycodes.hxx>
 
 #ifndef IOS
 #include <cairo.h>
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 375f8361b2e2..9c0acd6449b1 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -41,6 +41,7 @@
 #include <vcl/QueueInfo.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/themecolors.hxx>
 #include <vcl/window.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/svmain.hxx>
diff --git a/vcl/qa/cppunit/text.cxx b/vcl/qa/cppunit/text.cxx
index ce9542fe3e04..4858d55b61db 100644
--- a/vcl/qa/cppunit/text.cxx
+++ b/vcl/qa/cppunit/text.cxx
@@ -15,6 +15,7 @@
 #include <vcl/BitmapReadAccess.hxx>
 #include <comphelper/errcode.hxx>
 #include <vcl/fntstyle.hxx>
+#include <vcl/glyphitem.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/virdev.hxx>
 
diff --git a/vcl/source/accessibility/accessiblemenubasecomponent.cxx b/vcl/source/accessibility/accessiblemenubasecomponent.cxx
index 361106cdbb01..8b9e09ed1824 100644
--- a/vcl/source/accessibility/accessiblemenubasecomponent.cxx
+++ b/vcl/source/accessibility/accessiblemenubasecomponent.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <comphelper/accessiblecontexthelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <tools/gen.hxx>
 #include <o3tl/safeint.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/unohelp.hxx>
diff --git a/vcl/source/accessibility/characterattributeshelper.cxx b/vcl/source/accessibility/characterattributeshelper.cxx
index c21bec219d14..83cd8e48f7ca 100644
--- a/vcl/source/accessibility/characterattributeshelper.cxx
+++ b/vcl/source/accessibility/characterattributeshelper.cxx
@@ -23,6 +23,7 @@
 #include <vcl/unohelp.hxx>
 #include <comphelper/sequence.hxx>
 
+#include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 using namespace ::com::sun::star::uno;
diff --git a/vcl/source/accessibility/vclxaccessiblepopupmenu.cxx b/vcl/source/accessibility/vclxaccessiblepopupmenu.cxx
index 95df37593bd2..c183a2af6dfc 100644
--- a/vcl/source/accessibility/vclxaccessiblepopupmenu.cxx
+++ b/vcl/source/accessibility/vclxaccessiblepopupmenu.cxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <comphelper/accessiblecontexthelper.hxx>
+#include <tools/color.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 12dcf20f73ce..0943b407751e 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -41,6 +41,7 @@
 #include <IconThemeSelector.hxx>
 #include <vcl/IconThemeInfo.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/themecolors.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/i18nhelp.hxx>
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index 98b2369093fb..6664e469acca 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/i18n/CharacterClassification.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontWidth.hpp>
+#include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/XExtendedToolkit.hpp>
 
 using namespace ::com::sun::star;
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index e29364f80a00..e78b45a11eef 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -22,6 +22,7 @@
 #include <tools/long.hxx>
 
 #include <vcl/cursor.hxx>
+#include <vcl/seleng.hxx>
 
 #include <cstddef>
 #include <limits>
diff --git a/vcl/source/filter/wmf/wmfexternal.cxx b/vcl/source/filter/wmf/wmfexternal.cxx
index 4d183bd30458..9c125f3f9f70 100644
--- a/vcl/source/filter/wmf/wmfexternal.cxx
+++ b/vcl/source/filter/wmf/wmfexternal.cxx
@@ -22,6 +22,7 @@
 #include <comphelper/propertyvalue.hxx>
 #include <vcl/wmfexternal.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
 
 // formally known as WMF_EXTERNALHEADER
 WmfExternal::WmfExternal()
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 4c6f54139e03..e6c376d1619a 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -23,6 +23,7 @@
 #include <comphelper/configuration.hxx>
 #include <o3tl/temporary.hxx>
 
+#include <vcl/glyphitem.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/font/Feature.hxx>
 #include <vcl/font/FeatureParser.hxx>
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index aed479f7a68d..c779015d44c1 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -36,6 +36,7 @@
 
 #include <i18nlangtag/lang.h>
 
+#include <vcl/glyphitem.hxx>
 #include <vcl/svapp.hxx>
 
 #include <algorithm>
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index c1d05b021627..8e0415cd9a81 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -29,6 +29,7 @@
 #include <vcl/event.hxx>
 #include <vcl/fontcharmap.hxx>
 #include <vcl/fntstyle.hxx>
+#include <vcl/glyphitem.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/print.hxx>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 0b207020cad6..c0f202d4a325 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -28,6 +28,7 @@
 
 #include <vcl/ctrl.hxx>
 #include <vcl/fntstyle.hxx>
+#include <vcl/glyphitem.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/mnemonic.hxx>
diff --git a/vcl/source/uitest/uitest.cxx b/vcl/source/uitest/uitest.cxx
index 6e882f38e4b5..9cd3eaa1767c 100644
--- a/vcl/source/uitest/uitest.cxx
+++ b/vcl/source/uitest/uitest.cxx
@@ -19,6 +19,7 @@
 
 #include <comphelper/dispatchcommand.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
 
 bool UITest::executeCommand(const OUString& rCommand)
 {
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 501541d9748d..9bb0dfdb8c22 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -30,6 +30,7 @@
 #include <vcl/dockwin.hxx>
 #include <vcl/toolkit/floatwin.hxx>
 #include <vcl/help.hxx>
+#include <vcl/notebookbar/NotebookBarAddonsItem.hxx>
 #include <vcl/toolkit/edit.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index e56eb69f9305..fc8b4944208d 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -26,6 +26,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <vcl/vcllayout.hxx>
+#include <vcl/themecolors.hxx>
 #include <vcl/status.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 58d80d5f2cb1..717b422c4856 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -35,6 +35,7 @@
 #include <vcl/toolkit/floatwin.hxx>
 #include <vcl/toolkit/unowrap.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/themecolors.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/window.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 13d2fafc2040..a6334133c23c 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -35,6 +35,7 @@
 
 #include <dndhelper.hxx>
 #include <vcl/inputtypes.hxx>
+#include <vcl/keycodes.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/timer.hxx>