summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/crsr/crstrvl.cxx1
-rw-r--r--sw/source/core/crsr/findtxt.cxx1
-rw-r--r--sw/source/core/crsr/viscrs.cxx1
-rw-r--r--sw/source/core/doc/DocumentDrawModelManager.cxx1
-rw-r--r--sw/source/core/doc/DocumentLayoutManager.cxx1
-rw-r--r--sw/source/core/doc/docdesc.cxx1
-rw-r--r--sw/source/core/doc/docdraw.cxx1
-rw-r--r--sw/source/core/doc/docfly.cxx1
-rw-r--r--sw/source/core/doc/doclay.cxx1
-rw-r--r--sw/source/core/doc/docnew.cxx1
-rw-r--r--sw/source/core/doc/docredln.cxx1
-rw-r--r--sw/source/core/doc/tblrwcl.cxx1
-rw-r--r--sw/source/core/docnode/ndtbl.cxx1
-rw-r--r--sw/source/core/docnode/ndtbl1.cxx1
-rw-r--r--sw/source/core/draw/dobjfac.cxx1
-rw-r--r--sw/source/core/draw/dpage.cxx1
-rw-r--r--sw/source/core/draw/drawdoc.cxx1
-rw-r--r--sw/source/core/draw/dview.cxx1
-rw-r--r--sw/source/core/frmedt/fecopy.cxx1
-rw-r--r--sw/source/core/frmedt/fedesc.cxx1
-rw-r--r--sw/source/core/frmedt/fefly1.cxx1
-rw-r--r--sw/source/core/frmedt/feflyole.cxx1
-rw-r--r--sw/source/core/frmedt/feshview.cxx1
-rw-r--r--sw/source/core/frmedt/fetab.cxx1
-rw-r--r--sw/source/core/frmedt/fews.cxx1
-rw-r--r--sw/source/core/inc/SwXMLBlockImport.hxx1
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx1
-rw-r--r--sw/source/core/layout/anchoredobject.cxx1
-rw-r--r--sw/source/core/layout/atrfrm.cxx1
-rw-r--r--sw/source/core/layout/flowfrm.cxx1
-rw-r--r--sw/source/core/layout/fly.cxx1
-rw-r--r--sw/source/core/layout/flycnt.cxx1
-rw-r--r--sw/source/core/layout/flyincnt.cxx1
-rw-r--r--sw/source/core/layout/flylay.cxx1
-rw-r--r--sw/source/core/layout/frmtool.cxx1
-rw-r--r--sw/source/core/layout/laycache.cxx1
-rw-r--r--sw/source/core/layout/newfrm.cxx1
-rw-r--r--sw/source/core/layout/pagechg.cxx1
-rw-r--r--sw/source/core/layout/sortedobjs.cxx1
-rw-r--r--sw/source/core/layout/ssfrm.cxx1
-rw-r--r--sw/source/core/layout/tabfrm.cxx1
-rw-r--r--sw/source/core/layout/trvlfrm.cxx1
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx1
-rw-r--r--sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx1
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx1
-rw-r--r--sw/source/core/swg/SwXMLSectionList.cxx1
-rw-r--r--sw/source/core/text/txtcache.cxx1
-rw-r--r--sw/source/core/txtnode/atrflyin.cxx1
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx1
-rw-r--r--sw/source/core/undo/docundo.cxx1
-rw-r--r--sw/source/core/undo/unattr.cxx1
-rw-r--r--sw/source/core/undo/undobj1.cxx1
-rw-r--r--sw/source/core/undo/undraw.cxx1
-rw-r--r--sw/source/core/undo/unins.cxx1
-rw-r--r--sw/source/core/undo/untbl.cxx1
-rw-r--r--sw/source/core/view/vdraw.cxx1
-rw-r--r--sw/source/core/view/vnew.cxx1
-rw-r--r--sw/source/core/view/vprint.cxx1
-rw-r--r--sw/source/filter/html/css1atr.cxx1
-rw-r--r--sw/source/filter/html/htmldrawreader.cxx1
-rw-r--r--sw/source/filter/html/htmldrawwriter.cxx1
-rw-r--r--sw/source/filter/html/htmlfly.hxx1
-rw-r--r--sw/source/filter/html/htmlflywriter.cxx1
-rw-r--r--sw/source/filter/html/htmlforw.cxx1
-rw-r--r--sw/source/filter/html/htmltab.cxx1
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx1
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx1
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx1
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx1
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx1
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx1
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx1
-rw-r--r--sw/source/ui/chrdlg/break.cxx1
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx1
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx1
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx1
-rw-r--r--sw/source/ui/config/optcomp.cxx1
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx1
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx1
-rw-r--r--sw/source/ui/envelp/envfmt.cxx1
-rw-r--r--sw/source/ui/fldui/fldref.cxx1
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx1
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx1
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx1
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx1
-rw-r--r--sw/source/ui/misc/docfnote.cxx1
-rw-r--r--sw/source/ui/misc/glossary.cxx1
-rw-r--r--sw/source/ui/misc/num.cxx1
-rw-r--r--sw/source/ui/table/tabledlg.cxx1
-rw-r--r--sw/source/uibase/app/appenv.cxx1
-rw-r--r--sw/source/uibase/app/applab.cxx1
-rw-r--r--sw/source/uibase/app/docsh.cxx1
-rw-r--r--sw/source/uibase/app/docst.cxx1
-rw-r--r--sw/source/uibase/app/docstyle.cxx1
-rw-r--r--sw/source/uibase/app/swmodul1.cxx1
-rw-r--r--sw/source/uibase/dbui/dbtree.cxx1
-rw-r--r--sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx1
-rw-r--r--sw/source/uibase/dochdl/gloshdl.cxx1
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx1
-rw-r--r--sw/source/uibase/docvw/AnnotationWin.cxx1
-rw-r--r--sw/source/uibase/docvw/edtdd.cxx1
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx1
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx1
-rw-r--r--sw/source/uibase/frmdlg/frmmgr.cxx1
-rw-r--r--sw/source/uibase/index/toxmgr.cxx1
-rw-r--r--sw/source/uibase/lingu/hhcwrp.cxx1
-rw-r--r--sw/source/uibase/lingu/olmenu.cxx1
-rw-r--r--sw/source/uibase/lingu/sdrhhcwrap.cxx1
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx1
-rw-r--r--sw/source/uibase/shells/annotsh.cxx1
-rw-r--r--sw/source/uibase/shells/basesh.cxx1
-rw-r--r--sw/source/uibase/shells/drawsh.cxx1
-rw-r--r--sw/source/uibase/shells/drformsh.cxx1
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx1
-rw-r--r--sw/source/uibase/shells/drwtxtex.cxx1
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx1
-rw-r--r--sw/source/uibase/shells/grfsh.cxx1
-rw-r--r--sw/source/uibase/shells/langhelper.cxx1
-rw-r--r--sw/source/uibase/shells/listsh.cxx1
-rw-r--r--sw/source/uibase/shells/tabsh.cxx1
-rw-r--r--sw/source/uibase/shells/textdrw.cxx1
-rw-r--r--sw/source/uibase/shells/textfld.cxx1
-rw-r--r--sw/source/uibase/shells/textglos.cxx1
-rw-r--r--sw/source/uibase/shells/textidx.cxx1
-rw-r--r--sw/source/uibase/shells/textsh.cxx1
-rw-r--r--sw/source/uibase/shells/textsh2.cxx1
-rw-r--r--sw/source/uibase/shells/txtattr.cxx1
-rw-r--r--sw/source/uibase/shells/txtcrsr.cxx1
-rw-r--r--sw/source/uibase/shells/txtnum.cxx1
-rw-r--r--sw/source/uibase/table/chartins.cxx1
-rw-r--r--sw/source/uibase/uiview/pview.cxx1
-rw-r--r--sw/source/uibase/uiview/swcli.cxx1
-rw-r--r--sw/source/uibase/uiview/view0.cxx1
-rw-r--r--sw/source/uibase/uiview/view2.cxx1
-rw-r--r--sw/source/uibase/uiview/viewcoll.cxx1
-rw-r--r--sw/source/uibase/uiview/viewdlg.cxx1
-rw-r--r--sw/source/uibase/uiview/viewdlg2.cxx1
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx1
-rw-r--r--sw/source/uibase/uiview/viewling.cxx1
-rw-r--r--sw/source/uibase/uiview/viewport.cxx1
-rw-r--r--sw/source/uibase/uiview/viewprt.cxx1
-rw-r--r--sw/source/uibase/uiview/viewtab.cxx1
-rw-r--r--sw/source/uibase/uno/unodispatch.cxx1
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx1
-rw-r--r--sw/source/uibase/utlui/gloslst.cxx1
-rw-r--r--sw/source/uibase/utlui/navipi.cxx1
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx1
-rw-r--r--sw/source/uibase/wrtsh/delete.cxx1
-rw-r--r--sw/source/uibase/wrtsh/select.cxx1
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx1
-rw-r--r--sw/source/uibase/wrtsh/wrtsh2.cxx1
-rw-r--r--sw/source/uibase/wrtsh/wrtsh3.cxx1
-rw-r--r--sw/source/uibase/wrtsh/wrtundo.cxx1
153 files changed, 153 insertions, 0 deletions
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index a08e0f4c3fba..3b2ad6514a51 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -26,6 +26,7 @@
#include <editeng/adjustitem.hxx>
#include <editeng/formatbreakitem.hxx>
#include <svx/svdobj.hxx>
+#include <osl/diagnose.h>
#include <crsrsh.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index f19f3ff908eb..ccb3a650c86f 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -28,6 +28,7 @@
#include <svl/srchitem.hxx>
#include <sfx2/sfxsids.hrc>
#include <editeng/outliner.hxx>
+#include <osl/diagnose.h>
#include <wrtsh.hxx>
#include <txatritr.hxx>
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 2813f162f1f6..4777b767deb3 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -51,6 +51,7 @@
#include <sfx2/lokhelper.hxx>
#include <boost/property_tree/json_parser.hpp>
#include <comphelper/string.hxx>
+#include <osl/diagnose.h>
#include <paintfrm.hxx>
#include <PostItMgr.hxx>
#include <SwGrammarMarkUp.hxx>
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index c3f09b767eea..21bde0ebfe75 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -45,6 +45,7 @@
#include <svl/srchitem.hxx>
#include <unotools/configmgr.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
class SdrOutliner;
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx
index 727aa8428611..95362f1e4be3 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -41,6 +41,7 @@
#include <frameformats.hxx>
#include <com/sun/star/embed/EmbedStates.hpp>
#include <svx/svdobj.hxx>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 561d828d839e..ee08206bd7ef 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -27,6 +27,7 @@
#include <sfx2/dispatch.hxx>
#include <tools/globname.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <unotools/localedatawrapper.hxx>
#include <fmtfsize.hxx>
#include <fmthdft.hxx>
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 4468e648a8a2..c450f4213dc3 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -24,6 +24,7 @@
#include <svx/svdogrp.hxx>
#include <editeng/measfld.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <fmtanchr.hxx>
#include <charatr.hxx>
#include <frmfmt.hxx>
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 6310be986709..5e417afecd38 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -21,6 +21,7 @@
#include <svl/itemiter.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdmark.hxx>
+#include <osl/diagnose.h>
#include <fmtfsize.hxx>
#include <fmtornt.hxx>
#include <dcontact.hxx>
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 72f8b6883073..2da94ef4699c 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -27,6 +27,7 @@
#include <editeng/shaditem.hxx>
#include <editeng/protitem.hxx>
#include <editeng/opaqitem.hxx>
+#include <osl/diagnose.h>
#include <svx/svdouno.hxx>
#include <editeng/frmdiritem.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 9c789deb66b7..35306e3c292e 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -38,6 +38,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/XmlIdRegistry.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <sfx2/linkmgr.hxx>
#include <editeng/ulspitem.hxx>
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index a378203b8962..72dff3406e96 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -20,6 +20,7 @@
#include <libxml/xmlwriter.h>
#include <boost/property_tree/json_parser.hpp>
+#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <tools/datetimeutils.hxx>
#include <hintids.hxx>
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 76474bba91b6..818782a5ff1b 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -19,6 +19,7 @@
#include <memory>
#include <com/sun/star/text/HoriOrientation.hpp>
+#include <osl/diagnose.h>
#include <hintids.hxx>
#include <editeng/lrspitem.hxx>
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 5be819329f90..389923d6f415 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -90,6 +90,7 @@
#include <o3tl/numeric.hxx>
#include <tools/datetimeutils.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#ifdef DBG_UTIL
#define CHECK_TABLE(t) (t).CheckConsistency();
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 84ebb7dd8821..6d2a677712be 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -49,6 +49,7 @@
#include <UndoTable.hxx>
#include <o3tl/enumrange.hxx>
#include <o3tl/safeint.hxx>
+#include <osl/diagnose.h>
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx
index 31bef2f94c3b..fb08ba595984 100644
--- a/sw/source/core/draw/dobjfac.cxx
+++ b/sw/source/core/draw/dobjfac.cxx
@@ -19,6 +19,7 @@
#include <dobjfac.hxx>
#include <dflyobj.hxx>
+#include <osl/diagnose.h>
SwObjectFactory aSwObjectFactory;
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 63a7c9e8f0fc..11b040425bf0 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -23,6 +23,7 @@
#include <sfx2/sfxhelp.hxx>
#include <vcl/help.hxx>
#include <svx/svdview.hxx>
+#include <osl/diagnose.h>
#include <fmturl.hxx>
#include <frmfmt.hxx>
#include <doc.hxx>
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 5735f36c83bb..4c3050ebf5b7 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <svx/drawitem.hxx>
+#include <osl/diagnose.h>
#include <doc.hxx>
#include <drawdoc.hxx>
#include <dpage.hxx>
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 5ae8d93b0778..dfa884e80db5 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -25,6 +25,7 @@
#include <svx/sdrundomanager.hxx>
#include <tools/globname.hxx>
#include <editeng/outliner.hxx>
+#include <osl/diagnose.h>
#include <com/sun/star/embed/EmbedMisc.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index b30d0275c878..99fad85445a4 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -35,6 +35,7 @@
#include <svx/svdograf.hxx>
#include <tools/stream.hxx>
#include <unotools/streamwrap.hxx>
+#include <osl/diagnose.h>
#include <fmtanchr.hxx>
#include <fmtcntnt.hxx>
#include <fmtornt.hxx>
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index 41171da5db40..f9f58949c2cb 100644
--- a/sw/source/core/frmedt/fedesc.cxx
+++ b/sw/source/core/frmedt/fedesc.cxx
@@ -33,6 +33,7 @@
#include <tabfrm.hxx>
#include <SwStyleNameMapper.hxx>
#include <ndtxt.hxx>
+#include <osl/diagnose.h>
size_t SwFEShell::GetPageDescCnt() const
{
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 5ddbd7de1e31..db5f4dd33419 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <comphelper/types.hxx>
+#include <osl/diagnose.h>
#include <fmtanchr.hxx>
#include <fmtcntnt.hxx>
#include <fmtornt.hxx>
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx
index b34fb3f77195..b780817d8e89 100644
--- a/sw/source/core/frmedt/feflyole.cxx
+++ b/sw/source/core/frmedt/feflyole.cxx
@@ -20,6 +20,7 @@
#include <sfx2/ipclient.hxx>
#include <sfx2/viewsh.hxx>
+#include <osl/diagnose.h>
#include <fesh.hxx>
#include <cntfrm.hxx>
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 749a58439f0d..af410a803af9 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -92,6 +92,7 @@
#include <calbck.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <svx/svxids.hrc>
+#include <osl/diagnose.h>
#include <com/sun/star/embed/EmbedMisc.hpp>
#include <com/sun/star/embed/Aspects.hpp>
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 85d4daba2666..1a44707f43c3 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -26,6 +26,7 @@
#include <editeng/brushitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <svtools/ruler.hxx>
+#include <osl/diagnose.h>
#include <swwait.hxx>
#include <fmtfsize.hxx>
#include <fmtornt.hxx>
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 0d6519dba776..242cc123c431 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -18,6 +18,7 @@
*/
#include <svx/svdobj.hxx>
+#include <osl/diagnose.h>
#include <comphelper/lok.hxx>
#include <init.hxx>
#include <fesh.hxx>
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 468315708cca..48dbcc49bb72 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -21,6 +21,7 @@
#include <xmloff/xmlimp.hxx>
#include <xmloff/xmlnamespace.hxx>
+#include <xmloff/xmltkmap.hxx>
#include <com/sun/star/xml/sax/FastToken.hpp>
#include <sax/fastattribs.hxx>
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index a5631667c1e5..a5229b626e11 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -35,6 +35,7 @@
#include <textboxhelper.hxx>
#include <unomid.h>
#include <svx/svdoashp.hxx>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index 70c836c68645..cedca5d10a4a 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -30,6 +30,7 @@
#include <sortedobjs.hxx>
#include <pagefrm.hxx>
#include <layouter.hxx>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 2fdf0f9ba0c2..fe29ecfe2faa 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -24,6 +24,7 @@
#include <sal/log.hxx>
#include <o3tl/any.hxx>
#include <o3tl/safeint.hxx>
+#include <osl/diagnose.h>
#include <svtools/unoimap.hxx>
#include <vcl/imap.hxx>
#include <vcl/imapobj.hxx>
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index aeeb9df158cf..4da7afb622df 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -20,6 +20,7 @@
#include <memory>
#include <sal/config.h>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <svx/svdobj.hxx>
#include <anchoredobject.hxx>
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 6dcf1b756ed4..755ea2ea1256 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -65,6 +65,7 @@
#include <txtfly.hxx>
#include <ndindex.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <osl/diagnose.h>
#include <wrtsh.hxx>
#include <view.hxx>
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index d1f3a86bec0d..f9a25f056aba 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -18,6 +18,7 @@
*/
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <svx/swframetypes.hxx>
#include <pagefrm.hxx>
#include <txtfrm.hxx>
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index c5c647e0738a..461d2f779e1b 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -26,6 +26,7 @@
#include <dflyobj.hxx>
#include <IDocumentSettingAccess.hxx>
#include <IDocumentDrawModelAccess.hxx>
+#include <osl/diagnose.h>
SwFlyInContentFrame::SwFlyInContentFrame( SwFlyFrameFormat *pFormat, SwFrame* pSib, SwFrame *pAnch ) :
SwFlyFrame( pFormat, pSib, pAnch )
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 8f58d83a138d..ea50b06ab364 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -47,6 +47,7 @@
#include <ndindex.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 7abc46270bfa..2d5131c4e658 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -25,6 +25,7 @@
#include <editeng/lspcitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <drawdoc.hxx>
#include <fmtornt.hxx>
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index afa012400d81..b9f8b1e96dbd 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -19,6 +19,7 @@
#include <editeng/formatbreakitem.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <tools/stream.hxx>
#include <doc.hxx>
#include <IDocumentStatistics.hxx>
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 4d4e76dd96dd..61084de170a5 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -21,6 +21,7 @@
#include <o3tl/safeint.hxx>
#include <svx/svdpage.hxx>
+#include <osl/diagnose.h>
#include <drawdoc.hxx>
#include <fmtpdsc.hxx>
#include <swtable.hxx>
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 76ffb60c89a2..1c304008aeca 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -20,6 +20,7 @@
#include <comphelper/lok.hxx>
#include <ndole.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <svl/itemiter.hxx>
#include <fmtfsize.hxx>
#include <fmthdft.hxx>
diff --git a/sw/source/core/layout/sortedobjs.cxx b/sw/source/core/layout/sortedobjs.cxx
index 2e3df19104f0..ad3759466b18 100644
--- a/sw/source/core/layout/sortedobjs.cxx
+++ b/sw/source/core/layout/sortedobjs.cxx
@@ -28,6 +28,7 @@
#include <pam.hxx>
#include <svx/svdobj.hxx>
#include <IDocumentDrawModelAccess.hxx>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index d8404b947c04..b4ac7980e90a 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -35,6 +35,7 @@
#include <hints.hxx>
#include <frmtool.hxx>
#include <ndtxt.hxx>
+#include <osl/diagnose.h>
// No inline cause we need the function pointers
tools::Long SwFrame::GetTopMargin() const
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index af675d8bd8b8..4747cede044b 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -59,6 +59,7 @@
#include <calbck.hxx>
#include <DocumentSettingManager.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <frmatr.hxx>
#include <frmtool.hxx>
#include <ndtxt.hxx>
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 350d118e37a6..a7506ca9a13a 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -52,6 +52,7 @@
#include <swselectionlist.hxx>
#include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
namespace {
bool lcl_GetModelPositionForViewPoint_Objects( const SwPageFrame* pPageFrame, bool bSearchBackground,
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index ae6c338fd716..323d6772184c 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -37,6 +37,7 @@
#include <IDocumentSettingAccess.hxx>
#include <textboxhelper.hxx>
#include <fmtsrnd.hxx>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
using namespace objectpositioning;
diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
index ffe9a3682a6d..50b2b9eb65f5 100644
--- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
@@ -27,6 +27,7 @@
#include <frmatr.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
+#include <osl/diagnose.h>
#include <fmtornt.hxx>
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index dea6424bc3dd..66014910cdf1 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -35,6 +35,7 @@
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
#include <svx/svdobj.hxx>
+#include <osl/diagnose.h>
#include <environmentofanchoredobject.hxx>
#include <frmatr.hxx>
#include <fmtwrapinfluenceonobjpos.hxx>
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx
index 77e1fcbd6e86..8a58b0df0ebe 100644
--- a/sw/source/core/swg/SwXMLSectionList.cxx
+++ b/sw/source/core/swg/SwXMLSectionList.cxx
@@ -20,6 +20,7 @@
#include <SwXMLSectionList.hxx>
#include <xmloff/xmlictxt.hxx>
#include <xmloff/xmlnamespace.hxx>
+#include <xmloff/xmltkmap.hxx>
#include <vector>
using namespace ::com::sun::star;
diff --git a/sw/source/core/text/txtcache.cxx b/sw/source/core/text/txtcache.cxx
index dbc22914cacd..188fa7bec697 100644
--- a/sw/source/core/text/txtcache.cxx
+++ b/sw/source/core/text/txtcache.cxx
@@ -22,6 +22,7 @@
#include "porlay.hxx"
#include <sfx2/viewsh.hxx>
+#include <osl/diagnose.h>
#include <view.hxx>
SwTextLine::SwTextLine( SwTextFrame const *pFrame, std::unique_ptr<SwParaPortion> pNew ) :
diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index 49c9d1d19670..cfb01bbace4f 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -34,6 +34,7 @@
#include <calbck.hxx>
#include <dcontact.hxx>
#include <textboxhelper.hxx>
+#include <osl/diagnose.h>
SwFormatFlyCnt::SwFormatFlyCnt( SwFrameFormat *pFrameFormat )
: SfxPoolItem( RES_TXTATR_FLYCNT ),
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index e156291d6478..161c22ea2ea0 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -27,6 +27,7 @@
#include <editeng/lrspitem.hxx>
#include <editeng/rsiditem.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <anchoredobject.hxx>
#include <txtfld.hxx>
#include <txtinet.hxx>
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index d1f0eee5fec6..990bebad2d58 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -39,6 +39,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index b1a63c1cf454..67b6f06a50a1 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -25,6 +25,7 @@
#include <svl/itemiter.hxx>
#include <editeng/tstpitem.hxx>
#include <svx/svdobj.hxx>
+#include <osl/diagnose.h>
#include <hintids.hxx>
#include <fmtflcnt.hxx>
#include <txtftn.hxx>
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 0e84af47d5c4..40ca36552139 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -21,6 +21,7 @@
#include <svl/itemiter.hxx>
#include <svx/svdundo.hxx>
+#include <osl/diagnose.h>
#include <hintids.hxx>
#include <hints.hxx>
#include <fmtflcnt.hxx>
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index b10cae23f0a3..c29e4a9a7713 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -24,6 +24,7 @@
#include <svx/svdpage.hxx>
#include <svx/svdmark.hxx>
#include <svx/svdview.hxx>
+#include <osl/diagnose.h>
#include <hintids.hxx>
#include <fmtanchr.hxx>
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 06a56636d7a8..f5cc03b93857 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -23,6 +23,7 @@
#include <unotools/charclass.hxx>
#include <editeng/keepitem.hxx>
#include <svx/svdobj.hxx>
+#include <osl/diagnose.h>
#include <fmtcntnt.hxx>
#include <frmfmt.hxx>
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index d2a9d5e36808..2ee01239b596 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -61,6 +61,7 @@
#include <unochart.hxx>
#include <calbck.hxx>
#include <frameformats.hxx>
+#include <osl/diagnose.h>
#include <memory>
#include <utility>
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 94f2f2240655..215f9e187326 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -41,6 +41,7 @@
#include <vcl/settings.hxx>
#include <vcl/canvastools.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <basegfx/range/b2irectangle.hxx>
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 44e632c5d4d0..24c7ed35ff03 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -19,6 +19,7 @@
#include <sfx2/printer.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <doc.hxx>
#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentUndoRedo.hxx>
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index bc92e9c58d13..bd243d2e074e 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -21,6 +21,7 @@
#include <hintids.hxx>
#include <sfx2/printer.hxx>
#include <svx/svdview.hxx>
+#include <osl/diagnose.h>
#include <txtfld.hxx>
#include <fmtfld.hxx>
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 0b3721fe4caa..b9179b601bf5 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -94,6 +94,7 @@
#include <o3tl/unit_conversion.hxx>
#include <rtl/strbuf.hxx>
+#include <osl/diagnose.h>
using namespace css;
using editeng::SvxBorderLine;
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index 1f09a40cf09b..90ac85467903 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -38,6 +38,7 @@
#include <svl/itemiter.hxx>
#include <svtools/htmltokn.h>
#include <svtools/htmlkywd.hxx>
+#include <osl/diagnose.h>
#include <charatr.hxx>
#include <drawdoc.hxx>
diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx
index d9ff363bda18..62325b40a2e3 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -31,6 +31,7 @@
#include <svl/whiter.hxx>
#include <svtools/htmlout.hxx>
#include <svtools/htmlkywd.hxx>
+#include <osl/diagnose.h>
#include <rtl/strbuf.hxx>
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index 32b9d80aa65d..ce1a43a3a40d 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -22,6 +22,7 @@
#include <o3tl/sorted_vector.hxx>
#include <o3tl/typed_flags_set.hxx>
+#include <sal/types.h>
class SdrObject;
class SwFrameFormat;
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index e6cf6316474f..442114fb48c3 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -40,6 +40,7 @@
#include <editeng/ulspitem.hxx>
#include <editeng/brushitem.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <fmtanchr.hxx>
#include <fmtornt.hxx>
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 91262fac3763..b3f84f896f89 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -46,6 +46,7 @@
#include <editeng/postitem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/crossedoutitem.hxx>
+#include <osl/diagnose.h>
#include <docsh.hxx>
#include <fmtanchr.hxx>
#include <viewsh.hxx>
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index c3c95cf7f788..a9e403e94519 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -34,6 +34,7 @@
#include <svtools/htmlkywd.hxx>
#include <svl/urihelper.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <dcontact.hxx>
#include <fmtornt.hxx>
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 199d2f6c9f51..7dc276264569 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -33,6 +33,7 @@
#include <svx/svdoole2.hxx>
#include <tools/UnitConversion.hxx>
#include <editeng/formatbreakitem.hxx>
+#include <osl/diagnose.h>
#include <ndtxt.hxx>
#include <ndnotxt.hxx>
#include <fmtcntnt.hxx>
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 91bb6e9ad5f1..012a4c4075f9 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -20,6 +20,7 @@
#include <memory>
#include <tools/urlobj.hxx>
#include <svl/urihelper.hxx>
+#include <osl/diagnose.h>
#include <ndtxt.hxx>
#include <pam.hxx>
#include <poolfmt.hxx>
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index e6901f360f84..4d005bc8ae50 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -21,6 +21,7 @@
#include <sal/log.hxx>
#include <comphelper/string.hxx>
+#include <osl/diagnose.h>
#include <o3tl/safeint.hxx>
#include <o3tl/temporary.hxx>
#include <tools/solar.h>
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 2f0a87cc4849..6c72ed5321eb 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -33,6 +33,7 @@
#include "sprmids.hxx"
#include <svx/unoapi.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <sot/exchange.hxx>
#include <fmtanchr.hxx>
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 4db9924e2b40..4ffd00a5ebee 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -78,6 +78,7 @@
#include <o3tl/safeint.hxx>
#include <unotools/fltrcfg.hxx>
#include <xmloff/odffields.hxx>
+#include <osl/diagnose.h>
#include <algorithm>
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index bd51f9d5bb69..5db9cb10d5b0 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -31,6 +31,7 @@
#include <rtl/tencinfo.h>
#include <sal/macros.h>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <swerror.h>
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 50c8f8b1c9c7..4efa7d21bea9 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -22,6 +22,7 @@
#include <osl/diagnose.h>
#include <xmloff/xmlmetai.hxx>
#include <xmloff/ProgressBarHelper.hxx>
+#include <xmloff/xmltkmap.hxx>
#include <o3tl/safeint.hxx>
#include <xmloff/xmluconv.hxx>
#include <docstat.hxx>
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 03b316895b09..2bef906093f7 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -18,6 +18,7 @@
*/
#include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
#include <uitool.hxx>
#include <swtypes.hxx>
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 692c835ec89f..4b4eeb094982 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -27,6 +27,7 @@
#include <sfx2/htmlmode.hxx>
#include <svl/cjkoptions.hxx>
#include <svl/macitem.hxx>
+#include <osl/diagnose.h>
#include <cmdid.h>
#include <swtypes.hxx>
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 92a0ed6cebf9..ed9f3f6a75ac 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -42,6 +42,7 @@
#include <com/sun/star/i18n/BreakIterator.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <comphelper/processfactory.hxx>
+#include <osl/diagnose.h>
#include <charatr.hxx>
#include <viewopt.hxx>
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 336669241daa..44b57bd86231 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -37,6 +37,7 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <svx/flagsdef.hxx>
+#include <osl/diagnose.h>
SwParaDlg::SwParaDlg(weld::Window *pParent,
SwView& rVw,
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 2cb5a8558eb3..8a57f054abca 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -34,6 +34,7 @@
#include <svtools/restartdialog.hxx>
#include <comphelper/processfactory.hxx>
#include <officecfg/Office/Compatibility.hxx>
+#include <osl/diagnose.h>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index c9b362355c6e..86672990f308 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -29,6 +29,7 @@
#include <unotools/localedatawrapper.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
std::unique_ptr<SfxTabPage> SwDocStatPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 357be32aa182..e905bc2a79cc 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -34,6 +34,7 @@
#include <sfx2/filedlghelper.hxx>
#include <editeng/sizeitem.hxx>
#include <svtools/htmlcfg.hxx>
+#include <osl/diagnose.h>
#include <uitool.hxx>
#include <IMark.hxx>
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index a8dd562debfa..b3b57a923011 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -23,6 +23,7 @@
#include <editeng/tstpitem.hxx>
#include <editeng/lrspitem.hxx>
#include <svtools/unitconv.hxx>
+#include <osl/diagnose.h>
#include <cmdid.h>
#include <wrtsh.hxx>
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 6cd7cc6e6720..21dcb0ca39fd 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -31,6 +31,7 @@
#include <IDocumentMarkAccess.hxx>
#include <unotools/syslocaleoptions.hxx>
#include <unotools/charclass.hxx>
+#include <osl/diagnose.h>
#include <comphelper/string.hxx>
#include <o3tl/safeint.hxx>
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index cf07d2a25b9f..de2c1adc3935 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -25,6 +25,7 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/htmlmode.hxx>
#include <sfx2/viewfrm.hxx>
+#include <osl/diagnose.h>
#include <viewopt.hxx>
#include <chldwrap.hxx>
#include <docsh.hxx>
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 7c6ac6406fe3..08e52b4d8400 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -22,6 +22,7 @@
#include <sfx2/viewfrm.hxx>
#include <svx/hdft.hxx>
#include <editeng/flstitem.hxx>
+#include <osl/diagnose.h>
#include <sfx2/htmlmode.hxx>
#include <sfx2/sfxdlg.hxx>
#include <svtools/htmlcfg.hxx>
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 5b4c8fb1f5cd..d3d9427751e0 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -59,6 +59,7 @@
#include <fmtfollowtextflow.hxx>
#include <svx/sdtaitm.hxx>
#include <sal/macros.h>
+#include <osl/diagnose.h>
#include <strings.hrc>
#include <svx/strings.hrc>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 3a0805e3ebaa..13bc59d038e8 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -35,6 +35,7 @@
#include <sfx2/viewfrm.hxx>
#include <svl/itemset.hxx>
#include <editeng/langitem.hxx>
+#include <osl/diagnose.h>
#include <swtypes.hxx>
#include <toxmgr.hxx>
#include <txttxmrk.hxx>
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 1455565d687f..f9086dc49375 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -18,6 +18,7 @@
*/
#include <svl/style.hxx>
+#include <osl/diagnose.h>
#include <wrtsh.hxx>
#include <view.hxx>
#include <docsh.hxx>
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 5cbfc4536acc..eb05d93a92a1 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -29,6 +29,7 @@
#include <sfx2/request.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/docfilt.hxx>
+#include <osl/diagnose.h>
#include <svx/svxdlg.hxx>
#include <editeng/acorrcfg.hxx>
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 53d763a39e44..cb2cf60e95d6 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -37,6 +37,7 @@
#include <svl/slstitm.hxx>
#include <svl/intitem.hxx>
#include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
static bool bLastRelative = false;
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 3a27bb61b007..6ab262e7eca1 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -56,6 +56,7 @@
#include <cmdid.h>
#include <svx/dialogs.hrc>
#include <svx/flagsdef.hxx>
+#include <osl/diagnose.h>
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index 3e4129b96743..02ce718915ae 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -30,6 +30,7 @@
#include <editeng/ulspitem.hxx>
#include <editeng/pbinitem.hxx>
#include <editeng/paperinf.hxx>
+#include <osl/diagnose.h>
#include <fmthdft.hxx>
#include <swwait.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 1bd34c590ede..705bdee9e37a 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -32,6 +32,7 @@
#include <editeng/ulspitem.hxx>
#include <editeng/lrspitem.hxx>
#include <com/sun/star/frame/XModel.hpp>
+#include <osl/diagnose.h>
#include <fmthdft.hxx>
#include <fmtanchr.hxx>
#include <fmtfsize.hxx>
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index b6937382ebe8..aeb593036e30 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -40,6 +40,7 @@
#include <comphelper/lok.hxx>
#include <comphelper/classids.hxx>
#include <basic/sbmod.hxx>
+#include <osl/diagnose.h>
#include <node.hxx>
#include <swwait.hxx>
#include <printdata.hxx>
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index ac044a5589a0..d642e140f6f7 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -26,6 +26,7 @@
#include <comphelper/flagguard.hxx>
#include <o3tl/any.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <hintids.hxx>
#include <sfx2/styledlg.hxx>
#include <svl/whiter.hxx>
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 87824949ffdf..cae16121fd7c 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -20,6 +20,7 @@
#include <memory>
#include <sal/config.h>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <cstdlib>
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index a20ef64ddf1d..0e103f2282bc 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -38,6 +38,7 @@
#include <editeng/colritem.hxx>
#include <editeng/brushitem.hxx>
#include <svl/cjkoptions.hxx>
+#include <osl/diagnose.h>
#include <swmodule.hxx>
#include <swtypes.hxx>
#include <usrpref.hxx>
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 23fdfcd68dda..469a69968d74 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/container/XContainerListener.hpp>
#include <cppuhelper/implbase.hxx>
#include <i18nlangtag/languagetag.hxx>
+#include <osl/diagnose.h>
#include <dbmgr.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index 0ce6317b294e..38ad0d75b5a7 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -32,6 +32,7 @@
#include <svx/svdview.hxx>
#include <unotools/linguprops.hxx>
#include <unotools/lingucfg.hxx>
+#include <osl/diagnose.h>
#include <doc.hxx>
#include <IDocumentDeviceAccess.hxx>
#include <IDocumentDrawModelAccess.hxx>
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 3e96b2c9e807..41f1aad97a79 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -38,6 +38,7 @@
#include <strings.hrc>
#include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
#include <editeng/acorrcfg.hxx>
#include <sfx2/event.hxx>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 41829abbb73e..772889bf06f7 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -130,6 +130,7 @@
#include <sfx2/classificationhelper.hxx>
#include <sfx2/sfxdlg.hxx>
#include <comphelper/classids.hxx>
+#include <osl/diagnose.h>
#include <memory>
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 19565529d607..49ea845944b8 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -33,6 +33,7 @@
#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
#include <svl/languageoptions.hxx>
+#include <osl/diagnose.h>
#include <editeng/eeitem.hxx>
#include <editeng/postitem.hxx>
diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index 31594da032af..3436c4159771 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -24,6 +24,7 @@
#include <sot/formats.hxx>
#include <sfx2/bindings.hxx>
#include <vcl/commandevent.hxx>
+#include <osl/diagnose.h>
#include <sfx2/viewfrm.hxx>
#include <fmturl.hxx>
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index c3af8bd54149..a72554202f2e 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -18,6 +18,7 @@
*/
#include <doc.hxx>
+#include <osl/diagnose.h>
#include <osl/thread.h>
#include <vcl/help.hxx>
#include <tools/urlobj.hxx>
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 74452292713a..6609c454038a 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -34,6 +34,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include <tools/resary.hxx>
+#include <osl/diagnose.h>
#include <sfx2/dispatch.hxx>
#include <sfx2/linkmgr.hxx>
#include <sfx2/app.hxx>
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index e8a3ba892829..fa5991baac56 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -29,6 +29,7 @@
#include <svx/xdef.hxx>
#include <tools/globname.hxx>
#include <comphelper/classids.hxx>
+#include <osl/diagnose.h>
#include <fmtclds.hxx>
#include <wrtsh.hxx>
#include <view.hxx>
diff --git a/sw/source/uibase/index/toxmgr.cxx b/sw/source/uibase/index/toxmgr.cxx
index fe4885830ffa..d583154dc095 100644
--- a/sw/source/uibase/index/toxmgr.cxx
+++ b/sw/source/uibase/index/toxmgr.cxx
@@ -24,6 +24,7 @@
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <swundo.hxx>
+#include <osl/diagnose.h>
// handle indexes with TOXMgr
SwTOXMgr::SwTOXMgr(SwWrtShell* pShell):
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx
index 23974dfa109a..5e4a7ef35273 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -28,6 +28,7 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/text/RubyAdjust.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <osl/diagnose.h>
#include <hhcwrp.hxx>
#include "sdrhhcwrap.hxx"
#include <doc.hxx>
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 866402f8905f..8fbe2d07043b 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -57,6 +57,7 @@
#include <unotools/lingucfg.hxx>
#include <unotools/linguprops.hxx>
#include <vcl/settings.hxx>
+#include <osl/diagnose.h>
#include <map>
diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx
index b09b3fa12b42..a626be95da3e 100644
--- a/sw/source/uibase/lingu/sdrhhcwrap.cxx
+++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx
@@ -21,6 +21,7 @@
#include <svx/svdpagv.hxx>
#include <sfx2/printer.hxx>
#include <svx/svdview.hxx>
+#include <osl/diagnose.h>
#include <drawdoc.hxx>
#include "sdrhhcwrap.hxx"
#include <docsh.hxx>
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index ebbb7f0c2a00..a6503b588549 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -45,6 +45,7 @@
#include <vector>
#include <svx/svxdlg.hxx>
+#include <osl/diagnose.h>
#include <bitmaps.hlst>
#include <docsh.hxx>
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 2071df547be6..70e1ef1086dd 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -84,6 +84,7 @@
#include <svl/itempool.hxx>
#include <editeng/outliner.hxx>
#include <editeng/editview.hxx>
+#include <osl/diagnose.h>
#include <svl/languageoptions.hxx>
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 41e1c96f2711..78e37c09c756 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -92,6 +92,7 @@
#include <svx/unobrushitemhelper.hxx>
#include <comphelper/scopeguard.hxx>
#include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
#include <svx/svxdlg.hxx>
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 5b57fcb07a1d..4c6629274bca 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -42,6 +42,7 @@
#include <svx/svdundo.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/sdasitm.hxx>
+#include <osl/diagnose.h>
#include <swundo.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index 2e2f5fd5210b..7c16bde0a7b8 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <sfx2/htmlmode.hxx>
#include <tools/urlobj.hxx>
+#include <osl/diagnose.h>
#include <viewopt.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index f901f32cc15d..4dad1d221060 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -27,6 +27,7 @@
#include <svl/whiter.hxx>
#include <svx/swframevalidation.hxx>
#include <svx/anchorid.hxx>
+#include <osl/diagnose.h>
#include <drawdoc.hxx>
#include <uitool.hxx>
#include <fmtornt.hxx>
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 7bec3a0f82d4..da358b617d17 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -63,6 +63,7 @@
#include <editeng/editview.hxx>
#include <vcl/unohelp2.hxx>
#include <editeng/hyphenzoneitem.hxx>
+#include <osl/diagnose.h>
#include <cmdid.h>
#include <doc.hxx>
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 9fc21dfcbacf..780b7260a5ae 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -48,6 +48,7 @@
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <comphelper/propertysequence.hxx>
+#include <osl/diagnose.h>
#include <swtypes.hxx>
#include <view.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 0ed3e1daa146..013e54887119 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -38,6 +38,7 @@
#include <svx/compressgraphicdialog.hxx>
#include <svx/tbxcolor.hxx>
#include <svx/sdangitm.hxx>
+#include <osl/diagnose.h>
#include <drawdoc.hxx>
#include <view.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx
index c5db2c5cceb1..a9ebd1d9c759 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -40,6 +40,7 @@
#include <svl/slstitm.hxx>
#include <svl/stritem.hxx>
#include <svx/svxids.hrc>
+#include <osl/diagnose.h>
#include <ndtxt.hxx>
#include <pam.hxx>
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index cb37bfa08402..cbf3008c5c66 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -24,6 +24,7 @@
#include <sfx2/viewfrm.hxx>
#include <svl/eitem.hxx>
#include <svl/whiter.hxx>
+#include <osl/diagnose.h>
#include <numrule.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 036274546d04..9c73c9923a2d 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -46,6 +46,7 @@
#include <comphelper/lok.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <editeng/itemtype.hxx>
+#include <osl/diagnose.h>
#include <fmtornt.hxx>
#include <fmtlsplt.hxx>
diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx
index e92f11130b86..b5b81e3f2228 100644
--- a/sw/source/uibase/shells/textdrw.cxx
+++ b/sw/source/uibase/shells/textdrw.cxx
@@ -25,6 +25,7 @@
#include <svx/svdouno.hxx>
#include <com/sun/star/form/FormButtonType.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <osl/diagnose.h>
#include <view.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 582bcb524bf2..158ba5626915 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -34,6 +34,7 @@
#include <svx/postattr.hxx>
#include <svx/hlnkitem.hxx>
#include <svx/svxdlg.hxx>
+#include <osl/diagnose.h>
#include <fmtinfmt.hxx>
#include <fldwrap.hxx>
#include <redline.hxx>
diff --git a/sw/source/uibase/shells/textglos.cxx b/sw/source/uibase/shells/textglos.cxx
index b6aee47f7c55..d229964d2072 100644
--- a/sw/source/uibase/shells/textglos.cxx
+++ b/sw/source/uibase/shells/textglos.cxx
@@ -20,6 +20,7 @@
#include <sfx2/request.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
+#include <osl/diagnose.h>
#include <view.hxx>
#include <cmdid.h>
diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx
index b577547347e6..fc82635ecc6b 100644
--- a/sw/source/uibase/shells/textidx.cxx
+++ b/sw/source/uibase/shells/textidx.cxx
@@ -22,6 +22,7 @@
#include <sfx2/viewfrm.hxx>
#include <svl/eitem.hxx>
#include <editeng/sizeitem.hxx>
+#include <osl/diagnose.h>
#include <fmtfsize.hxx>
#include <fldbas.hxx>
#include <uiitems.hxx>
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 50d8171c90f6..8300a91295ca 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -44,6 +44,7 @@
#include <svtools/htmlcfg.hxx>
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
+#include <osl/diagnose.h>
#include <comphelper/classids.hxx>
#include <editeng/acorrcfg.hxx>
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx
index 0438d42aa3b1..efdb74694949 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -31,6 +31,7 @@
#include <fldbas.hxx>
#include <dbmgr.hxx>
#include <svx/dataaccessdescriptor.hxx>
+#include <osl/diagnose.h>
#include <vcl/svapp.hxx>
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index 839e7f760e47..7c34d31f9b3a 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -36,6 +36,7 @@
#include <editeng/scripttypeitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/cmapitem.hxx>
+#include <osl/diagnose.h>
#include <paratr.hxx>
#include <fmtinfmt.hxx>
diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx
index 1290c2070679..d49d3d1433ef 100644
--- a/sw/source/uibase/shells/txtcrsr.cxx
+++ b/sw/source/uibase/shells/txtcrsr.cxx
@@ -25,6 +25,7 @@
#include <svl/eitem.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
+#include <osl/diagnose.h>
#include <view.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx
index 8f8ca2429513..b75cc1c7dcbd 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -22,6 +22,7 @@
#include <svl/stritem.hxx>
#include <editeng/numitem.hxx>
#include <editeng/brushitem.hxx>
+#include <osl/diagnose.h>
#include <numrule.hxx>
#include <cmdid.h>
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index 8c1737f11305..2fcea5f285f5 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -20,6 +20,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
#include <IDocumentChartDataProviderAccess.hxx>
+#include <osl/diagnose.h>
#include <swmodule.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index b17bebd8c261..8fc8f681dbea 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -37,6 +37,7 @@
#include <svx/svdview.hxx>
#include <svx/zoomslideritem.hxx>
#include <tools/svborder.hxx>
+#include <osl/diagnose.h>
#include <globdoc.hxx>
#include <wdocsh.hxx>
diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx
index 02dc88cade38..d076bb5f0ae5 100644
--- a/sw/source/uibase/uiview/swcli.cxx
+++ b/sw/source/uibase/uiview/swcli.cxx
@@ -26,6 +26,7 @@
#include <edtwin.hxx>
#include <swcli.hxx>
#include <svtools/embedhlp.hxx>
+#include <osl/diagnose.h>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index ad2756b8fdd8..8d7e8521664e 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -37,6 +37,7 @@
#include <avmedia/mediaplayer.hxx>
#include <swmodule.hxx>
#include <com/sun/star/linguistic2/XLinguProperties.hpp>
+#include <osl/diagnose.h>
#include <sfx2/objface.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index e781c95261df..70395f6f6275 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -132,6 +132,7 @@
#include <vcl/GraphicNativeMetadata.hxx>
#include <vcl/settings.hxx>
#include <i18nutil/searchopt.hxx>
+#include <osl/diagnose.h>
#include <paratr.hxx>
#include <rootfrm.hxx>
#include <frameformats.hxx>
diff --git a/sw/source/uibase/uiview/viewcoll.cxx b/sw/source/uibase/uiview/viewcoll.cxx
index 94ad59d1d3ca..9ee42e1e21b4 100644
--- a/sw/source/uibase/uiview/viewcoll.cxx
+++ b/sw/source/uibase/uiview/viewcoll.cxx
@@ -23,6 +23,7 @@
#include <sfx2/request.hxx>
#include <svl/stritem.hxx>
#include <svl/style.hxx>
+#include <osl/diagnose.h>
#include <view.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/uiview/viewdlg.cxx b/sw/source/uibase/uiview/viewdlg.cxx
index c6f81808e4e3..041b13bf4885 100644
--- a/sw/source/uibase/uiview/viewdlg.cxx
+++ b/sw/source/uibase/uiview/viewdlg.cxx
@@ -18,6 +18,7 @@
*/
#include <sfx2/request.hxx>
+#include <osl/diagnose.h>
#include <view.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index ff0c3764f6e4..dd0da7acef95 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -21,6 +21,7 @@
#include <sfx2/objface.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdview.hxx>
+#include <osl/diagnose.h>
#include <fldmgr.hxx>
#include <expfld.hxx>
#include <modcfg.hxx>
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index 0e860f80472b..80024ccf6ac4 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -42,6 +42,7 @@
#include <sfx2/dispatch.hxx>
#include <svx/svdoutl.hxx>
#include <vcl/ptrstyle.hxx>
+#include <osl/diagnose.h>
#include <view.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index a84474176ce1..9497927262b0 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -38,6 +38,7 @@
#include <svx/dialmgr.hxx>
#include <svx/svxerr.hxx>
#include <svx/svxdlg.hxx>
+#include <osl/diagnose.h>
#include <swwait.hxx>
#include <uitool.hxx>
#include <view.hxx>
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index 688c28f65c87..b5ebbb258187 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -39,6 +39,7 @@
#include <comphelper/lok.hxx>
#include <vcl/weld.hxx>
#include <tools/svborder.hxx>
+#include <osl/diagnose.h>
#include "viewfunc.hxx"
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index be7337c25654..42081968d13f 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -35,6 +35,7 @@
#include <svl/intitem.hxx>
#include <svl/flagitem.hxx>
#include <sfx2/linkmgr.hxx>
+#include <osl/diagnose.h>
#include <modcfg.hxx>
#include <edtwin.hxx>
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index d4f34c04d7cb..73da69f4f326 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -59,6 +59,7 @@
#include <comphelper/lok.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <boost/property_tree/json_parser.hpp>
+#include <osl/diagnose.h>
#include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx
index d9b3481b4ee4..696f946056ad 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -26,6 +26,7 @@
#include <sfx2/dispatch.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <comphelper/servicehelper.hxx>
+#include <osl/diagnose.h>
#include <unodispatch.hxx>
#include <view.hxx>
#include <cmdid.h>
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 5ddc8778d7b7..0ff3ca871b48 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -30,6 +30,7 @@
#include <sot/filelist.hxx>
#include <svl/eitem.hxx>
#include <vcl/graphicfilter.hxx>
+#include <osl/diagnose.h>
#include <sfx2/docinsert.hxx>
#include <sfx2/filedlghelper.hxx>
diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx
index 8d2dcc2af2d3..46b44ecf567d 100644
--- a/sw/source/uibase/utlui/gloslst.cxx
+++ b/sw/source/uibase/utlui/gloslst.cxx
@@ -21,6 +21,7 @@
#include <svl/fstathelper.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/transliterationwrapper.hxx>
+#include <osl/diagnose.h>
#include <swtypes.hxx>
#include <swmodule.hxx>
#include <shellio.hxx>
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index bbfc9b062fce..47593d643c42 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -27,6 +27,7 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
#include <tools/urlobj.hxx>
+#include <osl/diagnose.h>
#include <swtypes.hxx>
#include <swmodule.hxx>
#include <view.hxx>
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index 88b2b27b344a..6e5caee15da3 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -24,6 +24,7 @@
#include <svx/numinf.hxx>
#include <svx/flagsdef.hxx>
#include <svl/itemset.hxx>
+#include <osl/diagnose.h>
#include <docsh.hxx>
#include <swtypes.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx
index 4a9b29af36e3..7db55f76c627 100644
--- a/sw/source/uibase/wrtsh/delete.cxx
+++ b/sw/source/uibase/wrtsh/delete.cxx
@@ -32,6 +32,7 @@
#include <i18nutil/unicode.hxx>
#include <o3tl/temporary.hxx>
#include <rtl/character.hxx>
+#include <osl/diagnose.h>
#include <doc.hxx>
inline void SwWrtShell::OpenMark()
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index 2c61e51c1deb..8c1c21fc964c 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -25,6 +25,7 @@
#include <svl/macitem.hxx>
#include <unotools/charclass.hxx>
#include <sfx2/event.hxx>
+#include <osl/diagnose.h>
#include <cmdid.h>
#include <view.hxx>
#include <basesh.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index be70c7b66014..66686a8e9808 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -85,6 +85,7 @@
#include <sfx2/viewfrm.hxx>
#include <vcl/uitest/logger.hxx>
#include <vcl/uitest/eventdescription.hxx>
+#include <osl/diagnose.h>
#include <PostItMgr.hxx>
#include <FrameControlsManager.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index cbda31185fed..66b38c3d84ea 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -27,6 +27,7 @@
#include <sfx2/linkmgr.hxx>
#include <sfx2/viewfrm.hxx>
#include <sot/exchange.hxx>
+#include <osl/diagnose.h>
#include <fmtinfmt.hxx>
#include <wrtsh.hxx>
#include <docsh.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx
index 1fd1ce2cddeb..7d30c3780fc2 100644
--- a/sw/source/uibase/wrtsh/wrtsh3.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh3.cxx
@@ -27,6 +27,7 @@
#include <svx/srchdlg.hxx>
#include <com/sun/star/form/FormButtonType.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <osl/diagnose.h>
#include <swmodule.hxx>
#include <wrtsh.hxx>
#include <view.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtundo.cxx b/sw/source/uibase/wrtsh/wrtundo.cxx
index 1e92006a232b..49d73d75e579 100644
--- a/sw/source/uibase/wrtsh/wrtundo.cxx
+++ b/sw/source/uibase/wrtsh/wrtundo.cxx
@@ -25,6 +25,7 @@
#include <swdtflvr.hxx>
#include <svtools/svtresid.hxx>
#include <svtools/strings.hrc>
+#include <osl/diagnose.h>
// Undo ends all modes. If a selection is emerged by the Undo,
// this must be considered for further action.