tdf#42949 Fix IWYU warnings in include/vcl/[v-x]*

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

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

65 files changed, 78 insertions, 0 deletions

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 330b69ab27dd..6562f26d5dbc 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -27,6 +27,7 @@
 #include <sal/types.h>
 #include <sal/log.hxx>
 
+#include <vcl/virdev.hxx>
 #include <vcl/inputtypes.hxx>
 #ifndef LIBO_HEADLESS
 # include <vcl/opengl/OpenGLContext.hxx>
diff --git a/vcl/inc/fontattributes.hxx b/vcl/inc/fontattributes.hxx
index 7f5bd1d3b610..358f9bc62af5 100644
--- a/vcl/inc/fontattributes.hxx
+++ b/vcl/inc/fontattributes.hxx
@@ -24,6 +24,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 #include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 
 
 /* The following class is extraordinarily similar to ImplFont. */
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx
index 58bcd07927a0..a0f700c925fc 100644
--- a/vcl/inc/fontinstance.hxx
+++ b/vcl/inc/fontinstance.hxx
@@ -26,6 +26,7 @@
 #include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <tools/gen.hxx>
+#include <tools/fontenum.hxx>
 #include <vcl/glyphitem.hxx>
 #include <vcl/vcllayout.hxx>
 
diff --git a/vcl/inc/osx/runinmain.hxx b/vcl/inc/osx/runinmain.hxx
index 8f8559dac5c8..287479981aa3 100644
--- a/vcl/inc/osx/runinmain.hxx
+++ b/vcl/inc/osx/runinmain.hxx
@@ -46,6 +46,7 @@
 
 #include "saltimer.h"
 #include <salframe.hxx>
+#include <tools/debug.hxx>
 
 union RuninmainResult
 {
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 452a88e6f9f5..5dec19b7dc47 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -25,8 +25,11 @@
 #include <tools/fract.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/inputctx.hxx>
 #include <vcl/window.hxx>
+#include <vcl/settings.hxx>
 #include <o3tl/typed_flags_set.hxx>
+#include <cppuhelper/weakref.hxx>
 
 #include <boost/optional.hpp>
 #include <list>
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index ca8f118c8003..4fa46de7649e 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -21,6 +21,7 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 #include <vcl/opengl/OpenGLHelper.hxx>
 
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 60283c8ad33e..87dfa3ca275a 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -26,6 +26,8 @@
 
 #include <osl/file.h>
 
+#include <vcl/event.hxx>
+#include <vcl/inputctx.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/syswin.hxx>
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 3d89e179484d..a3f727719e74 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -22,6 +22,8 @@
 #include <sal/macros.h>
 #include <tools/helpers.hxx>
 
+#include <vcl/event.hxx>
+#include <vcl/inputctx.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index b1c5774c21ff..c92b621a023c 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -43,6 +43,7 @@
 #include <vcl/svmain.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 
 #include <osx/saldata.hxx>
 #include <osx/salinst.h>
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 973fdddfb33c..792e5718d6ab 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -24,6 +24,7 @@
 #include <objc/objc-runtime.h>
 
 #include <rtl/ustrbuf.hxx>
+#include <tools/debug.hxx>
 
 #include <vcl/commandevent.hxx>
 #include <vcl/floatwin.hxx>
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index fd2eba1badc2..44e608318268 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <string.h>
+#include <tools/debug.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
 #include <vcl/opengl/OpenGLHelper.hxx>
 #include <opengl/zone.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
index cca60f0c6b4c..29994860e25f 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@@ -17,6 +17,7 @@
 
 #include <vcl/graphicfilter.hxx>
 #include <tools/stream.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 using namespace ::com::sun::star;
 
diff --git a/vcl/source/app/salusereventlist.cxx b/vcl/source/app/salusereventlist.cxx
index ed66602ca549..1ccbeea03438 100644
--- a/vcl/source/app/salusereventlist.cxx
+++ b/vcl/source/app/salusereventlist.cxx
@@ -27,6 +27,7 @@
 
 #include <com/sun/star/uno/Exception.hpp>
 #include <cppuhelper/exc_hlp.hxx>
+#include <tools/debug.hxx>
 #include <sal/log.hxx>
 #include <sal/types.h>
 #include <svdata.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 57f603221c87..813154ba465f 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -55,7 +55,9 @@
 #include <vcl/toolkit/unowrap.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/vclmedit.hxx>
+#include <vcl/virdev.hxx>
 #include <bitmaps.hlst>
+#include <o3tl/make_unique.hxx>
 
 SalFrame::SalFrame()
     : m_pWindow(nullptr)
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index bdcb3fddafad..53d1dafcfd07 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -30,6 +30,7 @@
 #include <sal/types.h>
 #include <svdata.hxx>
 #include <tools/time.hxx>
+#include <tools/debug.hxx>
 #include <unotools/configmgr.hxx>
 #include <vcl/scheduler.hxx>
 #include <vcl/idle.hxx>
diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx
index 9f794c93f341..15fb85ad35a0 100644
--- a/vcl/source/control/fixedhyper.cxx
+++ b/vcl/source/control/fixedhyper.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/event.hxx>
 #include <vcl/fixedhyper.hxx>
+#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <comphelper/anytostring.hxx>
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index 1f502e3102db..dc584833cc07 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -21,6 +21,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/source/control/listctrl.cxx b/vcl/source/control/listctrl.cxx
index d861dca20b31..b3b4a1a2ca20 100644
--- a/vcl/source/control/listctrl.cxx
+++ b/vcl/source/control/listctrl.cxx
@@ -18,7 +18,9 @@
  */
 
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 #include <vcl/listctrl.hxx>
+#include <vcl/settings.hxx>
 
 ListControl::ListControl(vcl::Window* pParent, WinBits nBits):
     Control(pParent, nBits),
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index 569814ddb263..08a0296dacdb 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/event.hxx>
 #include <vcl/status.hxx>
 #include <vcl/prgsbar.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index fe277456a613..41d815c1c578 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -20,6 +20,7 @@
 #include <vcl/event.hxx>
 #include <vcl/spin.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/vclevent.hxx>
 
 #include <spin.hxx>
 
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 859468fd9861..cdc1d4cbd11a 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -22,6 +22,7 @@
 #include <vcl/texteng.hxx>
 #include <vcl/textview.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/inputctx.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 3ccae7706092..8811fe28e55b 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -28,6 +28,7 @@
 #include <vcl/xtextedt.hxx>
 #include "textdat2.hxx"
 #include <vcl/commandevent.hxx>
+#include <vcl/inputctx.hxx>
 
 #include <svl/undo.hxx>
 #include <vcl/cursor.hxx>
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index fba89942e081..f64622354fdf 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -22,10 +22,12 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/decoview.hxx>
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/vclmedit.hxx>
 #include <vcl/xtextedt.hxx>
+#include <vcl/textview.hxx>
 #include <svl/undo.hxx>
 #include <svl/lstner.hxx>
 #include <vcl/uitest/uiobject.hxx>
diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx
index 6112735f55c3..ba045916e471 100644
--- a/vcl/source/edit/xtextedt.cxx
+++ b/vcl/source/edit/xtextedt.cxx
@@ -20,6 +20,7 @@
 #include <i18nutil/searchopt.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <vcl/xtextedt.hxx>
+#include <vcl/textview.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <unotools/textsearch.hxx>
diff --git a/vcl/source/filter/wmf/wmfexternal.cxx b/vcl/source/filter/wmf/wmfexternal.cxx
index 27e490a504e2..b1486c98ff8e 100644
--- a/vcl/source/filter/wmf/wmfexternal.cxx
+++ b/vcl/source/filter/wmf/wmfexternal.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/wmfexternal.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 // formally known as WMF_EXTERNALHEADER
 WmfExternal::WmfExternal() :
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index ba7a1923e4ca..9bfd9a26930e 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -28,6 +28,7 @@
 
 #include <string.h>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 BitmapInfoAccess::BitmapInfoAccess( Bitmap& rBitmap, BitmapAccessMode nMode ) :
             mpBuffer        ( nullptr ),
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index bc0ff8a3e53b..7d1cbbde664d 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -40,6 +40,7 @@
 #include <impgraph.hxx>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
+#include <com/sun/star/graphic/XPrimitive2D.hpp>
 #include <vcl/dibtools.hxx>
 #include <memory>
 #include <o3tl/make_unique.hxx>
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 2443b6877e22..a3211e71a5e4 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -21,7 +21,9 @@
 #include <sal/log.hxx>
 
 #include <tools/helpers.hxx>
+#include <tools/debug.hxx>
 
+#include <vcl/event.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/print.hxx>
 
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index fa16e55326a8..35f034318e7a 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -28,6 +28,7 @@
 #include <comphelper/sequence.hxx>
 #include <sal/types.h>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 #include <printdlg.hxx>
 #include <svdata.hxx>
diff --git a/vcl/source/gdi/vectorgraphicdata.cxx b/vcl/source/gdi/vectorgraphicdata.cxx
index 08aebe0a1b3d..0e6b610154a8 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/sequence.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/wmfexternal.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 7e251c5a5809..41c735c83766 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -26,6 +26,7 @@
 #include <vcl/ITiledRenderable.hxx>
 #include <vcl/virdev.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 using namespace ::com::sun::star::uno;
 
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx b/vcl/source/graphic/UnoGraphicProvider.cxx
index 09e911c7bc3a..c89e83004bf0 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -27,6 +27,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/wmf.hxx>
+#include <vcl/wmfexternal.hxx>
 #include <svl/solar.hrc>
 #include <vcl/virdev.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/source/helper/displayconnectiondispatch.cxx b/vcl/source/helper/displayconnectiondispatch.cxx
index 1128b5ee6973..85c4e8cdee01 100644
--- a/vcl/source/helper/displayconnectiondispatch.cxx
+++ b/vcl/source/helper/displayconnectiondispatch.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/svapp.hxx>
+#include <tools/debug.hxx>
 
 #include <displayconnectiondispatch.hxx>
 #include <svdata.hxx>
diff --git a/vcl/source/helper/svtaccessiblefactory.cxx b/vcl/source/helper/svtaccessiblefactory.cxx
index c545e3c76ae0..1351309391b2 100644
--- a/vcl/source/helper/svtaccessiblefactory.cxx
+++ b/vcl/source/helper/svtaccessiblefactory.cxx
@@ -23,6 +23,7 @@
 #include <vcl/accessiblefactory.hxx>
 
 #include <tools/svlibrary.h>
+#include <tools/debug.hxx>
 
 #include <osl/module.h>
 #include <osl/diagnose.h>
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 16f4b576ab15..4c6588460082 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -46,6 +46,7 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/helpers.hxx>
+#include <tools/debug.hxx>
 
 void OutputDevice::DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap )
 {
diff --git a/vcl/source/outdev/clipping.cxx b/vcl/source/outdev/clipping.cxx
index eb5355d4d123..3503b9555970 100644
--- a/vcl/source/outdev/clipping.cxx
+++ b/vcl/source/outdev/clipping.cxx
@@ -20,6 +20,7 @@
 #include <sal/config.h>
 #include <osl/diagnose.h>
 
+#include <tools/debug.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index ffc6d9c2d147..1e0cb553c04b 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -25,8 +25,10 @@
 #include <vcl/print.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/fontcharmap.hxx>
+#include <vcl/event.hxx>
 #include <font/FeatureCollector.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 #include <sallayout.hxx>
 #include <salgdi.hxx>
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index e3275b904a3e..4c12160e19e7 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -18,6 +18,8 @@
  */
 
 #include <tools/bigint.hxx>
+#include <tools/debug.hxx>
+#include <vcl/cursor.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/metaact.hxx>
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index bc54bcfac2bd..9e03be3d3454 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -20,6 +20,7 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 
+#include <tools/debug.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/metaact.hxx>
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index c52378afd382..d3a9fb5b6c14 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -20,6 +20,7 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 
+#include <tools/debug.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/outdevstate.hxx>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index d81fda0c58da..9a1c92ced226 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -28,6 +28,7 @@
 #include <osl/file.h>
 #include <sal/log.hxx>
 #include <tools/lineend.hxx>
+#include <tools/debug.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/textrectinfo.hxx>
diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx
index 36905ae6f992..32a0316dbbd6 100644
--- a/vcl/source/treelist/headbar.cxx
+++ b/vcl/source/treelist/headbar.cxx
@@ -26,6 +26,7 @@
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 8ebbef7b23d6..cdd18ce04ed1 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -36,6 +36,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <i18nlangtag/languagetag.hxx>
+#include <tools/debug.hxx>
 
 #include <vcl/treelistentry.hxx>
 #include <vcl/viewdataentry.hxx>
diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx
index 572cef42fe38..00a437e19f81 100644
--- a/vcl/source/treelist/treelist.cxx
+++ b/vcl/source/treelist/treelist.cxx
@@ -20,6 +20,7 @@
 #include <vcl/treelist.hxx>
 #include <vcl/treelistentry.hxx>
 #include <vcl/viewdataentry.hxx>
+#include <tools/debug.hxx>
 #include <osl/diagnose.h>
 #include <o3tl/make_unique.hxx>
 
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index 514a43aea13b..d992e7a68fd2 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -38,6 +38,7 @@
 #include <rtl/instance.hxx>
 #include <comphelper/string.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistentry.hxx>
diff --git a/vcl/source/treelist/treelistentry.cxx b/vcl/source/treelist/treelistentry.cxx
index 05729f2399e7..52549a15cee4 100644
--- a/vcl/source/treelist/treelistentry.cxx
+++ b/vcl/source/treelist/treelistentry.cxx
@@ -22,6 +22,7 @@
 #include <vcl/treelist.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <tools/debug.hxx>
 
 #include <limits>
 
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 70bdfedfa5f7..f60cb2322367 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -13,6 +13,7 @@
 
 #include <rtl/bootstrap.hxx>
 #include <osl/file.hxx>
+#include <vcl/event.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <vcl/uitest/eventdescription.hxx>
 #include <svdata.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 857bf71f34ca..76ed9da95b80 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -60,6 +60,7 @@
 #include <strings.hrc>
 #include <tools/svlibrary.h>
 #include <tools/diagnose_ex.h>
+#include <o3tl/make_unique.hxx>
 
 #ifdef DISABLE_DYNLOADING
 #include <dlfcn.h>
diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx
index 8ad91cedb45f..62d5d695a9a4 100644
--- a/vcl/source/window/clipping.cxx
+++ b/vcl/source/window/clipping.cxx
@@ -21,6 +21,7 @@
 #include <vcl/virdev.hxx>
 
 #include <sal/types.h>
+#include <tools/debug.hxx>
 
 #include <salobj.hxx>
 #include <window.h>
diff --git a/vcl/source/window/debug.cxx b/vcl/source/window/debug.cxx
index a81768b78eaf..ee056719d1f2 100644
--- a/vcl/source/window/debug.cxx
+++ b/vcl/source/window/debug.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/window.hxx>
 #include <vcl/outdev.hxx>
+#include <tools/debug.hxx>
 
 #include <window.h>
 
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 647f87bf3d36..2f27d3e3f520 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -21,6 +21,7 @@
 #include <vcl/syswin.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/event.hxx>
 
 #include <svdata.hxx>
 
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index c5d6a93798d4..e66dfe241ca0 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -19,6 +19,7 @@
 
 #include <tools/time.hxx>
 #include <sal/log.hxx>
+#include <o3tl/deleter.hxx>
 
 #include <brdwin.hxx>
 #include <svdata.hxx>
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index c9dd1590aa38..036c763a8da0 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -21,6 +21,7 @@
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 
+#include <tools/debug.hxx>
 #include <vcl/errinf.hxx>
 #include <vcl/window.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 31a998f8d5de..a464566cac06 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -69,6 +69,7 @@
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/configmgr.hxx>
+#include <tools/debug.hxx>
 
 #include <cassert>
 #include <set>
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index ba436d4b3945..5de28384b357 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -48,6 +48,7 @@
 
 #include <opengl/zone.hxx>
 
+#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index e7be404010e2..2fa82c352cda 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -35,6 +35,7 @@
 #include <unx/helper.hxx>
 
 #include <vcl/inputtypes.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <salwtype.hxx>
 #include <sal/macros.h>
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 0f8703a28031..2a5c475815c8 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -32,6 +32,7 @@
 #include <sal/log.hxx>
 
 #include <tools/helpers.hxx>
+#include <tools/debug.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/salbtype.hxx>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
index 586b59693fc6..a4fc227ad74f 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -33,6 +33,7 @@
 #include <tools/color.hxx>
 #include <tools/poly.hxx>
 #include <tools/stream.hxx>
+#include <tools/debug.hxx>
 
 using namespace psp ;
 
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index ea714892383c..7535e643d745 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -37,6 +37,7 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/window.hxx>
 
 #include <algorithm>
 
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index cf623025df68..a2c185f674c8 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <cppuhelper/implbase.hxx>
+#include <cppuhelper/weakref.hxx>
 #include <rtl/ref.hxx>
 #include <sal/log.hxx>
 
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index 77a6b9dc15ab..feac1816ddd2 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -37,6 +37,7 @@
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <rtl/uri.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <vcl/settings.hxx>
 
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index deed77f11858..ef712f5b6584 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -41,6 +41,8 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/virdev.hxx>
+#include <vcl/event.hxx>
 #include <window.h>
 #include <numeric>
 
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 6e0e3057ae40..9a7a41f0d5db 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -24,9 +24,11 @@
 #include <osl/conditn.hxx>
 #include <osl/file.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 #include <tools/time.hxx>
 #include <comphelper/solarmutex.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <vcl/inputtypes.hxx>
 #include <vcl/opengl/OpenGLHelper.hxx>
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index c28ac2f66601..99c7694e7b13 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -43,6 +43,7 @@
 #include <o3tl/enumarray.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
 
+#include <vcl/event.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index ca323450332c..ab59b663efb1 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -38,6 +38,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/button.hxx>
+#include <vcl/combobox.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/pngwrite.hxx>
 #include <vcl/floatwin.hxx>