From 6256797dacfafaa573a67643440a3fe4e8128dca Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemeng@ubuntu.com>
Date: Wed, 26 Dec 2018 01:11:42 +0100
Subject: 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>
---
 .../source/extended/AccessibleGridControlTable.cxx |  1 +
 .../extended/AccessibleGridControlTableCell.cxx    |  1 +
 .../source/extended/accessibletabbarbase.cxx       |  1 +
 .../source/standard/vclxaccessiblebutton.cxx       |  2 ++
 .../source/standard/vclxaccessiblecheckbox.cxx     |  2 ++
 .../source/standard/vclxaccessibleedit.cxx         |  1 +
 .../source/standard/vclxaccessiblemenuitem.cxx     |  1 +
 .../source/standard/vclxaccessibleradiobutton.cxx  |  2 ++
 .../source/standard/vclxaccessiblescrollbar.cxx    |  1 +
 .../source/standard/vclxaccessiblestatusbar.cxx    |  1 +
 .../source/standard/vclxaccessibletoolbox.cxx      |  1 +
 avmedia/source/viewer/mediawindow_impl.cxx         |  1 +
 basctl/source/basicide/basdoc.cxx                  |  1 +
 basctl/source/basicide/baside2.cxx                 |  1 +
 basctl/source/basicide/baside2b.cxx                |  1 +
 basctl/source/basicide/basides1.cxx                |  1 +
 basctl/source/basicide/basides2.cxx                |  1 +
 basctl/source/basicide/bastype2.cxx                |  1 +
 basctl/source/basicide/bastype3.cxx                |  1 +
 basctl/source/basicide/layout.cxx                  |  1 +
 basctl/source/basicide/linenumberwindow.cxx        |  1 +
 basctl/source/basicide/localizationmgr.cxx         |  1 +
 basctl/source/basicide/scriptdocument.cxx          |  1 +
 basctl/source/dlged/managelang.cxx                 |  1 +
 basic/source/classes/sb.cxx                        |  1 +
 basic/source/runtime/inputbox.cxx                  |  1 +
 basic/source/runtime/iosys.cxx                     |  1 +
 .../controller/dialogs/dlg_ChartType_UNO.cxx       |  1 +
 cppcanvas/source/mtfrenderer/implrenderer.cxx      |  1 +
 .../source/mtfrenderer/transparencygroupaction.cxx |  1 +
 cui/source/dialogs/SignSignatureLineDialog.cxx     |  1 +
 cui/source/dialogs/SpellDialog.cxx                 |  1 +
 cui/source/dialogs/colorpicker.cxx                 |  1 +
 cui/source/dialogs/cuicharmap.cxx                  |  1 +
 cui/source/dialogs/hangulhanjadlg.cxx              |  1 +
 cui/source/dialogs/hyphen.cxx                      |  1 +
 cui/source/dialogs/screenshotannotationdlg.cxx     |  1 +
 cui/source/dialogs/showcols.cxx                    |  1 +
 cui/source/dialogs/thesdlg.cxx                     |  1 +
 cui/source/inc/cuicharmap.hxx                      |  1 +
 cui/source/options/optasian.cxx                    |  1 +
 cui/source/options/optctl.cxx                      |  1 +
 cui/source/options/optdict.cxx                     |  1 +
 cui/source/options/optjsearch.cxx                  |  1 +
 cui/source/options/personalization.hxx             |  1 +
 cui/source/options/radiobtnbox.cxx                 |  1 +
 cui/source/options/securityoptions.cxx             |  1 +
 dbaccess/source/ui/app/AppDetailPageHelper.cxx     |  1 +
 dbaccess/source/ui/app/AppDetailView.cxx           |  1 +
 dbaccess/source/ui/app/AppTitleWindow.cxx          |  1 +
 dbaccess/source/ui/browser/dataview.cxx            |  1 +
 dbaccess/source/ui/control/VertSplitView.cxx       |  1 +
 dbaccess/source/ui/control/dbtreelistbox.cxx       |  1 +
 dbaccess/source/ui/control/marktree.cxx            |  1 +
 dbaccess/source/ui/control/opendoccontrols.cxx     |  1 +
 dbaccess/source/ui/control/sqledit.cxx             |  1 +
 dbaccess/source/ui/inc/paramdialog.hxx             |  1 +
 dbaccess/source/ui/querydesign/JoinTableView.cxx   |  1 +
 dbaccess/source/ui/querydesign/TableWindow.cxx     |  1 +
 .../source/ui/querydesign/TableWindowListBox.cxx   |  1 +
 .../source/ui/querydesign/TableWindowTitle.cxx     |  1 +
 .../source/ui/querydesign/limitboxcontroller.cxx   |  1 +
 .../source/ui/querydesign/querycontainerwindow.cxx |  1 +
 .../ui/relationdesign/RelationDesignView.cxx       |  1 +
 .../source/ui/tabledesign/TableDesignHelpBar.cxx   |  1 +
 .../source/ui/tabledesign/TableFieldDescWin.cxx    |  1 +
 dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx     |  1 +
 dbaccess/source/ui/uno/UserSettingsDlg.cxx         |  1 +
 dbaccess/source/ui/uno/composerdialogs.cxx         |  1 +
 .../source/ui/uno/textconnectionsettings_uno.cxx   |  1 +
 dbaccess/source/ui/uno/unosqlmessage.cxx           |  1 +
 .../source/deployment/gui/dp_gui_extlistbox.cxx    |  1 +
 .../source/deployment/gui/dp_gui_extlistbox.hxx    |  1 +
 desktop/source/deployment/gui/license_dialog.cxx   |  1 +
 .../source/accessibility/AccessibleImageBullet.cxx |  1 +
 .../accessibility/AccessibleStaticTextBase.cxx     |  1 +
 editeng/source/editeng/impedit.cxx                 |  1 +
 editeng/source/items/bulitem.cxx                   |  1 +
 editeng/source/items/flditem.cxx                   |  1 +
 editeng/source/items/numitem.cxx                   |  1 +
 editeng/source/items/svxfont.cxx                   |  1 +
 editeng/source/misc/hangulhanja.cxx                |  1 +
 editeng/source/outliner/outlvw.cxx                 |  1 +
 editeng/source/rtf/svxrtf.cxx                      |  1 +
 editeng/source/uno/unoedprx.cxx                    |  1 +
 editeng/source/uno/unofield.cxx                    |  1 +
 editeng/source/uno/unofored.cxx                    |  1 +
 editeng/source/uno/unoforou.cxx                    |  1 +
 editeng/source/uno/unonrule.cxx                    |  1 +
 extensions/source/bibliography/bibcont.cxx         |  1 +
 extensions/source/bibliography/bibload.cxx         |  1 +
 extensions/source/bibliography/framectr.cxx        |  1 +
 extensions/source/bibliography/toolbar.cxx         |  1 +
 extensions/source/propctrlr/browserlistbox.cxx     |  1 +
 extensions/source/propctrlr/browserview.cxx        |  1 +
 extensions/source/propctrlr/controlfontdialog.cxx  |  1 +
 extensions/source/propctrlr/selectlabeldialog.cxx  |  1 +
 extensions/source/propctrlr/taborder.cxx           |  1 +
 extensions/source/scanner/grid.cxx                 |  1 +
 extensions/source/scanner/sanedlg.cxx              |  1 +
 filter/source/flash/impswfdialog.cxx               |  1 +
 filter/source/flash/swfwriter.cxx                  |  1 +
 filter/source/flash/swfwriter1.cxx                 |  1 +
 filter/source/flash/swfwriter2.cxx                 |  1 +
 filter/source/graphicfilter/egif/egif.cxx          |  1 +
 filter/source/pdf/pdfdialog.cxx                    |  1 +
 filter/source/pdf/pdfexport.cxx                    |  1 +
 filter/source/xsltdialog/xmlfiltertestdialog.hxx   |  1 +
 forms/source/component/imgprod.cxx                 |  1 +
 forms/source/richtext/richtextvclcontrol.cxx       |  1 +
 forms/source/runtime/formoperations.cxx            |  1 +
 forms/source/solar/control/navtoolbar.cxx          |  2 ++
 formula/source/ui/dlg/funcutl.cxx                  |  1 +
 fpicker/source/office/OfficeControlAccess.cxx      |  1 +
 fpicker/source/office/PlacesListBox.cxx            |  1 +
 framework/inc/uielement/toolbarmanager.hxx         |  1 +
 framework/source/layoutmanager/layoutmanager.cxx   |  1 +
 .../source/uielement/edittoolbarcontroller.cxx     |  1 +
 .../uielement/spinfieldtoolbarcontroller.cxx       |  1 +
 framework/source/uielement/statusbarmanager.cxx    |  2 ++
 framework/source/uielement/toolbarmanager.cxx      |  1 +
 include/IwyuFilter_include.yaml                    |  7 +++++
 .../primitive2d/textenumsprimitive2d.hxx           |  1 +
 include/editeng/crossedoutitem.hxx                 |  1 +
 include/editeng/udlnitem.hxx                       |  1 +
 include/editeng/wghtitem.hxx                       |  1 +
 include/framework/menuconfiguration.hxx            |  1 +
 include/svtools/brwbox.hxx                         |  1 +
 include/svtools/dialogcontrolling.hxx              |  1 +
 include/svtools/tabbar.hxx                         |  1 +
 include/svtools/valueset.hxx                       |  1 +
 include/svx/dialcontrol.hxx                        |  2 ++
 include/svx/sidebar/SidebarDialControl.hxx         |  1 +
 include/svx/svdview.hxx                            |  1 +
 include/vcl/ITiledRenderable.hxx                   |  2 ++
 include/vcl/layout.hxx                             |  2 ++
 include/vcl/lstbox.hxx                             |  4 +++
 include/vcl/notebookbar.hxx                        |  1 +
 include/vcl/split.hxx                              |  1 +
 include/vcl/status.hxx                             |  4 +++
 include/vcl/svtabbx.hxx                            |  2 ++
 include/vcl/taskpanelist.hxx                       |  7 ++++-
 include/vcl/toolbox.hxx                            |  2 ++
 include/vcl/vclenum.hxx                            |  2 +-
 include/vcl/vcllayout.hxx                          |  4 +--
 include/vcl/vclmedit.hxx                           |  1 -
 include/vcl/vclptr.hxx                             |  4 +--
 include/vcl/vclreferencebase.hxx                   |  5 ----
 include/vcl/vectorgraphicdata.hxx                  |  5 ++--
 include/vcl/weld.hxx                               | 31 +++++++++++++++++++---
 include/vcl/window.hxx                             | 30 +++------------------
 include/vcl/wmf.hxx                                |  1 -
 include/vcl/wmfexternal.hxx                        |  4 +--
 include/vcl/wrkwin.hxx                             |  1 -
 include/vcl/xtextedt.hxx                           |  8 +-----
 linguistic/source/lngsvcmgr.cxx                    |  1 +
 oox/source/drawingml/shape.cxx                     |  1 +
 oox/source/vml/vmlshape.cxx                        |  1 +
 reportdesign/source/ui/dlg/AddField.cxx            |  1 +
 reportdesign/source/ui/misc/ColorListener.cxx      |  1 +
 reportdesign/source/ui/report/EndMarker.cxx        |  1 +
 reportdesign/source/ui/report/ReportController.cxx |  1 +
 reportdesign/source/ui/report/StartMarker.cxx      |  1 +
 sc/inc/scabstdlg.hxx                               |  1 +
 sc/qa/unit/tiledrendering/tiledrendering.cxx       |  1 +
 sc/source/core/data/documen2.cxx                   |  1 +
 sc/source/core/data/dpobject.cxx                   |  1 +
 sc/source/core/data/drwlayer.cxx                   |  1 +
 sc/source/core/tool/detfunc.cxx                    |  1 +
 sc/source/ui/attrdlg/scdlgfact.cxx                 |  1 +
 sc/source/ui/cctrl/checklistmenu.cxx               |  1 +
 sc/source/ui/dbgui/csvgrid.cxx                     |  1 +
 sc/source/ui/dbgui/csvruler.cxx                    |  1 +
 sc/source/ui/dbgui/csvtablebox.cxx                 |  1 +
 sc/source/ui/docshell/arealink.cxx                 |  1 +
 sc/source/ui/docshell/dbdocimp.cxx                 |  1 +
 sc/source/ui/docshell/impex.cxx                    |  1 +
 sc/source/ui/docshell/olinefun.cxx                 |  1 +
 sc/source/ui/drawfunc/fuins2.cxx                   |  1 +
 sc/source/ui/drawfunc/futext3.cxx                  |  1 +
 sc/source/ui/inc/autofmt.hxx                       |  3 +++
 sc/source/ui/inc/dataproviderdlg.hxx               |  1 +
 sc/source/ui/inc/scuiasciiopt.hxx                  |  1 +
 sc/source/ui/inc/tpformula.hxx                     |  2 ++
 sc/source/ui/miscdlgs/autofmt.cxx                  |  1 +
 sc/source/ui/miscdlgs/dataproviderdlg.cxx          |  1 +
 sc/source/ui/optdlg/tpformula.cxx                  |  1 +
 sc/source/ui/undo/undodat.cxx                      |  1 +
 sc/source/ui/unoobj/TablePivotCharts.cxx           |  1 +
 sc/source/ui/unoobj/cellsuno.cxx                   |  1 +
 sc/source/ui/unoobj/chartuno.cxx                   |  1 +
 sc/source/ui/unoobj/fielduno.cxx                   |  1 +
 sc/source/ui/unoobj/textuno.cxx                    |  1 +
 sc/source/ui/view/dbfunc.cxx                       |  1 +
 sc/source/ui/view/dbfunc3.cxx                      |  1 +
 sc/source/ui/view/drawvie3.cxx                     |  1 +
 sc/source/ui/view/drawvie4.cxx                     |  1 +
 sc/source/ui/view/drawview.cxx                     |  1 +
 sc/source/ui/view/gridwin.cxx                      |  1 +
 sc/source/ui/view/gridwin3.cxx                     |  1 +
 sc/source/ui/view/preview.cxx                      |  1 +
 sc/source/ui/view/viewfun3.cxx                     |  1 +
 sc/source/ui/view/viewfun4.cxx                     |  1 +
 sc/source/ui/view/viewfun7.cxx                     |  1 +
 sd/inc/sdmod.hxx                                   |  1 +
 sd/source/core/CustomAnimationCloner.cxx           |  1 +
 sd/source/core/annotations/Annotation.cxx          |  1 +
 sd/source/core/drawdoc3.cxx                        |  1 +
 sd/source/core/sdpage.cxx                          |  1 +
 sd/source/core/stlfamily.cxx                       |  1 +
 sd/source/filter/eppt/epptbase.hxx                 |  2 ++
 sd/source/ui/animations/CategoryListBox.cxx        |  2 ++
 sd/source/ui/animations/CustomAnimationList.cxx    |  2 ++
 sd/source/ui/animations/CustomAnimationPane.cxx    |  1 +
 sd/source/ui/animations/motionpathtag.cxx          |  1 +
 sd/source/ui/dlg/RemoteDialogClientBox.cxx         |  1 +
 sd/source/ui/dlg/animobjs.cxx                      |  1 +
 sd/source/ui/dlg/custsdlg.cxx                      |  1 +
 sd/source/ui/dlg/sddlgfact.cxx                     |  1 +
 sd/source/ui/dlg/unchss.cxx                        |  1 +
 sd/source/ui/func/fupage.cxx                       |  1 +
 sd/source/ui/func/fuprobjs.cxx                     |  1 +
 sd/source/ui/func/unprlout.cxx                     |  2 ++
 sd/source/ui/inc/unomodel.hxx                      |  1 +
 sd/source/ui/sidebar/DocumentHelper.cxx            |  1 +
 sd/source/ui/sidebar/MasterPageContainer.cxx       |  1 +
 sd/source/ui/sidebar/MasterPageObserver.cxx        |  1 +
 sd/source/ui/sidebar/MasterPagesSelector.cxx       |  1 +
 .../ui/slidesorter/controller/SlsSlotManager.cxx   |  1 +
 sd/source/ui/tools/IconCache.cxx                   |  1 +
 sd/source/ui/tools/SdGlobalResourceContainer.cxx   |  1 +
 sd/source/ui/view/OutlinerIterator.cxx             |  1 +
 sd/source/ui/view/drawview.cxx                     |  1 +
 sd/source/ui/view/drviewsb.cxx                     |  1 +
 sd/source/ui/view/drviewse.cxx                     |  1 +
 sfx2/source/appl/newhelp.cxx                       |  1 +
 sfx2/source/appl/opengrf.cxx                       |  1 +
 sfx2/source/appl/sfxhelp.cxx                       |  1 +
 sfx2/source/appl/shutdownicon.cxx                  |  1 +
 sfx2/source/bastyp/frmhtmlw.cxx                    |  1 +
 sfx2/source/bastyp/sfxhtml.cxx                     |  1 +
 sfx2/source/control/charwin.cxx                    |  2 ++
 sfx2/source/control/recentdocsview.cxx             |  1 +
 sfx2/source/control/recentdocsviewitem.cxx         |  1 +
 sfx2/source/control/request.cxx                    |  1 +
 sfx2/source/control/shell.cxx                      |  1 +
 sfx2/source/control/templatedefaultview.cxx        |  1 +
 sfx2/source/control/templatelocalview.cxx          |  1 +
 sfx2/source/control/templatesearchview.cxx         |  1 +
 sfx2/source/control/thumbnailview.cxx              |  1 +
 sfx2/source/control/thumbnailviewacc.cxx           |  1 +
 sfx2/source/dialog/filtergrouping.cxx              |  1 +
 sfx2/source/dialog/navigat.cxx                     |  1 +
 sfx2/source/doc/docfac.cxx                         |  1 +
 sfx2/source/doc/doctempl.cxx                       |  1 +
 sfx2/source/doc/iframe.cxx                         |  1 +
 sfx2/source/doc/new.cxx                            |  1 +
 sfx2/source/doc/templatedlg.cxx                    |  1 +
 sfx2/source/inc/statcach.hxx                       |  1 +
 sfx2/source/inc/templatesearchview.hxx             |  1 +
 sfx2/source/inc/workwin.hxx                        |  1 +
 sfx2/source/sidebar/Deck.cxx                       |  1 +
 sfx2/source/sidebar/FocusManager.cxx               |  1 +
 sfx2/source/sidebar/MenuButton.cxx                 |  1 +
 sfx2/source/sidebar/PanelTitleBar.cxx              |  1 +
 sfx2/source/sidebar/TabBar.cxx                     |  1 +
 sfx2/source/sidebar/TabItem.cxx                    |  1 +
 sfx2/source/view/printer.cxx                       |  1 +
 svgio/inc/svgstyleattributes.hxx                   |  1 +
 svtools/source/brwbox/ebbcontrols.cxx              |  1 +
 svtools/source/brwbox/editbrowsebox2.cxx           |  1 +
 svtools/source/contnr/iconviewimpl.cxx             |  1 +
 svtools/source/contnr/ivctrl.cxx                   |  1 +
 svtools/source/contnr/simptabl.cxx                 |  1 +
 svtools/source/control/autocmpledit.cxx            |  1 +
 svtools/source/control/calendar.cxx                |  1 +
 svtools/source/control/fileurlbox.cxx              |  1 +
 svtools/source/control/inettbc.cxx                 |  1 +
 svtools/source/control/ruler.cxx                   |  1 +
 svtools/source/control/scrwin.cxx                  |  1 +
 svtools/source/control/tabbar.cxx                  |  1 +
 svtools/source/control/toolbarmenu.cxx             |  1 +
 svtools/source/control/toolbarmenuacc.cxx          |  1 +
 svtools/source/control/valueacc.cxx                |  1 +
 svtools/source/dialogs/prnsetup.cxx                |  1 +
 svtools/source/dialogs/wizdlg.cxx                  |  1 +
 svtools/source/edit/editsyntaxhighlighter.cxx      |  2 ++
 svtools/source/edit/svmedit2.cxx                   |  1 +
 svtools/source/hatchwindow/ipwin.cxx               |  1 +
 svtools/source/misc/dialogcontrolling.cxx          |  1 +
 svtools/source/misc/embedhlp.cxx                   |  1 +
 svtools/source/misc/unitconv.cxx                   |  1 +
 svtools/source/svhtml/htmlout.cxx                  |  1 +
 svtools/source/table/tablecontrol.cxx              |  1 +
 svtools/source/table/tablecontrol_impl.cxx         |  1 +
 svx/source/dialog/ClassificationEditView.cxx       |  1 +
 svx/source/dialog/charmap.cxx                      |  1 +
 svx/source/dialog/dialcontrol.cxx                  |  2 ++
 svx/source/dialog/framelinkarray.cxx               |  1 +
 svx/source/dialog/frmsel.cxx                       |  2 ++
 svx/source/dialog/measctrl.cxx                     |  1 +
 svx/source/dialog/rubydialog.cxx                   |  1 +
 svx/source/dialog/searchcharmap.cxx                |  1 +
 svx/source/fmcomp/fmgridcl.cxx                     |  1 +
 svx/source/fmcomp/fmgridif.cxx                     |  1 +
 svx/source/fmcomp/gridcell.cxx                     |  1 +
 svx/source/fmcomp/gridctrl.cxx                     |  1 +
 svx/source/form/fmexch.cxx                         |  1 +
 svx/source/form/fmscriptingenv.cxx                 |  1 +
 svx/source/form/fmtextcontrolshell.cxx             |  1 +
 .../sdr/contact/objectcontactofobjlistpainter.cxx  |  1 +
 svx/source/sdr/contact/sdrmediawindow.cxx          |  1 +
 svx/source/sdr/contact/viewcontactofgroup.cxx      |  1 +
 svx/source/sdr/properties/pageproperties.cxx       |  1 +
 svx/source/sidebar/possize/SidebarDialControl.cxx  |  1 +
 svx/source/stbctrls/insctrl.cxx                    |  1 +
 svx/source/stbctrls/modctrl.cxx                    |  2 ++
 svx/source/stbctrls/zoomsliderctrl.cxx             |  1 +
 svx/source/svdraw/svdmrkv.cxx                      |  1 +
 svx/source/svdraw/svdsnpv.cxx                      |  1 +
 svx/source/svdraw/textchaincursor.cxx              |  1 +
 svx/source/table/tablecontroller.cxx               |  1 +
 svx/source/tbxctrls/tbunocontroller.cxx            |  1 +
 svx/source/unodraw/UnoNamespaceMap.cxx             |  1 -
 svx/source/unodraw/unopool.cxx                     |  1 +
 svx/source/xoutdev/_xoutbmp.cxx                    |  1 +
 svx/source/xoutdev/xtable.cxx                      |  1 +
 sw/source/core/doc/DocumentRedlineManager.cxx      |  1 +
 sw/source/core/doc/doccomp.cxx                     |  1 +
 sw/source/core/doc/docdesc.cxx                     |  1 +
 sw/source/core/doc/docfmt.cxx                      |  1 +
 sw/source/core/doc/doclay.cxx                      |  1 +
 sw/source/core/edit/edfcol.cxx                     |  1 +
 sw/source/core/frmedt/fecopy.cxx                   |  1 +
 sw/source/core/inc/layact.hxx                      |  2 ++
 sw/source/filter/html/SwAppletImpl.cxx             |  1 +
 sw/source/ui/dbui/createaddresslistdialog.cxx      |  1 +
 sw/source/ui/dbui/mmaddressblockpage.cxx           |  1 +
 sw/source/ui/fldui/FldRefTreeListBox.cxx           |  1 +
 sw/source/ui/table/autoformatpreview.cxx           |  1 +
 sw/source/uibase/cctrl/actctrl.cxx                 |  1 +
 sw/source/uibase/config/modcfg.cxx                 |  1 +
 sw/source/uibase/dbui/mailmergehelper.cxx          |  1 +
 sw/source/uibase/docvw/AnnotationMenuButton.cxx    |  1 +
 sw/source/uibase/docvw/AnnotationWin.cxx           |  1 +
 sw/source/uibase/docvw/SidebarTxtControlAcc.cxx    |  1 +
 sw/source/uibase/docvw/edtwin.cxx                  |  1 +
 sw/source/uibase/inc/PageBreakWin.hxx              |  1 +
 sw/source/uibase/shells/basesh.cxx                 |  1 +
 sw/source/uibase/uiview/srcview.cxx                |  1 +
 sw/source/uibase/utlui/initui.cxx                  |  1 +
 sw/source/uibase/utlui/viewlayoutctrl.cxx          |  1 +
 sw/source/uibase/web/wview.cxx                     |  1 +
 toolkit/source/awt/stylesettings.cxx               |  1 +
 toolkit/source/awt/vclxmenu.cxx                    |  1 +
 toolkit/source/awt/vclxtoolkit.cxx                 |  1 +
 toolkit/source/awt/vclxwindow.cxx                  |  2 ++
 toolkit/source/helper/vclunohelper.cxx             |  1 +
 uui/source/authfallbackdlg.cxx                     |  2 --
 uui/source/passworddlg.cxx                         |  1 +
 uui/source/secmacrowarnings.cxx                    |  1 +
 vcl/headless/svpinst.cxx                           |  1 +
 vcl/inc/fontattributes.hxx                         |  1 +
 vcl/inc/fontinstance.hxx                           |  1 +
 vcl/inc/osx/runinmain.hxx                          |  1 +
 vcl/inc/window.h                                   |  3 +++
 vcl/opengl/salbmp.cxx                              |  1 +
 vcl/osx/salframe.cxx                               |  2 ++
 vcl/osx/salframeview.mm                            |  2 ++
 vcl/osx/salinst.cxx                                |  1 +
 vcl/osx/salmenu.cxx                                |  1 +
 vcl/osx/salobj.cxx                                 |  1 +
 vcl/qa/cppunit/graphicfilter/filters-test.cxx      |  1 +
 vcl/source/app/salusereventlist.cxx                |  1 +
 vcl/source/app/salvtables.cxx                      |  2 ++
 vcl/source/app/scheduler.cxx                       |  1 +
 vcl/source/control/fixedhyper.cxx                  |  2 ++
 vcl/source/control/fmtfield.cxx                    |  1 +
 vcl/source/control/listctrl.cxx                    |  2 ++
 vcl/source/control/prgsbar.cxx                     |  1 +
 vcl/source/control/spinbtn.cxx                     |  1 +
 vcl/source/edit/texteng.cxx                        |  1 +
 vcl/source/edit/textview.cxx                       |  1 +
 vcl/source/edit/vclmedit.cxx                       |  2 ++
 vcl/source/edit/xtextedt.cxx                       |  1 +
 vcl/source/filter/wmf/wmfexternal.cxx              |  1 +
 vcl/source/gdi/bmpacc.cxx                          |  1 +
 vcl/source/gdi/impgraph.cxx                        |  1 +
 vcl/source/gdi/print.cxx                           |  2 ++
 vcl/source/gdi/print3.cxx                          |  1 +
 vcl/source/gdi/vectorgraphicdata.cxx               |  1 +
 vcl/source/gdi/virdev.cxx                          |  1 +
 vcl/source/graphic/UnoGraphicProvider.cxx          |  1 +
 vcl/source/helper/displayconnectiondispatch.cxx    |  1 +
 vcl/source/helper/svtaccessiblefactory.cxx         |  1 +
 vcl/source/outdev/bitmap.cxx                       |  1 +
 vcl/source/outdev/clipping.cxx                     |  1 +
 vcl/source/outdev/font.cxx                         |  2 ++
 vcl/source/outdev/map.cxx                          |  2 ++
 vcl/source/outdev/outdev.cxx                       |  1 +
 vcl/source/outdev/outdevstate.cxx                  |  1 +
 vcl/source/outdev/text.cxx                         |  1 +
 vcl/source/treelist/headbar.cxx                    |  1 +
 vcl/source/treelist/svimpbox.cxx                   |  1 +
 vcl/source/treelist/treelist.cxx                   |  1 +
 vcl/source/treelist/treelistbox.cxx                |  1 +
 vcl/source/treelist/treelistentry.cxx              |  1 +
 vcl/source/uitest/logger.cxx                       |  1 +
 vcl/source/window/builder.cxx                      |  1 +
 vcl/source/window/clipping.cxx                     |  1 +
 vcl/source/window/debug.cxx                        |  1 +
 vcl/source/window/dockingarea.cxx                  |  1 +
 vcl/source/window/dockmgr.cxx                      |  1 +
 vcl/source/window/errinf.cxx                       |  1 +
 vcl/source/window/window.cxx                       |  1 +
 vcl/unx/generic/app/saldisp.cxx                    |  1 +
 vcl/unx/generic/app/salinst.cxx                    |  1 +
 vcl/unx/generic/gdi/salbmp.cxx                     |  1 +
 vcl/unx/generic/print/common_gfx.cxx               |  1 +
 vcl/unx/generic/printer/cupsmgr.cxx                |  1 +
 vcl/unx/gtk/a11y/atkutil.cxx                       |  1 +
 vcl/unx/gtk/gtkinst.cxx                            |  1 +
 vcl/unx/gtk3/gtk3gtkinst.cxx                       |  2 ++
 vcl/win/app/salinst.cxx                            |  2 ++
 vcl/win/window/salframe.cxx                        |  1 +
 vcl/workben/vcldemo.cxx                            |  1 +
 .../source/component/documentdigitalsignatures.cxx |  1 +
 427 files changed, 510 insertions(+), 57 deletions(-)

diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 413a1c15d163..1711efa4efc8 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -20,6 +20,7 @@
 #include <extended/AccessibleGridControlTable.hxx>
 #include <extended/AccessibleGridControlTableCell.hxx>
 #include <vcl/accessibletable.hxx>
+#include <tools/debug.hxx>
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 3eed001d8df0..1bac475d58c1 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -20,6 +20,7 @@
 #include <extended/AccessibleGridControlTableCell.hxx>
 #include <vcl/accessibletable.hxx>
 #include <tools/gen.hxx>
+#include <tools/debug.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
 namespace accessibility
diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx
index a512b8672140..1e213f0711fa 100644
--- a/accessibility/source/extended/accessibletabbarbase.cxx
+++ b/accessibility/source/extended/accessibletabbarbase.cxx
@@ -22,6 +22,7 @@
 #include <extended/accessibletabbarpagelist.hxx>
 #endif
 #include <svtools/tabbar.hxx>
+#include <vcl/vclevent.hxx>
 
 
 namespace accessibility
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index 5ec472639640..106755898a01 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -31,6 +31,8 @@
 #include <strings.hxx>
 
 #include <vcl/button.hxx>
+#include <vcl/event.hxx>
+#include <vcl/vclevent.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 6b979c18bfad..5f459eb1e99c 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -32,6 +32,8 @@
 #include <cppuhelper/typeprovider.hxx>
 
 #include <vcl/button.hxx>
+#include <vcl/event.hxx>
+#include <vcl/vclevent.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 8ff501eb8b55..7b5bfcc102c5 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -34,6 +34,7 @@
 #include <comphelper/string.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
+#include <vcl/settings.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/vclmedit.hxx>
 #include <vcl/textdata.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index ace8efa6f469..1f72bcec3f80 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -31,6 +31,7 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <comphelper/sequence.hxx>
 #include <i18nlangtag/languagetag.hxx>
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/menu.hxx>
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 4db841005697..c970dd5c3ce9 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -32,6 +32,8 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <vcl/window.hxx>
 #include <vcl/button.hxx>
+#include <vcl/event.hxx>
+#include <vcl/vclevent.hxx>
 #include <strings.hxx>
 
 using namespace ::com::sun::star;
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index c515df91064f..1f29c4d6014d 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <vcl/scrbar.hxx>
+#include <vcl/vclevent.hxx>
 #include <strings.hxx>
 
 using namespace ::com::sun::star;
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 1af8b3993025..3d5b1f77270e 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <vcl/status.hxx>
+#include <vcl/vclevent.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 9d3e9a2bbce8..d226ef6383a4 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <vcl/toolbox.hxx>
+#include <vcl/vclevent.hxx>
 #include <comphelper/accessiblewrapper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/types.hxx>
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 7afc2c2d2595..49c3a88b41fa 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -35,6 +35,7 @@
 #include <unotools/securityoptions.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 
 #include <com/sun/star/awt/SystemPointer.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index e953c6ee8edb..47437d07779a 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -33,6 +33,7 @@
 #include <svl/itemset.hxx>
 #include <svx/svxids.hrc>
 #include <tools/globname.hxx>
+#include <tools/debug.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 81efba1d5b3d..ecd7b2be0be4 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -52,6 +52,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/xtextedt.hxx>
+#include <vcl/textview.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <cassert>
 
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 726109076587..5ab200ceaf63 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -41,6 +41,7 @@
 #include <svl/urihelper.hxx>
 #include <svx/svxids.hrc>
 #include <vcl/xtextedt.hxx>
+#include <vcl/textview.hxx>
 #include <vcl/txtattr.hxx>
 #include <vcl/settings.hxx>
 #include <svtools/textwindowpeer.hxx>
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 7cc498490af6..d9a9adecaa3a 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -49,6 +49,7 @@
 #include <svl/visitem.hxx>
 #include <svl/whiter.hxx>
 #include <vcl/xtextedt.hxx>
+#include <vcl/textview.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index ab2d5766aa1f..c58ba4520fe0 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -27,6 +27,7 @@
 #include "baside2.hxx"
 #include "basdoc.hxx"
 #include <vcl/xtextedt.hxx>
+#include <vcl/textview.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/signaturestate.hxx>
 #include <com/sun/star/container/XNamed.hpp>
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 2b237dd0e3ea..39ab977d58dd 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -26,6 +26,7 @@
 #include <o3tl/make_unique.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/debug.hxx>
 #include <svtools/imagemgr.hxx>
 #include <vcl/treelistentry.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 8e366b65b3e1..33930b42e00d 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -28,6 +28,7 @@
 #include <sfx2/docfac.hxx>
 #include <vcl/treelistentry.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 57d5a9369753..cb301d684fa7 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -21,6 +21,7 @@
 
 #include <bastypes.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/event.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 257ac8fd1a8d..a8bab6373484 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -9,6 +9,7 @@
 
 #include "baside2.hxx"
 
+#include <vcl/textview.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 743e43089deb..4310e511cc63 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/resource/MissingResourceException.hpp>
 #include <com/sun/star/resource/XStringResourceSupplier.hpp>
 #include <sfx2/dispatch.hxx>
+#include <tools/debug.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 20ff404b304e..9f4a919632f4 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -54,6 +54,7 @@
 #include <unotools/collatorwrapper.hxx>
 
 #include <tools/diagnose_ex.h>
+#include <tools/debug.hxx>
 
 #include <comphelper/documentinfo.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 94481c672664..e3a9021824ff 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -37,6 +37,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/settings.hxx>
+#include <tools/debug.hxx>
 
 namespace basctl
 {
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 3eebffa44d3a..d97b5698c71a 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -19,6 +19,7 @@
 
 #include <sb.hxx>
 #include <tools/stream.hxx>
+#include <tools/debug.hxx>
 #include <vcl/errinf.hxx>
 #include <comphelper/solarmutex.hxx>
 #include <basic/sbx.hxx>
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index b3d495d5bead..d38ca3670836 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -20,6 +20,7 @@
 #include <tools/lineend.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/window.hxx>
 #include <runtime.hxx>
 #include <stdobj.hxx>
 #include <rtlproto.hxx>
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index e2a72044feab..c0b85982cf81 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/window.hxx>
 #include <osl/file.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 384f1ac6e4dc..785bda5a3adc 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -23,6 +23,7 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/frame/XModel.hpp>
+#include <o3tl/make_unique.hxx>
 
 namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
 
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 9a88ea81a216..551fa731b794 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <tools/diagnose_ex.h>
+#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/anytostring.hxx>
 #include <comphelper/propertysequence.hxx>
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 8fdfca98a39e..3cbb946bf6ef 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -22,6 +22,7 @@
 #include <utility>
 
 #include <tools/gen.hxx>
+#include <tools/debug.hxx>
 
 #include <canvas/canvastools.hxx>
 
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx
index b89fe4d20cbf..009ae54e055d 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/docfilt.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/xoutbmp.hxx>
+#include <tools/date.hxx>
 #include <tools/stream.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/streamwrap.hxx>
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index f1bc5f8ae708..962c17d3387d 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -30,6 +30,7 @@
 #include <svl/undo.hxx>
 #include <unotools/lingucfg.hxx>
 #include <vcl/textdata.hxx>
+#include <vcl/textview.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <editeng/unolingu.hxx>
 #include <editeng/splwrap.hxx>
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 3e5da04a0818..1413ba0f211e 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -30,6 +30,7 @@
 #include <cppuhelper/basemutex.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/bitmapaccess.hxx>
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index e85cf449d90d..ad5cf3819cad 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -31,6 +31,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/fontcharmap.hxx>
+#include <vcl/virdev.hxx>
 #include <svl/stritem.hxx>
 #include <o3tl/make_unique.hxx>
 #include <officecfg/Office/Common.hxx>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 18338fa0f79c..53d72894911e 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -26,6 +26,7 @@
 #include <algorithm>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <vcl/controllayout.hxx>
 #include <vcl/builderfactory.hxx>
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 44c9df73ddcc..c36d179ec384 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -27,6 +27,7 @@
 #include <vcl/builderfactory.hxx>
 #include <sal/log.hxx>
 #include <i18nlangtag/languagetag.hxx>
+#include <tools/debug.hxx>
 
 #define HYPH_POS_CHAR       '='
 
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 58304062d111..1d38a7d3b5f6 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -33,6 +33,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
+#include <vcl/event.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/salgtype.hxx>
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index d9dca102beb8..efa55c8d7466 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -23,6 +23,7 @@
 #include <vcl/msgbox.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/types.hxx>
+#include <tools/debug.hxx>
 
 #define CUIFM_PROP_HIDDEN "Hidden"
 #define CUIFM_PROP_LABEL  "Label"
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 209c67d2e6ff..e1cf0b926aea 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -22,6 +22,7 @@
 #include <strings.hrc>
 #include <dialmgr.hxx>
 
+#include <tools/debug.hxx>
 #include <svl/lngmisc.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svlbitm.hxx>
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index b37457249d69..3500e4a12fff 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -21,6 +21,7 @@
 
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/virdev.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <svl/itemset.hxx>
 #include <svx/charmap.hxx>
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index db08f0a86493..3c202e8a4ae8 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -21,6 +21,7 @@
 #include <map>
 #include <optasian.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/unolingu.hxx>
 #include <o3tl/any.hxx>
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 18c23123df74..da78943bea33 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -20,6 +20,7 @@
 #include "optctl.hxx"
 #include <svl/ctloptions.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 // class SvxCTLOptionsPage -----------------------------------------------------
 
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index ecd11054d07c..4849b287922f 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -29,6 +29,7 @@
 #include <vcl/weld.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
 #include <svx/dialogs.hrc>
 
 #include <linguistic/misc.hxx>
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 48ca735a6670..f325ae125abb 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/debug.hxx>
 #include <unotools/searchopt.hxx>
 #include <i18nutil/transliteration.hxx>
 #include "optjsearch.hxx"
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 5fd8bc522e8e..8cd7fd89bcb1 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -21,6 +21,7 @@
 #define MAX_RESULTS 9           // Maximum number of search results
 #define MAX_DEFAULT_PERSONAS 6  // Maximum number of default personas
 
+class Edit;
 class FixedText;
 class FixedHyperlink;
 class SearchAndParseThread;
diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx
index 766aced584d7..555232026a3e 100644
--- a/cui/source/options/radiobtnbox.cxx
+++ b/cui/source/options/radiobtnbox.cxx
@@ -19,6 +19,7 @@
 
 #include <radiobtnbox.hxx>
 
+#include <vcl/event.hxx>
 #include <vcl/svlbitm.hxx>
 
 namespace svx {
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index d0ca206669c7..e1af87dc49d2 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/debug.hxx>
 #include <unotools/securityoptions.hxx>
 #include <vcl/svapp.hxx>
 #include "securityoptions.hxx"
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index fe7eb6b9de7b..2402312fc12f 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -61,6 +61,7 @@
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/event.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <tools/stream.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 81d7a32ed47b..e4c30fe5629e 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/util/URL.hpp>
 #include <core_resource.hxx>
 #include <listviewitems.hxx>
+#include <vcl/event.hxx>
 #include <vcl/image.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/settings.hxx>
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 9f18829c2c67..139b01a8533f 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -21,6 +21,7 @@
 #include <core_resource.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/event.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 041315775a61..78ab9779d967 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -27,6 +27,7 @@
 #include <svtools/acceleratorexecute.hxx>
 #include <svtools/imgdef.hxx>
 #include <tools/diagnose_ex.h>
+#include <vcl/event.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index 4f44d180114e..337ccfe3aaec 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -21,6 +21,7 @@
 
 #include <vcl/split.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/event.hxx>
 #include <osl/diagnose.h>
 
 #define SPLITTER_WIDTH  80
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 2ad783072f18..d2ed91fa0241 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -39,6 +39,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/treelistentry.hxx>
+#include <vcl/event.hxx>
 
 #include <memory>
 #include <o3tl/make_unique.hxx>
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index 54e19671afb9..1344b054cc85 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -21,6 +21,7 @@
 #include <vcl/treelistentry.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/event.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index a44eab8e1a3d..4b72452af67b 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -32,6 +32,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/help.hxx>
 #include <vcl/commandinfoprovider.hxx>
+#include <vcl/event.hxx>
 #include <unotools/historyoptions.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <tools/urlobj.hxx>
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index c94c5335b8df..093755de63a6 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -34,6 +34,7 @@
 #include <QueryDesignView.hxx>
 #include <vcl/settings.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <vcl/event.hxx>
 
 using namespace dbaui;
 
diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx
index c962802e47f0..49ddf496de3c 100644
--- a/dbaccess/source/ui/inc/paramdialog.hxx
+++ b/dbaccess/source/ui/inc/paramdialog.hxx
@@ -23,6 +23,7 @@
 #include "commontypes.hxx"
 
 #include <vcl/weld.hxx>
+#include <vcl/timer.hxx>
 
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index aa1ca17714c3..9a9320a69fad 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -35,6 +35,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 #include <TableWindowData.hxx>
 #include <JAccess.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index c7be7a9d94f8..b43244dfa5d5 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -29,6 +29,7 @@
 #include <vcl/wall.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.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 43536d7925ab..54c06c8f0a3b 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <vcl/svapp.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.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 8daf223ccddc..2414ea7b98f6 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -25,6 +25,7 @@
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 #include <stringconstants.hxx>
 #include <TableWindowListBox.hxx>
 #include <TableConnection.hxx>
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index f0145fe14301..eb083fbc0e4d 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -13,6 +13,7 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 909c69af0261..572d8354683a 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -26,6 +26,7 @@
 #include <stringconstants.hxx>
 #include <strings.hxx>
 #include <sfx2/sfxsids.hrc>
+#include <vcl/event.hxx>
 #include <vcl/fixed.hxx>
 #include <UITools.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 6b46690fb5b8..37b2f270ace7 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -22,6 +22,7 @@
 #include <RelationController.hxx>
 #include <svl/undo.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/event.hxx>
 #include <browserids.hxx>
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index 08585d56e11b..62d0f16c5314 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -20,6 +20,7 @@
 #include <TableDesignHelpBar.hxx>
 #include <svtools/svmedit.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/event.hxx>
 #include <helpids.h>
 #include <memory>
 using namespace dbaui;
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 731af987b629..8e80e52fb1a3 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -22,6 +22,7 @@
 #include <FieldDescriptions.hxx>
 #include <strings.hrc>
 #include <TableDesignHelpBar.hxx>
+#include <vcl/event.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/settings.hxx>
 #include <helpids.h>
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index be42039bbe41..3a498049c7a7 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -26,6 +26,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <o3tl/make_unique.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index fdc79695b726..760805897ab4 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -23,6 +23,7 @@
 #include <UserAdminDlg.hxx>
 #include <comphelper/processfactory.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <o3tl/make_unique.hxx>
 
 using namespace dbaui;
 
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index c9b1973bb4a9..56593aefe9a6 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -31,6 +31,7 @@
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
+#include <o3tl/make_unique.hxx>
 
 extern "C" void createRegistryInfo_ComposerDialogs()
 {
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 899a521eb5e9..4c7cc453cf7b 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -35,6 +35,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <o3tl/make_unique.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 2fc5c0a0982a..c0ca52114eb2 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -28,6 +28,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <connectivity/dbexception.hxx>
 #include <vcl/svapp.hxx>
+#include <o3tl/make_unique.hxx>
 
 using namespace dbaui;
 using namespace dbtools;
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index e7e2da90938d..5b4a03b5d5af 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/deployment/ExtensionRemovedException.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <i18nlangtag/languagetag.hxx>
+#include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index abe69cf87623..245f1fd4d259 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -28,6 +28,7 @@
 
 #include <svtools/extensionlistbox.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <cppuhelper/weakref.hxx>
 #include <unotools/collatorwrapper.hxx>
 
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 50b9d59018c2..b64ba25d4399 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -28,6 +28,7 @@
 #include <svtools/svmedit.hxx>
 #include <svl/lstner.hxx>
 #include <vcl/xtextedt.hxx>
+#include <vcl/textview.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/threadex.hxx>
 #include <vcl/builderfactory.hxx>
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 89f97dde5e42..84dbdfcf22cd 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <tools/gen.hxx>
+#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <rtl/ustring.hxx>
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index f8fd3c1a7b24..73a93f210326 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -28,6 +28,7 @@
 #include <algorithm>
 #include <functional>
 #include <osl/mutex.hxx>
+#include <tools/debug.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 66cf4b6a347f..fea76c05896f 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
 #include <editeng/flditem.hxx>
 #include <svl/intitem.hxx>
+#include <vcl/inputctx.hxx>
 #include <vcl/transfer.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 23fa148496bf..04c844e99bdd 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -23,6 +23,7 @@
 #include <editeng/bulletitem.hxx>
 
 #include <tools/tenccvt.hxx>
+#include <tools/debug.hxx>
 #include <vcl/dibtools.hxx>
 
 #define BULITEM_VERSION     (sal_uInt16(2))
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index ca06b8af1532..91a1b340ffb6 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -29,6 +29,7 @@
 #include <editeng/unonames.hxx>
 
 #include <tools/tenccvt.hxx>
+#include <tools/debug.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 1236c787d6fa..6510a6d0dafa 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -44,6 +44,7 @@
 #include <comphelper/processfactory.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
+#include <tools/debug.hxx>
 #include <unotools/configmgr.hxx>
 #include <libxml/xmlwriter.h>
 #include <editeng/unonrule.hxx>
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 3f4807869aee..2f9119a0f143 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/outdev.hxx>
 #include <vcl/print.hxx>
+#include <tools/debug.hxx>
 #include <tools/gen.hxx>
 #include <tools/poly.hxx>
 #include <unotools/charclass.hxx>
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 10ee91d48623..c55900b8c340 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -37,6 +37,7 @@
 #include <unotools/charclass.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 #include <editeng/edtdlg.hxx>
 #include <editeng/unolingu.hxx>
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 98ca96a18fe7..c061a039a67a 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -41,6 +41,7 @@
 #include <editeng/eeitem.hxx>
 #include <editeng/numitem.hxx>
 #include <vcl/window.hxx>
+#include <vcl/event.hxx>
 #include <svl/itemset.hxx>
 #include <svl/eitem.hxx>
 #include <editeng/editstat.hxx>
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 639aee2825d5..380cf5d1cc86 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -25,6 +25,7 @@
 #include <svtools/rtftoken.h>
 #include <svl/itempool.hxx>
 #include <i18nlangtag/languagetag.hxx>
+#include <tools/debug.hxx>
 
 #include <comphelper/string.hxx>
 
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 1929777c2f26..35784061f501 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -28,6 +28,7 @@
 #include <algorithm>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
+#include <tools/debug.hxx>
 
 
 // Project-local header
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index b703f6333bc0..de977939f430 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <vcl/svapp.hxx>
+#include <tools/debug.hxx>
 
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index ea83a1ddf4fa..889b7b7b4420 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 #include <editeng/eeitem.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index af0918a799c4..da0de656a2ad 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 #include <svl/style.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index ea7b262523f7..27dbecfe9108 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -28,6 +28,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <vcl/GraphicLoader.hxx>
+#include <tools/debug.hxx>
 
 #include <editeng/brushitem.hxx>
 #include <editeng/unoprnms.hxx>
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 81a2d8692b9a..8d65c0015b7a 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -19,6 +19,7 @@
 
 
 #include <cppuhelper/weak.hxx>
+#include <vcl/event.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XWindowPeer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 06c77c01d902..420b7eed6057 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 9be3dc455439..5ec9d92005b3 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -30,6 +30,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include "bibconfig.hxx"
 #include <cppuhelper/implbase.hxx>
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/form/XConfirmDeleteListener.hpp>
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index c63d7792200b..28feeb20c96e 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -31,6 +31,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/mnemonic.hxx>
+#include <vcl/event.hxx>
 #include "bibbeam.hxx"
 #include "bibview.hxx"
 #include "bibresid.hxx"
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index a6c962d75205..dcac53bdf98a 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/commandevent.hxx>
+#include <vcl/event.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index 3418d642d3e5..804c55d91914 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -21,6 +21,7 @@
 #include "propertyeditor.hxx"
 #include <helpids.h>
 #include <propctrlr.h>
+#include <vcl/event.hxx>
 #include <vcl/tabpage.hxx>
 #include <memory>
 
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index 82e777d18dee..d170f7637c48 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -20,6 +20,7 @@
 
 #include "controlfontdialog.hxx"
 #include <cppuhelper/typeprovider.hxx>
+#include <o3tl/make_unique.hxx>
 #include "fontdialog.hxx"
 #include "formstrings.hxx"
 #include "pcrcommon.hxx"
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 77a126f877f0..5ec3a91d15e7 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/types.hxx>
 #include <vcl/treelistentry.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 
 namespace pcr
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index a4d0cfb5f1d0..98dd0c9a4a1b 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -32,6 +32,7 @@
 #include <vcl/treelistentry.hxx>
 #include <vcl/builderfactory.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 namespace pcr
 {
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index f976aed6e789..08d7cf57e130 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -27,6 +27,7 @@
 
 #include "grid.hxx"
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
 
 #include <algorithm>
 #include <limits>
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 1a88a2ee5194..2f9d710a41e7 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -26,6 +26,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
 #include "sanedlg.hxx"
 #include "grid.hxx"
 #include <math.h>
diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx
index b12febde0cb5..a1ad4c7ea5ff 100644
--- a/filter/source/flash/impswfdialog.cxx
+++ b/filter/source/flash/impswfdialog.cxx
@@ -19,6 +19,7 @@
 
 
 #include "impswfdialog.hxx"
+#include <tools/solar.h>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index fc751f772728..1dc03182aa15 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -21,6 +21,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <tools/debug.hxx>
 
 using namespace ::swf;
 using namespace ::com::sun::star::uno;
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 8acc14884e0a..68c4135e0c27 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -32,6 +32,7 @@
 #include <vcl/graphictools.hxx>
 #include <sal/log.hxx>
 #include <tools/helpers.hxx>
+#include <tools/debug.hxx>
 
 #include <zlib.h>
 
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 325cddde4c99..428c807c50ca 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -20,6 +20,7 @@
 #include "swfwriter.hxx"
 #include <vcl/virdev.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <tools/debug.hxx>
 
 #include <math.h>
 
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index d4f37bc3b1fa..394f48d4ab9a 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -19,6 +19,7 @@
 
 
 #include <tools/stream.hxx>
+#include <tools/debug.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index aecc07873c78..c1f9082cfa72 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -24,6 +24,7 @@
 #include <svl/solar.hrc>
 #include <com/sun/star/view/XRenderable.hpp>
 #include <comphelper/processfactory.hxx>
+#include <o3tl/make_unique.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index ff5141792526..7b1e658d764a 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -19,6 +19,7 @@
 
 
 #include <osl/file.hxx>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/fract.hxx>
 #include <tools/poly.hxx>
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index f8ae67c367c7..5c726c6499f4 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
 
+#include <cppuhelper/weakref.hxx>
 #include <vcl/weld.hxx>
 #include <svl/poolitem.hxx>
 
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index c4ae8ee9e008..51961d86682d 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -21,6 +21,7 @@
 #include <services.hxx>
 
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/svapp.hxx>
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index f4ea26f2404f..dd89ec4cdf84 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -37,6 +37,7 @@
 #include <editeng/editids.hrc>
 #include <svx/svxids.hrc>
 #include <osl/diagnose.h>
+#include <vcl/event.hxx>
 
 namespace frm
 {
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 35798286fa3d..c3fd30b7b262 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -63,6 +63,7 @@
 #include <osl/mutex.hxx>
 #include <sal/macros.h>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 
 namespace frm
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index c4f9ddf64a89..2e8f82aff31d 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -27,11 +27,13 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/form/runtime/FormFeature.hpp>
 
+#include <vcl/event.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/commandinfoprovider.hxx>
 
 #include <sal/macros.h>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 #define LID_RECORD_LABEL    1000
 #define LID_RECORD_FILLER   1001
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 70d3eb222e15..9499992b6b7e 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -21,6 +21,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
 #include <vcl/fixed.hxx>
 
 #include <formula/funcutl.hxx>
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index e4023f524d62..d9b6061ae0db 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -28,6 +28,7 @@
 #include <vcl/lstbox.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/urlobj.hxx>
+#include <tools/debug.hxx>
 
 #include <algorithm>
 #include <functional>
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 7d50e2b5e85b..da318d6030a5 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -11,6 +11,7 @@
 #include <svtools/PlaceEditDialog.hxx>
 
 #include <vcl/headbar.hxx>
+#include <vcl/event.hxx>
 #include <bitmaps.hlst>
 
 #define COLUMN_NAME     1
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 2511445b1df1..7219e8770899 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -51,6 +51,7 @@
 
 class PopupMenu;
 class ToolBox;
+class Menu;
 
 namespace framework
 {
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index d26927ae61d2..a746715366bf 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -61,6 +61,7 @@
 #include <comphelper/lok.hxx>
 #include <svtools/imgdef.hxx>
 #include <tools/diagnose_ex.h>
+#include <vcl/settings.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/dockingarea.hxx>
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 7f1aab8906b8..9d3265bb701b 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -26,6 +26,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolbox.hxx>
+#include <vcl/event.hxx>
 
 using namespace ::com::sun::star;
 using namespace css::uno;
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 7bf9568cecf9..6abf26102e31 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <svtools/toolboxcontroller.hxx>
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 6505f7054ffb..5f4052361ba2 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -42,8 +42,10 @@
 #include <comphelper/processfactory.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtools/statusbarcontroller.hxx>
+#include <tools/debug.hxx>
 
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 #include <vcl/status.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 29ccca57f239..20d1222e552c 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -69,6 +69,7 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandinfoprovider.hxx>
+#include <tools/debug.hxx>
 
 #include <svtools/menuoptions.hxx>
 
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index d9d8facad6d0..b86f47d264ba 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -280,3 +280,10 @@ blacklist:
     - com/sun/star/frame/XTerminateListener.hpp
     - com/sun/star/datatransfer/dnd/XDragGestureListener.hpp
     - com/sun/star/datatransfer/dnd/XDropTargetListener.hpp
+    include/vcl/vclstatuslistener.hxx:
+    # base class has to be a complete type
+    - com/sun/star/frame/XStatusListener.hpp
+    include/vcl/weld.hxx:
+    # base class has to be a complete type
+    - com/sun/star/accessibility/XAccessibleRelationSet.hpp
+    - com/sun/star/accessibility/XAccessible.hpp
diff --git a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx
index b84779984e95..3547185e2126 100644
--- a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx
@@ -24,6 +24,7 @@
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 
 
 namespace drawinglayer
diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx
index 8d524aef93ab..f1ffb7d3ffd3 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_EDITENG_CROSSEDOUTITEM_HXX
 
 #include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 #include <svl/eitem.hxx>
 #include <editeng/editengdllapi.h>
 
diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index b26c9a7e9ade..6e76ccb17c66 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -22,6 +22,7 @@
 #include <svl/eitem.hxx>
 #include <vcl/vclenum.hxx>
 #include <tools/color.hxx>
+#include <tools/fontenum.hxx>
 #include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 504650420841..3e453362119a 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_EDITENG_WGHTITEM_HXX
 
 #include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 #include <svl/eitem.hxx>
 #include <editeng/editengdllapi.h>
 
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index 1707eeea583c..8cf07268a0c1 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -32,6 +32,7 @@
 #include <framework/fwedllapi.h>
 
 #include <cppuhelper/weak.hxx>
+#include <cppuhelper/weakref.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/toolbox.hxx>
 
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 31c28e8b8e11..cba45688835d 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -24,6 +24,7 @@
 #include <vcl/ctrl.hxx>
 #include <vcl/vclptr.hxx>
 #include <tools/multisel.hxx>
+#include <vcl/event.hxx>
 #include <vcl/headbar.hxx>
 #include <vcl/transfer.hxx>
 #include <vcl/AccessibleBrowseBoxObjType.hxx>
diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx
index 35b7a11171c5..ada35ea75581 100644
--- a/include/svtools/dialogcontrolling.hxx
+++ b/include/svtools/dialogcontrolling.hxx
@@ -24,6 +24,7 @@
 
 #include <tools/link.hxx>
 #include <vcl/button.hxx>
+#include <vcl/vclevent.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 7b63f60ce44a..cccd894b36cb 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -23,6 +23,7 @@
 #include <svtools/svtdllapi.h>
 #include <tools/link.hxx>
 #include <vcl/window.hxx>
+#include <vcl/settings.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
 
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 440d6e671d35..2a37ea21216b 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -22,6 +22,7 @@
 
 #include <svtools/svtdllapi.h>
 
+#include <vcl/event.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/timer.hxx>
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index d962012eb448..6c8be018e053 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -24,9 +24,11 @@
 #include <vcl/ctrl.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/virdev.hxx>
 #include <svx/svxdllapi.h>
 
 class NumericField;
+class Edit;
 
 namespace svx {
 
diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx
index 0b2d8bce1b7d..c5f4fd85d7f8 100644
--- a/include/svx/sidebar/SidebarDialControl.hxx
+++ b/include/svx/sidebar/SidebarDialControl.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SVX_SIDEBAR_SIDEBARDIALCONTROL_HXX
 
 #include <svx/dialcontrol.hxx>
+#include <vcl/field.hxx>
 
 namespace svx { namespace sidebar {
 
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 677ba9b70fc2..149bffcb872f 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -27,6 +27,7 @@
 #include <svtools/accessibilityoptions.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/svdcrtv.hxx>
+#include <vcl/event.hxx>
 #include <unotools/options.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 2064b934b5c2..dcd98b959fc9 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -19,6 +19,8 @@
 #include <vcl/ptrstyle.hxx>
 #include <map>
 
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+
 namespace vcl
 {
     /*
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 86a967c66415..da4cb16f5d68 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -17,6 +17,8 @@
 #include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/event.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/IContext.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 115645b17ab8..df42d7b6b9d2 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -25,6 +25,10 @@
 #include <vcl/dllapi.h>
 #include <vcl/ctrl.hxx>
 
+class DataChangedEvent;
+class NotifyEvent;
+class UserDrawEvent;
+
 #define LISTBOX_APPEND              (SAL_MAX_INT32)
 #define LISTBOX_ENTRY_NOTFOUND      (SAL_MAX_INT32)
 #define LISTBOX_MAX_ENTRIES         (SAL_MAX_INT32 - 1)
diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index 4a031753609a..b2e9b8cf9f28 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -12,6 +12,7 @@
 
 #include <vcl/builder.hxx>
 #include <vcl/ctrl.hxx>
+#include <vcl/settings.hxx>
 #include <vector>
 
 namespace com { namespace sun { namespace star { namespace ui { class XContextChangeEventListener; } } } }
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index b205ffe85edb..fcc2fb182532 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_SPLIT_HXX
 
 #include <vcl/dllapi.h>
+#include <vcl/keycod.hxx>
 #include <vcl/window.hxx>
 
 #define SPLITTER_DEFAULTSTEPSIZE 0xFFFF
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index da7740af2ba6..c89b5064ff81 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -27,6 +27,10 @@
 #include <memory>
 #include <vector>
 
+class DataChangedEvent;
+class HelpEvent;
+class MouseEvent;
+class UserDrawEvent;
 struct ImplStatusItem;
 
 void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos,
diff --git a/include/vcl/svtabbx.hxx b/include/vcl/svtabbx.hxx
index 75aadf0db8f9..3e5f68bf146c 100644
--- a/include/vcl/svtabbx.hxx
+++ b/include/vcl/svtabbx.hxx
@@ -23,6 +23,8 @@
 #include <vcl/treelistbox.hxx>
 #include <vcl/accessibletableprovider.hxx>
 
+#include <tools/debug.hxx>
+
 #include <memory>
 #include <vector>
 
diff --git a/include/vcl/taskpanelist.hxx b/include/vcl/taskpanelist.hxx
index 5a6507fcf1e0..c055882e76a1 100644
--- a/include/vcl/taskpanelist.hxx
+++ b/include/vcl/taskpanelist.hxx
@@ -23,7 +23,12 @@
 #include <vcl/dllapi.h>
 
 #include <vector>
-#include <vcl/window.hxx>
+#include <vcl/keycod.hxx>
+#include <vcl/vclptr.hxx>
+
+class KeyEvent;
+
+namespace vcl { class Window; }
 
 class VCL_DLLPUBLIC TaskPaneList
 {
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index ea6672d12ac8..574501825879 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -24,6 +24,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/dockwin.hxx>
 #include <vcl/image.hxx>
+#include <vcl/keycod.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 #include <limits>
@@ -38,6 +39,7 @@ class Timer;
 struct ImplToolItem;
 struct ImplToolBoxPrivateData;
 class  PopupMenu;
+class VclMenuEvent;
 
 #define TOOLBOX_STYLE_FLAT          (sal_uInt16(0x0004))
 
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index a55c5b0ceb35..1e8f59428e3f 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_VCL_VCLENUM_HXX
 
 #include <sal/types.h>
-#include <tools/fontenum.hxx>
+#include <o3tl/typed_flags_set.hxx>
 
 enum class SelectionMode { NONE, Single, Range, Multiple };
 
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
index 6151785f5480..44752b6e4e06 100644
--- a/include/vcl/vcllayout.hxx
+++ b/include/vcl/vcllayout.hxx
@@ -21,18 +21,18 @@
 #define INCLUDED_VCL_VCLLAYOUT_HXX
 
 #include <memory>
-#include <vector>
 
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <tools/gen.hxx>
 #include <vcl/devicecoordinate.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/glyphitem.hxx>
 
 class ImplLayoutArgs;
 class PhysicalFontFace;
 class SalGraphics;
 struct GlyphItem;
+class SalLayoutGlyphs;
+
 namespace vcl
 {
     class TextLayoutCache;
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index df57a4767eda..bcf294c87e46 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -28,7 +28,6 @@
 #include <memory>
 
 class ImpVclMEdit;
-class Timer;
 class ExtTextEngine;
 class TextView;
 
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 1308b5d1a68b..9a621fdd0228 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -22,9 +22,7 @@
 
 #include <sal/config.h>
 
-#include <config_global.h>
 #include <rtl/ref.hxx>
-#include <vcl/vclreferencebase.hxx>
 
 #include <utility>
 #include <type_traits>
@@ -35,6 +33,8 @@
 #endif
 #endif
 
+class VclReferenceBase;
+
 namespace vcl { namespace detail {
 
 template<typename>
diff --git a/include/vcl/vclreferencebase.hxx b/include/vcl/vclreferencebase.hxx
index f90f579631a8..03b59b360391 100644
--- a/include/vcl/vclreferencebase.hxx
+++ b/include/vcl/vclreferencebase.hxx
@@ -20,13 +20,8 @@
 #define INCLUDED_VCL_Reference_HXX
 
 #include <vcl/dllapi.h>
-#include <tools/debug.hxx>
 #include <osl/interlck.h>
 
-#include <cassert>
-
-class VclReferenceBase;
-
 class VCL_DLLPUBLIC VclReferenceBase
 {
     mutable oslInterlockedCount mnRefCnt;
diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx
index ea7615d2bdf6..113a733e296d 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -21,13 +21,14 @@
 #define INCLUDED_VCL_VECTORGRAPHICDATA_HXX
 
 #include <basegfx/range/b2drange.hxx>
-#include <com/sun/star/graphic/XPrimitive2D.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/wmfexternal.hxx>
 #include <rtl/ustring.hxx>
 #include <deque>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace graphic { class XPrimitive2D; } } } }
+struct WmfExternal;
 
 typedef css::uno::Sequence<sal_Int8> VectorGraphicDataArray;
 
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 04af87070d8a..653f83f1dfa3 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -11,20 +11,45 @@
 #define INCLUDED_VCL_WELD_HXX
 
 #include <rtl/ustring.hxx>
+#include <tools/color.hxx>
+#include <tools/fldunit.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
+#include <tools/time.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/field.hxx>
 #include <vcl/vclenum.hxx>
-#include <vcl/virdev.hxx>
-#include <o3tl/make_unique.hxx>
+#include <vcl/font.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/uitest/factory.hxx>
 
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+
+#include <vector>
+
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace awt
+{
+class XWindow;
+}
+}
+}
+}
 
 typedef css::uno::Reference<css::accessibility::XAccessible> a11yref;
 typedef css::uno::Reference<css::accessibility::XAccessibleRelationSet> a11yrelationset;
 
 class SvNumberFormatter;
+class KeyEvent;
+class MouseEvent;
+class OutputDevice;
+class VirtualDevice;
+struct SystemEnvData;
 
 namespace vcl
 {
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 02b59375423c..1e9539cf9a2a 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -24,20 +24,14 @@
 #include <vcl/dllapi.h>
 #include <vcl/outdev.hxx>
 #include <vcl/pointr.hxx>
+#include <tools/link.hxx>
 #include <tools/wintypes.hxx>
 #include <vcl/vclenum.hxx>
-#include <vcl/inputtypes.hxx>
-#include <vcl/cursor.hxx>
-#include <vcl/inputctx.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/region.hxx>
-#include <vcl/salnativewidgets.hxx>
 #include <vcl/uitest/factory.hxx>
-#include <vcl/vclevent.hxx>
 #include <vcl/IDialogRenderable.hxx>
 #include <rtl/ustring.hxx>
-#include <rtl/ref.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
@@ -49,13 +43,10 @@ struct ImplCalcToTopData;
 struct SystemEnvData;
 struct SystemParentData;
 class ImplBorderWindow;
-class Idle;
 class Timer;
 class DockingManager;
 class ScrollBar;
-class Bitmap;
 class FixedText;
-class Image;
 class MouseEvent;
 class KeyEvent;
 class CommandEvent;
@@ -69,6 +60,8 @@ class SalFrame;
 class MenuFloatingWindow;
 class VCLXWindow;
 class VclWindowEvent;
+class AllSettings;
+class InputContext;
 enum class ImplPaintFlags;
 enum class VclEventId;
 
@@ -76,20 +69,16 @@ namespace com { namespace sun { namespace star {
 namespace accessibility {
     class XAccessible;
 }
-namespace beans {
-    struct PropertyValue;
-}
+
 namespace rendering {
     class XCanvas;
     class XSpriteCanvas;
 }
 namespace awt {
     class XWindowPeer;
-    class XWindow;
 }
 namespace uno {
     class Any;
-    class XInterface;
 }
 namespace datatransfer { namespace clipboard {
     class XClipboard;
@@ -420,16 +409,12 @@ const char* ImplDbgCheckWindow( const void* pObj );
 
 namespace vcl { class Window; }
 namespace vcl { class Cursor; }
-namespace vcl { class ILibreOfficeKitNotifier; }
 class Dialog;
 class WindowImpl;
 class PaintHelper;
 class VclSizeGroup;
-class OutputDevice;
 class Application;
-class SystemWindow;
 class WorkWindow;
-class Dialog;
 class MessBox;
 class MessageDialog;
 class DockingWindow;
@@ -438,12 +423,9 @@ class GroupBox;
 class PushButton;
 class RadioButton;
 class SystemChildWindow;
-class ImplBorderWindow;
 class ImplDockingWindowWrapper;
 class ImplPopupFloatWin;
-class MenuFloatingWindow;
 class LifecycleTest;
-namespace svt { class PopupWindowControllerImpl; }
 
 
 enum class WindowHitTest {
@@ -1595,10 +1577,6 @@ public:
 
 }
 
-// Only for compatibility - because many people outside haven't included event.hxx
-// These require Window to be defined for VclPtr<Window>
-#include <vcl/event.hxx>
-
 #endif // INCLUDED_VCL_WINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/wmf.hxx b/include/vcl/wmf.hxx
index d17dc7ec7fce..26a1c734425d 100644
--- a/include/vcl/wmf.hxx
+++ b/include/vcl/wmf.hxx
@@ -25,7 +25,6 @@
 class FilterConfigItem;
 class GDIMetaFile;
 class SvStream;
-struct WmfExternal;
 
 VCL_DLLPUBLIC bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF );
 
diff --git a/include/vcl/wmfexternal.hxx b/include/vcl/wmfexternal.hxx
index fd55c621c060..d428151ecf13 100644
--- a/include/vcl/wmfexternal.hxx
+++ b/include/vcl/wmfexternal.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_VCL_WMFEXTERNAL_HXX
 
 #include <vcl/dllapi.h>
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
+
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
 
 struct VCL_DLLPUBLIC WmfExternal
 {
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index d1ef8fd70e66..628d476a9a38 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_WRKWIN_HXX
 #define INCLUDED_VCL_WRKWIN_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/syswin.hxx>
 #include <o3tl/typed_flags_set.hxx>
diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx
index bab4ba693654..94ca9d843f38 100644
--- a/include/vcl/xtextedt.hxx
+++ b/include/vcl/xtextedt.hxx
@@ -21,14 +21,8 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/texteng.hxx>
-#include <vcl/textview.hxx>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace util {
-    struct SearchOptions;
-}}}}
+namespace i18nutil { struct SearchOptions; }
 
 class VCL_DLLPUBLIC ExtTextEngine : public TextEngine
 {
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index a95f5bfd4fbd..5a28687a5589 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/linguistic2/LinguServiceEventFlags.hpp>
 #include <com/sun/star/linguistic2/ProofreadingIterator.hpp>
 
+#include <tools/debug.hxx>
 #include <unotools/lingucfg.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 2c3348fcf159..45d7946816d3 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -91,6 +91,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/wmfexternal.hxx>
 #include <sal/log.hxx>
 #include <svx/unoshape.hxx>
 
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 4e48d2a015f9..7118c92bd6e0 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -25,6 +25,7 @@
 #include <o3tl/safeint.hxx>
 #include <oox/vml/vmlshape.hxx>
 #include <vcl/wmf.hxx>
+#include <vcl/wmfexternal.hxx>
 #include <vcl/virdev.hxx>
 
 #include <com/sun/star/beans/PropertyValues.hpp>
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 908cec305ad8..09fb88ebd1bb 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/i18n/XCollator.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 
+#include <vcl/event.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index eb8bf1ca198c..48fa67902927 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -19,6 +19,7 @@
 #include <ColorListener.hxx>
 #include <svl/hint.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/event.hxx>
 
 #include <strings.hxx>
 
diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx
index 0e763fce8c24..4dd537fae143 100644
--- a/reportdesign/source/ui/report/EndMarker.cxx
+++ b/reportdesign/source/ui/report/EndMarker.cxx
@@ -24,6 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/lineinfo.hxx>
+#include <vcl/event.hxx>
 
 
 #define CORNER_SPACE    5
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 4ba304f1ed18..809357a86495 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -129,6 +129,7 @@
 #include <unotools/syslocale.hxx>
 #include <unotools/viewoptions.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <osl/mutex.hxx>
 #include <PropertyForward.hxx>
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 9ed8e3b041b0..0e19ed712ba6 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -24,6 +24,7 @@
 #include <ReportDefines.hxx>
 #include <SectionWindow.hxx>
 #include <helpids.h>
+#include <vcl/event.hxx>
 #include <vcl/help.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/lineinfo.hxx>
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 2c0c80c8ee2f..8542a283375b 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -44,6 +44,7 @@ struct ScDPNumGroupInfo;
 class ScTabViewShell;
 class ScConditionalFormat;
 class ScConditionalFormatList;
+class Date;
 enum class CreateNameFlags;
 enum class CellShiftDisabledFlags;
 
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 0df9df47c65a..2d76108571d2 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -30,6 +30,7 @@
 #include <svx/svdpage.hxx>
 #include <vcl/scheduler.hxx>
 #include <vcl/vclevent.hxx>
+#include <vcl/virdev.hxx>
 #include <sc.hrc>
 
 #include <chrono>
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 8ca890344a74..ebcae2c95774 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -33,6 +33,7 @@
 #include <rtl/crc.h>
 #include <basic/basmgr.hxx>
 #include <sal/log.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <document.hxx>
 #include <table.hxx>
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index d9b6347a89d7..59e131c03a0e 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -72,6 +72,7 @@
 #include <svl/zforlist.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <utility>
 #include <vector>
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index d7dc576c407d..13d1fbb3d7d6 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -46,6 +46,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <tools/globname.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 3123afd5846a..146dac680dd8 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -48,6 +48,7 @@
 #include <svx/sxcecitm.hxx>
 #include <svl/whiter.hxx>
 #include <editeng/writingmodeitem.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 81896109b16b..6ffcab237e63 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -76,6 +76,7 @@
 #include <svx/dialogs.hrc>
 #include <sfx2/sfxdlg.hxx>
 #include <conditio.hxx>
+#include <o3tl/make_unique.hxx>
 
 IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl);
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 492c64b3d1c7..5dd7e9b9ced5 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -24,6 +24,7 @@
 #include <bitmaps.hlst>
 
 #include <vcl/decoview.hxx>
+#include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <tools/wintypes.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index bff66aa2609e..c49eb3a0c79e 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -34,6 +34,7 @@
 #include <scitems.hxx>
 #include <editeng/eeitem.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/virdev.hxx>
 
 #include <editeng/colritem.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 529838a05d37..a9904be48f88 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <comphelper/string.hxx>
+#include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 #include <miscuno.hxx>
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx
index 15d0069a1ee2..fb8d0216a97e 100644
--- a/sc/source/ui/dbgui/csvtablebox.cxx
+++ b/sc/source/ui/dbgui/csvtablebox.cxx
@@ -19,6 +19,7 @@
 
 #include <csvtablebox.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/settings.hxx>
 #include <editutil.hxx>
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 12a082d88cec..808b5e688c57 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -24,6 +24,7 @@
 #include <svl/stritem.hxx>
 #include <vcl/weld.hxx>
 #include <unotools/charclass.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <arealink.hxx>
 
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 06aba93ee2e2..09ccf13f9ba6 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -24,6 +24,7 @@
 #include <svx/dataaccessdescriptor.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sal/log.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/XCompletedExecution.hpp>
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index e5a72112972d..063032a50193 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -58,6 +58,7 @@
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <o3tl/safeint.hxx>
+#include <o3tl/make_unique.hxx>
 #include <tools/svlibrary.h>
 #include <unotools/configmgr.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx
index 23a8f846af35..d5a7797adadf 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -31,6 +31,7 @@
 
 #include <sfx2/lokhelper.hxx>
 #include <comphelper/lok.hxx>
+#include <o3tl/make_unique.hxx>
 
 
 static void lcl_InvalidateOutliner( SfxBindings* pBindings )
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 66d935a5c9e7..dd93508a545d 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -44,6 +44,7 @@
 #include <svx/charthelper.hxx>
 #include <scmod.hxx>
 #include <sal/log.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <cppuhelper/component_context.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index 6f7431056b9f..51713c59afb9 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -27,6 +27,7 @@
 #include <vcl/cursor.hxx>
 #include <sfx2/objsh.hxx>
 #include <editeng/writingmodeitem.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <global.hxx>
 #include <drwlayer.hxx>
diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index 2a650ef77223..723e1ba555f9 100644
--- a/sc/source/ui/inc/autofmt.hxx
+++ b/sc/source/ui/inc/autofmt.hxx
@@ -22,6 +22,9 @@
 
 #include <svx/framelinkarray.hxx>
 #include <scdllapi.h>
+#include <vcl/window.hxx>
+
+namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } }
 
 class ScAutoFormatData;
 class SvxBoxItem;
diff --git a/sc/source/ui/inc/dataproviderdlg.hxx b/sc/source/ui/inc/dataproviderdlg.hxx
index 44b58376bc1e..ed590a7634bc 100644
--- a/sc/source/ui/inc/dataproviderdlg.hxx
+++ b/sc/source/ui/inc/dataproviderdlg.hxx
@@ -20,6 +20,7 @@
 
 #include <memory>
 
+class Menu;
 class ScDocument;
 class ScDataProviderBaseControl;
 class ScDBData;
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index e2d6518c0ee3..765b0b954118 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -31,6 +31,7 @@ class CheckBox;
 class Edit;
 class FixedText;
 class RadioButton;
+class NumericField;
 
 class ScCsvTableBox;
 class SvxTextEncodingBox;
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index d15b06077f0d..53e8496d38e7 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -27,6 +27,8 @@
 #include <calcconfig.hxx>
 #include <docoptio.hxx>
 
+class Edit;
+
 class ScTpFormulaOptions : public SfxTabPage
 {
     friend class VclPtr<ScTpFormulaOptions>;
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index c4650addbd8e..4d7209ab2fca 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -34,6 +34,7 @@
 #include <svtools/scriptedtext.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/virdev.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <comphelper/processfactory.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index d4cd62bcf5aa..f273eebafd40 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -23,6 +23,7 @@
 #include <utility>
 #include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
+#include <vcl/field.hxx>
 
 constexpr int MENU_START = 0;
 constexpr int MENU_COLUMN = 1;
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 9ceb2ee71565..95553d13bf8a 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -29,6 +29,7 @@
 #include <scresid.hxx>
 #include <formula/grammar.hxx>
 #include "calcoptionsdlg.hxx"
+#include <vcl/edit.hxx>
 
 #include <unotools/localedatawrapper.hxx>
 
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 45047082faca..39522d994000 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -48,6 +48,7 @@
 #include <markdata.hxx>
 
 #include <sfx2/lokhelper.hxx>
+#include <o3tl/make_unique.hxx>
 
 // Show or hide outline groups
 
diff --git a/sc/source/ui/unoobj/TablePivotCharts.cxx b/sc/source/ui/unoobj/TablePivotCharts.cxx
index 22c3b2bbc6d1..cb36d5aa819a 100644
--- a/sc/source/ui/unoobj/TablePivotCharts.cxx
+++ b/sc/source/ui/unoobj/TablePivotCharts.cxx
@@ -29,6 +29,7 @@
 #include <tools/globname.hxx>
 #include <svtools/embedhlp.hxx>
 #include <comphelper/sequence.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <TablePivotChart.hxx>
 #include <TablePivotCharts.hxx>
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 86381a2a755d..191c22cfc3bf 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -43,6 +43,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <float.h>
+#include <o3tl/make_unique.hxx>
 
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/util/CellProtection.hpp>
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index d3be0afbf05f..596c40740137 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -37,6 +37,7 @@
 #include <tools/globname.hxx>
 #include <svx/charthelper.hxx>
 #include <svtools/embedhlp.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <ChartTools.hxx>
 #include <chartuno.hxx>
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index c2c297a822a9..e1e6ce3dfc27 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -31,6 +31,7 @@
 
 #include <svl/hint.hxx>
 #include <vcl/svapp.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <editeng/eeitem.hxx>
 
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 43e4a639e8ba..fa3e58e99b0d 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -34,6 +34,7 @@
 #include <editeng/unofored.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
+#include <o3tl/make_unique.hxx>
 #include <com/sun/star/awt/FontSlant.hpp>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 0e3ce98c515f..132660bf9dfb 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/bindings.hxx>
 #include <vcl/weld.hxx>
 #include <unotools/charclass.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 92e288f3179b..e522233717e8 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -26,6 +26,7 @@
 #include <svl/zforlist.hxx>
 #include <sfx2/app.hxx>
 #include <unotools/collatorwrapper.hxx>
+#include <o3tl/make_unique.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index aeae719ae3c3..2b92dfa7ee26 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -21,6 +21,7 @@
 #include <svx/svdoole2.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <strings.hrc>
 #include <scresid.hxx>
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 062edabb33eb..47df55c8103d 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -27,6 +27,7 @@
 #include <tools/urlobj.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <sal/log.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <drawview.hxx>
 #include <global.hxx>
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 9cd2db49bd17..8ec01408b049 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -42,6 +42,7 @@
 #include <svx/sdr/contact/viewobjectcontact.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/sdrpagewindow.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <drawview.hxx>
 #include <global.hxx>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index bc101b6087d4..060fdc4bce19 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -43,6 +43,7 @@
 #include <vcl/cursor.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
+#include <vcl/inputctx.hxx>
 #include <vcl/settings.hxx>
 #include <sot/formats.hxx>
 #include <comphelper/classids.hxx>
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 4faefae92ead..5523a995965a 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -19,6 +19,7 @@
 
 #include <scitems.hxx>
 #include <editeng/eeitem.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <svx/svdoutl.hxx>
 #include <svx/svdotext.hxx>
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 82458b0b8ad0..320b07d9ebd2 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -33,6 +33,7 @@
 #include <vcl/waitobj.hxx>
 #include <vcl/settings.hxx>
 #include <o3tl/deleter.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <preview.hxx>
 #include <prevwsh.hxx>
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index d9a5b81891c1..4ea5b443d034 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -36,6 +36,7 @@
 #include <tools/urlobj.hxx>
 #include <sot/exchange.hxx>
 #include <memory>
+#include <o3tl/make_unique.hxx>
 
 #include <sfx2/lokhelper.hxx>
 
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 2a2e2db41b8c..a5aa028d3ef0 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -43,6 +43,7 @@
 #include <svl/sharedstringpool.hxx>
 #include <vcl/weld.hxx>
 #include <avmedia/mediawindow.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <comphelper/storagehelper.hxx>
 
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index b0b1770f7033..cb43fb421425 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -34,6 +34,7 @@
 #include <sfx2/ipclient.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/embed/Aspects.hpp>
+#include <o3tl/make_unique.hxx>
 
 #include <document.hxx>
 #include <viewfunc.hxx>
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 3196bafe07da..6c5c2b558a1a 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <sfx2/module.hxx>
 #include <sal/types.h>
+#include <vcl/virdev.hxx>
 #include <map>
 #include <memory>
 
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index 1393e8497ce5..fdf3bea3904a 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -36,6 +36,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <rtl/ref.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 #include <animations/animationnodehelper.hxx>
 
 #include <svx/svditer.hxx>
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index 563555cf2825..fa2cfb4cca41 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -33,6 +33,7 @@
 
 #include <unotools/datetime.hxx>
 #include <tools/datetime.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <sfx2/viewsh.hxx>
 #include <svx/svdundo.hxx>
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 0a68485c2dff..28217258aff2 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -38,6 +38,7 @@
 #include <vcl/weld.hxx>
 #include <sot/formats.hxx>
 #include <xmloff/autolayout.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <strings.hrc>
 #include <drawdoc.hxx>
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index e1f033dd5e7b..a6de2cb6556d 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -60,6 +60,7 @@
 #include <sal/log.hxx>
 #include <basegfx/utils/tools.hxx>
 #include <o3tl/enumarray.hxx>
+#include <o3tl/make_unique.hxx>
 #include <xmloff/autolayout.hxx>
 
 #include <Outliner.hxx>
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 98b8a33685aa..c2feb3f1bec4 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -27,6 +27,7 @@
 #include <svl/style.hxx>
 
 #include <svx/unoprov.hxx>
+#include <tools/debug.hxx>
 
 #include <strings.hrc>
 #include <stlfamily.hxx>
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 8e4ec04a34e3..2884953d77bb 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/presentation/FadeEffect.hpp>
+#include <com/sun/star/beans/PropertyState.hpp>
 #include <vcl/vclptr.hxx>
 #include <vcl/graph.hxx>
 
@@ -42,6 +43,7 @@ namespace com { namespace sun { namespace star { namespace drawing { class XMast
 namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
 namespace com { namespace sun { namespace star { namespace drawing { class XDrawPages; } } } }
 namespace com { namespace sun { namespace star { namespace drawing { class XDrawPagesSupplier; } } } }
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
 namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
 namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
 namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
diff --git a/sd/source/ui/animations/CategoryListBox.cxx b/sd/source/ui/animations/CategoryListBox.cxx
index 1b5505abdf9f..054cb84acdcd 100644
--- a/sd/source/ui/animations/CategoryListBox.cxx
+++ b/sd/source/ui/animations/CategoryListBox.cxx
@@ -20,6 +20,8 @@
 #include "CategoryListBox.hxx"
 #include <vcl/builderfactory.hxx>
 
+#include <vcl/event.hxx>
+
 namespace sd {
 
 CategoryListBox::CategoryListBox( vcl::Window* pParent )
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 19513ab58193..c6878658c437 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -33,6 +33,8 @@
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
+#include <tools/debug.hxx>
 #include <o3tl/make_unique.hxx>
 #include <osl/diagnose.h>
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index e3a7a2654444..60f052445929 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -47,6 +47,7 @@
 #include <createcustomanimationpanel.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <vcl/button.hxx>
 #include <vcl/scrbar.hxx>
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 7ca7fc925361..f9c82c78a505 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -44,6 +44,7 @@
 #include <svx/svxids.hrc>
 #include <svx/polypolygoneditor.hxx>
 #include <svx/svddrgmt.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include "CustomAnimationPane.hxx"
 #include <View.hxx>
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 002cfaf088ce..8f9dbdf3cae0 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -30,6 +30,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 
 #include <sdresid.hxx>
 #include <strings.hrc>
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 8b93a4dc115f..feda5d5b99d2 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -27,6 +27,7 @@
 #include <sfx2/progress.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/virdev.hxx>
 
 #include <anminfo.hxx>
 #include <animobjs.hxx>
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 44b8b5730665..a56cd9bdcf0a 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -31,6 +31,7 @@
 #include <vcl/weld.hxx>
 #include <vcl/treelistentry.hxx>
 #include <unotools/charclass.hxx>
+#include <tools/debug.hxx>
 
 // SdCustomShowDlg
 SdCustomShowDlg::SdCustomShowDlg(weld::Window* pWindow, SdDrawDocument& rDrawDoc)
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 5b336e60822d..625bce33b733 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sfx2/objsh.hxx>
+#include <o3tl/make_unique.hxx>
 #include "sddlgfact.hxx"
 #include <BreakDlg.hxx>
 #include <copydlg.hxx>
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index b3392c51894f..5e870bab9896 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -24,6 +24,7 @@
 #include <svl/hint.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpool.hxx>
+#include <tools/debug.hxx>
 
 #include <unchss.hxx>
 
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 1fe20d09b107..93a0727b4365 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -51,6 +51,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/opengrf.hxx>
 #include <rtl/ustring.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <strings.hrc>
 #include <sdpage.hxx>
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 9524590fab16..e99f4d57e9c0 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -22,6 +22,7 @@
 #include <svl/style.hxx>
 #include <editeng/outliner.hxx>
 #include <svl/hint.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <app.hrc>
 
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index cd867a32f176..c78fe137dcb4 100644
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/debug.hxx>
+
 #include <unprlout.hxx>
 
 #include <strings.hrc>
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index eda3a1511038..b072bf303d6c 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -43,6 +43,7 @@
 
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <cppuhelper/weakref.hxx>
 #include <sddllapi.h>
 
 namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index 31a4b1df7c16..4148657b1e59 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -38,6 +38,7 @@
 #include <tools/diagnose_ex.h>
 #include <xmloff/autolayout.hxx>
 #include <sal/log.hxx>
+#include <o3tl/make_unique.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index b806a91661e6..abee11f431b3 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -53,6 +53,7 @@
 #include <osl/mutex.hxx>
 #include <osl/getglobalmutex.hxx>
 #include <xmloff/autolayout.hxx>
+#include <tools/debug.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx
index 93d6f4cfd7e0..d13a418fc918 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -30,6 +30,7 @@
 #include <svl/lstner.hxx>
 #include <osl/doublecheckedlocking.h>
 #include <osl/getglobalmutex.hxx>
+#include <tools/debug.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 6ef4023993b7..82eee8854c25 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -38,6 +38,7 @@
 #include "PreviewValueSet.hxx"
 #include <ViewShellBase.hxx>
 #include <sfx2/objface.hxx>
+#include <o3tl/make_unique.hxx>
 #include <drawview.hxx>
 #include <vcl/image.hxx>
 #include <vcl/floatwin.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 5512970a9590..338f0cd6d481 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -83,6 +83,7 @@
 #include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
 #include <vcl/svapp.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <memory>
 
diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx
index 3d38142dd225..5cd46bc18b23 100644
--- a/sd/source/ui/tools/IconCache.cxx
+++ b/sd/source/ui/tools/IconCache.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <tools/IconCache.hxx>
 
+#include <tools/debug.hxx>
 #include <osl/doublecheckedlocking.h>
 #include <osl/getglobalmutex.hxx>
 #include <unordered_map>
diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
index 2eb9d1b75190..dc0e86704d5f 100644
--- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx
+++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
@@ -29,6 +29,7 @@
 #include <o3tl/deleter.hxx>
 #include <rtl/instance.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 #include <algorithm>
 #include <memory>
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index da5e7b35096a..1829da7ca1ec 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -22,6 +22,7 @@
 #include <svx/svditer.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <o3tl/make_unique.hxx>
 #include <Outliner.hxx>
 
 #include <drawdoc.hxx>
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index f567664c45bc..07f521fe6ead 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -36,6 +36,7 @@
 #include <editeng/numitem.hxx>
 #include <svl/whiter.hxx>
 #include <sal/log.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objface.hxx>
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 3c628a7eaa2a..f3fd2da7349d 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -36,6 +36,7 @@
 #include <svx/dialogs.hrc>
 #include <unotools/useroptions.hxx>
 #include <tools/diagnose_ex.h>
+#include <o3tl/make_unique.hxx>
 
 #include <app.hrc>
 #include <strings.hrc>
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index d7aa739db685..50bd4d28e4f7 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -61,6 +61,7 @@
 #include <svl/urihelper.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/notebookbar/SfxNotebookBar.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <DrawViewShell.hxx>
 #include <slideshow.hxx>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 7a269a09d8a4..78ae4d441905 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -32,6 +32,7 @@
 #include <vcl/treelistentry.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 #include <sfx2/strings.hrc>
 #include <helpids.h>
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 643c8b7c07c9..873bd7914189 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -18,6 +18,7 @@
  */
 
 
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 8f3319ca76c3..7a29d265ddd0 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -47,6 +47,7 @@
 #include <svtools/helpopt.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <tools/urlobj.hxx>
+#include <tools/debug.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/pathoptions.hxx>
 #include <rtl/byteseq.hxx>
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index bc4c6ba5b8b2..a24e254c7948 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -56,6 +56,7 @@
 #include <sfx2/dispatch.hxx>
 #include <comphelper/extract.hxx>
 #include <tools/urlobj.hxx>
+#include <tools/debug.hxx>
 #include <osl/security.hxx>
 #include <osl/file.hxx>
 #include <osl/module.hxx>
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index bfcb263306af..327cd406f7d6 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -26,6 +26,7 @@
 #include <svl/urihelper.hxx>
 #include <tools/datetime.hxx>
 #include <tools/stream.hxx>
+#include <tools/debug.hxx>
 #include <unotools/resmgr.hxx>
 
 #include <sfx2/frmhtmlw.hxx>
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 3fa9fe0b1cd0..1bf5a179bd0d 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -19,6 +19,7 @@
 
 
 #include <tools/urlobj.hxx>
+#include <tools/debug.hxx>
 
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx
index ae03b958805d..567c2f2ffc95 100644
--- a/sfx2/source/control/charwin.cxx
+++ b/sfx2/source/control/charwin.cxx
@@ -19,6 +19,8 @@
 
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/virdev.hxx>
+#include <vcl/event.hxx>
 #include <sfx2/charwin.hxx>
 #include <comphelper/dispatchcommand.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index 3970c7f08a39..8117185768df 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -26,6 +26,7 @@
 #include <sfx2/sfxresid.hxx>
 #include <unotools/historyoptions.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
 #include <vcl/pngread.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index 9ef487dee663..361ea310f929 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -21,6 +21,7 @@
 #include <tools/urlobj.hxx>
 #include <unotools/historyoptions.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/event.hxx>
 
 #include <bitmaps.hlst>
 
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 3f647230c6e4..dbe72939e288 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -29,6 +29,7 @@
 #include <svl/itemiter.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 #include <svl/itempool.hxx>
 #include <itemdel.hxx>
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 70df660c4d23..cf370b7dd238 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -43,6 +43,7 @@
 #include <sfx2/msgpool.hxx>
 #include <sidebar/ContextChangeBroadcaster.hxx>
 #include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
+#include <tools/debug.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx
index f40791e23359..b5ca2ba75123 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -12,6 +12,7 @@
 #include <sfx2/templateviewitem.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
 #include <sfx2/app.hxx>
 
 #include <sfx2/strings.hrc>
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index bb909106097f..3ece5e8fe522 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -24,6 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.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 b585d95c74ee..279b8bc596ad 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -15,6 +15,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 
 #include <sfx2/strings.hrc>
 #include <bitmaps.hlst>
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index beeadd44ebfe..e31b95e2226a 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -39,6 +39,7 @@
 #include <vcl/help.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 0198d2333889..7e1dde9ab9fa 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -26,6 +26,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 70630396cb3b..60a7a72e5e75 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -35,6 +35,7 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/string.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/debug.hxx>
 
 #include <list>
 #include <vector>
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index d80d656ffd29..e8cb333181e0 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -25,6 +25,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <helpids.h>
+#include <tools/debug.hxx>
 
 SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR );
 
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index dd7c6974d7d8..ee08443654b8 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -45,6 +45,7 @@
 
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 #include <tools/globname.hxx>
 
 #include <assert.h>
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index af059b36ca1f..ead24be42953 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -29,6 +29,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <tools/urlobj.hxx>
+#include <tools/debug.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index f6319d58abb3..b12b78d80678 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -43,6 +43,7 @@
 #include <sfx2/sfxsids.hrc>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
+#include <tools/debug.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index f9b3dad2732e..d6d45c7f14e5 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -29,6 +29,7 @@
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <tools/urlobj.hxx>
+#include <tools/debug.hxx>
 
 #include <sfx2/strings.hrc>
 #include <sfx2/sfxsids.hrc>
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 940679960b93..006d00235a93 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -36,6 +36,7 @@
 #include <unotools/pathoptions.hxx>
 #include <unotools/viewoptions.hxx>
 #include <vcl/edit.hxx>
+#include <vcl/event.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index dfe107940902..1849cd5cfc4e 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/implbase.hxx>
+#include <tools/debug.hxx>
 
 #include <sfx2/bindings.hxx>
 
diff --git a/sfx2/source/inc/templatesearchview.hxx b/sfx2/source/inc/templatesearchview.hxx
index d8e187d27409..9e5fd4134995 100644
--- a/sfx2/source/inc/templatesearchview.hxx
+++ b/sfx2/source/inc/templatesearchview.hxx
@@ -14,6 +14,7 @@
 
 class TemplateViewItem;
 class PopupMenu;
+class Menu;
 
 class TemplateSearchView final : public ThumbnailView
 {
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 626c4f768cd3..04fa88c68953 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/frame/XLayoutManagerListener.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/propshlp.hxx>
+#include <cppuhelper/weakref.hxx>
 
 #include <rtl/ustring.hxx>
 #include <o3tl/typed_flags_set.hxx>
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 16aeb33dcc11..7202d5a750cc 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -28,6 +28,7 @@
 #include <sfx2/sidebar/Tools.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 
+#include <vcl/event.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index 610e28a4b66f..0ce13947b6d7 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/sidebar/Tools.hxx>
 #include <sfx2/sidebar/TitleBar.hxx>
 #include <vcl/button.hxx>
+#include <vcl/event.hxx>
 #include <vcl/toolbox.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx
index 0f7403c35446..b42e904e5000 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/sidebar/Paint.hxx>
 #include <sfx2/sidebar/Tools.hxx>
 #include <sfx2/sidebar/Theme.hxx>
+#include <vcl/event.hxx>
 
 using namespace css;
 using namespace css::uno;
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index d20427a2ca6d..50e5656a2347 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -26,6 +26,7 @@
 #include <sfx2/sidebar/ControllerFactory.hxx>
 #include <sfx2/sidebar/Tools.hxx>
 #include <tools/svborder.hxx>
+#include <vcl/event.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/image.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index aec410c02d14..670f8fbf6ef9 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -32,6 +32,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/image.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx
index 3e0e5f635f86..92743e178b7b 100644
--- a/sfx2/source/sidebar/TabItem.cxx
+++ b/sfx2/source/sidebar/TabItem.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/sidebar/Tools.hxx>
 
 #include <sfx2/sidebar/Theme.hxx>
+#include <vcl/event.hxx>
 
 using namespace css;
 using namespace css::uno;
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index fcf370b1eae8..f7b23937ce27 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -21,6 +21,7 @@
 #include <vcl/metric.hxx>
 #include <unotools/printwarningoptions.hxx>
 #include <svtools/printoptions.hxx>
+#include <tools/debug.hxx>
 
 #include <utility>
 #include <vector>
diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index a024dc68b789..91eb882135fc 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -23,6 +23,7 @@
 #include "svgpaint.hxx"
 #include "svgnode.hxx"
 #include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 
 
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index aafa43cf8bdf..5c834f768bc7 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -20,6 +20,7 @@
 #include <vcl/decoview.hxx>
 #include <vcl/fmtfield.hxx>
 #include <vcl/xtextedt.hxx>
+#include <vcl/textview.hxx>
 
 #include <algorithm>
 
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index 5b12a94c634a..7ea589dc3993 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -26,6 +26,7 @@
 #include <vcl/svtaccessiblefactory.hxx>
 #include <vcl/accessiblefactory.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 namespace svt
 {
diff --git a/svtools/source/contnr/iconviewimpl.cxx b/svtools/source/contnr/iconviewimpl.cxx
index 0ffe52386b5b..804dc06db627 100644
--- a/svtools/source/contnr/iconviewimpl.cxx
+++ b/svtools/source/contnr/iconviewimpl.cxx
@@ -20,6 +20,7 @@
 #include <vcl/svapp.hxx>
 #include <svtools/iconview.hxx>
 #include <iconviewimpl.hxx>
+#include <tools/debug.hxx>
 
 IconViewImpl::IconViewImpl( SvTreeListBox* pTreeListBox, SvTreeList* pTreeList, WinBits nWinStyle )
 : SvImpLBox( pTreeListBox, pTreeList, nWinStyle )
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 82d027d2fdf7..c178f6fcd01d 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -26,6 +26,7 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/vclevent.hxx>
 
 using namespace ::com::sun::star::accessibility;
 
diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx
index 0b4eff95f86f..22f2fa25f828 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -23,6 +23,7 @@
 #include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/event.hxx>
 #include <uitest/uiobject.hxx>
 
 SvSimpleTableContainer::SvSimpleTableContainer(vcl::Window* pParent, WinBits nBits)
diff --git a/svtools/source/control/autocmpledit.cxx b/svtools/source/control/autocmpledit.cxx
index 8bffcd166eb4..9c60a830c10d 100644
--- a/svtools/source/control/autocmpledit.cxx
+++ b/svtools/source/control/autocmpledit.cxx
@@ -9,6 +9,7 @@
 
 #include <svtools/autocmpledit.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/event.hxx>
 
 AutocompleteEdit::AutocompleteEdit( vcl::Window* pParent )
     : Edit( pParent )
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index baf324e9b071..1f1fdad135a6 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/event.hxx>
 #include <vcl/commandevent.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/calendarwrapper.hxx>
diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index 6033efad980b..eeec4958ce53 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.cxx
@@ -20,6 +20,7 @@
 #include <svtools/fileurlbox.hxx>
 #include <osl/file.h>
 #include <svl/filenotation.hxx>
+#include <vcl/event.hxx>
 
 
 namespace svt
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index bcd14d5b6eee..460d0354123c 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -46,6 +46,7 @@
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <unotools/historyoptions.hxx>
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index d380523ca7aa..33330e425d32 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -21,6 +21,7 @@
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/poly.hxx>
+#include <vcl/event.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <vcl/settings.hxx>
 #include <sal/log.hxx>
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index 3b3901f48f82..d503ff5928fc 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -20,6 +20,7 @@
 #include <svtools/scrwin.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 
 
 ScrollableWindow::ScrollableWindow( vcl::Window* pParent ) :
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 430523330bb6..9185f903d106 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -27,6 +27,7 @@
 #include <vcl/decoview.hxx>
 #include <vcl/button.hxx>
 #include <vcl/edit.hxx>
+#include <vcl/event.hxx>
 #include <vcl/image.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 76de7e8534b9..197f4db2e4e8 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -32,6 +32,7 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 
 #include <svtools/framestatuslistener.hxx>
 #include <svtools/valueset.hxx>
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 611654ae5986..ec1f941e1c71 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -27,6 +27,7 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <tools/debug.hxx>
 
 #include <svtools/toolbarmenu.hxx>
 
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 4341dfceda7a..9191d5a5c539 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -21,6 +21,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 #include <svtools/valueset.hxx>
 #include "valueimp.hxx"
 #include <comphelper/servicehelper.hxx>
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index b7baf49b85cb..f6ce79dd2f3c 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -22,6 +22,7 @@
 #include <svtools/svtresid.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/print.hxx>
+#include <vcl/event.hxx>
 #include <sal/log.hxx>
 
 void ImplFillPrnDlgListBox( const Printer* pPrinter,
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index a1931000377c..997f46edae7f 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <osl/diagnose.h>
+#include <vcl/event.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/tabpage.hxx>
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index 22b64c740772..f189cec85609 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -19,7 +19,9 @@
 
 
 #include <svtools/svmedit.hxx>
+#include <vcl/event.hxx>
 #include <vcl/xtextedt.hxx>
+#include <vcl/textview.hxx>
 #include <vcl/builderfactory.hxx>
 #include <svtools/editsyntaxhighlighter.hxx>
 #include <vcl/txtattr.hxx>
diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx
index 86ccf9b8737f..4687d2535867 100644
--- a/svtools/source/edit/svmedit2.cxx
+++ b/svtools/source/edit/svmedit2.cxx
@@ -20,6 +20,7 @@
 
 #include <svtools/svmedit2.hxx>
 #include <vcl/xtextedt.hxx>
+#include <vcl/textview.hxx>
 
 ExtMultiLineEdit::ExtMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) :
     MultiLineEdit( pParent, nWinStyle )
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx
index 20d49a243516..bcbe6d7805e2 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx
index b3f0ed3c8cb9..f0bf61cf3a6b 100644
--- a/svtools/source/misc/dialogcontrolling.cxx
+++ b/svtools/source/misc/dialogcontrolling.cxx
@@ -20,6 +20,7 @@
 #include <svtools/dialogcontrolling.hxx>
 #include <vcl/window.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 #include <algorithm>
 
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index fdf904a6d2fd..2da0c1a1255d 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -52,6 +52,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/debug.hxx>
 #include <memory>
 
 using namespace com::sun::star;
diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx
index 1d3e40cdcebc..4f2cb9c8fda4 100644
--- a/svtools/source/misc/unitconv.cxx
+++ b/svtools/source/misc/unitconv.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <svtools/unitconv.hxx>
+#include <tools/debug.hxx>
 
 void SetFieldUnit(weld::MetricSpinButton& rField, FieldUnit eUnit, bool bAll)
 {
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 65b7da3e7317..b045394cfb38 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -32,6 +32,7 @@
 #include <vcl/imappoly.hxx>
 #include <svl/urihelper.hxx>
 #include <rtl/character.hxx>
+#include <tools/debug.hxx>
 
 #include <sstream>
 
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 89c02e1075c9..1e3338adc612 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -30,6 +30,7 @@
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/settings.hxx>
+#include <vcl/vclevent.hxx>
 
 using namespace ::com::sun::star::uno;
 using ::com::sun::star::accessibility::XAccessible;
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 9dda651250c9..752f2816c98b 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -38,6 +38,7 @@
 #include <rtl/ref.hxx>
 #include <vcl/image.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/debug.hxx>
 
 #include <cstdlib>
 #include <functional>
diff --git a/svx/source/dialog/ClassificationEditView.cxx b/svx/source/dialog/ClassificationEditView.cxx
index 99989843fa45..ea0002897da5 100644
--- a/svx/source/dialog/ClassificationEditView.cxx
+++ b/svx/source/dialog/ClassificationEditView.cxx
@@ -12,6 +12,7 @@
 #include <svx/ClassificationField.hxx>
 
 #include <vcl/builder.hxx>
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svl/itemset.hxx>
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index db400f99c9a2..c43c1f819651 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -20,6 +20,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/virdev.hxx>
 #include <svtools/colorcfg.hxx>
 
 #include <rtl/textenc.h>
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 0d9c51023985..95c68ce17ccd 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -23,10 +23,12 @@
 #include <vcl/svapp.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
+#include <vcl/event.hxx>
 #include <vcl/field.hxx>
 #include <vcl/settings.hxx>
 #include <svtools/colorcfg.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/virdev.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
 namespace svx {
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index 0281c0300bfd..3d61a9d1810d 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -23,6 +23,7 @@
 #include <vector>
 #include <set>
 #include <algorithm>
+#include <tools/debug.hxx>
 #include <vcl/outdev.hxx>
 #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx>
 #include <svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx>
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index ce7233371857..c33336b07605 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -19,7 +19,9 @@
 
 #include <svx/frmsel.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 #include <algorithm>
 #include <math.h>
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 1e641d6b5d42..eb9d4011da2d 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -22,6 +22,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/measctrl.hxx>
 #include <svx/dlgutil.hxx>
+#include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <memory>
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 452ae7fc3dcc..d2d681334cc1 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include <sal/config.h>
+#include <tools/debug.hxx>
 
 #include <osl/diagnose.h>
 #include <o3tl/any.hxx>
diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx
index 61e6eaaa8712..228f50c88788 100644
--- a/svx/source/dialog/searchcharmap.cxx
+++ b/svx/source/dialog/searchcharmap.cxx
@@ -20,6 +20,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/virdev.hxx>
 #include <svtools/colorcfg.hxx>
 
 #include <rtl/textenc.h>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index acd329d5ceca..b4f42480eb48 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -62,6 +62,7 @@
 #include <svl/eitem.hxx>
 #include <vcl/fmtfield.hxx>
 #include <svl/numuno.hxx>
+#include <tools/debug.hxx>
 #include <tools/multisel.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/help.hxx>
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 155eba15e46e..534c608811de 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -54,6 +54,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <vcl/unohelp.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/macros.h>
 
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index ae61518d539d..1d9e7eec9326 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -65,6 +65,7 @@
 #include <svtools/svmedit.hxx>
 #include <svx/dialmgr.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/longcurr.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 0ff3ff4df8e6..10b8de7b4d1b 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <tools/diagnose_ex.h>
+#include <tools/debug.hxx>
 #include <tools/fract.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/menu.hxx>
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 940f1f9c5dac..fd9c1ee677b2 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -25,6 +25,7 @@
 #include <sot/formats.hxx>
 #include <vcl/treelistbox.hxx>
 #include <vcl/treelistentry.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
 
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index edc281665a95..88ce72814899 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/script/XScriptListener.hpp>
 
 #include <tools/diagnose_ex.h>
+#include <tools/debug.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index bb419edcc9da..810f18f08b27 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -59,6 +59,7 @@
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 #include <vcl/outdev.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <memory>
 
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index cd1c49457bfe..850547c9cf83 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -27,6 +27,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 #include <svx/unoapi.hxx>
+#include <tools/debug.hxx>
 #include <memory>
 
 namespace sdr { namespace contact {
diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx
index 891b0c084123..a804a1423ac1 100644
--- a/svx/source/sdr/contact/sdrmediawindow.cxx
+++ b/svx/source/sdr/contact/sdrmediawindow.cxx
@@ -24,6 +24,7 @@
 #include <sdr/contact/viewobjectcontactofsdrmediaobj.hxx>
 #include <vcl/window.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 
 namespace sdr { namespace contact {
 
diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx
index 38afca26ff65..3aa1b9302b08 100644
--- a/svx/source/sdr/contact/viewcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewcontactofgroup.cxx
@@ -27,6 +27,7 @@
 #include <basegfx/color/bcolor.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
+#include <tools/debug.hxx>
 
 
 namespace sdr
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index 51e11fa4c419..9e4706fcf72d 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -25,6 +25,7 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdpool.hxx>
 #include <vcl/outdev.hxx>
+#include <tools/debug.hxx>
 
 
 namespace sdr
diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx
index 502f959f39e7..ee2923c3cedd 100644
--- a/svx/source/sidebar/possize/SidebarDialControl.cxx
+++ b/svx/source/sidebar/possize/SidebarDialControl.cxx
@@ -19,6 +19,7 @@
 #include <svx/sidebar/SidebarDialControl.hxx>
 
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index dc3bb8222dbd..f77577e2bc3f 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -21,6 +21,7 @@
 #include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
+#include <tools/debug.hxx>
 
 #include <svx/strings.hrc>
 
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index d057314eda35..1faddf461c23 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -21,8 +21,10 @@
 #include <vcl/image.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/event.hxx>
 #include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
+#include <tools/debug.hxx>
 
 #include <svx/strings.hrc>
 #include <svx/modctrl.hxx>
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index b54490cc4ce1..52ffa75d8762 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -23,6 +23,7 @@
 #include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/event.hxx>
 #include <svx/zoomslideritem.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 42926e718100..4c9dfcc6dce7 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -57,6 +57,7 @@
 #include <comphelper/lok.hxx>
 #include <sfx2/lokhelper.hxx>
 #include <sfx2/viewsh.hxx>
+#include <o3tl/make_unique.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 77100d37d6fc..81292e8be5f7 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -32,6 +32,7 @@
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/sdrpaintwindow.hxx>
+#include <tools/debug.hxx>
 
 
 class ImplPageOriginOverlay
diff --git a/svx/source/svdraw/textchaincursor.cxx b/svx/source/svdraw/textchaincursor.cxx
index d6d1f4de2894..117d6ddeeb5a 100644
--- a/svx/source/svdraw/textchaincursor.cxx
+++ b/svx/source/svdraw/textchaincursor.cxx
@@ -21,6 +21,7 @@
 #include <svx/textchaincursor.hxx>
 #include <svx/svdedxv.hxx>
 #include <svx/svdoutl.hxx>
+#include <vcl/event.hxx>
 
 // XXX: Possible duplication of code in behavior with stuff in ImpEditView (or ImpEditEngine) and OutlinerView
 
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 2a6dd212be91..581f6e8f754f 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -69,6 +69,7 @@
 #include <memory>
 #include <o3tl/enumarray.hxx>
 #include <o3tl/enumrange.hxx>
+#include <o3tl/make_unique.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/lok.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 18b22663e2c0..07402ebef464 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <rtl/ref.hxx>
+#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index bc68a44329a1..88049ce4d914 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
 
 namespace svx
 {
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index aa1976335718..80cccf7e51d9 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -34,6 +34,7 @@
 #include <svx/unopage.hxx>
 #include <svx/svdetc.hxx>
 #include <editeng/editeng.hxx>
+#include <tools/debug.hxx>
 
 #include <svx/unoapi.hxx>
 #include <memory>
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 9b9f28944771..be113900d941 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -22,6 +22,7 @@
 
 #include <comphelper/base64.hxx>
 #include <comphelper/graphicmimetype.hxx>
+#include <tools/debug.hxx>
 #include <tools/poly.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/virdev.hxx>
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 13b7ce1c2918..a4ae1c9a368b 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -27,6 +27,7 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdpool.hxx>
 #include <vcl/outdev.hxx>
+#include <tools/debug.hxx>
 #include <stack>
 
 using namespace com::sun::star;
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 57b70c9ce3c5..326b151da2a7 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -40,6 +40,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <sal/log.hxx>
+#include <o3tl/make_unique.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index d61775dc8f1e..f8a1bf8f3488 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -21,6 +21,7 @@
 #include <hintids.hxx>
 #include <rtl/character.hxx>
 #include <vcl/vclenum.hxx>
+#include <o3tl/make_unique.hxx>
 #include <editeng/crossedoutitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/boxitem.hxx>
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 390590af3c59..f391fc323b11 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -65,6 +65,7 @@
 #include <svx/swframetypes.hxx>
 #include <svx/svxids.hrc>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
+#include <o3tl/make_unique.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 8783623f6ab6..731120f0e263 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -35,6 +35,7 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/misccfg.hxx>
 #include <sal/log.hxx>
+#include <o3tl/make_unique.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <fmtpdsc.hxx>
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index da2225d1b9f7..11f9e0ef571a 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -35,6 +35,7 @@
 #include <svx/svdouno.hxx>
 #include <svx/fmpage.hxx>
 #include <editeng/frmdiritem.hxx>
+#include <o3tl/make_unique.hxx>
 #include <swmodule.hxx>
 #include <modcfg.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 5a76f8ab99d9..13fd5b3ce686 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -60,6 +60,7 @@
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/virdev.hxx>
 
 #include <hintids.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 9eb869de51ec..2315d6e839c1 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -77,6 +77,7 @@
 #include <textboxhelper.hxx>
 #include <vcl/virdev.hxx>
 #include <svx/svdundo.hxx>
+#include <o3tl/make_unique.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index adb79928ce5d..8f5960837031 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -21,6 +21,8 @@
 
 #include <sal/config.h>
 
+#include <vcl/inputtypes.hxx>
+
 #include <ctime>
 
 #include <swtypes.hxx>
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index a60fd75f36e6..725e94a622d5 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -21,6 +21,7 @@
 #include <svtools/htmlkywd.hxx>
 #include <svl/urihelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 #include <comphelper/embeddedobjectcontainer.hxx>
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index d38f3866d349..a05eba96f9d8 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/event.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/commandevent.hxx>
 #include <svtools/controldims.hxx>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 178d5d985d19..2e50668fef41 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -25,6 +25,7 @@
 #include <vcl/weld.hxx>
 #include <vcl/txtattr.hxx>
 #include <vcl/xtextedt.hxx>
+#include <vcl/textview.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/treelistentry.hxx>
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx
index 6935a568996f..c69d6141c74c 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.cxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx
@@ -20,6 +20,7 @@
 #include "FldRefTreeListBox.hxx"
 
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
 #include <vcl/help.hxx>
 
 SwFieldRefTreeListBox::SwFieldRefTreeListBox(vcl::Window* pParent, WinBits nStyle)
diff --git a/sw/source/ui/table/autoformatpreview.cxx b/sw/source/ui/table/autoformatpreview.cxx
index d5e13e58b99f..6f0f92f98ffb 100644
--- a/sw/source/ui/table/autoformatpreview.cxx
+++ b/sw/source/ui/table/autoformatpreview.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/builderfactory.hxx>
+#include <vcl/settings.hxx>
 #include <com/sun/star/i18n/BreakIterator.hpp>
 #include <comphelper/processfactory.hxx>
 #include <svtools/scriptedtext.hxx>
diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx
index c1e4da12e912..92f97a00f5e2 100644
--- a/sw/source/uibase/cctrl/actctrl.cxx
+++ b/sw/source/uibase/cctrl/actctrl.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/builderfactory.hxx>
 #include <actctrl.hxx>
+#include <vcl/event.hxx>
 #include <vcl/toolbox.hxx>
 
 bool NumEditAction::EventNotify( NotifyEvent& rNEvt )
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index 78dbae70b85f..ea2d83bc111a 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -22,6 +22,7 @@
 #include <comphelper/classids.hxx>
 #include <o3tl/any.hxx>
 #include <tools/stream.hxx>
+#include <tools/fontenum.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/svxids.hrc>
 #include <editeng/svxenum.hxx>
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index b929b5317c89..88e10572ea38 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/mail/MailServiceProvider.hpp>
 #include <com/sun/star/mail/XSmtpService.hpp>
 #include <comphelper/processfactory.hxx>
+#include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index 1b4a19171f28..51a7d809d7cc 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -29,6 +29,7 @@
 #include <vcl/decoview.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/event.hxx>
 
 #include <cmdid.h>
 #include <AnnotationWin.hxx>
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index fa46377e8179..8d10bd8972bc 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -31,6 +31,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
 #include <svl/languageoptions.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <editeng/postitem.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index 40bee0951c16..1751d9284f21 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -34,6 +34,7 @@
 #include <svx/AccessibleTextHelper.hxx>
 #include <editeng/outliner.hxx>
 #include <o3tl/make_unique.hxx>
+#include <vcl/vclevent.hxx>
 
 namespace sw { namespace sidebarwindows {
 
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 6fb5b68c2a16..26613e463ebb 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/i18n/UnicodeScript.hpp>
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
 
+#include <vcl/inputctx.hxx>
 #include <vcl/help.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/weld.hxx>
diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx
index e51766641b7c..8e0ad200137e 100644
--- a/sw/source/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/uibase/inc/PageBreakWin.hxx
@@ -14,6 +14,7 @@
 #include <vcl/menubtn.hxx>
 #include <boost/optional.hpp>
 
+class Menu;
 class SwPageFrame;
 
 /** Class for the page break control window.
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 618548977001..48fb9e17c71f 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -41,6 +41,7 @@
 #include <svx/clipfmtitem.hxx>
 #include <svx/contdlg.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/inputctx.hxx>
 #include <svl/slstitm.hxx>
 #include <svl/ptitem.hxx>
 #include <svl/itemiter.hxx>
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index d36fa59347e7..388406d7ce22 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -27,6 +27,7 @@
 #include <vcl/print.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/textview.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx
index b7a7364cfd8d..d8fd77e627d1 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -33,6 +33,7 @@
 #include <authfld.hxx>
 #include <dbmgr.hxx>
 #include <unotools/syslocale.hxx>
+#include <vcl/keycod.hxx>
 
 #include <unomid.h>
 
diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx
index c813ffaa5baf..d6e75784da35 100644
--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
@@ -19,6 +19,7 @@
 
 #include <viewlayoutctrl.hxx>
 
+#include <vcl/event.hxx>
 #include <vcl/status.hxx>
 #include <vcl/image.hxx>
 #include <svl/eitem.hxx>
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index c3f0c0f27ca7..3d82442780f0 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -30,6 +30,7 @@
 #include <svx/fmshell.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
+#include <vcl/inputctx.hxx>
 
 #include <sfx2/objface.hxx>
 #include <swmodule.hxx>
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index 22cce1247cc6..def0df8e0451 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -26,6 +26,7 @@
 
 #include <cppuhelper/interfacecontainer.hxx>
 #include <osl/mutex.hxx>
+#include <vcl/event.hxx>
 #include <vcl/window.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 8782c77bb34c..17af677eee88 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -29,6 +29,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/uuid.h>
 #include <osl/mutex.hxx>
+#include <tools/debug.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/keycod.hxx>
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 782ea2121804..fcfa51958ca9 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -91,6 +91,7 @@
 #include <vcl/dockingarea.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/edit.hxx>
+#include <vcl/event.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/floatwin.hxx>
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index a29e445582f4..ddd25add186a 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -50,6 +50,8 @@
 #include <vcl/window.hxx>
 #include <tools/color.hxx>
 #include <tools/fract.hxx>
+#include <tools/debug.hxx>
+#include <vcl/event.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
 #include <vcl/tabpage.hxx>
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 4308a255afc8..6cfedeeaa802 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -19,6 +19,7 @@
 
 #include <tools/stream.hxx>
 #include <vcl/bitmap.hxx>
+#include <vcl/event.hxx>
 #include <vcl/window.hxx>
 #include <vcl/unohelp.hxx>
 #include <sal/macros.h>
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx
index b7190107da2a..c147a7f1b9a7 100644
--- a/uui/source/authfallbackdlg.cxx
+++ b/uui/source/authfallbackdlg.cxx
@@ -11,8 +11,6 @@
 
 #include <iostream>
 
-using namespace boost;
-
 AuthFallbackDlg::AuthFallbackDlg(weld::Window* pParent, const OUString& instructions,
                                  const OUString& url)
     : GenericDialogController(pParent, "uui/ui/authfallback.ui", "AuthFallbackDlg")
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 436b5a7a8743..9229f9ec9a46 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -22,6 +22,7 @@
 
 #include <unotools/resmgr.hxx>
 #include <tools/urlobj.hxx>
+#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index c8953b5977e6..e112660e71b8 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -24,6 +24,7 @@
 #include <comphelper/processfactory.hxx>
 #include <osl/file.h>
 #include <sal/macros.h>
+#include <tools/debug.hxx>
 #include <unotools/resmgr.hxx>
 #include <com/sun/star/security/NoPasswordException.hpp>
 
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>
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index c67d893b0624..ef842b91d86f 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/ucb/Command.hpp>
 #include <com/sun/star/uno/SecurityException.hpp>
 #include <vcl/weld.hxx>
+#include <tools/date.hxx>
 #include <unotools/securityoptions.hxx>
 #include <com/sun/star/security/CertificateValidity.hpp>
 #include <com/sun/star/security/CertificateKind.hpp>
-- 
cgit