tdf#42949 Fix IWYU warnings in include/vcl/[ab]*

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

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

301 files changed, 319 insertions, 25 deletions

diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx
index edff82759c6e..d11cbfdd78b9 100644
--- a/accessibility/source/extended/listboxaccessible.cxx
+++ b/accessibility/source/extended/listboxaccessible.cxx
@@ -20,6 +20,7 @@
 #include <extended/listboxaccessible.hxx>
 #include <vcl/treelistbox.hxx>
 #include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
 
 namespace accessibility
 {
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 0a9e99fbc9c5..c4ce7d832fca 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -27,6 +27,7 @@
 #include <deque>
 #include <sfx2/docfac.hxx>
 #include <vcl/treelistentry.hxx>
+#include <osl/diagnose.h>
 
 namespace basctl
 {
diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx
index 34d5be4943e2..00a8a8f5c90f 100644
--- a/canvas/source/vcl/bitmapbackbuffer.cxx
+++ b/canvas/source/vcl/bitmapbackbuffer.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <osl/diagnose.h>
 #include <vcl/bitmapex.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/svapp.hxx>
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 5e31483aa7c9..46493dc61bdd 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -39,6 +39,7 @@
 #include <vcl/weld.hxx>
 #include <vcl/settings.hxx>
 #include <rtl/math.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 5792972d63cb..45c8cdbaa27c 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -21,6 +21,7 @@
 #include "DataBrowser.hxx"
 #include <comphelper/stl_types.hxx>
 
+#include <osl/diagnose.h>
 #include <sfx2/dispatch.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <svtools/miscopt.hxx>
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 808abd4be90e..0d7e48f264b5 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -33,6 +33,7 @@
 #include <svx/svxids.hrc>
 #include <svl/zforlist.hxx>
 #include <svtools/controldims.hxx>
+#include <osl/diagnose.h>
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 6262bf63dba6..c1ea174c43d3 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -27,6 +27,7 @@
 
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <svl/stritem.hxx>
 
 #define CHART_LB_FUNCTION_STD_ERROR     0
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index da340f0c1ac8..158266f00d42 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/embed/XComponentSupplier.hpp>
 #include <com/sun/star/chart2/XChartTypeTemplate.hpp>
 #include <svtools/miscopt.hxx>
+#include <osl/diagnose.h>
 
 namespace
 {
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 21794cf1a9b6..5c320ddf6151 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -26,6 +26,7 @@
 
 #include <svx/svxids.hrc>
 #include <rtl/math.hxx>
+#include <osl/diagnose.h>
 #include <svx/chrtitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/comphelper/source/misc/xmlsechelper.cxx b/comphelper/source/misc/xmlsechelper.cxx
index 84ccd203092f..850d7a42e161 100644
--- a/comphelper/source/misc/xmlsechelper.cxx
+++ b/comphelper/source/misc/xmlsechelper.cxx
@@ -26,6 +26,7 @@
 #include <unotools/syslocale.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustrbuf.h>
+#include <osl/diagnose.h>
 #include <vector>
 
 using namespace std;
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 50ee47fdaba9..828205e31f93 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -56,6 +56,7 @@
 #include <vcl/treelistentry.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <unotools/configmgr.hxx>
 #include <dialmgr.hxx>
 #include <svl/stritem.hxx>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 648073c75f4c..a99a814d28e1 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -20,6 +20,7 @@
 #include <config_features.h>
 #include <osl/process.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <rtl/character.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/weld.hxx>
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 4b98847c9539..e106826bdeba 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <osl/diagnose.h>
 #include <comphelper/lok.hxx>
 #include <o3tl/make_unique.hxx>
 #include <vcl/settings.hxx>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 7b61df5813ec..cf2297ab6c81 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -25,6 +25,7 @@
 
 #include <algorithm>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <vcl/controllayout.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/decoview.hxx>
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 5805c1f1537e..8c3f6cfc528f 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -41,6 +41,7 @@
 #include <vcl/button.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <set>
 
 using namespace com::sun::star;
 
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 66ee00b34b9c..e1a454038638 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -19,6 +19,7 @@
 
 #include <showcols.hxx>
 
+#include <osl/diagnose.h>
 #include <vcl/msgbox.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/types.hxx>
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 8423823cf113..7304c5cc1545 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/diagnose.h>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 5e32d0c5630f..97a78c6fe34e 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -29,6 +29,7 @@
 #include <svx/stddlg.hxx>
 
 #include <memory>
+#include <stack>
 
 class SvxThesaurusDialog;
 
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 89a052ef95c4..0603423c63ad 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/diagnose.h>
 #include "connpooloptions.hxx"
 #include <svtools/editbrowsebox.hxx>
 #include <vcl/field.hxx>
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 935d6576c913..db08f0a86493 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <map>
 #include <optasian.hxx>
+#include <osl/diagnose.h>
 #include <editeng/langitem.hxx>
 #include <editeng/unolingu.hxx>
 #include <o3tl/any.hxx>
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 420b94f3f573..8846661ddbb7 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -23,6 +23,7 @@
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/svxids.hrc>
+#include <osl/diagnose.h>
 
 Color SvxDefaultColorOptPage::GetSelectEntryColor() const
 {
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 37124377cbe1..abf4a4b3b5a4 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -52,6 +52,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <vcl/svapp.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <svx/svxdlg.hxx>
 #include <editeng/optitems.hxx>
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 49ea86844901..e44eb7dbf216 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -36,6 +36,7 @@
 #include <unotools/configitem.hxx>
 #include <unotools/optionsdlg.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <sfx2/fcontnr.hxx>
 
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 186852f41a76..343783b8ccef 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -19,6 +19,7 @@
 
 #include <macroass.hxx>
 
+#include <osl/diagnose.h>
 #include <basic/basmgr.hxx>
 #include <comphelper/string.hxx>
 #include <svl/macitem.hxx>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index c6f989d9f211..fde0bffd9804 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <memory>
+#include <osl/diagnose.h>
 #include <svl/style.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dialoghelper.hxx>
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index 742b152e6a0e..f86e6d320e6f 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONDIALOG_HXX
 
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <svtools/roadmapwizard.hxx>
 
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 6e4056c4a746..841a90963d04 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -79,6 +79,7 @@
 #include <defaultobjectnamecheck.hxx>
 #include <osl/mutex.hxx>
 #include "subcomponentmanager.hxx"
+#include <set>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index b24b34c9c538..956cec1e887e 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 <osl/diagnose.h>
 
 #define SPLITTER_WIDTH  80
 
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index 2fff06db9a9e..12964ce0d786 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <core_resource.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index ef899a068c0b..f86ab1f85b1c 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -20,6 +20,8 @@
 #include "QTableConnectionData.hxx"
 #include "QTableWindow.hxx"
 
+#include <osl/diagnose.h>
+
 using namespace dbaui;
 
 // class OQueryTableConnectionData
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index c9f125779e7b..29ae31e28617 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -21,6 +21,7 @@
 #include <memory>
 #include "dp_gui.h"
 #include "dp_gui_theextmgr.hxx"
+#include <osl/diagnose.h>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index e1ac1723e3bc..5a1a2528955c 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include "dp_gui_dialog2.hxx"
 #include "dp_gui_extensioncmdqueue.hxx"
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index d84cda7360b9..b22ddabf00a0 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <algorithm>
 #include <map>
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index 732f788ef677..a28974655149 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -54,6 +54,7 @@
 #include "editdbg.hxx"
 
 #include <rtl/strbuf.hxx>
+#include <osl/diagnose.h>
 
 #if defined( DBG_UTIL ) || ( OSL_DEBUG_LEVEL > 1 )
 
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 5881868ab5b4..cbe547d33dff 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -52,6 +52,7 @@
 
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <svl/grabbagitem.hxx>
 #include <tools/stream.hxx>
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index f283524d328f..7147c3f4f6c9 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -22,6 +22,7 @@
 #include "editundo.hxx"
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
+#include <osl/diagnose.h>
 
 
 static void lcl_DoSetSelection( EditView const * pView, sal_uInt16 nPara )
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 525918337381..db235d41d7d5 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -20,6 +20,7 @@
 
 #include "impedit.hxx"
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
 #include <edtspell.hxx>
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 6f3a8557e95c..0511f68bec09 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -55,6 +55,7 @@
 
 
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 #include <svl/asiancfg.hxx>
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 641adf60ea25..369b80def020 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -73,6 +73,7 @@
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <comphelper/string.hxx>
 #include <comphelper/lok.hxx>
 #include <memory>
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index ab2d01aa225b..bf235228a05d 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -33,6 +33,7 @@
 #include "editobj2.hxx"
 #include <i18nlangtag/lang.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <editxml.hxx>
 
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 9b029cbdb4b4..7b544edafb3c 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -27,6 +27,7 @@
 #include <editeng/langitem.hxx>
 #include <editeng/fontitem.hxx>
 #include "textconv.hxx"
+#include <osl/diagnose.h>
 
 
 using namespace com::sun::star;
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 3820048f4165..f21950827dd7 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -46,6 +46,7 @@
 #include <com/sun/star/drawing/ShadingPattern.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 
+#include <osl/diagnose.h>
 #include <i18nutil/unicode.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <limits.h>
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 1763dc69be5d..b3912754cbe4 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -26,6 +26,7 @@
 #include <math.h>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <unotools/fontdefs.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/unohelp.hxx>
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index a3999205d579..10ee91d48623 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -36,6 +36,7 @@
 #include <vcl/stdtext.hxx>
 #include <unotools/charclass.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <editeng/edtdlg.hxx>
 #include <editeng/unolingu.hxx>
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f5f1c9077853..e05f20b21992 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -27,6 +27,7 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nutil/transliteration.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <sot/storinfo.hxx>
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index a53d8337f033..5841f4def1a7 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -52,6 +52,7 @@
 #include <svtools/strings.hrc>
 #include <unotools/resmgr.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::comphelper;
 using namespace ::linguistic;
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 60d0c10b1395..342e5878889f 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -52,6 +52,7 @@
 #include <svl/itempool.hxx>
 #include <libxml/xmlwriter.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <o3tl/make_unique.hxx>
 
 // calculate if it's RTL or not
diff --git a/editeng/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx
index 5ecfaf6409f5..20fc608328ab 100644
--- a/editeng/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
@@ -31,6 +31,7 @@
 #include <vcl/bitmap.hxx>
 #include <tools/stream.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <o3tl/cow_wrapper.hxx>
 #include <libxml/xmlwriter.h>
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 1a211d87b02f..98ca96a18fe7 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -45,6 +45,7 @@
 #include <svl/eitem.hxx>
 #include <editeng/editstat.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <o3tl/make_unique.hxx>
 
 using namespace ::com::sun::star;
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index 3b4b4decd54c..ea83a1ddf4fa 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -19,6 +19,7 @@
 
 
 #include <algorithm>
+#include <osl/diagnose.h>
 #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 84ecb7a0cddd..af0918a799c4 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -19,6 +19,7 @@
 
 
 #include <algorithm>
+#include <osl/diagnose.h>
 #include <svl/style.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 
diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index 35587b17b36c..6fbccbe107bc 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -20,6 +20,7 @@
 #include <emfreader.hxx>
 #include <osl/endian.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vcl/dibtools.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 8d5c5fa8a827..38eb685216be 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -32,6 +32,7 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <vcl/virdev.hxx>
 #include <o3tl/make_unique.hxx>
 #include <o3tl/safeint.hxx>
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 1d4b92c48b80..92a7e804f6e4 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -20,6 +20,7 @@
 #include "abpfinalpage.hxx"
 #include "addresssettings.hxx"
 #include "abspilot.hxx"
+#include <osl/diagnose.h>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index e58f37b95fae..ebe654a81a27 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -29,6 +29,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/weld.hxx>
+#include <osl/diagnose.h>
 #include "abpfinalpage.hxx"
 #include "fieldmappingpage.hxx"
 #include "fieldmappingimpl.hxx"
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index fbb25e46853a..4795c05e6b95 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -30,6 +30,7 @@
 #include <componentmodule.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/waitobj.hxx>
+#include <osl/diagnose.h>
 
 
 namespace abp
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 50a1ee30b402..d1ed34353752 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -34,6 +34,7 @@
 #include <unotools/confignode.hxx>
 #include <sal/macros.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 
 namespace abp
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 8bb6a9262f3e..b5288387b737 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <vcl/builder.hxx>
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index cce25e368b3d..af4751428cf1 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -24,6 +24,7 @@
 #include "optiongrouplayouter.hxx"
 #include <helpids.h>
 #include <comphelper/processfactory.hxx>
+#include <osl/diagnose.h>
 
 #define GBW_STATE_OPTIONLIST        0
 #define GBW_STATE_DEFAULTOPTION     1
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index cc052dc95151..b05fe7d377cb 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -30,6 +30,7 @@
 #include "controlwizard.hxx"
 #include "groupboxwiz.hxx"
 #include "dbptools.hxx"
+#include <osl/diagnose.h>
 
 
 namespace dbp
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index f1fc23d2ebe8..92f7bb45cc1c 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -25,6 +25,7 @@
 #include <svl/solar.hrc>
 #include <tools/debug.hxx>
 #include <rtl/strbuf.hxx>
+#include <osl/diagnose.h>
 
 namespace compmodule
 {
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 7083df4cea96..f960ee3232ad 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -22,6 +22,7 @@
 #include "linedescriptor.hxx"
 
 #include <tools/debug.hxx>
+#include <osl/diagnose.h>
 
 
 namespace pcr
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 0c2a4f1c906b..5e6705c2d203 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -31,6 +31,7 @@
 #include <vcl/scrbar.hxx>
 #include <vcl/treelistentry.hxx>
 #include <vcl/builderfactory.hxx>
+#include <osl/diagnose.h>
 
 namespace pcr
 {
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index 94fe3eb45baa..27d8711b530a 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -22,6 +22,7 @@
 #include <osl/thread.h>
 #include <osl/module.h>
 #include <tools/stream.hxx>
+#include <tools/link.hxx>
 #include <vcl/bitmap.hxx>
 #include <sane/sane.h>
 #include "scanner.hxx"
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 36880f01c132..dada5ebea5fd 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -35,6 +35,7 @@
 #include <tools/helpers.hxx>
 #include <osl/mutex.hxx>
 #include <osl/module.hxx>
+#include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/sysdata.hxx>
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index dac781d7fe87..59d61fcaffd9 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -40,6 +40,7 @@
 #include <vcl/graphictools.hxx>
 #include <vcl/weld.hxx>
 #include <strings.hrc>
+#include <osl/diagnose.h>
 
 #include <math.h>
 #include <memory>
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 1c2ae74e39fa..5980a6689513 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
+#include <osl/diagnose.h>
 #include <comphelper/classids.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfac.hxx>
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 7340efa42e15..68339d2a43c2 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -22,6 +22,7 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
+#include <osl/diagnose.h>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/metric.hxx>
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index 85be228fa7eb..a9677ddf16fe 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <tools/urlobj.hxx>
+#include <osl/diagnose.h>
 
 #include "typedetectionexport.hxx"
 #include "xmlfiltersettingsdialog.hxx"
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index fd9960e36726..c52917eda7c9 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <osl/diagnose.h>
 
 #include "typedetectionimport.hxx"
 #include "xmlfiltersettingsdialog.hxx"
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index ae221ae07278..c04170ee0126 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 
 #include <comphelper/oslfile2streamwrap.hxx>
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index fb91a7b09d17..0caa32ec5cd2 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index 0807ffdac6e8..dc51b5ef47e2 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -20,6 +20,7 @@
 #include "imgprod.hxx"
 #include <services.hxx>
 
+#include <osl/diagnose.h>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/svapp.hxx>
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 13070c6d0094..bf64e94d48a8 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -31,6 +31,7 @@
 #include <vcl/settings.hxx>
 #include <unotools/lingucfg.hxx>
 #include <svl/undo.hxx>
+#include <osl/diagnose.h>
 
 #include <algorithm>
 #include <memory>
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 5eec237ff775..6dd1741e7047 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -21,6 +21,7 @@
 #include "textattributelistener.hxx"
 #include "richtextengine.hxx"
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/eeitem.hxx>
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 8d16ce737fc6..f4ea26f2404f 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -36,6 +36,7 @@
 #include <editeng/fhgtitem.hxx>
 #include <editeng/editids.hrc>
 #include <svx/svxids.hrc>
+#include <osl/diagnose.h>
 
 namespace frm
 {
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 74c3461d47c9..c4f9ddf64a89 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -31,6 +31,7 @@
 #include <vcl/commandinfoprovider.hxx>
 
 #include <sal/macros.h>
+#include <osl/diagnose.h>
 
 #define LID_RECORD_LABEL    1000
 #define LID_RECORD_FILLER   1001
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index c39cf363766c..e4023f524d62 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <vcl/lstbox.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/urlobj.hxx>
diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index 2b2e29f0ec15..f547b2fd634f 100644
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
@@ -22,6 +22,7 @@
 #include "iodlg.hxx"
 #include <svtools/fileview.hxx>
 #include <tools/debug.hxx>
+#include <osl/diagnose.h>
 
 #include <memory>
 
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 393ace33ac8b..14410a256ad9 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -294,3 +294,11 @@ blacklist:
     include/svl/urihelper.hxx:
     # base class has to be a complete type
     - tools/link.hxx
+    include/vcl/bitmap.hxx:
+    # Needed for template
+    - o3tl/typed_flags_set.hxx
+    include/vcl/builderfactory.hxx:
+    # Needed for macros
+    - vcl/builder.hxx
+    - vcl/vclptr.hxx
+
diff --git a/include/sfx2/charmapcontrol.hxx b/include/sfx2/charmapcontrol.hxx
index 716f7ba05d26..970e3fa6d1d9 100644
--- a/include/sfx2/charmapcontrol.hxx
+++ b/include/sfx2/charmapcontrol.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <sfx2/charwin.hxx>
 #include <vcl/button.hxx>
+#include <deque>
 
 class SvxCharViewControl;
 
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 21f81b9bfb91..d4a5caa941dc 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -40,6 +40,7 @@
 #include <vcl/weld.hxx>
 #include <vcl/window.hxx>
 #include <vcl/textview.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 namespace com { namespace sun { namespace star {
     namespace accessibility { class XAccessible; }
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 53e553af4011..353a542439cf 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -21,7 +21,6 @@
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <tools/link.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>
@@ -29,12 +28,12 @@
 #include <functional>
 #include <memory>
 
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/frame/XModel.hpp>
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
 
 namespace vcl { class Window; }
 class Dialog;
-class Bitmap;
 class BitmapEx;
 namespace weld
 {
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 5cc0cdf0a621..98d1bb8a3b61 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -23,7 +23,6 @@
 #include <vcl/dllapi.h>
 #include <vcl/timer.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/vclptr.hxx>
 
 #define ANIMATION_TIMEOUT_ON_CLICK 2147483647L
 
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index b304baa5af01..c23367c34c9a 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_BITMAP_HXX
 #define INCLUDED_VCL_BITMAP_HXX
 
-#include <tools/link.hxx>
 #include <tools/solar.h>
 #include <vcl/checksum.hxx>
 #include <vcl/dllapi.h>
@@ -32,6 +31,8 @@
 
 class Color;
 
+template <typename Arg, typename Ret> class Link;
+
 enum class BmpMirrorFlags
 {
     NONE             = 0x00,
@@ -94,15 +95,10 @@ class   BitmapInfoAccess;
 class   BitmapReadAccess;
 class   BitmapWriteAccess;
 class   BitmapPalette;
-class   Color;
 class   GDIMetaFile;
 class   AlphaMask;
 class   OutputDevice;
 class   SalBitmap;
-namespace vcl
-{
-    class Kernel;
-}
 
 struct BitmapSystemData
 {
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index 9117b57730e4..47eb8cabb31e 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_BMPACC_HXX
 #define INCLUDED_VCL_BMPACC_HXX
 
-#include <memory>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/salbtype.hxx>
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index e5656be11591..c519f459642d 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -24,14 +24,14 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/alpha.hxx>
 #include <tools/color.hxx>
-#include <basegfx/color/bcolormodifier.hxx>
 
-#include <com/sun/star/uno/Reference.hxx>
 #include <sal/types.h>
 
 namespace com { namespace sun { namespace star { namespace rendering {
     class XBitmapCanvas;
 } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace basegfx { class BColorModifierStack; }
 
 enum class TransparentType
 {
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 1883a128f48e..74fc3b44946f 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_VCL_BUILDER_HXX
 
 #include <typeinfo>
-#include <osl/module.hxx>
 #include <sal/log.hxx>
 #include <unotools/resmgr.hxx>
 #include <tools/fldunit.hxx>
@@ -23,17 +22,12 @@
 
 #include <memory>
 #include <map>
-#include <set>
-#include <stack>
 #include <vector>
 #ifdef check
 #  //some problem with MacOSX and a check define
 #  undef check
 #endif
 
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
 class Button;
 class ComboBox;
 class FormattedField;
@@ -51,6 +45,7 @@ class TimeField;
 class VclExpander;
 class VclMultiLineEdit;
 namespace xmlreader { class XmlReader; }
+namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
 
 struct ComboBoxTextItem
 {
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index e4edc323a93b..5bad4b5e2e15 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -24,17 +24,14 @@
 #include <vcl/dllapi.h>
 #include <vcl/image.hxx>
 #include <vcl/ctrl.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/salnativewidgets.hxx>
 #include <vcl/vclenum.hxx>
-#include <vcl/vclptr.hxx>
 #include <memory>
 #include <vector>
 
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
+namespace com { namespace sun { namespace star { namespace frame { struct FeatureStateEvent; } } } }
+template <class T> class VclPtr;
 
 class Color;
-class UserDrawEvent;
 class ImplCommonButtonData;
 enum class DrawButtonFlags;
 
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 3d0e6cb09195..0141582f1af1 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -22,6 +22,7 @@
 
 #include <memory>
 #include <vcl/vclenum.hxx>
+#include <tools/link.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/bitmapex.hxx>
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index 23ee7bd4f6f6..9ddcccc0d27c 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -27,6 +27,7 @@
 #include <svl/intitem.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/aeitem.hxx>
+#include <osl/diagnose.h>
 
 namespace rptui
 {
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 001bbf028d89..702ed3ab560f 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -35,6 +35,7 @@
 #include <cppuhelper/basemutex.hxx>
 #include <svtools/svmedit.hxx>
 #include <rtl/ref.hxx>
+#include <osl/diagnose.h>
 
 #include <vector>
 
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index ae181b7381fc..3648de8fc976 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -27,6 +27,7 @@
 #include <editeng/justifyitem.hxx>
 #include <osl/diagnose.h>
 #include <svl/poolcach.hxx>
+#include <osl/diagnose.h>
 
 #include <global.hxx>
 #include <document.hxx>
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index f8f0cdfdd90c..f607d20fc80e 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -20,6 +20,7 @@
 #include <sfx2/objsh.hxx>
 #include <svl/listener.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <document.hxx>
 #include <brdcst.hxx>
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index dd8d5a1e1e36..f0a15fd904bc 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -23,6 +23,7 @@
 #include <editeng/justifyitem.hxx>
 #include <osl/diagnose.h>
 #include <svl/itemset.hxx>
+#include <osl/diagnose.h>
 
 #include <dpoutput.hxx>
 #include <document.hxx>
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index a153b68bafdc..6f82740d3b38 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -21,6 +21,7 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <cassert>
 #include <cstdlib>
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 2ca4d572bdf0..15a2e22d8811 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -34,6 +34,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <formula/funcvarargs.h>
+#include <osl/diagnose.h>
 
 #include <memory>
 
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 353f4dca9029..7097bbcb79e8 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -36,6 +36,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <osl/diagnose.h>
 
 #include <sc.hrc>
 #include <attrib.hxx>
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index fc873b431c8f..c194da86e3e2 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -33,6 +33,7 @@
 #include <svl/sharedstringpool.hxx>
 #include <vcl/weld.hxx>
 #include <rtl/math.hxx>
+#include <osl/diagnose.h>
 
 #include <document.hxx>
 #include <formulacell.hxx>
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 0f6a1795b99c..4e77457c9058 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/objsh.hxx>
 #include <unotools/charclass.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 59dd62bba3ca..c84a32939016 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -36,6 +36,7 @@
 #include <unotools/transliterationwrapper.hxx>
 #include <tools/tenccvt.hxx>
 #include <o3tl/make_unique.hxx>
+#include <osl/diagnose.h>
 
 #include <globstr.hrc>
 #include <scresid.hxx>
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index b1d8fcc18a1a..b5402a540a3e 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -37,6 +37,7 @@
 #include <refupdatecontext.hxx>
 #include <refupdat.hxx>
 
+#include <osl/diagnose.h>
 #include <svl/zforlist.hxx>
 #include <svl/itemset.hxx>
 #include <svl/isethint.hxx>
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 38fa2b524aa7..eef51bbeecff 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -29,6 +29,7 @@
 #include <svl/sharedstringpool.hxx>
 #include <sal/macros.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <rtl/character.hxx>
 #include <tools/solar.h>
 #include <unotools/charclass.hxx>
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index af24358fd914..16df499e903f 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -35,6 +35,7 @@
 #include <svl/inethist.hxx>
 #include <unotools/syslocale.hxx>
 #include <sfx2/objsh.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/text/textfield/Type.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 8ba1e6e32338..14c57288ecef 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -36,6 +36,7 @@
 #include <rtl/character.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <unicode/uchar.h>
 #include <unicode/regex.h>
 #include <i18nlangtag/mslangid.hxx>
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index b1e9b9fe77b7..c151000f34e1 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -28,6 +28,7 @@
 #include <svl/zforlist.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <sal/macros.h>
+#include <osl/diagnose.h>
 
 #include <attrib.hxx>
 #include <sc.hrc>
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 0d41e175e335..56078ea0b915 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -37,6 +37,7 @@
 #include <vector>
 #include <algorithm>
 #include <comphelper/random.hxx>
+#include <osl/diagnose.h>
 
 using ::std::vector;
 using namespace formula;
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index bfae0949a487..3ebcdb107138 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/sfxsids.hrc>
 #include <svl/eitem.hxx>
 #include <svl/itemset.hxx>
+#include <osl/diagnose.h>
 
 #define SC_PROGRESS_CXX
 #include <progress.hxx>
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 1ed5892abd29..5a736dd005b8 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -34,6 +34,7 @@
 #include <tools/stream.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <math.h>
 
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 81f83286f997..d3662d744650 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index 89092cd59d19..00691f6c6059 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -21,6 +21,7 @@
 #include <svl/zformat.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <osl/diagnose.h>
 
 #include <zforauto.hxx>
 #include <global.hxx>
diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index 10d4df072193..cb677d18c7fb 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -19,6 +19,7 @@
 
 #include <unotools/fltrcfg.hxx>
 
+#include <osl/diagnose.h>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docinf.hxx>
 #include <filter/msfilter/svxmsbas.hxx>
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 08c7d1caa616..359e0154d60f 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -48,6 +48,7 @@
 #include <svtools/parhtml.hxx>
 #include <vcl/outdev.hxx>
 #include <stdio.h>
+#include <osl/diagnose.h>
 
 #include <htmlexp.hxx>
 #include <filter.hxx>
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index 9f6b737b039e..b3a7bcdc7913 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <scitems.hxx>
+#include <osl/diagnose.h>
 #include <comphelper/string.hxx>
 #include <editeng/eeitem.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 9ea3af92cb3b..183e63f6ae29 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -49,6 +49,7 @@
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/tenccvt.hxx>
+#include <osl/diagnose.h>
 
 #include <rtl/tencinfo.h>
 
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 6c380aba533f..ba323332b24d 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <editeng/boxitem.hxx>
 #include <editeng/editobj.hxx>
 #include <svl/eitem.hxx>
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index e2f8f8706431..47be06d9d8ed 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -26,6 +26,7 @@
 #include <editeng/shaditem.hxx>
 #include <vcl/outdev.hxx>
 #include <svtools/rtftoken.h>
+#include <osl/diagnose.h>
 
 #include <rtfparse.hxx>
 #include <global.hxx>
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 5a7902e215cc..b6aebd7ece7c 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -37,6 +37,7 @@
 #include <comphelper/propertysequence.hxx>
 #include <sfx2/app.hxx>
 #include <o3tl/make_unique.hxx>
+#include <osl/diagnose.h>
 
 #include <algorithm>
 
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index be163f7d03cc..7a0006c643b7 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -32,6 +32,7 @@
 #include <svx/flagsdef.hxx>
 #include <editeng/flstitem.hxx>
 #include <sfx2/app.hxx>
+#include <osl/diagnose.h>
 
 ScAttrDlg::ScAttrDlg(weld::Window* pParent, const SfxItemSet* pCellAttrs)
     : SfxTabDialogController(pParent, "modules/scalc/ui/formatcellsdialog.ui",
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index e74191ac2314..4e82125791dc 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -25,6 +25,7 @@
 #include <sc.hrc>
 
 #include <tabpages.hxx>
+#include <osl/diagnose.h>
 
 const sal_uInt16 ScTabPageProtection::pProtectionRanges[] =
 {
diff --git a/sc/source/ui/dataprovider/sqldataprovider.cxx b/sc/source/ui/dataprovider/sqldataprovider.cxx
index 4414c2d77da4..54faff99be83 100644
--- a/sc/source/ui/dataprovider/sqldataprovider.cxx
+++ b/sc/source/ui/dataprovider/sqldataprovider.cxx
@@ -30,6 +30,7 @@
 #include <datamapper.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/processfactory.hxx>
+#include <osl/diagnose.h>
 
 using namespace css;
 using namespace ::com::sun::star::beans;
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index da0f99c49b86..71b06030702c 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -21,6 +21,7 @@
 
 #include <vcl/waitobj.hxx>
 #include <comphelper/processfactory.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/sheet/DataImportMode.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 4effd48ae2b8..41af9f861003 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/sheet/DataPilotFieldShowItemsMode.hpp>
 
 #include <vcl/builderfactory.hxx>
+#include <osl/diagnose.h>
 
 #include <scresid.hxx>
 #include <dpobject.hxx>
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 24592e061e6b..72b34fa3b811 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -44,6 +44,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <miscuno.hxx>
 #include <tools/urlobj.hxx>
+#include <osl/diagnose.h>
 
 //! TODO make dynamic
 const SCSIZE ASCIIDLG_MAXROWS                = MAXROWCOUNT;
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 8a5b6463e0ff..fba38b8e27d0 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -20,6 +20,7 @@
 #include <unordered_set>
 #include <unordered_map>
 #include <map>
+#include <set>
 
 namespace com { namespace sun { namespace star {
 
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index bcd6cd0549e1..c73e46474fff 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -29,6 +29,7 @@
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistentry.hxx>
 #include <o3tl/make_unique.hxx>
+#include <osl/diagnose.h>
 
 #include <algorithm>
 
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 0b90ef899ea0..7ea90d530b4d 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -28,6 +28,7 @@
 #include <svx/drawitem.hxx>
 #include <unotools/pathoptions.hxx>
 #include <vcl/builderfactory.hxx>
+#include <osl/diagnose.h>
 
 #define HDL(hdl) LINK(this,ScTabBgColorDlg,hdl)
 
diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx
index 976fca594264..3778fdd6766c 100644
--- a/sc/source/ui/navipi/navcitem.cxx
+++ b/sc/source/ui/navipi/navcitem.cxx
@@ -19,6 +19,7 @@
 
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
+#include <osl/diagnose.h>
 
 #include <navcitem.hxx>
 #include <global.hxx>
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 8b45a529acb0..109a56453728 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -22,6 +22,7 @@
 #include <scitems.hxx>
 
 #include <vcl/settings.hxx>
+#include <osl/diagnose.h>
 
 #include <tptable.hxx>
 #include <global.hxx>
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 1292b4678ada..83533d2715d9 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/diagnose.h>
 #include <scitems.hxx>
 #include <editeng/memberids.h>
 #include <osl/diagnose.h>
diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx
index 446e4fb2d93e..8863bed7c24a 100644
--- a/sc/source/ui/view/invmerge.cxx
+++ b/sc/source/ui/view/invmerge.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/window.hxx>
+#include <osl/diagnose.h>
 
 #include <invmerge.hxx>
 
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index eef5558dbed3..ea4294842be4 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -49,6 +49,7 @@
 #include <sfx2/app.hxx>
 #include <svl/languageoptions.hxx>
 #include <oox/export/drawingml.hxx>
+#include <osl/diagnose.h>
 
 #include <vcl/settings.hxx>
 #include <vcl/metric.hxx>
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 72d7afcb985b..e7cf58debcc6 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -21,6 +21,7 @@
 #include <svx/svdpntv.hxx>
 #include <vcl/outdev.hxx>
 #include <svx/sdrpaintwindow.hxx>
+#include <osl/diagnose.h>
 
 namespace accessibility {
 
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index c4bfa9aa7e93..72119b3634ba 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -33,6 +33,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 #include <o3tl/make_unique.hxx>
+#include <osl/diagnose.h>
 
 #include <sdresid.hxx>
 
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 56688e35932a..268c0f4a9f9d 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -31,6 +31,7 @@
 #include <vcl/idle.hxx>
 #include <sal/types.h>
 #include <osl/thread.hxx>
+#include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <avmedia/mediawindow.hxx>
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index 6af085d1c12c..b6955b78c9e4 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -26,6 +26,7 @@
 
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <set>
 
diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
index ad5e891bb970..e32429c05025 100644
--- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
@@ -20,6 +20,7 @@
 #include "SlsFramePainter.hxx"
 #include <vcl/outdev.hxx>
 #include <vcl/bitmapaccess.hxx>
+#include <osl/diagnose.h>
 
 namespace sd { namespace slidesorter { namespace view {
 
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index 47099f1211e5..cd05e4c04401 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -23,6 +23,7 @@
 #include <vcl/window.hxx>
 #include <vcl/virdev.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <tools/gen.hxx>
 #include <tools/fract.hxx>
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index ca0560874257..ba9090c58173 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -25,6 +25,7 @@
 #include <Window.hxx>
 #include <rtl/math.hxx>
 #include <basegfx/numeric/ftools.hxx>
+#include <osl/diagnose.h>
 
 namespace sd { namespace slidesorter { namespace view {
 
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
index 7b373be669dd..93be4844ebbd 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
@@ -26,6 +26,7 @@
 #include <Window.hxx>
 
 #include <bitmaps.hlst>
+#include <osl/diagnose.h>
 
 namespace sd { namespace slidesorter { namespace view {
 
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index 736760e7aefb..b7976d9c55ca 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -27,6 +27,7 @@
 #include <vcl/settings.hxx>
 
 #include <svtools/colorcfg.hxx>
+#include <osl/diagnose.h>
 
 namespace sd { namespace slidesorter { namespace view {
 
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 49d23010de6d..b86cf3dbdbb5 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -33,6 +33,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <tools/debug.hxx>
 #include <svl/svdde.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 519bb3dc5e96..034a8987de36 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -31,6 +31,7 @@
 #include <sfx2/sfxhelp.hxx>
 #include <vcl/treelistentry.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <sfx2/strings.hrc>
 #include <helpids.h>
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 060d1413bd7c..643c8b7c07c9 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -47,6 +47,7 @@
 #include <sfx2/opengrf.hxx>
 #include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
+#include <osl/diagnose.h>
 
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index b02dc8f7260e..e917c3a91a0c 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -58,6 +58,7 @@
 #include <tools/urlobj.hxx>
 #include <osl/security.hxx>
 #include <osl/file.hxx>
+#include <osl/module.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index f82c47c1ee6c..9555a128e41f 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <tools/stream.hxx>
 #include <svl/style.hxx>
 
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 3249e6d81dea..3f647230c6e4 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp>
 #include <svl/itemiter.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <svl/itempool.hxx>
 #include <itemdel.hxx>
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 70f2a77e9116..c6e336e0231b 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -34,6 +34,7 @@
 #include <svtools/imagemgr.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <memory>
 
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 7e2d8f71b666..498433ad9f42 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -53,6 +53,7 @@
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/weld.hxx>
+#include <osl/diagnose.h>
 
 #include <sfx2/mailmodelapi.hxx>
 #include <sfxtypes.hxx>
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index f04feef9dd86..22cec980a06a 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -23,6 +23,7 @@
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/style.hxx>
+#include <osl/diagnose.h>
 
 #include <sfx2/styfitem.hxx>
 #include <sfx2/styledlg.hxx>
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index 5bcb4b977ab6..05312c84f1d4 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/CloseVetoException.hpp>
 #include <comphelper/processfactory.hxx>
+#include <osl/diagnose.h>
 
 #include <toolkit/helper/vclunohelper.hxx>
 
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 1254e4163161..a0c4e508b4c0 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -19,6 +19,7 @@
 
 #include <svl/intitem.hxx>
 #include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
 
 #include <sfx2/templdlg.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index a9efb2dbf696..d919f317123b 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -39,6 +39,7 @@
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
 #include <memory>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx
index 3c830c5bc653..7c68dd93add9 100644
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -27,6 +27,7 @@
 #include <cppuhelper/weak.hxx>
 #include <vcl/event.hxx>
 #include <vcl/window.hxx>
+#include <osl/diagnose.h>
 
 
 namespace sfx2
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 29688315f17e..e5c86e05ca53 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -30,6 +30,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <officecfg/Office/Math.hxx>
 #include "cfgitem.hxx"
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index c9672e22e942..2eba1f5c58f1 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -33,6 +33,7 @@
 #include <tools/gen.hxx>
 #include <vcl/outdev.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <cassert>
 #include <math.h>
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 7c092b64fe1e..3cd64af729db 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -28,6 +28,7 @@
 #include <unotools/syslocale.hxx>
 #include <o3tl/make_unique.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <rtl/character.hxx>
 #include <parse.hxx>
 #include <strings.hrc>
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index 2ffbd1a83b13..2f3839c54a39 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -13,6 +13,7 @@
 #include <svtools/rtfkeywd.hxx>
 #include <filter/msfilter/rtfutil.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 SmRtfExport::SmRtfExport(const SmNode* pIn)
     : SmWordExportBase(pIn)
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index cbe3b3b11ac0..cb0533c1b269 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -24,6 +24,7 @@
 #include "cfgitem.hxx"
 #include <smmod.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 
 SmSym::SmSym() :
diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx
index 2529bc997cd7..c660cf2b282d 100644
--- a/starmath/source/wordexportbase.cxx
+++ b/starmath/source/wordexportbase.cxx
@@ -10,6 +10,7 @@
 #include "wordexportbase.hxx"
 #include <node.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 SmWordExportBase::SmWordExportBase(const SmNode* pIn)
     : m_pTree(pIn)
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 4280c0818332..67c981aa0f8b 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <tools/debug.hxx>
 #include <svtools/brwbox.hxx>
 #include "datwin.hxx"
diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx
index fd0f51c49270..e39c313b4da1 100644
--- a/svtools/source/brwbox/brwimpl.hxx
+++ b/svtools/source/brwbox/brwimpl.hxx
@@ -21,6 +21,7 @@
 
 #include <svtaccessiblefactory.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
+#include <osl/diagnose.h>
 
 #include <map>
 
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index 3d962b425501..5a1fc3f6d765 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -24,6 +24,7 @@
 #include <comphelper/types.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtaccessiblefactory.hxx>
+#include <osl/diagnose.h>
 
 namespace svt
 {
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 42b8370cfa08..de870e3370bd 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -34,6 +34,7 @@
 #include <svl/hint.hxx>
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 904b53f5cd41..2b76004d968f 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/link.hxx>
+#include <osl/diagnose.h>
 
 #include <rtl/instance.hxx>
 #include "itemholder2.hxx"
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index c6667d66c1cc..3d747fb48e48 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -33,6 +33,7 @@
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 namespace svt
 {
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 2c69ef1dd2c7..358cdc2b831e 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -21,6 +21,7 @@
 #include <svtools/iconview.hxx>
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <vcl/treelistentry.hxx>
 #include <svtools/fileview.hxx>
 #include <svtools/svtresid.hxx>
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 7c9f9cf333ad..b0e8d1f359b5 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -19,6 +19,7 @@
 
 
 #include <limits.h>
+#include <osl/diagnose.h>
 #include <tools/debug.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/help.hxx>
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 12bcc3dfc6d3..672fe544f9a4 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -30,6 +30,8 @@
 #include <svtaccessiblefactory.hxx>
 #include <o3tl/make_unique.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::accessibility;
 
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 7e720a9af0c6..cf5590b02f5a 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <comphelper/processfactory.hxx>
 #include <osl/file.h>
+#include <osl/diagnose.h>
 #include <svtools/svtresid.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/stdtext.hxx>
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 292b7b3a23fa..d1f52db83759 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -30,6 +30,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/weld.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/ui/dialogs/AddressBookSourcePilot.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index 8f9c01104936..9934966e1c0a 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -30,6 +30,7 @@
 
 #include <svtools/colrdlg.hxx>
 #include <vcl/weld.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 33d0a6d185d2..d5e43b1e6171 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -23,6 +23,7 @@
 #include <svtools/svtresid.hxx>
 #include <roadmap.hxx>
 #include <tools/debug.hxx>
+#include <osl/diagnose.h>
 
 #include <vector>
 #include <map>
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index b2ff6deef3d7..bf14a0dae2e0 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -24,6 +24,7 @@
 #include <svtools/svtresid.hxx>
 #include <svtools/strings.hrc>
 #include <vcl/svapp.hxx>
+#include <stack>
 
 namespace svt
 {
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index c73451896e34..a1931000377c 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/diagnose.h>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/tabpage.hxx>
diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx
index fa2b66a19181..b3f0ed3c8cb9 100644
--- a/svtools/source/misc/dialogcontrolling.cxx
+++ b/svtools/source/misc/dialogcontrolling.cxx
@@ -19,6 +19,7 @@
 
 #include <svtools/dialogcontrolling.hxx>
 #include <vcl/window.hxx>
+#include <osl/diagnose.h>
 
 #include <algorithm>
 
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index a408c03771d6..9882a7dc98e3 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
+#include <osl/diagnose.h>
 #include <sot/exchange.hxx>
 #include <svtools/embedtransfer.hxx>
 #include <tools/mapunit.hxx>
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index fd8a23850be6..4978dfda4d49 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <ucbhelper/content.hxx>
 #include <unotools/configmgr.hxx>
 #include <svtools/strings.hrc>
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index 8d0bbcc04e3c..c8fe74fd8a11 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -24,6 +24,7 @@
 #include <tools/svlibrary.h>
 
 #include <osl/module.h>
+#include <osl/diagnose.h>
 
 namespace svt
 {
diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx
index 44109cb93ec8..cdf752a12501 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -26,6 +26,7 @@
 
 #include <vcl/event.hxx>
 #include <vcl/cursor.hxx>
+#include <osl/diagnose.h>
 
 
 namespace svt { namespace table
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx
index 133230c55b55..51bd2fc6d26b 100644
--- a/svx/source/dialog/SpellDialogChildWindow.cxx
+++ b/svx/source/dialog/SpellDialogChildWindow.cxx
@@ -20,6 +20,7 @@
 #include <svx/SpellDialogChildWindow.hxx>
 
 #include <svx/svxdlg.hxx>
+#include <osl/diagnose.h>
 
 namespace svx {
 
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 7d173aaa0974..8c8daa71a1ec 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <sal/config.h>
 
+#include <osl/diagnose.h>
 #include <o3tl/any.hxx>
 #include <svx/rubydialog.hxx>
 #include <sfx2/app.hxx>
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 9753b897c5c1..11e494b6f6bc 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/diagnose.h>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <i18nlangtag/mslangid.hxx>
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 74ecec61ae71..6f7c594d6076 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -38,6 +38,7 @@
 #include <editeng/editdata.hxx>
 #include <editeng/writingmodeitem.hxx>
 #include <editeng/charrotateitem.hxx>
+#include <osl/diagnose.h>
 #include <i18nutil/unicode.hxx>
 #include <svl/solar.hrc>
 #include <tools/bigint.hxx>
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx
index 9e9546df1740..773dce6de000 100644
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -22,6 +22,7 @@
 #include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <osl/diagnose.h>
 
 SvxColorValueSet::SvxColorValueSet(vcl::Window* _pParent, WinBits nWinStyle)
 :   ValueSet(_pParent, nWinStyle)
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index ad2029bd7c53..7112f7dada98 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 
 namespace svx
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 1712a8f63781..a465dd9fed83 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -35,6 +35,7 @@
 #include <unotools/linguprops.hxx>
 #include <unotools/intlwrapper.hxx>
 #include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
 
 
 namespace textconversiondlgs
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index cafbe882ff37..fcb1b78e8bb7 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -38,6 +38,7 @@
 #include <editeng/memberids.h>
 #include <tools/stream.hxx>
 #include <tools/mapunit.hxx>
+#include <osl/diagnose.h>
 
 #include <svx/unoapi.hxx>
 #include <svl/style.hxx>
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 3bf103d9469e..f81f42eaf6e0 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/drawing/LineCap.hpp>
 #include <com/sun/star/uno/Any.hxx>
 
+#include <osl/diagnose.h>
 #include <i18nutil/unicode.hxx>
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 5123a0cf72f6..7a4990a404a5 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -19,6 +19,7 @@
 
 #include <svx/XPropertyTable.hxx>
 
+#include <osl/diagnose.h>
 #include <vcl/virdev.hxx>
 #include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index c87759ad97a7..cc0c4732940e 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/diagnose.h>
 #include <editeng/svxenum.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 865907a172a9..51166259b046 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -38,6 +38,7 @@
 #include <numrule.hxx>
 #include <pagedesc.hxx>
 #include <paratr.hxx>
+#include <osl/diagnose.h>
 #include <svl/whiter.hxx>
 #include <svx/xtable.hxx>
 
diff --git a/sw/source/core/doc/DocumentListsManager.cxx b/sw/source/core/doc/DocumentListsManager.cxx
index df335c2d6d9e..38efc60084a7 100644
--- a/sw/source/core/doc/DocumentListsManager.cxx
+++ b/sw/source/core/doc/DocumentListsManager.cxx
@@ -22,6 +22,7 @@
 #include <numrule.hxx>
 
 #include <comphelper/random.hxx>
+#include <osl/diagnose.h>
 
 #include <vector>
 
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 09d457056a05..626578f2ad14 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -62,6 +62,7 @@
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <strings.hrc>
 #include <frmatr.hxx>
 #include <com/sun/star/table/BorderLineStyle.hpp>
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index b804dc578d37..521080f7a251 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -32,6 +32,7 @@
 #include <calbck.hxx>
 #include <IDocumentStylePoolAccess.hxx>
 #include <editeng/svxacorr.hxx>
+#include <osl/diagnose.h>
 
 #include <editeng/acorrcfg.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 9bd9ab22ef08..f1e912b5b1ab 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -19,6 +19,7 @@
 
 #ifdef DBG_UTIL
 
+#include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/itemiter.hxx>
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 7d6e880c605a..86a8e4cfe76d 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/diagnose.h>
 #include <hintids.hxx>
 #include <rtl/character.hxx>
 #include <vcl/vclenum.hxx>
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 4845ed486497..5b60d9056aaf 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/diagnose.h>
 #include <hintids.hxx>
 #include <unotools/tempfile.hxx>
 #include <svl/urihelper.hxx>
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index e78977830d06..8cf91b73427f 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -20,6 +20,7 @@
 #include <hintids.hxx>
 #include <o3tl/make_unique.hxx>
 #include <rtl/math.hxx>
+#include <osl/diagnose.h>
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 4810980cf551..2fd4585ec7e7 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -21,6 +21,7 @@
 #include <libxml/xmlwriter.h>
 
 #include <sal/macros.h>
+#include <osl/diagnose.h>
 #include <hintids.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 50c2ebb3793c..dd44e1ec29d9 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -51,6 +51,7 @@
 #include <libxml/xmlwriter.h>
 
 #include <unotools/saveopt.hxx>
+#include <osl/diagnose.h>
 
 #include <IDocumentListsAccess.hxx>
 #include <IDocumentStylePoolAccess.hxx>
diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx
index 0bef02b0ae08..6a4a49a2da56 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -26,6 +26,7 @@
 #include <istyleaccess.hxx>
 #include <unordered_map>
 #include <o3tl/make_unique.hxx>
+#include <osl/diagnose.h>
 
 typedef std::unordered_map< OUString,
                             std::shared_ptr<SfxItemSet> > SwStyleNameCache;
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 4088485a4964..1331c4e5b8a1 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -30,6 +30,7 @@
 #include <vcl/fmtfield.hxx>
 #include <ndindex.hxx>
 #include <vector>
+#include <osl/diagnose.h>
 
 
 #ifdef DBG_UTIL
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index c65986e9145f..c343e022ec2f 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -24,6 +24,7 @@
 #include <ndtxt.hxx>
 #include <fldbas.hxx>
 #include <docary.hxx>
+#include <osl/diagnose.h>
 
 bool CompareSwOutlineNodes::operator()( SwNode* const& lhs, SwNode* const& rhs) const
 {
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index f4abfdb55557..d42b387cb44e 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -31,6 +31,7 @@
 #include <fldupde.hxx>
 #include <swtblfmt.hxx>
 #include <fieldhint.hxx>
+#include <osl/diagnose.h>
 
 /// Ctor moves all lines/boxes from a SwTable into itself.
 /// Afterwards the SwTable is empty and must be deleted.
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index 705165115ffa..7785717b92c8 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp>
 #include <comphelper/processfactory.hxx>
 #include <o3tl/make_unique.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index 4b73f2e078c2..a2ac38c150a6 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -23,6 +23,7 @@
 #include <swtypes.hxx>
 #include <grfatr.hxx>
 #include <swunohelper.hxx>
+#include <osl/diagnose.h>
 
 #include <cmdid.h>
 #include <unomid.h>
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 18e7d95970f2..247cab4e6b21 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
+#include <osl/diagnose.h>
 #include <svl/macitem.hxx>
 #include <svtools/unoevent.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index b5b3513395e7..d04f2b053205 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 
+#include <osl/diagnose.h>
 #include <sfx2/docfilt.hxx>
 #include <sot/storage.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 0a653db9d137..5219bbb3f551 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -35,6 +35,7 @@
 
 #include <boost/optional.hpp>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <algorithm>
 
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 534425993cdc..3550c1d1ddea 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -51,6 +51,7 @@
 #include <unometa.hxx>
 #include <docsh.hxx>
 #include <svl/zforlist.hxx>
+#include <osl/diagnose.h>
 
 #include <algorithm>
 
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index ea924809a705..07d6747f6470 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -19,6 +19,7 @@
 
 #include <hintids.hxx>
 #include <hints.hxx>
+#include <osl/diagnose.h>
 #include <sfx2/objsh.hxx>
 #include <editeng/xmlcnitm.hxx>
 #include <editeng/twolinesitem.hxx>
diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx
index 1724baec70d7..fabc4f8e1380 100644
--- a/sw/source/core/undo/SwUndoField.cxx
+++ b/sw/source/core/undo/SwUndoField.cxx
@@ -30,6 +30,7 @@
 #include <dbfld.hxx>
 #include <docsh.hxx>
 #include <pam.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star::uno;
 
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index 01bebbe2de95..9822c2d115cf 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -27,6 +27,7 @@
 #include <strings.hrc>
 #include <fmtcntnt.hxx>
 #include <fmthdft.hxx>
+#include <osl/diagnose.h>
 
 SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
                                const SwPageDesc & _aNew,
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index 480c9008f0bf..958f55139f16 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -27,6 +27,7 @@
 #include <ndtxt.hxx>
 #include <UndoCore.hxx>
 #include <rolbck.hxx>
+#include <osl/diagnose.h>
 
 SwUndoInsNum::SwUndoInsNum( const SwNumRule& rOldRule,
                             const SwNumRule& rNewRule,
diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx
index 8edbc9910c2c..cab7026483d6 100644
--- a/sw/source/core/undo/unspnd.cxx
+++ b/sw/source/core/undo/unspnd.cxx
@@ -32,6 +32,7 @@
 #include <redline.hxx>
 #include <docary.hxx>
 #include <IShellCursorSupplier.hxx>
+#include <osl/diagnose.h>
 
 // SPLITNODE
 
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index 82ef158a418d..5f094afb3092 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
 
 #include <SwXTextDefaults.hxx>
 #include <SwStyleNameMapper.hxx>
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index f4112d3e48c0..c80adc0a0d72 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -22,6 +22,7 @@
 #include <comphelper/interfacecontainer2.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <osl/diagnose.h>
 
 #include <cmdid.h>
 #include <unomid.h>
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index 0f5b5d8a0d4b..5038d261729b 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -22,6 +22,7 @@
 #include <cppuhelper/supportsservice.hxx>
 
 #include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
 
 #include <unoredlines.hxx>
 #include <unoredline.hxx>
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 3014fb905259..661157edd083 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -37,6 +37,7 @@
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/lnkbase.hxx>
 #include <osl/mutex.hxx>
+#include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <fmtclds.hxx>
 #include <unotextrange.hxx>
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 87f342d231d2..6e11a89aef8a 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -25,6 +25,7 @@
 #include <unomid.h>
 #include <fchrfmt.hxx>
 
+#include <osl/diagnose.h>
 #include <i18nutil/searchopt.hxx>
 #include <o3tl/any.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index a6b41a588aae..ef7faed07197 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -46,6 +46,7 @@
 #include <iodetect.hxx>
 
 #include <vcl/metric.hxx>
+#include <osl/diagnose.h>
 
 #define ASC_BUFFLEN 4096
 
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index ac001af12e29..4db87558ecb9 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -56,6 +56,7 @@
 #include <osl/module.hxx>
 #include <rtl/bootstrap.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 using namespace utl;
 using namespace com::sun::star::uno;
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx
index 8b219d2b60b3..30109e940402 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <cstddef>
 
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 426e3c9c8d72..2edf9a57c5fe 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -78,6 +78,8 @@
 #include <numrule.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/character.hxx>
+#include <osl/diagnose.h>
+#include <deque>
 
 #include <svtools/HtmlWriter.hxx>
 
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 4a20f7dd68ca..158884433ab1 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -21,6 +21,7 @@
 
 #include <hintids.hxx>
 #include <comphelper/string.hxx>
+#include <osl/diagnose.h>
 #include <rtl/strbuf.hxx>
 #include <basic/sbx.hxx>
 #include <basic/basmgr.hxx>
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index ded8ff86c16b..26b6d2d370fe 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -46,6 +46,7 @@
 #include <charfmt.hxx>
 #include <docary.hxx>
 #include <svx/svxids.hrc>
+#include <osl/diagnose.h>
 
 #include <doc.hxx>
 #include <IDocumentStylePoolAccess.hxx>
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 8ad9815902ce..ff200babd3b7 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -26,6 +26,7 @@
 #include <editeng/fhgtitem.hxx>
 #include <svtools/htmltokn.h>
 #include <editeng/boxitem.hxx>
+#include <osl/diagnose.h>
 
 #include <doc.hxx>
 #include <pam.hxx>
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 9498ca1ffbc8..da9211de08dc 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
+#include <osl/diagnose.h>
 #include <docsh.hxx>
 #include <IDocumentFieldsAccess.hxx>
 #include <svtools/htmltokn.h>
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 4c5911e72090..24eb6bdfa4c4 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -23,6 +23,7 @@
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmlout.hxx>
 #include <svtools/htmltokn.h>
+#include <osl/diagnose.h>
 #include <fmtfld.hxx>
 #include <doc.hxx>
 #include <breakit.hxx>
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 80d6be5338a7..8546e8d01721 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -34,6 +34,7 @@
 #include <frmfmt.hxx>
 #include <ndindex.hxx>
 #include <pam.hxx>
+#include <osl/diagnose.h>
 
 using namespace css;
 
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 6319ea9663bf..cfab31225bc6 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <osl/diagnose.h>
 #include <svtools/htmlout.hxx>
 #include <svtools/htmlkywd.hxx>
 #include <rtl/strbuf.hxx>
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 3565f9115861..9527271c2f11 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -42,6 +42,7 @@
 #include <svtools/htmlkywd.hxx>
 #include <unotools/eventcfg.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <fmtornt.hxx>
 #include <fmturl.hxx>
diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx
index 8584297f2b70..81df21aad9be 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -28,6 +28,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <numrule.hxx>
 #include <doc.hxx>
 #include <docary.hxx>
diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx
index bd0d2dadab8b..c4fd8ea9bdf7 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -40,6 +40,7 @@
 
 #include <SwNodeNum.hxx>
 #include <rtl/strbuf.hxx>
+#include <osl/diagnose.h>
 
 using namespace css;
 
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index b084a27d41c7..5ce635e6aa7c 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -28,6 +28,7 @@
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
 #include <sfx2/linkmgr.hxx>
+#include <osl/diagnose.h>
 
 #include <hintids.hxx>
 #include <fmtornt.hxx>
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 600d27c5dc72..d0dd6ca84bfb 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -50,6 +50,7 @@
 #endif
 #include <rtl/strbuf.hxx>
 #include <sal/types.h>
+#include <osl/diagnose.h>
 
 #define MAX_DEPTH (3)
 
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index f6b0bc289673..ba523eb0d207 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -53,6 +53,7 @@
 #include <vcl/wrkwin.hxx>
 #include <o3tl/make_unique.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include "css1kywd.hxx"
 #include "svxcss1.hxx"
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index 05d72841b81e..afd16a3e708f 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -28,6 +28,7 @@
 #include <editeng/eeitem.hxx>
 #include <o3tl/make_unique.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <shellio.hxx>
 #include <doc.hxx>
 #include <docary.hxx>
diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx
index 9f06edcceeb1..b0cbff4212f3 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -19,6 +19,7 @@
 
 #include <svl/itemiter.hxx>
 #include <svl/whiter.hxx>
+#include <osl/diagnose.h>
 
 // tdf#94088 SdrAllFillAttributesHelper needed
 #include <svx/unobrushitemhelper.hxx>
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index f0d42826a9df..55aaa3349d02 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -23,6 +23,7 @@
 #include <editeng/brushitem.hxx>
 #include <tools/fract.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <wrtswtbl.hxx>
 #include <swtable.hxx>
 #include <frmfmt.hxx>
diff --git a/sw/source/filter/ww8/needed_cast.hxx b/sw/source/filter/ww8/needed_cast.hxx
index a7a6a045d758..1fe7ca091e76 100644
--- a/sw/source/filter/ww8/needed_cast.hxx
+++ b/sw/source/filter/ww8/needed_cast.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_NEEDED_CAST_HXX
 #define INCLUDED_SW_SOURCE_FILTER_WW8_NEEDED_CAST_HXX
 
+#include <osl/diagnose.h>
+
 namespace ww
 {
     template<typename Ret, typename Param> Ret checking_cast(Param in, Ret)
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 6daec44d8e37..b04d8f085e13 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -19,6 +19,7 @@
 
 #include "xmlexpit.hxx"
 
+#include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <sax/tools/converter.hxx>
 #include <svl/itempool.hxx>
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 578d07d0face..184a6e6194f1 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -30,6 +30,7 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <editeng/xmlcnitm.hxx>
 #include <editeng/memberids.h>
+#include <osl/diagnose.h>
 
 #include <hintids.hxx>
 #include <unomid.h>
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 1e1c5f3a9672..68e7ca2f47d7 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <rtl/ustring.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/util/MeasureUnit.hpp>
 
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 360f0c918c2c..350e9d088535 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -19,6 +19,7 @@
 
 #include <hintids.hxx>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <osl/diagnose.h>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlmetai.hxx>
 #include <xmloff/xmlmetae.hxx>
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 08cc3f6d897c..590d208d0d63 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -21,6 +21,7 @@
 
 #include <cstddef>
 
+#include <osl/diagnose.h>
 #include <swtypes.hxx>
 #include "createaddresslistdialog.hxx"
 #include "customizeaddresslistdialog.hxx"
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 5573d8bb2bf9..29d8770f8585 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -22,6 +22,7 @@
 #include "dbtablepreviewdialog.hxx"
 #include <svtools/simptabl.hxx>
 #include <vcl/treelistentry.hxx>
+#include <osl/diagnose.h>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 5066f1eadbce..3e8d9a3f7bde 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -27,6 +27,7 @@
 #include <unotools/tempfile.hxx>
 #include <unotools/pathoptions.hxx>
 #include <vcl/treelistentry.hxx>
+#include <osl/diagnose.h>
 
 #include <swtypes.hxx>
 #include <glosbib.hxx>
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
index 4b0f4be31c97..9c00526c29a3 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <osl/diagnose.h>
 #include <o3tl/any.hxx>
 #include <tools/stream.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index 14bf687ef258..5f5305cad250 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -19,6 +19,7 @@
 
 #include <hintids.hxx>
 #include <o3tl/any.hxx>
+#include <osl/diagnose.h>
 #include <tools/stream.hxx>
 #include <sfx2/app.hxx>
 #include <editeng/paperinf.hxx>
diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx
index 8de5f3eb1499..f18d781fd08a 100644
--- a/sw/source/uibase/envelp/labelcfg.cxx
+++ b/sw/source/uibase/envelp/labelcfg.cxx
@@ -26,6 +26,7 @@
 #include <rtl/bootstrap.hxx>
 #include <unotools/configpaths.hxx>
 #include <xmlreader/xmlreader.hxx>
+#include <osl/diagnose.h>
 
 #include <unomid.h>
 
diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx
index 7227172e9726..3c1e1be14732 100644
--- a/sw/source/uibase/envelp/labimg.cxx
+++ b/sw/source/uibase/envelp/labimg.cxx
@@ -21,6 +21,7 @@
 
 #include <o3tl/any.hxx>
 #include <tools/stream.hxx>
+#include <osl/diagnose.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <unotools/useroptions.hxx>
diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx
index e33aa1e0c099..edbab35994b7 100644
--- a/sw/source/uibase/globdoc/globdoc.cxx
+++ b/sw/source/uibase/globdoc/globdoc.cxx
@@ -20,6 +20,7 @@
 #include <comphelper/fileformat.h>
 #include <comphelper/classids.hxx>
 #include <unotools/moduleoptions.hxx>
+#include <osl/diagnose.h>
 
 #include <unomid.h>
 
diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx
index 66ec98433785..f51f735822e6 100644
--- a/sw/source/uibase/misc/numberingtypelistbox.cxx
+++ b/sw/source/uibase/misc/numberingtypelistbox.cxx
@@ -28,6 +28,7 @@
 #include <editeng/numitem.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/strarray.hxx>
+#include <osl/diagnose.h>
 
 #include <unomid.h>
 
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx
index 585d48820b88..aa4746fdb26c 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -19,6 +19,7 @@
 
 #include <editeng/itemtype.hxx>
 #include <unosett.hxx>
+#include <osl/diagnose.h>
 
 #include <swtypes.hxx>
 #include <cmdid.h>
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index 215583d1e7a6..a36e29cebe86 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -24,6 +24,7 @@
 #include <comphelper/fileformat.h>
 #include <comphelper/classids.hxx>
 #include <sfx2/objface.hxx>
+#include <osl/diagnose.h>
 
 #include <sfx2/msg.hxx>
 #include <cmdid.h>
diff --git a/toolkit/source/helper/imagealign.cxx b/toolkit/source/helper/imagealign.cxx
index 7dd8e1c2b04e..43e7cb012c68 100644
--- a/toolkit/source/helper/imagealign.cxx
+++ b/toolkit/source/helper/imagealign.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/awt/ImageAlign.hpp>
 
 #include <helper/imagealign.hxx>
+#include <osl/diagnose.h>
 
 namespace toolkit
 {
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 553d9cf51dbe..007d6686d44d 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -30,6 +30,7 @@
 #include <svx/svxerr.hxx>
 #include <svx/dialogs.hrc>
 #include <unotools/resmgr.hxx>
+#include <osl/diagnose.h>
 
 #include <ids.hxx>
 #include <ids.hrc>
diff --git a/vcl/inc/impanmvw.hxx b/vcl/inc/impanmvw.hxx
index 702443404ac2..b8164f60933d 100644
--- a/vcl/inc/impanmvw.hxx
+++ b/vcl/inc/impanmvw.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_SOURCE_GDI_IMPANMVW_HXX
 
 #include <vcl/animate.hxx>
+#include <vcl/vclptr.hxx>
 
 class Animation;
 class OutputDevice;
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 587d2823e0b7..c45532434f98 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -32,6 +32,10 @@
 
 struct  BitmapBuffer;
 class   BitmapPalette;
+namespace vcl
+{
+    class Kernel;
+}
 
 class VCL_PLUGIN_PUBLIC OpenGLSalBitmap : public SalBitmap
 {
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index a2cf2e25b388..ca8f118c8003 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <vcl/opengl/OpenGLHelper.hxx>
 
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 92ccc7c750fe..485212a72ded 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -46,6 +46,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::awt;
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index 662a5c1bd7b2..30b3ab5cffdc 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -19,6 +19,7 @@
 
 #include <config_features.h>
 
+#include <osl/diagnose.h>
 #include <osx/saldata.hxx>
 #include <osx/salnsmenu.h>
 #include <osx/salinst.h>
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 23f52dfbbf4f..50a899c9da4d 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -22,6 +22,7 @@
 #include <comphelper/fileurl.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <osl/file.h>
 
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index b3797c958f4d..dcbfb98451f2 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <condition_variable>
 #include <mutex>
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 4a99e4305324..973fdddfb33c 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <objc/objc-runtime.h>
 
diff --git a/vcl/osx/salnsmenu.mm b/vcl/osx/salnsmenu.mm
index e823bcfcbd1d..1dba47f031db 100644
--- a/vcl/osx/salnsmenu.mm
+++ b/vcl/osx/salnsmenu.mm
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <osl/diagnose.h>
 
 #include <vcl/window.hxx>
 
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index d8498ff6a364..08f696345aa2 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -21,6 +21,7 @@
 
 #include <vcl/print.hxx>
 #include <sal/macros.h>
+#include <osl/diagnose.h>
 
 #include <osx/salinst.h>
 #include <osx/salprn.h>
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 8fd2a5e76aee..cc3c06f95619 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <cstddef>
 #include <limits>
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 3221804607e3..626214690166 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -22,6 +22,7 @@
 #include <osl/module.h>
 #include <osl/file.hxx>
 #include <osl/thread.h>
+#include <osl/module.hxx>
 
 #include <rtl/tencinfo.h>
 #include <rtl/instance.hxx>
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index 413f470cac56..e85fd67eae02 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -21,6 +21,7 @@
 #include <vcl/unohelp.hxx>
 
 #include <svdata.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx b/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx
index 13e238bc1ecf..73f521480f09 100644
--- a/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx
+++ b/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <tools/helpers.hxx>
+#include <osl/diagnose.h>
 
 #include <vcl/bitmapex.hxx>
 #include <vcl/bitmapaccess.hxx>
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 54600b8ea31d..4ac8c03cc32b 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -44,6 +44,7 @@
 #include <controldata.hxx>
 #include <o3tl/make_unique.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <comphelper/dispatchcommand.hxx>
 
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 519eb8aa5a49..59220ac21258 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <comphelper/string.hxx>
 
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index d9e2b015506b..676d6b165916 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -38,6 +38,7 @@
 #include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 9c471d0d5655..b25f35febcd2 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -21,6 +21,7 @@
 #include <vcl/imgctrl.hxx>
 
 #include <com/sun/star/awt/ImageScaleMode.hpp>
+#include <osl/diagnose.h>
 
 namespace ImageScaleMode = css::awt::ImageScaleMode;
 
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index e7f770d5ff1f..41750ae91eca 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -40,6 +40,7 @@
 
 #include <rtl/instance.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <comphelper/string.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index 63fdab60ffef..165dbfde9fa9 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <cstddef>
 
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index a8fe3486be61..33e34151cfb7 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -30,6 +30,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/edit.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <o3tl/make_unique.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index e9629d7f9967..cff800230814 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -31,6 +31,7 @@
 #include <strings.hrc>
 #include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
+#include <osl/diagnose.h>
 
 class ImpVclMEdit : public SfxListener
 {
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 76c8c35fd8b6..1e93721f9992 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <osl/diagnose.h>
 
 #include <algorithm>
 
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 2994bbc610aa..15f2352e96ef 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -25,6 +25,7 @@
 #include <vcl/bitmap.hxx>
 #include <config_features.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLHelper.hxx>
 #endif
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index ae7e5bcd858d..d5cf8178c34f 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -20,9 +20,11 @@
 #include <rtl/crc.h>
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/color/bcolormodifier.hxx>
 #include <unotools/resmgr.hxx>
 
 #include <vcl/ImageTree.hxx>
diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx
index dc7236bce9b0..77689140c863 100644
--- a/vcl/source/gdi/gdimetafiletools.cxx
+++ b/vcl/source/gdi/gdimetafiletools.cxx
@@ -26,6 +26,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graphictools.hxx>
+#include <osl/diagnose.h>
 
 // helpers
 
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 0f93bc0908e8..0262c4b6b8d8 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -21,6 +21,7 @@
 #include <cstdlib>
 #include <memory>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/fract.hxx>
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 9655126ed411..0624bee326ef 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -27,6 +27,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <set>
 #include <memory>
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 78e3a19c7381..753c85f9ae6d 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <cassert>
 #include <memory>
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 1a689ce1dfcd..c1d40686a50a 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -30,6 +30,7 @@
 #include <vcl/lineinfo.hxx>
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <svmconverter.hxx>
 
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index e6596df1f5b8..42aa0d78c486 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -44,6 +44,7 @@
 #include <comphelper/lok.hxx>
 #include <bitmapwriteaccess.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 void OutputDevice::DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap )
 {
diff --git a/vcl/source/outdev/clipping.cxx b/vcl/source/outdev/clipping.cxx
index 1c17d53aba14..eb5355d4d123 100644
--- a/vcl/source/outdev/clipping.cxx
+++ b/vcl/source/outdev/clipping.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/config.h>
+#include <osl/diagnose.h>
 
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 17cda2bf157e..e3275b904a3e 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -24,6 +24,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/wrkwin.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <svdata.hxx>
 #include <window.h>
diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx
index 3634bfe3cb01..c848ec2d0b53 100644
--- a/vcl/source/outdev/nativecontrols.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -23,6 +23,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 7222111e883d..a988a4966bc2 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <accel.h>
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index b598996a0c51..98cb27322aee 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -46,6 +46,7 @@
 
 #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <comphelper/processfactory.hxx>
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index d3140e084a55..ce0e4b03fa3f 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -42,6 +42,7 @@
 
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 0ed1ac2e1414..a5820aff5013 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -35,6 +35,7 @@
 #include <tools/poly.hxx>
 #include <svl/imageitm.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <svdata.hxx>
 #include <window.h>
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx
index e890a09a8426..00c5c4c3c6f7 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -33,6 +33,7 @@
 
 #include <rtl/ustring.h>
 
+#include <osl/diagnose.h>
 #include <osl/module.h>
 #include <o3tl/char16_t2wchar_t.hxx>
 
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 51eb8f9bb602..bcfb83315fb6 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <memory>
 #include <string.h>
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index e5bd5dbcd9d4..e9e398b8b4c7 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -43,6 +43,7 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/fltcall.hxx>
 #include <osl/file.hxx>
+#include <osl/module.hxx>
 
 #include "../source/filter/igif/gifread.hxx"
 #include "../source/filter/ixbm/xbmread.hxx"
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 0013af494d00..0dd4b04d59a2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -35,6 +35,7 @@
 #include <rtl/uri.hxx>
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <oox/helper/graphichelper.hxx>
 #include <vcl/wmfexternal.hxx>
 #include <vcl/graph.hxx>