tdf#42949 Fix IWYU warnings in include/vcl/[B-E]*

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

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

101 files changed, 113 insertions, 59 deletions

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 1ce155272d89..2e433d8550e9 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -34,6 +34,7 @@
 #include <tools/urlobj.hxx>
 #include <unotools/securityoptions.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <com/sun/star/awt/SystemPointer.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/comphelper/source/misc/xmlsechelper.cxx b/comphelper/source/misc/xmlsechelper.cxx
index 850d7a42e161..068134bf47fe 100644
--- a/comphelper/source/misc/xmlsechelper.cxx
+++ b/comphelper/source/misc/xmlsechelper.cxx
@@ -20,6 +20,7 @@
 
 #include <comphelper/xmlsechelper.hxx>
 
+#include <o3tl/deleter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/fixed.hxx>
 #include <svl/solar.hrc>
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 08e97f39ae73..49e9d99d2528 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -28,6 +28,7 @@
 #include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
+#include <tools/solar.h>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/numbers.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 5b8a74508786..51369f8d4ce9 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -34,6 +34,7 @@
 #include "QuerySizeTabWinUndoAct.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 #include <TableWindowData.hxx>
 #include <JAccess.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index fa46b86c3a4d..87754ae9da5c 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -42,6 +42,7 @@
 #include <UITools.hxx>
 #include <osl/diagnose.h>
 #include <vcl/treelistentry.hxx>
+#include <vcl/commandevent.hxx>
 
 using namespace ::svt;
 using namespace ::dbaui;
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 7bb8f611a4a6..c7d84e2ad904 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -28,6 +28,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 7f126a99d6f5..d56c9dcdc47e 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -26,6 +26,7 @@
 #include <osl/diagnose.h>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <vcl/svapp.hxx>
+#include <vcl/commandevent.hxx>
 
 using namespace dbaui;
 using namespace ::com::sun::star::sdbc;
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index f12e5366844a..8daf223ccddc 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -24,6 +24,7 @@
 #include <vcl/help.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 #include <stringconstants.hxx>
 #include <TableWindowListBox.hxx>
 #include <TableConnection.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 0a97c99213c9..7fd6bc3341cd 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -45,6 +45,7 @@
 #include <UITools.hxx>
 #include "TableFieldControl.hxx"
 #include <dsntypes.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <dbaccess_slotid.hrc>
 
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index fd661a107066..841935648226 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/builder.hxx>
+#include <vcl/commandevent.hxx>
 #include <helpids.h>
 
 using namespace ::dbaui;
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index b09ce623127f..3e3808c3bbfa 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -36,6 +36,7 @@
 #include <cppuhelper/weakref.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/commandevent.hxx>
 #include <algorithm>
 
 #define USER_PACKAGE_MANAGER    "user"
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index d5e7fdd75e7b..dffd2534ef69 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -38,6 +38,7 @@
 #include <vcl/vclptr.hxx>
 #include <tools/fract.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <vcl/dndhelp.hxx>
 #include <svl/ondemand.hxx>
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 3aca9d72da53..dd53fa908634 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -33,6 +33,7 @@
 #include <comphelper/asyncnotification.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/commandevent.hxx>
 #include <osl/mutex.hxx>
 
 
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 6dd1741e7047..5d53b8558820 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -36,6 +36,7 @@
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 
 #define EMPTY_PAPER_SIZE    0x7FFFFFFF
 
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index f1195068a464..6505f7054ffb 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -43,6 +43,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtools/statusbarcontroller.hxx>
 
+#include <vcl/commandevent.hxx>
 #include <vcl/status.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 14410a256ad9..d802d6b26af9 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -301,4 +301,15 @@ blacklist:
     # Needed for macros
     - vcl/builder.hxx
     - vcl/vclptr.hxx
-
+    include/vcl/devicecoordinate.hxx:
+    # Needed for #if configure switch
+    - basegfx/point/b2ipoint.hxx
+    include/vcl/errinf.hxx:
+    # Needed for template
+    - o3tl/typed_flags_set.hxx
+    include/vcl/edit.hxx:
+    # Needed for template
+    - o3tl/deleter.hxx
+    include/vcl/event.hxx:
+    # Needed for enum type 
+    - vcl/window.hxx
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 6025c57416ae..9f5ff8c1df09 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -25,6 +25,7 @@
 #include <svtools/svtabbx.hxx>
 #include <unotools/intlwrapper.hxx>
 #include <unotools/collatorwrapper.hxx>
+#include <vcl/commandevent.hxx>
 
 class SvSimpleTable;
 class SVT_DLLPUBLIC SvSimpleTableContainer : public Control
diff --git a/include/vcl/BitmapAlphaClampFilter.hxx b/include/vcl/BitmapAlphaClampFilter.hxx
index f4325b8b9e15..d99e731b292a 100644
--- a/include/vcl/BitmapAlphaClampFilter.hxx
+++ b/include/vcl/BitmapAlphaClampFilter.hxx
@@ -11,8 +11,6 @@
 #ifndef INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEFILTER_HXX
 #define INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEFILTER_HXX
 
-#include <tools/color.hxx>
-
 #include <vcl/BitmapFilter.hxx>
 
 /** If the alpha is beyond a certain threshold, make it fully transparent
diff --git a/include/vcl/BitmapColorQuantizationFilter.hxx b/include/vcl/BitmapColorQuantizationFilter.hxx
index 4be1ff3b9f49..c3fd049de0ff 100644
--- a/include/vcl/BitmapColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapColorQuantizationFilter.hxx
@@ -11,8 +11,6 @@
 #ifndef INCLUDED_INCLUDE_VCL_BITMAPCOLORQUANTIZATIONFILTER_HXX
 #define INCLUDED_INCLUDE_VCL_BITMAPCOLORQUANTIZATIONFILTER_HXX
 
-#include <tools/color.hxx>
-
 #include <vcl/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapColorQuantizationFilter : public BitmapFilter
diff --git a/include/vcl/BitmapFilter.hxx b/include/vcl/BitmapFilter.hxx
index 9fc8f8017683..19599d06316f 100644
--- a/include/vcl/BitmapFilter.hxx
+++ b/include/vcl/BitmapFilter.hxx
@@ -12,7 +12,7 @@
 #define INCLUDED_VCL_BITMAPFILTER_HXX
 
 #include <vcl/bitmapex.hxx>
-#include <vcl/animate.hxx>
+class Animation;
 
 class VCL_DLLPUBLIC BitmapFilter
 {
diff --git a/include/vcl/BitmapMonochromeFilter.hxx b/include/vcl/BitmapMonochromeFilter.hxx
index 0c344b467d94..6ce71a69d92c 100644
--- a/include/vcl/BitmapMonochromeFilter.hxx
+++ b/include/vcl/BitmapMonochromeFilter.hxx
@@ -11,8 +11,6 @@
 #ifndef INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEFILTER_HXX
 #define INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEFILTER_HXX
 
-#include <tools/color.hxx>
-
 #include <vcl/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapMonochromeFilter : public BitmapFilter
diff --git a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx b/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
index 5072c3f17cd8..b311f8fc266d 100644
--- a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
@@ -11,8 +11,6 @@
 #ifndef INCLUDED_INCLUDE_VCL_BITMAPSIMPLECOLORQUANTIZATIONFILTER_HXX
 #define INCLUDED_INCLUDE_VCL_BITMAPSIMPLECOLORQUANTIZATIONFILTER_HXX
 
-#include <tools/color.hxx>
-
 #include <vcl/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapSimpleColorQuantizationFilter : public BitmapFilter
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index 90c45fc6ebde..6a8f6c8b9605 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -14,17 +14,17 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/ImageTree.hxx>
 #include <vcl/salbtype.hxx>
-#include <tools/stream.hxx>
 #if ENABLE_CAIRO_CANVAS
 #include <vcl/cairo.hxx>
 #endif
-#include <com/sun/star/geometry/IntegerPoint2D.hpp>
-#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
 #include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <o3tl/safeint.hxx>
 #include <array>
 
+class SvStream;
+namespace basegfx { class B2DHomMatrix; }
+namespace com { namespace sun { namespace star { namespace geometry { struct IntegerRectangle2D; } } } }
+
 namespace vcl {
 namespace bitmap {
 
diff --git a/include/vcl/EnumContext.hxx b/include/vcl/EnumContext.hxx
index 5a63d00c22e6..ba7480409b3b 100644
--- a/include/vcl/EnumContext.hxx
+++ b/include/vcl/EnumContext.hxx
@@ -23,8 +23,6 @@
 
 #include <rtl/ustring.hxx>
 
-#include <vector>
-
 
 namespace vcl {
 
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 7f8f7ce4c332..d50f1ff192d4 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -14,6 +14,7 @@
 #include <LibreOfficeKit/LibreOfficeKitTypes.h>
 #include <tools/gen.hxx>
 #include <svx/ruler.hxx>
+#include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/vclevent.hxx>
 #include <vcl/pointr.hxx>
diff --git a/include/vcl/canvastools.hxx b/include/vcl/canvastools.hxx
index 915e4e218cd3..94be4627596c 100644
--- a/include/vcl/canvastools.hxx
+++ b/include/vcl/canvastools.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/rendering/XColorSpace.hpp>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/range/b2irectangle.hxx>
 
@@ -31,11 +30,6 @@
 class Point;
 class Size;
 namespace tools { class Rectangle; }
-namespace tools {
-    class Polygon;
-    class PolyPolygon;
-}
-class Bitmap;
 class BitmapEx;
 class Color;
 
@@ -58,12 +52,12 @@ namespace com { namespace sun { namespace star { namespace geometry
 
 namespace com { namespace sun { namespace star { namespace rendering
 {
-    class  XGraphicDevice;
     class  XBitmap;
-    class  XIntegerBitmap;
     class  XIntegerReadOnlyBitmap;
 } } } }
 
+namespace com { namespace sun { namespace star { namespace rendering { class XColorSpace; } } } }
+
 namespace vcl
 {
     namespace unotools
diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx
index f934cb6ceb7e..c20cc745328a 100644
--- a/include/vcl/checksum.hxx
+++ b/include/vcl/checksum.hxx
@@ -23,7 +23,6 @@
 
 #include <sal/config.h>
 #include <sal/types.h>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 
 #define BITMAP_CHECKSUM_SIZE 8
diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx
index d8f20a381be5..88185efde077 100644
--- a/include/vcl/commandevent.hxx
+++ b/include/vcl/commandevent.hxx
@@ -24,9 +24,9 @@
 #include <tools/gen.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
-#include <vcl/keycod.hxx>
-#include <vcl/font.hxx>
+#include <vcl/keycodes.hxx>
 #include <o3tl/typed_flags_set.hxx>
+#include <rtl/ustring.hxx>
 
 class CommandExtTextInputData;
 class CommandWheelData;
diff --git a/include/vcl/commandinfoprovider.hxx b/include/vcl/commandinfoprovider.hxx
index ce695cee8b79..96a77cfb7520 100644
--- a/include/vcl/commandinfoprovider.hxx
+++ b/include/vcl/commandinfoprovider.hxx
@@ -22,7 +22,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/image.hxx>
 
-#include <com/sun/star/frame/XFrame.hpp>
+namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
 
 namespace vcl { namespace CommandInfoProvider {
 
diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx
index 50bba28396a0..cd2779eaac1d 100644
--- a/include/vcl/configsettings.hxx
+++ b/include/vcl/configsettings.hxx
@@ -20,12 +20,13 @@
 #define INCLUDED_VCL_CONFIGSETTINGS_HXX
 
 #include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 #include <unotools/configitem.hxx>
 #include <vcl/dllapi.h>
 
 #include <unordered_map>
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+
 namespace vcl
 {
     typedef std::unordered_map< OUString, OUString > OUStrMap;
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 48daf0e5401e..391c576ddff3 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -21,14 +21,12 @@
 #define INCLUDED_VCL_CTRL_HXX
 
 #include <tools/link.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/window.hxx>
-#include <vcl/salnativewidgets.hxx>
 #include <memory>
 
 // forward
-namespace vcl { struct ImplControlData; struct ControlLayoutData; }
+namespace vcl { struct ImplControlData; }
 class StyleSettings;
 
 
diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx
index b4d7641a0dd8..632578072775 100644
--- a/include/vcl/cvtgrf.hxx
+++ b/include/vcl/cvtgrf.hxx
@@ -25,7 +25,6 @@
 #include <vcl/salctype.hxx>
 
 
-struct  ConvertData;
 class   Graphic;
 
 class VCL_DLLPUBLIC GraphicConverter
diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx
index a4331adc4d87..32afcfc24737 100644
--- a/include/vcl/debugevent.hxx
+++ b/include/vcl/debugevent.hxx
@@ -15,7 +15,8 @@
 #include <vcl/dllapi.h>
 #include <vcl/timer.hxx>
 #include <sal/types.h>
-#include <vcl/window.hxx>
+
+namespace vcl { class Window; }
 
 class VCL_DLLPUBLIC DebugEventInjector : private Timer {
   sal_uInt32 mnEventsLeft;
diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx
index 136780893f52..f998a993fe78 100644
--- a/include/vcl/decoview.hxx
+++ b/include/vcl/decoview.hxx
@@ -21,14 +21,15 @@
 #define INCLUDED_VCL_DECOVIEW_HXX
 
 #include <vcl/dllapi.h>
+#include <vcl/outdev.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/vclenum.hxx>
-#include <o3tl/typed_flags_set.hxx>
 
 namespace tools { class Rectangle; }
 class Point;
 class Color;
-class OutputDevice;
+
+namespace o3tl { template <typename T> struct typed_flags; }
 
 // Flags for DrawSymbol()
 enum class DrawSymbolFlags
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index b6d7bbdb110e..96690febcad5 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -21,11 +21,9 @@
 #define INCLUDED_VCL_DIALOG_HXX
 
 #include <memory>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/syswin.hxx>
 #include <vcl/vclptr.hxx>
-#include <vcl/IDialogRenderable.hxx>
 #include <vcl/abstdlg.hxx>
 
 struct DialogImpl;
diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx
index 9aa9ac5f4203..6c05ca56a172 100644
--- a/include/vcl/dibtools.hxx
+++ b/include/vcl/dibtools.hxx
@@ -20,9 +20,6 @@
 #define INCLUDED_VCL_DIBTOOLS_HXX
 
 #include <vcl/dllapi.h>
-#include <vcl/mapmod.hxx>
-#include <vcl/region.hxx>
-#include <vcl/alpha.hxx>
 #include <vcl/salbtype.hxx>
 
 // predefines
@@ -30,6 +27,7 @@
 class SvStream;
 class BitmapEx;
 class Bitmap;
+class AlphaMask;
 
 // - Compression defines
 
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index d2e6a585d633..7bbbc9e49d79 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_VCL_DOCKWIN_HXX
 #define INCLUDED_VCL_DOCKWIN_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/builder.hxx>
 #include <vcl/floatwin.hxx>
-#include <o3tl/deleter.hxx>
 #include <memory>
 #include <vector>
 
+namespace o3tl { template <typename T> struct default_delete; }
+
 // data to be sent with docking events
 struct DockingData
 {
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 63b65e324920..40d2f447e96a 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/ctrl.hxx>
 
-#include <functional>
 #include <memory>
 
 #include <o3tl/deleter.hxx>
diff --git a/include/vcl/embeddedfontshelper.hxx b/include/vcl/embeddedfontshelper.hxx
index 4ffa0bd59a79..7cf4d36126fa 100644
--- a/include/vcl/embeddedfontshelper.hxx
+++ b/include/vcl/embeddedfontshelper.hxx
@@ -12,12 +12,13 @@
 
 #include <vcl/dllapi.h>
 
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/fontenum.hxx>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
 /**
  Helper functions for handling embedded fonts in documents.
 
diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx
index 174c424f2871..a6ef02762c5a 100644
--- a/include/vcl/errcode.hxx
+++ b/include/vcl/errcode.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_ERRCODE_HXX
 
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <ostream>
 
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index f34d5624b991..e3d24ab0cc28 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -30,12 +30,10 @@
 
 #include <limits.h>
 
-namespace vcl { class Window; }
 namespace weld { class Window; }
 
 class ErrorHandler;
 class ErrorContext;
-class ErrorStringFactory;
 class ErrorInfo;
 class DynamicErrorInfo;
 class ImplDynamicErrorInfo;
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 688811746ccc..f160a27c4cd1 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -20,23 +20,15 @@
 #ifndef INCLUDED_VCL_EVENT_HXX
 #define INCLUDED_VCL_EVENT_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <tools/gen.hxx>
 #include <vcl/keycod.hxx>
-#include <vcl/commandevent.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/window.hxx>
 
-class AllSettings;
-struct IDataObject;
-
-namespace com { namespace sun { namespace star { namespace awt {
-    struct KeyEvent;
-    struct MouseEvent;
-} } } }
+class CommandEvent;
 
 enum class TextDirectionality {
     LeftToRight_TopToBottom,
diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx
index 4650fbc5c6e4..9fdeb16fe8c5 100644
--- a/include/vcl/evntpost.hxx
+++ b/include/vcl/evntpost.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_VCL_EVNTPOST_HXX
 
 #include <tools/link.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 
 struct ImplSVEvent;
diff --git a/include/vcl/imap.hxx b/include/vcl/imap.hxx
index bba9ebe6b84c..e143e7b811c8 100644
--- a/include/vcl/imap.hxx
+++ b/include/vcl/imap.hxx
@@ -23,6 +23,7 @@
 #include <vcl/imapobj.hxx>
 #include <vcl/dllapi.h>
 #include <tools/stream.hxx>
+#include <tools/solar.h>
 #include <memory>
 #include <vector>
 
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 22d494dfa6e2..0c4cb53bc523 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -22,6 +22,7 @@
 #include <vcl/window.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/IContext.hxx>
+#include <vcl/commandevent.hxx>
 #include <set>
 
 class VCL_DLLPUBLIC VclContainer : public vcl::Window,
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 8746c738c460..2b9503642a84 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -41,6 +41,7 @@
 #include <comphelper/SelectionMultiplex.hxx>
 #include <vcl/treelistbox.hxx>
 #include <vcl/treelistentry.hxx>
+#include <vcl/commandevent.hxx>
 #include <svl/solar.hrc>
 #include <ReportVisitor.hxx>
 #include <core_resource.hxx>
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 25f8209d7d5d..2362d97e5232 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -55,6 +55,7 @@
 
 #include <connectivity/dbtools.hxx>
 
+#include <vcl/commandevent.hxx>
 #include <vcl/lineinfo.hxx>
 #include <ColorChanger.hxx>
 
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index dc17b3cf9c29..2b076349346a 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <toolkit/helper/convert.hxx>
 
+#include <vcl/commandevent.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index bad7ae69e817..dd9757aac61b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -40,6 +40,7 @@
 #include <svl/typedwhich.hxx>
 #include <svl/zforlist.hxx>
 #include <tools/gen.hxx>
+#include <tools/solar.h>
 
 #include <cassert>
 #include <memory>
diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx
index 6f90c218bdbb..aa5cccca14d8 100644
--- a/sc/inc/rechead.hxx
+++ b/sc/inc/rechead.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SC_INC_RECHEAD_HXX
 #define INCLUDED_SC_INC_RECHEAD_HXX
 
+#include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <memory>
 
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index eb7f56e3227a..b43b700afcca 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -21,6 +21,7 @@
 #include <cassert>
 
 #include <osl/diagnose.h>
+#include <tools/solar.h>
 #include <xlstyle.hxx>
 #include <xestyle.hxx>
 #include <xestream.hxx>
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index 790da0a05061..e48d596bd5ef 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -22,6 +22,7 @@
 #include <osl/thread.h>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
+#include <tools/solar.h>
 #include <ftools.hxx>
 #include <xistream.hxx>
 #include <xlstring.hxx>
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index 1c03c3d39cd8..ee6664162fbf 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_XISTYLE_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_XISTYLE_HXX
 
+#include <tools/solar.h>
 #include <vector>
 #include <memory>
 #include <rangelst.hxx>
diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx
index 8c951603c8ce..5ffec7d0e0ad 100644
--- a/sc/source/ui/inc/autostyl.hxx
+++ b/sc/source/ui/inc/autostyl.hxx
@@ -22,6 +22,7 @@
 
 #include <vector>
 #include <rtl/ustring.hxx>
+#include <tools/solar.h>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 73bdb2665d50..7a66fdad4f2c 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -22,6 +22,7 @@
 
 #include <resltn.hxx>
 #include <tools/color.hxx>
+#include <tools/solar.h>
 #include <vcl/errinf.hxx>
 
 #include "htmlpublishmode.hxx"
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 72119b3634ba..a4aa0644abe7 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -32,6 +32,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/commandevent.hxx>
 #include <o3tl/make_unique.hxx>
 #include <osl/diagnose.h>
 
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index b421f13f3630..c2869b8732de 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/deployment/DeploymentException.hpp>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <sdresid.hxx>
 #include <strings.hrc>
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 3218fc97453e..7272780bd32d 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -23,6 +23,7 @@
 #include <vcl/help.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx
index 3f891ae2c1bb..b585d95c74ee 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -14,6 +14,7 @@
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <sfx2/strings.hrc>
 #include <bitmaps.hlst>
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 649490e0f87f..5ae456bec36b 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -38,6 +38,7 @@
 #include <vcl/scrbar.hxx>
 #include <vcl/help.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 839342506ed7..16aeb33dcc11 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -30,6 +30,7 @@
 
 #include <vcl/dockwin.hxx>
 #include <vcl/scrbar.hxx>
+#include <vcl/commandevent.hxx>
 #include <tools/svborder.hxx>
 #include <sal/log.hxx>
 
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index dd9881b18bac..33c5c8d7a698 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -30,6 +30,7 @@
 
 #include <sfx2/sfxresid.hxx>
 
+#include <vcl/commandevent.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/image.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 4d47efa937e2..737db2750da4 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
@@ -20,6 +20,7 @@
 #include <svl/lckbitem.hxx>
 #include <svl/poolitem.hxx>
 #include <tools/stream.hxx>
+#include <tools/solar.h>
 #include <osl/diagnose.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 67c981aa0f8b..2674b5488694 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -25,6 +25,7 @@
 #include <svtools/colorcfg.hxx>
 #include <vcl/salgtype.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <tools/multisel.hxx>
 #include <tools/fract.hxx>
diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx
index 2f592281d45e..2680dfcde131 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.cxx
@@ -20,6 +20,7 @@
 
 #include <svtools/brwhead.hxx>
 #include <svtools/brwbox.hxx>
+#include <vcl/commandevent.hxx>
 
 
 BrowserHeader::BrowserHeader( BrowseBox* pParent, WinBits nWinBits )
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 7b9101d4584f..3e8ea365970b 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -20,6 +20,7 @@
 
 #include "datwin.hxx"
 #include <o3tl/numeric.hxx>
+#include <vcl/commandevent.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <vcl/image.hxx>
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index b0e8d1f359b5..80e9d88a224b 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -31,6 +31,7 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/controllayout.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <svtools/ivctrl.hxx>
 #include "imivctl.hxx"
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 796579b0a838..846d451cf71c 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -24,6 +24,7 @@
 #include <vcl/controllayout.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 
 using namespace ::com::sun::star::accessibility;
 
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 19641fe2b2cc..61adb2802371 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -26,6 +26,7 @@
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/calendarwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index 352e79e13e87..e00a9bdf5645 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -26,6 +26,7 @@
 #include <vcl/image.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index d2ed2058800d..3b3901f48f82 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -19,6 +19,7 @@
 
 #include <svtools/scrwin.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 
 
 ScrollableWindow::ScrollableWindow( vcl::Window* pParent ) :
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 3f97b55b1e10..f55ad89c87b9 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -29,6 +29,7 @@
 #include <vcl/edit.hxx>
 #include <vcl/image.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 #include <svtaccessiblefactory.hxx>
 #include <svtools/svtresid.hxx>
 #include <svtools/strings.hrc>
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 824de42d35ca..4530ec1c54dc 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -31,6 +31,7 @@
 #include <vcl/taskpanelist.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <svtools/framestatuslistener.hxx>
 #include <svtools/valueset.hxx>
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index bc37cf818ec2..4e57665d21ed 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -24,6 +24,7 @@
 #include <vcl/scrbar.hxx>
 #include <vcl/help.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <com/sun/star/accessibility/AccessibleEventObject.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index d5b6d8b6e183..74bf17153c15 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -25,6 +25,7 @@
 
 #include <vcl/help.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 
 namespace svt { namespace table
 {
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 2403b92245e1..0827efb3df9b 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -46,6 +46,7 @@
 #include <vcl/builder.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <svx/strings.hrc>
 
diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx
index fde2d73dd67e..891b0c084123 100644
--- a/svx/source/sdr/contact/sdrmediawindow.cxx
+++ b/svx/source/sdr/contact/sdrmediawindow.cxx
@@ -23,6 +23,7 @@
 
 #include <sdr/contact/viewobjectcontactofsdrmediaobj.hxx>
 #include <vcl/window.hxx>
+#include <vcl/commandevent.hxx>
 
 namespace sdr { namespace contact {
 
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index ff1766d8cd39..ed517b89073c 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -25,6 +25,7 @@
 #include <basic/sbxvar.hxx>
 #include <unotools/syslocale.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <tools/solar.h>
 #include "swdllapi.h"
 
 class CharClass;
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index c82d1e0edab8..936a765393fa 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -25,6 +25,7 @@
 #include <set>
 #include <memory>
 #include <vector>
+#include <tools/solar.h>
 
 class SfxPoolItem;
 class SwTextNode;
diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx
index 5fcda8748c88..1fc6e757452c 100644
--- a/sw/inc/extinput.hxx
+++ b/sw/inc/extinput.hxx
@@ -21,6 +21,7 @@
 
 #include "pam.hxx"
 #include <i18nlangtag/lang.h>
+#include <vcl/commandevent.hxx>
 #include <vector>
 
 class CommandExtTextInputData;
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 55a5f4a8c862..96a8401a3fe9 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -25,6 +25,8 @@
 
 #include <swfont.hxx>
 
+#include <vcl/commandevent.hxx>
+
 #include <cstddef>
 #include <memory>
 #include <vector>
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 590d208d0d63..c3c927f71c5b 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -28,6 +28,7 @@
 #include <mmconfigitem.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/commandevent.hxx>
 #include <svtools/controldims.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 9843cd863cd2..108f6b36f7bc 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -55,6 +55,7 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/button.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 #include <comphelper/asyncnotification.hxx>
 #include <comphelper/flagguard.hxx>
 #include <comphelper/profilezone.hxx>
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 011a083de4cd..c2dcf90f3a8c 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -26,6 +26,7 @@
 #include <osl/thread.hxx>
 #include <osl/diagnose.h>
 #include <tools/urlobj.hxx>
+#include <tools/solar.h>
 #include <ucbhelper/interactionrequest.hxx>
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/ucb/InteractiveNetworkConnectException.hpp>
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index d78bcffed3be..8d44135b885d 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -25,6 +25,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <osx/a11yfactory.h>
 #include <osx/salframe.h>
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index dcbfb98451f2..f58f0e43e893 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -42,6 +42,7 @@
 #include <vcl/idle.hxx>
 #include <vcl/svmain.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <osx/saldata.hxx>
 #include <osx/salinst.h>
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index 75aed6a48c8d..c5f223bcf45a 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -14,6 +14,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/seqstream.hxx>
 #include <vcl/canvastools.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
 
 #include <com/sun/star/graphic/SvgTools.hpp>
 #include <com/sun/star/graphic/Primitive2DTools.hpp>
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 03a2946417b2..91901b883882 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -25,6 +25,7 @@
 #include <vcl/decoview.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
+#include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index 676d6b165916..1f502e3102db 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -24,6 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 #include <svl/zformat.hxx>
 #include <vcl/fmtfield.hxx>
 #include <vcl/weld.hxx>
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index b8472d0a583b..d1ee6e2a876a 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -18,6 +18,7 @@
  */
 
 
+#include <vcl/commandevent.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/event.hxx>
diff --git a/vcl/source/control/listctrl.cxx b/vcl/source/control/listctrl.cxx
index 73c6b43c555d..d861dca20b31 100644
--- a/vcl/source/control/listctrl.cxx
+++ b/vcl/source/control/listctrl.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/commandevent.hxx>
 #include <vcl/listctrl.hxx>
 
 ListControl::ListControl(vcl::Window* pParent, WinBits nBits):
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 57c6542f3a8c..acc132e537f2 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/spinfld.hxx>
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 33e34151cfb7..859468fd9861 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -21,6 +21,7 @@
 
 #include <vcl/texteng.hxx>
 #include <vcl/textview.hxx>
+#include <vcl/commandevent.hxx>
 #include "textdoc.hxx"
 #include "textdat2.hxx"
 #include "textundo.hxx"
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 54757b008881..6857089945eb 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -27,6 +27,7 @@
 #include <vcl/textdata.hxx>
 #include <vcl/xtextedt.hxx>
 #include "textdat2.hxx"
+#include <vcl/commandevent.hxx>
 
 #include <svl/undo.hxx>
 #include <vcl/cursor.hxx>
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index cff800230814..10c6f20c0bb9 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <memory>
+#include <vcl/commandevent.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index 30a6ae5b2ee3..2a64944d12bf 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -16,6 +16,7 @@
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/embeddedfontshelper.hxx>
+#include <com/sun/star/io/XInputStream.hpp>
 
 #include <fontsubset.hxx>
 #include <outdev.h>
diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx
index 378832b55611..ee9196c6411e 100644
--- a/vcl/source/helper/commandinfoprovider.cxx
+++ b/vcl/source/helper/commandinfoprovider.cxx
@@ -25,6 +25,7 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/weakref.hxx>
 
+#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/frame/theUICommandDescription.hpp>
 #include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp>
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index a70b99f4d421..97ebe9a14d61 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -21,6 +21,7 @@
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/help.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 
 #include <cstdlib>
 #include <memory>
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index e51363bd2861..ec0244ce5157 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -30,6 +30,7 @@
 #include <vcl/i18nhelp.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/commandevent.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <sot/formats.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index ef882d36ea02..079f87ee580f 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -26,6 +26,7 @@
 #include <scrwnd.hxx>
 
 #include <vcl/timer.hxx>
+#include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <sal/log.hxx>
 
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index be4092de6822..8e81ce88d095 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/commandevent.hxx>
 #include <vcl/window.hxx>
 #include <vcl/seleng.hxx>
 #include <comphelper/lok.hxx>