basctl/source/dlged/dlged.cxx | 1
basegfx/source/polygon/b3dpolygon.cxx | 1
chart2/source/controller/main/ChartTransferable.cxx | 1
chart2/source/controller/main/SelectionHelper.cxx | 1
chart2/source/view/main/DrawModelWrapper.cxx | 1
cui/source/dialogs/cuigaldlg.cxx | 1
cui/source/tabpages/swpossizetabpage.cxx | 1
cui/source/tabpages/textattr.cxx | 1
cui/source/tabpages/tpcolor.cxx | 1
cui/source/tabpages/tplnedef.cxx | 1
cui/source/tabpages/tplneend.cxx | 1
dbaccess/source/ui/tabledesign/TableController.cxx | 1
extensions/source/activex/so_activex.cxx | 1
extensions/source/propctrlr/propertyhandler.cxx | 1
filter/source/msfilter/escherex.cxx | 1
include/IwyuFilter_include.yaml | 20
++++++++++
include/basegfx/polygon/b2dpolygon.hxx | 1
include/basegfx/polygon/b2dpolypolygontools.hxx | 1
include/basegfx/utils/systemdependentdata.hxx | 1
include/basic/sbxdef.hxx | 1
include/codemaker/global.hxx | 2 -
include/comphelper/propertysethelper.hxx | 1
include/comphelper/servicedecl.hxx | 1
include/dbaccess/dataview.hxx | 1
include/formula/FormulaOpCodeMapperObj.hxx | 1
include/framework/transactionmanager.hxx | 2 -
include/i18nlangtag/languagetagicu.hxx | 1
include/o3tl/cow_wrapper.hxx | 1
include/o3tl/lazy_update.hxx | 2 -
include/o3tl/typed_flags_set.hxx | 1
include/o3tl/vector_utils.hxx | 2 +
include/oox/crypto/StrongEncryptionDataSpace.hxx | 1
include/oox/drawingml/drawingmltypes.hxx | 1
include/sax/tools/converter.hxx | 1
include/sfx2/QuerySaveDocument.hxx | 1
include/sfx2/XmlIdRegistry.hxx | 1
include/sfx2/devtools/DevelopmentToolDockingWindow.hxx | 4 --
include/sfx2/devtools/DocumentModelTreeHandler.hxx | 3 -
include/sfx2/devtools/ObjectInspectorTreeHandler.hxx | 2 -
include/sfx2/dinfdlg.hxx | 1
include/sfx2/lokcharthelper.hxx | 1
include/sfx2/notebookbar/SfxNotebookBar.hxx | 3 +
include/sfx2/sidebar/FocusManager.hxx | 1
include/sfx2/sidebar/Sidebar.hxx | 3 +
include/sfx2/sidebar/TabBar.hxx | 2 -
include/sfx2/sidebar/Theme.hxx | 2 -
include/svl/SfxBroadcaster.hxx | 1
include/svl/imageitm.hxx | 1
include/svtools/HtmlWriter.hxx | 1
include/svtools/filechangedchecker.hxx | 2 -
include/svtools/imagemgr.hxx | 1
include/svtools/querydelete.hxx | 1
include/svtools/stringtransfer.hxx | 1
include/svtools/toolbarmenu.hxx | 1
include/svx/connctrl.hxx | 1
include/svx/dialcontrol.hxx | 1
include/svx/fmtools.hxx | 1
include/svx/fontworkgallery.hxx | 1
include/svx/framelink.hxx | 2 -
include/svx/gallerybinaryengine.hxx | 3 -
include/svx/gallerybinaryengineentry.hxx | 2 -
include/svx/galleryobjectcollection.hxx | 3 -
include/svx/galmisc.hxx | 1
include/svx/galtheme.hxx | 2 -
include/svx/polypolygoneditor.hxx | 1
include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx | 2 +
include/svx/sidebar/AreaPropertyPanelBase.hxx | 1
include/svx/svdobj.hxx | 2 -
include/svx/svdoole2.hxx | 3 +
include/svx/svxdlg.hxx | 1
include/svx/ucsubset.hxx | 1
include/svx/unoshape.hxx | 1
include/toolkit/awt/vclxwindows.hxx | 1
include/toolkit/helper/vclunohelper.hxx | 1
include/tools/XmlWriter.hxx | 2 -
include/tools/helpers.hxx | 1
include/tools/multisel.hxx | 1
include/unotools/dynamicmenuoptions.hxx | 2 -
include/unotools/optionsdlg.hxx | 1
include/unotools/weakref.hxx | 3 -
include/vcl/BitmapBuffer.hxx | 1
include/vcl/GraphicNativeTransform.hxx | 4 +-
include/vcl/Scanline.hxx | 1
include/vcl/bitmap/BitmapTypes.hxx | 3 +
include/vcl/filter/PDFiumLibrary.hxx | 1
include/vcl/opengl/OpenGLContext.hxx | 5 --
include/vcl/outdevmap.hxx | 2 +
include/vcl/pdf/PDFAnnotationMarker.hxx | 2 +
include/vcl/pdf/PDFFindFlags.hxx | 1
include/vcl/unohelp2.hxx | 3 -
include/xmloff/SchXMLImportHelper.hxx | 4 --
include/xmloff/XMLTextShapeStyleContext.hxx | 1
include/xmloff/shapeimport.hxx | 1
include/xmloff/xmlictxt.hxx | 1
reportdesign/source/filter/xml/xmlReportElementBase.cxx | 1
reportdesign/source/ui/report/ReportSection.cxx | 1
reportdesign/source/ui/report/dlgedfac.cxx | 1
sc/source/core/data/column3.cxx | 1
sc/source/core/data/dociter.cxx | 1
sc/source/core/data/documen2.cxx | 1
sc/source/core/data/documen3.cxx | 1
sc/source/core/data/documen4.cxx | 1
sc/source/core/data/documen7.cxx | 1
sc/source/core/data/documen8.cxx | 1
sc/source/core/data/documen9.cxx | 1
sc/source/core/data/document.cxx | 1
sc/source/core/data/drwlayer.cxx | 1
sc/source/core/data/fillinfo.cxx | 1
sc/source/core/data/postit.cxx | 1
sc/source/core/data/table1.cxx | 1
sc/source/core/data/table2.cxx | 1
sc/source/core/data/table3.cxx | 1
sc/source/core/data/table4.cxx | 1
sc/source/core/data/table5.cxx | 2 +
sc/source/core/data/table7.cxx | 1
sc/source/core/tool/detfunc.cxx | 1
sc/source/filter/oox/drawingfragment.cxx | 1
sc/source/filter/rtf/eeimpars.cxx | 1
sc/source/filter/xml/XMLCellRangeSourceContext.cxx | 1
sc/source/filter/xml/celltextparacontext.cxx | 1
sc/source/filter/xml/xmlcelli.cxx | 1
sc/source/filter/xml/xmlcondformat.cxx | 1
sc/source/filter/xml/xmlnexpi.cxx | 1
sc/source/ui/app/drwtrans.cxx | 1
sc/source/ui/app/inputhdl.cxx | 1
sc/source/ui/app/seltrans.cxx | 1
sc/source/ui/docshell/dbdocfun.cxx | 1
sc/source/ui/docshell/docfunc.cxx | 1
sc/source/ui/docshell/docsh3.cxx | 1
sc/source/ui/docshell/documentlinkmgr.cxx | 2 +
sc/source/ui/drawfunc/drawsh5.cxx | 1
sc/source/ui/drawfunc/fuconarc.cxx | 1
sc/source/ui/drawfunc/fuconpol.cxx | 1
sc/source/ui/drawfunc/fuconrec.cxx | 1
sc/source/ui/drawfunc/futext.cxx | 1
sc/source/ui/drawfunc/futext3.cxx | 1
sc/source/ui/inc/ChildWindowWrapper.hxx | 1
sc/source/ui/miscdlgs/anyrefdg.cxx | 1
sc/source/ui/miscdlgs/conflictsdlg.cxx | 1
sc/source/ui/miscdlgs/datafdlg.cxx | 1
sc/source/ui/navipi/content.cxx | 1
sc/source/ui/optdlg/tpusrlst.cxx | 1
sc/source/ui/undo/undoblk.cxx | 1
sc/source/ui/undo/undoblk3.cxx | 1
sc/source/ui/undo/undocell.cxx | 1
sc/source/ui/undo/undodat.cxx | 1
sc/source/ui/undo/undotab.cxx | 1
sc/source/ui/undo/undoutil.cxx | 1
sc/source/ui/view/auditsh.cxx | 1
sc/source/ui/view/cellsh4.cxx | 1
sc/source/ui/view/dbfunc.cxx | 1
sc/source/ui/view/dbfunc3.cxx | 1
sc/source/ui/view/dbfunc4.cxx | 1
sc/source/ui/view/drawvie4.cxx | 1
sc/source/ui/view/drawview.cxx | 1
sc/source/ui/view/gridwin3.cxx | 1
sc/source/ui/view/gridwin4.cxx | 1
sc/source/ui/view/hdrcont.cxx | 1
sc/source/ui/view/olinewin.cxx | 1
sc/source/ui/view/output3.cxx | 1
sc/source/ui/view/printfun.cxx | 1
sc/source/ui/view/select.cxx | 1
sc/source/ui/view/spelldialog.cxx | 1
sc/source/ui/view/spelleng.cxx | 1
sc/source/ui/view/tabview.cxx | 1
sc/source/ui/view/tabview2.cxx | 1
sc/source/ui/view/tabview3.cxx | 1
sc/source/ui/view/tabview5.cxx | 1
sc/source/ui/view/tabvwsh5.cxx | 1
sc/source/ui/view/tabvwshe.cxx | 1
sc/source/ui/view/tabvwshg.cxx | 1
sc/source/ui/view/tabvwshh.cxx | 1
sc/source/ui/view/viewfun2.cxx | 1
sc/source/ui/view/viewfun3.cxx | 1
sc/source/ui/view/viewfun4.cxx | 1
sc/source/ui/view/viewfun7.cxx | 1
sc/source/ui/view/viewfunc.cxx | 1
sd/qa/unit/import-tests.cxx | 1
sd/source/core/shapelist.cxx | 1
sd/source/filter/pdf/sdpdffilter.cxx | 1
sd/source/filter/ppt/ppt97animations.cxx | 1
sd/source/filter/ppt/pptinanimations.cxx | 1
sd/source/ui/app/optsitem.cxx | 1
sd/source/ui/app/sdmod2.cxx | 1
sd/source/ui/dlg/masterlayoutdlg.cxx | 1
sd/source/ui/dlg/tpaction.cxx | 1
sd/source/ui/func/fuconarc.cxx | 1
sd/source/ui/func/fuconbez.cxx | 1
sd/source/ui/func/fuconrec.cxx | 1
sd/source/ui/func/futext.cxx | 1
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 1
sd/source/ui/sidebar/MasterPageContainer.cxx | 1
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 1
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 1
sd/source/ui/slidesorter/controller/SlsFocusManager.cxx | 1
sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx | 1
sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 1
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 1
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 1
sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx | 1
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 1
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 1
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 1
sd/source/ui/slidesorter/view/SlsToolTip.cxx | 1
sd/source/ui/view/FormShellManager.cxx | 1
sd/source/ui/view/OutlinerIterator.cxx | 1
sd/source/ui/view/ToolBarManager.cxx | 1
sd/source/ui/view/ViewShellManager.cxx | 1
sd/source/ui/view/drviewsb.cxx | 1
sd/source/ui/view/frmview.cxx | 1
sd/source/ui/view/sdview3.cxx | 1
sd/source/ui/view/viewshe2.cxx | 1
sfx2/source/devtools/ObjectInspectorTreeHandler.cxx | 1
svx/source/dialog/dialcontrol.cxx | 1
svx/source/dialog/imapdlg.cxx | 1
svx/source/form/fmmodel.cxx | 1
svx/source/form/fmpage.cxx | 1
svx/source/gallery2/galbrws2.cxx | 1
svx/source/gallery2/galmisc.cxx | 1
svx/source/gallery2/galtheme.cxx | 1
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 1
svx/source/sdr/properties/attributeproperties.cxx | 1
svx/source/sdr/properties/e3dsceneproperties.cxx | 1
svx/source/sdr/properties/groupproperties.cxx | 1
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 1
svx/source/svdraw/svddrgv.cxx | 1
svx/source/svdraw/svdedtv.cxx | 1
svx/source/svdraw/svdedtv1.cxx | 1
svx/source/svdraw/svdedtv2.cxx | 1
svx/source/svdraw/svdfmtf.cxx | 1
svx/source/svdraw/svditer.cxx | 1
svx/source/svdraw/svdmark.cxx | 1
svx/source/svdraw/svdmrkv.cxx | 1
svx/source/svdraw/svdmrkv1.cxx | 1
svx/source/svdraw/svdobjplusdata.cxx | 1
svx/source/svdraw/svdoedge.cxx | 1
svx/source/svdraw/svdoole2.cxx | 1
svx/source/svdraw/svdopath.cxx | 1
svx/source/svdraw/svdorect.cxx | 1
svx/source/svdraw/svdpagv.cxx | 1
svx/source/svdraw/svdpdf.cxx | 1
svx/source/svdraw/svdtext.cxx | 1
svx/source/svdraw/svdundo.cxx | 1
sw/source/core/crsr/crstrvl.cxx | 1
sw/source/core/crsr/findtxt.cxx | 1
sw/source/core/crsr/viscrs.cxx | 1
sw/source/core/doc/DocumentDrawModelManager.cxx | 1
sw/source/core/doc/DocumentLayoutManager.cxx | 1
sw/source/core/doc/docdesc.cxx | 1
sw/source/core/doc/docdraw.cxx | 1
sw/source/core/doc/docfly.cxx | 1
sw/source/core/doc/doclay.cxx | 1
sw/source/core/doc/docnew.cxx | 1
sw/source/core/doc/docredln.cxx | 1
sw/source/core/doc/tblrwcl.cxx | 1
sw/source/core/docnode/ndtbl.cxx | 1
sw/source/core/docnode/ndtbl1.cxx | 1
sw/source/core/draw/dobjfac.cxx | 1
sw/source/core/draw/dpage.cxx | 1
sw/source/core/draw/drawdoc.cxx | 1
sw/source/core/draw/dview.cxx | 1
sw/source/core/frmedt/fecopy.cxx | 1
sw/source/core/frmedt/fedesc.cxx | 1
sw/source/core/frmedt/fefly1.cxx | 1
sw/source/core/frmedt/feflyole.cxx | 1
sw/source/core/frmedt/feshview.cxx | 1
sw/source/core/frmedt/fetab.cxx | 1
sw/source/core/frmedt/fews.cxx | 1
sw/source/core/inc/SwXMLBlockImport.hxx | 1
sw/source/core/layout/anchoreddrawobject.cxx | 1
sw/source/core/layout/anchoredobject.cxx | 1
sw/source/core/layout/atrfrm.cxx | 1
sw/source/core/layout/flowfrm.cxx | 1
sw/source/core/layout/fly.cxx | 1
sw/source/core/layout/flycnt.cxx | 1
sw/source/core/layout/flyincnt.cxx | 1
sw/source/core/layout/flylay.cxx | 1
sw/source/core/layout/frmtool.cxx | 1
sw/source/core/layout/laycache.cxx | 1
sw/source/core/layout/newfrm.cxx | 1
sw/source/core/layout/pagechg.cxx | 1
sw/source/core/layout/sortedobjs.cxx | 1
sw/source/core/layout/ssfrm.cxx | 1
sw/source/core/layout/tabfrm.cxx | 1
sw/source/core/layout/trvlfrm.cxx | 1
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 1
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx | 1
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 1
sw/source/core/swg/SwXMLSectionList.cxx | 1
sw/source/core/text/txtcache.cxx | 1
sw/source/core/txtnode/atrflyin.cxx | 1
sw/source/core/txtnode/ndtxt.cxx | 1
sw/source/core/undo/docundo.cxx | 1
sw/source/core/undo/unattr.cxx | 1
sw/source/core/undo/undobj1.cxx | 1
sw/source/core/undo/undraw.cxx | 1
sw/source/core/undo/unins.cxx | 1
sw/source/core/undo/untbl.cxx | 1
sw/source/core/view/vdraw.cxx | 1
sw/source/core/view/vnew.cxx | 1
sw/source/core/view/vprint.cxx | 1
sw/source/filter/html/css1atr.cxx | 1
sw/source/filter/html/htmldrawreader.cxx | 1
sw/source/filter/html/htmldrawwriter.cxx | 1
sw/source/filter/html/htmlfly.hxx | 1
sw/source/filter/html/htmlflywriter.cxx | 1
sw/source/filter/html/htmlforw.cxx | 1
sw/source/filter/html/htmltab.cxx | 1
sw/source/filter/ww8/writerhelper.cxx | 1
sw/source/filter/ww8/ww8glsy.cxx | 1
sw/source/filter/ww8/ww8par2.cxx | 1
sw/source/filter/ww8/ww8par4.cxx | 1
sw/source/filter/ww8/ww8par5.cxx | 1
sw/source/filter/ww8/ww8scan.cxx | 1
sw/source/filter/xml/xmlmeta.cxx | 1
sw/source/ui/chrdlg/break.cxx | 1
sw/source/ui/chrdlg/chardlg.cxx | 1
sw/source/ui/chrdlg/drpcps.cxx | 1
sw/source/ui/chrdlg/pardlg.cxx | 1
sw/source/ui/config/optcomp.cxx | 1
sw/source/ui/dialog/docstdlg.cxx | 1
sw/source/ui/dialog/uiregionsw.cxx | 1
sw/source/ui/envelp/envfmt.cxx | 1
sw/source/ui/fldui/fldref.cxx | 1
sw/source/ui/fldui/fldtdlg.cxx | 1
sw/source/ui/fmtui/tmpdlg.cxx | 1
sw/source/ui/frmdlg/frmpage.cxx | 1
sw/source/ui/index/swuiidxmrk.cxx | 1
sw/source/ui/misc/docfnote.cxx | 1
sw/source/ui/misc/glossary.cxx | 1
sw/source/ui/misc/num.cxx | 1
sw/source/ui/table/tabledlg.cxx | 1
sw/source/uibase/app/appenv.cxx | 1
sw/source/uibase/app/applab.cxx | 1
sw/source/uibase/app/docsh.cxx | 1
sw/source/uibase/app/docst.cxx | 1
sw/source/uibase/app/docstyle.cxx | 1
sw/source/uibase/app/swmodul1.cxx | 1
sw/source/uibase/dbui/dbtree.cxx | 1
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 1
sw/source/uibase/dochdl/gloshdl.cxx | 1
sw/source/uibase/dochdl/swdtflvr.cxx | 1
sw/source/uibase/docvw/AnnotationWin.cxx | 1
sw/source/uibase/docvw/edtdd.cxx | 1
sw/source/uibase/docvw/edtwin2.cxx | 1
sw/source/uibase/fldui/fldmgr.cxx | 1
sw/source/uibase/frmdlg/frmmgr.cxx | 1
sw/source/uibase/index/toxmgr.cxx | 1
sw/source/uibase/lingu/hhcwrp.cxx | 1
sw/source/uibase/lingu/olmenu.cxx | 1
sw/source/uibase/lingu/sdrhhcwrap.cxx | 1
sw/source/uibase/misc/redlndlg.cxx | 1
sw/source/uibase/shells/annotsh.cxx | 1
sw/source/uibase/shells/basesh.cxx | 1
sw/source/uibase/shells/drawsh.cxx | 1
sw/source/uibase/shells/drformsh.cxx | 1
sw/source/uibase/shells/drwbassh.cxx | 1
sw/source/uibase/shells/drwtxtex.cxx | 1
sw/source/uibase/shells/drwtxtsh.cxx | 1
sw/source/uibase/shells/grfsh.cxx | 1
sw/source/uibase/shells/langhelper.cxx | 1
sw/source/uibase/shells/listsh.cxx | 1
sw/source/uibase/shells/tabsh.cxx | 1
sw/source/uibase/shells/textdrw.cxx | 1
sw/source/uibase/shells/textfld.cxx | 1
sw/source/uibase/shells/textglos.cxx | 1
sw/source/uibase/shells/textidx.cxx | 1
sw/source/uibase/shells/textsh.cxx | 1
sw/source/uibase/shells/textsh2.cxx | 1
sw/source/uibase/shells/txtattr.cxx | 1
sw/source/uibase/shells/txtcrsr.cxx | 1
sw/source/uibase/shells/txtnum.cxx | 1
sw/source/uibase/table/chartins.cxx | 1
sw/source/uibase/uiview/pview.cxx | 1
sw/source/uibase/uiview/swcli.cxx | 1
sw/source/uibase/uiview/view0.cxx | 1
sw/source/uibase/uiview/view2.cxx | 1
sw/source/uibase/uiview/viewcoll.cxx | 1
sw/source/uibase/uiview/viewdlg.cxx | 1
sw/source/uibase/uiview/viewdlg2.cxx | 1
sw/source/uibase/uiview/viewdraw.cxx | 1
sw/source/uibase/uiview/viewling.cxx | 1
sw/source/uibase/uiview/viewport.cxx | 1
sw/source/uibase/uiview/viewprt.cxx | 1
sw/source/uibase/uiview/viewtab.cxx | 1
sw/source/uibase/uno/unodispatch.cxx | 1
sw/source/uibase/utlui/glbltree.cxx | 1
sw/source/uibase/utlui/gloslst.cxx | 1
sw/source/uibase/utlui/navipi.cxx | 1
sw/source/uibase/utlui/numfmtlb.cxx | 1
sw/source/uibase/wrtsh/delete.cxx | 1
sw/source/uibase/wrtsh/select.cxx | 1
sw/source/uibase/wrtsh/wrtsh1.cxx | 1
sw/source/uibase/wrtsh/wrtsh2.cxx | 1
sw/source/uibase/wrtsh/wrtsh3.cxx | 1
sw/source/uibase/wrtsh/wrtundo.cxx | 1
toolkit/inc/awt/vclxprinter.hxx | 2 +
tools/inc/poly.h | 1
vcl/qt5/Qt5OpenGLContext.cxx | 2 +
vcl/source/app/salvtables.cxx | 1
vcl/source/app/unohelp2.cxx | 3 +
xmloff/source/script/xmlbasicscript.cxx | 1
xmloff/source/style/FillStyleContext.cxx | 1
xmloff/source/text/XMLIndexSourceBaseContext.hxx | 1
xmlsecurity/source/helper/ooxmlsecparser.cxx | 1
xmlsecurity/source/helper/xsecparser.cxx | 1
406 files changed, 390 insertions(+), 89 deletions(-)
New commits:
commit 2633d5f97ff45cc4a7f016bee1f2e8f92a60d2fb
Author: Gabor Kelemen <kelemen.gab...@nisz.hu>
AuthorDate: Thu Apr 1 09:40:51 2021 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Apr 9 11:56:36 2021 +0200
Recheck include/ with IWYU
See tdf#42949 for motivation
Change-Id: Ifc253bf800bb1468b5774663a93f4fb30bec81d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113657
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 9ddb6adbc8a5..2d5154a6f8e0 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -47,6 +47,7 @@
#include <vcl/svapp.hxx>
#include <xmlscript/xml_helper.hxx>
#include <xmlscript/xmldlg_imexp.hxx>
+#include <osl/diagnose.h>
namespace basctl
{
diff --git a/basegfx/source/polygon/b3dpolygon.cxx
b/basegfx/source/polygon/b3dpolygon.cxx
index aac10925c234..89c9c279eb75 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -25,6 +25,7 @@
#include <basegfx/color/bcolor.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <cassert>
+#include <memory>
#include <vector>
#include <algorithm>
diff --git a/chart2/source/controller/main/ChartTransferable.cxx
b/chart2/source/controller/main/ChartTransferable.cxx
index 03e8eaef2509..322e73be3aa8 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -34,6 +34,7 @@
#include <svx/svdmodel.hxx>
#include <svx/unomodel.hxx>
#include <svx/svdview.hxx>
+#include <osl/diagnose.h>
constexpr sal_uInt32 CHARTTRANSFER_OBJECTTYPE_DRAWMODEL = 1;
diff --git a/chart2/source/controller/main/SelectionHelper.cxx
b/chart2/source/controller/main/SelectionHelper.cxx
index dc3230749f57..51ec5ab91da5 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -29,6 +29,7 @@
#include <svx/svdopath.hxx>
#include <vcl/svapp.hxx>
#include <basegfx/point/b2dpoint.hxx>
+#include <osl/diagnose.h>
namespace chart
{
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx
b/chart2/source/view/main/DrawModelWrapper.cxx
index 68ffac559a25..14bd6b55cfcb 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -34,6 +34,7 @@
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
#include <libxml/xmlwriter.h>
+#include <osl/diagnose.h>
#include <com/sun/star/container/XChild.hpp>
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 186a63096d65..f39aa3b32ea7 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -51,6 +51,7 @@
#include <strings.hrc>
#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
+#include <osl/diagnose.h>
using namespace ::ucbhelper;
using namespace ::cppu;
diff --git a/cui/source/tabpages/swpossizetabpage.cxx
b/cui/source/tabpages/swpossizetabpage.cxx
index 2b9c8c70a4b4..e3154fa62339 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -35,6 +35,7 @@
#include <com/sun/star/text/RelOrientation.hpp>
#include <svx/svxids.hrc>
#include <svtools/unitconv.hxx>
+#include <osl/diagnose.h>
using namespace ::com::sun::star::text;
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 43fea9f6c830..9c650d46e373 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -31,6 +31,7 @@
#include <svx/dlgutil.hxx>
#include <editeng/writingmodeitem.hxx>
#include <svtools/unitconv.hxx>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index e6eadad2075b..d1241b0e7db5 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -34,6 +34,7 @@
#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <officecfg/Office/Common.hxx>
+#include <osl/diagnose.h>
using namespace com::sun::star;
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 2af5b2558421..23739c287f2a 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -43,6 +43,7 @@
#include <svx/svxids.hrc>
#include <cuitabarea.hxx>
#include <svtools/unitconv.hxx>
+#include <osl/diagnose.h>
#define XOUT_WIDTH 150
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index e51119dcdefc..2d923e166477 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -45,6 +45,7 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <svx/strings.hrc>
+#include <osl/diagnose.h>
#define XOUT_WIDTH 150
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index 623c4f569efd..27c9a3aab3bb 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -56,6 +56,7 @@
#include <algorithm>
#include <functional>
+#include <set>
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
org_openoffice_comp_dbu_OTableDesign_get_implementation(
diff --git a/extensions/source/activex/so_activex.cxx
b/extensions/source/activex/so_activex.cxx
index b539e2897f2d..5840e36b6521 100644
--- a/extensions/source/activex/so_activex.cxx
+++ b/extensions/source/activex/so_activex.cxx
@@ -50,6 +50,7 @@
#include "SOActiveX.h"
#include <comphelper\documentconstants.hxx>
+#include <sal/types.h>
#include <exception>
CComModule _Module;
diff --git a/extensions/source/propctrlr/propertyhandler.cxx
b/extensions/source/propctrlr/propertyhandler.cxx
index e30c38020444..c47f4e822228 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -34,6 +34,7 @@
#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <rtl/ref.hxx>
#include <algorithm>
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 64bfe3e0d9de..3e20001f82d8 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -91,6 +91,7 @@
#include <sal/log.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <osl/diagnose.h>
#include <algorithm>
#include <memory>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index ce376cba10a4..00cfb961a447 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -40,6 +40,9 @@ excludelist:
include/rtl/math.hxx:
# TODO MSVC does not compile basegfx/numeric/ftools.hxx when this is
replaced
- math.h
+ include/android/compatibility.hxx:
+ # TODO check whether actually needed, just silence this for now
+ - math.h
include/sfx2/toolbarids.hxx:
# needed for enum definition
- sal/types.h
@@ -198,6 +201,9 @@ excludelist:
include/comphelper/servicehelper.hxx:
# Needed for macro
- rtl/instance.hxx
+ include/comphelper/stl_types.hxx:
+ # Needed for std::equal
+ - algorithm
include/comphelper/unique_disposing_ptr.hxx:
# base class has to be a complete type
- com/sun/star/lang/XServiceInfo.hpp
@@ -211,11 +217,22 @@ excludelist:
include/basegfx/numeric/ftools.hxx:
# MSVC does not compile when this is removed
- math.h
+ - cmath
include/basegfx/utils/unopolypolygon.hxx:
# base class has to be a complete type
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/rendering/XBezierPolyPolygon2D.hpp
- com/sun/star/rendering/XLinePolyPolygon2D.hpp
+ include/o3tl/deleter.hxx:
+ # Needed for __COVERITY__
+ - com/sun/star/uno/Exception.hpp
+ - sal/log.hxx
+ include/o3tl/lru_map.hxx:
+ # Needed for std::min
+ - algorithm
+ include/o3tl/make_shared.hxx:
+ # Needed for __COVERITY__
+ - o3tl/deleter.hxx
include/sot/exchange.hxx:
# Used in a macro #define
- com/sun/star/datatransfer/dnd/DNDConstants.hpp
@@ -233,6 +250,9 @@ excludelist:
include/tools/fldunit.hxx:
# Needed for enum type
- sal/types.h
+ include/tools/long.hxx:
+ # Needed on _WIN64
+ - sal/types.h
include/tools/svlibrary.h:
# Used behind #ifndef
- osl/module.h
diff --git a/include/basegfx/polygon/b2dpolygon.hxx
b/include/basegfx/polygon/b2dpolygon.hxx
index e74b458ec3af..c5a862773507 100644
--- a/include/basegfx/polygon/b2dpolygon.hxx
+++ b/include/basegfx/polygon/b2dpolygon.hxx
@@ -19,6 +19,7 @@
#pragma once
+#include <memory>
#include <ostream>
#include <vector>
diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx
b/include/basegfx/polygon/b2dpolypolygontools.hxx
index aed3766d75df..f104ec931ab9 100644
--- a/include/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
@@ -23,7 +23,6 @@
#include <basegfx/polygon/b3dpolypolygon.hxx>
#include <com/sun/star/drawing/PointSequenceSequence.hpp>
#include <vector>
-#include <set>
#include <basegfx/basegfxdllapi.h>
#include <o3tl/sorted_vector.hxx>
diff --git a/include/basegfx/utils/systemdependentdata.hxx
b/include/basegfx/utils/systemdependentdata.hxx
index 4486559df6fc..6778fa967e61 100644
--- a/include/basegfx/utils/systemdependentdata.hxx
+++ b/include/basegfx/utils/systemdependentdata.hxx
@@ -13,7 +13,6 @@
#include <basegfx/basegfxdllapi.h>
#include <memory>
#include <map>
-#include <set>
namespace basegfx
{
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 6c7a5a8c0bd1..b52b0beb3c7d 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -22,6 +22,7 @@
#define INCLUDED_BASIC_SBXDEF_HXX
#include <o3tl/typed_flags_set.hxx>
+#include <sal/types.h>
enum class SbxClassType { // SBX-class-IDs (order is important!)
DontCare = 1, // don't care (search, not 0 due to StarBASIC)
diff --git a/include/codemaker/global.hxx b/include/codemaker/global.hxx
index 60e0d1bf774b..c3bb22942cf7 100644
--- a/include/codemaker/global.hxx
+++ b/include/codemaker/global.hxx
@@ -20,9 +20,7 @@
#ifndef INCLUDED_CODEMAKER_GLOBAL_HXX
#define INCLUDED_CODEMAKER_GLOBAL_HXX
-#include <list>
#include <vector>
-#include <set>
#include <string_view>
#include <osl/file.hxx>
diff --git a/include/comphelper/propertysethelper.hxx
b/include/comphelper/propertysethelper.hxx
index 9c348b50c7c1..33321e2cc994 100644
--- a/include/comphelper/propertysethelper.hxx
+++ b/include/comphelper/propertysethelper.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <comphelper/comphelperdllapi.h>
#include <rtl/ref.hxx>
-#include <memory>
namespace comphelper
{
diff --git a/include/comphelper/servicedecl.hxx
b/include/comphelper/servicedecl.hxx
index 6cd24699cd2b..94f5db000753 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_COMPHELPER_SERVICEDECL_HXX
#include <comphelper/comphelperdllapi.h>
-#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx
index e6f47a351a6f..1c2cacdcf1c0 100644
--- a/include/dbaccess/dataview.hxx
+++ b/include/dbaccess/dataview.hxx
@@ -26,7 +26,6 @@
#include <rtl/ref.hxx>
#include <tools/wintypes.hxx>
#include <vcl/outdev.hxx>
-#include <vcl/vclptr.hxx>
#include <vcl/window.hxx>
namespace com::sun::star {
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx
b/include/formula/FormulaOpCodeMapperObj.hxx
index c7b7a400f5c9..7e5928a1b3ba 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -23,7 +23,6 @@
#include <memory>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
#include <cppuhelper/implbase.hxx>
diff --git a/include/framework/transactionmanager.hxx
b/include/framework/transactionmanager.hxx
index 351ce89d2487..d6a07293a976 100644
--- a/include/framework/transactionmanager.hxx
+++ b/include/framework/transactionmanager.hxx
@@ -19,10 +19,8 @@
#pragma once
-#include <config_options.h>
#include <osl/mutex.hxx>
-#include "fwkdllapi.h"
#include "gate.hxx"
namespace framework{
diff --git a/include/i18nlangtag/languagetagicu.hxx
b/include/i18nlangtag/languagetagicu.hxx
index 3025734231ad..755d8eb12c76 100644
--- a/include/i18nlangtag/languagetagicu.hxx
+++ b/include/i18nlangtag/languagetagicu.hxx
@@ -15,7 +15,6 @@
#include <string_view>
#include <i18nlangtag/i18nlangtagdllapi.h>
-#include <rtl/ustring.hxx>
#include <unicode/locid.h>
class LanguageTag;
diff --git a/include/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx
index b9c463b852e4..8cc3651030fd 100644
--- a/include/o3tl/cow_wrapper.hxx
+++ b/include/o3tl/cow_wrapper.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_O3TL_COW_WRAPPER_HXX
#define INCLUDED_O3TL_COW_WRAPPER_HXX
-#include <memory>
#include <osl/interlck.h>
#include <utility>
diff --git a/include/o3tl/lazy_update.hxx b/include/o3tl/lazy_update.hxx
index 951a9bb7bdc2..ddff217a722c 100644
--- a/include/o3tl/lazy_update.hxx
+++ b/include/o3tl/lazy_update.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_O3TL_LAZY_UPDATE_HXX
#define INCLUDED_O3TL_LAZY_UPDATE_HXX
-#include <utility>
-
namespace o3tl
{
/** Update output object lazily
diff --git a/include/o3tl/typed_flags_set.hxx b/include/o3tl/typed_flags_set.hxx
index bf795908bad5..7c9053bcd4f0 100644
--- a/include/o3tl/typed_flags_set.hxx
+++ b/include/o3tl/typed_flags_set.hxx
@@ -26,7 +26,6 @@
#include <type_traits>
#include <o3tl/underlyingenumvalue.hxx>
-#include <sal/types.h>
namespace o3tl {
diff --git a/include/o3tl/vector_utils.hxx b/include/o3tl/vector_utils.hxx
index dc6d80a9ffbc..1fe34bcaf470 100644
--- a/include/o3tl/vector_utils.hxx
+++ b/include/o3tl/vector_utils.hxx
@@ -10,6 +10,8 @@
#pragma once
+#include <algorithm>
+#include <unordered_set>
#include <vector>
namespace o3tl
diff --git a/include/oox/crypto/StrongEncryptionDataSpace.hxx
b/include/oox/crypto/StrongEncryptionDataSpace.hxx
index 327308a4c6ac..59be5c9832a0 100644
--- a/include/oox/crypto/StrongEncryptionDataSpace.hxx
+++ b/include/oox/crypto/StrongEncryptionDataSpace.hxx
@@ -11,7 +11,6 @@
#ifndef INCLUDED_OOX_CRYPTO_STRONGENCRYPTINDATASPACE_HXX
#define INCLUDED_OOX_CRYPTO_STRONGENCRYPTINDATASPACE_HXX
-#include <oox/dllapi.h>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/packages/XPackageEncryption.hpp>
diff --git a/include/oox/drawingml/drawingmltypes.hxx
b/include/oox/drawingml/drawingmltypes.hxx
index c24bff255a3e..873fb76435a8 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/style/TabAlign.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <o3tl/safeint.hxx>
#include <o3tl/unit_conversion.hxx>
#include <oox/dllapi.h>
#include <oox/helper/helper.hxx>
diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx
index 88cea1c33ab7..a01ee6e68170 100644
--- a/include/sax/tools/converter.hxx
+++ b/include/sax/tools/converter.hxx
@@ -27,7 +27,6 @@
#include <sax/saxdllapi.h>
#include <sal/types.h>
-#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <tools/color.hxx>
diff --git a/include/sfx2/QuerySaveDocument.hxx
b/include/sfx2/QuerySaveDocument.hxx
index 06eecdf1df83..2d800be80d4e 100644
--- a/include/sfx2/QuerySaveDocument.hxx
+++ b/include/sfx2/QuerySaveDocument.hxx
@@ -23,7 +23,6 @@
#include <string_view>
-#include <rtl/ustring.hxx>
#include <sfx2/dllapi.h>
namespace weld
diff --git a/include/sfx2/XmlIdRegistry.hxx b/include/sfx2/XmlIdRegistry.hxx
index a2b4b2129760..494c83020883 100644
--- a/include/sfx2/XmlIdRegistry.hxx
+++ b/include/sfx2/XmlIdRegistry.hxx
@@ -25,7 +25,6 @@
#include <string_view>
#include <sfx2/dllapi.h>
-#include <rtl/ustring.hxx>
namespace com::sun::star::beans { struct StringPair; }
namespace com::sun::star::uno { template <typename > class Reference; }
diff --git a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
index 284072a6c18f..97df40d8f63b 100644
--- a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
+++ b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
@@ -12,7 +12,6 @@
#include <sfx2/dllapi.h>
#include <sfx2/dockwin.hxx>
-#include <vcl/customweld.hxx>
#include <vcl/weld.hxx>
#include <sfx2/devtools/ObjectInspectorWidgets.hxx>
@@ -23,9 +22,6 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/view/XSelectionChangeListener.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/frame/XController.hpp>
-
-#include <unordered_map>
/** Development tool main docking window
*
diff --git a/include/sfx2/devtools/DocumentModelTreeHandler.hxx
b/include/sfx2/devtools/DocumentModelTreeHandler.hxx
index c63986ad1476..47294d527efe 100644
--- a/include/sfx2/devtools/DocumentModelTreeHandler.hxx
+++ b/include/sfx2/devtools/DocumentModelTreeHandler.hxx
@@ -10,14 +10,11 @@
#pragma once
-#include <sfx2/dllapi.h>
#include <vcl/weld.hxx>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <unordered_map>
-
/** Document model tree handler
*
* Handles the DOM tree part of DevTools, which includes interaction with
diff --git a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
index 4fd340887855..0919bbfa3b9a 100644
--- a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
+++ b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
@@ -10,10 +10,8 @@
#pragma once
-#include <sfx2/dllapi.h>
#include <vcl/weld.hxx>
#include <vcl/commandevent.hxx>
-#include <vcl/svapp.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/XInterface.hpp>
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 521434236cea..04fe4131216b 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -33,6 +33,7 @@
#include <svtools/ctrlbox.hxx>
#include <vcl/idle.hxx>
+#include <vcl/weldutils.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/include/sfx2/lokcharthelper.hxx b/include/sfx2/lokcharthelper.hxx
index 319af8c35da5..ee30a645abfc 100644
--- a/include/sfx2/lokcharthelper.hxx
+++ b/include/sfx2/lokcharthelper.hxx
@@ -13,6 +13,7 @@
#include <sfx2/dllapi.h>
#include <tools/gen.hxx>
#include <vcl/vclptr.hxx>
+#include <vcl/window.hxx>
namespace com::sun::star::frame { class XController; }
namespace com::sun::star::frame { class XDispatch; }
diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx
b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index cb94dd2b4603..2fe195f06901 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -12,7 +12,10 @@
#include <sfx2/dllapi.h>
#include <rtl/ustring.hxx>
+#include <vcl/WeldedTabbedNotebookbar.hxx>
+
#include <map>
+#include <memory>
#include <string_view>
namespace com::sun::star::frame
diff --git a/include/sfx2/sidebar/FocusManager.hxx
b/include/sfx2/sidebar/FocusManager.hxx
index fd5d2e879e01..c51ccbfa832f 100644
--- a/include/sfx2/sidebar/FocusManager.hxx
+++ b/include/sfx2/sidebar/FocusManager.hxx
@@ -20,7 +20,6 @@
#include <sfx2/sidebar/Panel.hxx>
#include <tools/link.hxx>
-#include <vcl/vclevent.hxx>
#include <vcl/keycod.hxx>
namespace weld {
diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx
index 38e3dfc010b9..2520a80a4be4 100644
--- a/include/sfx2/sidebar/Sidebar.hxx
+++ b/include/sfx2/sidebar/Sidebar.hxx
@@ -21,7 +21,8 @@
#include <sfx2/dllapi.h>
#include <sfx2/viewfrm.hxx>
-#include <rtl/ustring.hxx>
+
+#include <string_view>
namespace com::sun::star::frame { class XFrame; }
namespace com::sun::star::uno { template <typename > class Reference; }
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 77b6fd91f5d0..f4faad6ba7cf 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -18,8 +18,6 @@
*/
#pragma once
-#include <config_options.h>
-#include <sfx2//dllapi.h>
#include <sfx2/sidebar/ResourceManager.hxx>
#include <vcl/InterimItemWindow.hxx>
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index c094509d0d7b..f75f4724526e 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -21,10 +21,8 @@
#include <sfx2/dllapi.h>
#include <tools/color.hxx>
-#include <vcl/image.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <tools/gen.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx
index 847643b8aceb..2c05a6abfe5a 100644
--- a/include/svl/SfxBroadcaster.hxx
+++ b/include/svl/SfxBroadcaster.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVL_BRDCST_HXX
#include <svl/svldllapi.h>
-#include <memory>
#include <vector>
class SfxListener;
diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx
index 2340230fb4a4..f06eb7fd6902 100644
--- a/include/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
@@ -22,7 +22,6 @@
#include <svl/svldllapi.h>
#include <svl/intitem.hxx>
-#include <memory>
#include <tools/degree.hxx>
struct SfxImageItem_Impl;
diff --git a/include/svtools/HtmlWriter.hxx b/include/svtools/HtmlWriter.hxx
index e9939f712941..61bebed54bae 100644
--- a/include/svtools/HtmlWriter.hxx
+++ b/include/svtools/HtmlWriter.hxx
@@ -11,7 +11,6 @@
#pragma once
#include <rtl/string.hxx>
-#include <rtl/ustring.hxx>
#include <string_view>
#include <vector>
#include <svtools/svtdllapi.h>
diff --git a/include/svtools/filechangedchecker.hxx
b/include/svtools/filechangedchecker.hxx
index 03021799bc2b..22fc5597570a 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -14,7 +14,7 @@
#include <osl/time.h>
#include <rtl/ustring.hxx>
-#include <vcl/idle.hxx>
+#include <vcl/timer.hxx>
#include <functional>
diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx
index 4abd02168ead..707fa5eda587 100644
--- a/include/svtools/imagemgr.hxx
+++ b/include/svtools/imagemgr.hxx
@@ -21,7 +21,6 @@
#include <rtl/ustring.hxx>
#include <svtools/svtdllapi.h>
-#include <tools/gen.hxx>
#include <vcl/vclenum.hxx>
enum class SvImageId {
diff --git a/include/svtools/querydelete.hxx b/include/svtools/querydelete.hxx
index 63f48d62fe48..31f494ea66c7 100644
--- a/include/svtools/querydelete.hxx
+++ b/include/svtools/querydelete.hxx
@@ -20,7 +20,6 @@
#include <memory>
#include <vcl/weld.hxx>
-#include <rtl/ustring.hxx>
#include <svtools/svtdllapi.h>
namespace svtools
diff --git a/include/svtools/stringtransfer.hxx
b/include/svtools/stringtransfer.hxx
index 9e3fead4e84c..d8c99a132840 100644
--- a/include/svtools/stringtransfer.hxx
+++ b/include/svtools/stringtransfer.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <config_options.h>
#include <svtools/svtdllapi.h>
#include <vcl/transfer.hxx>
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index 5a47d18625f3..9f1e36ddaca8 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <config_options.h>
#include <svtools/svtdllapi.h>
#include <memory>
diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx
index d15140529f83..44768922f317 100644
--- a/include/svx/connctrl.hxx
+++ b/include/svx/connctrl.hxx
@@ -23,7 +23,6 @@
#include <svx/svxdllapi.h>
#include <vcl/customweld.hxx>
#include <vcl/outdev.hxx>
-#include <memory>
class SfxItemSet;
class SdrEdgeObj;
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 75d7d7fffa78..e100b91574a1 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -24,7 +24,6 @@
#include <vcl/customweld.hxx>
#include <vcl/virdev.hxx>
#include <svx/svxdllapi.h>
-#include <svx/svdtrans.hxx>
class Edit;
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 5ed09267aac7..e8c0c7dbe4fd 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -31,7 +31,6 @@
#include <rtl/ref.hxx>
#include <cppuhelper/implbase.hxx>
#include <o3tl/sorted_vector.hxx>
-#include <set>
namespace com::sun::star::awt { class XWindow; }
namespace com::sun::star::beans { class XPropertySet; }
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index 55695327645d..beb540e8f1c1 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -22,7 +22,6 @@
#define INCLUDED_SVX_FONTWORKGALLERY_HXX
#include <svx/svxdllapi.h>
-#include <svtools/valueset.hxx>
#include <vcl/weld.hxx>
#include <vector>
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index b98ea5eab9aa..2ee2a6f556e0 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -25,8 +25,6 @@
#include <svx/svxdllapi.h>
#include <editeng/borderline.hxx>
-#include <memory>
-
namespace svx::frame {
diff --git a/include/svx/gallerybinaryengine.hxx
b/include/svx/gallerybinaryengine.hxx
index ab928b9324d5..11747c5ee2ea 100644
--- a/include/svx/gallerybinaryengine.hxx
+++ b/include/svx/gallerybinaryengine.hxx
@@ -22,14 +22,13 @@
#include <svx/galmisc.hxx>
#include <svx/svxdllapi.h>
#include <svx/fmmodel.hxx>
-#include <svx/gallerystoragelocations.hxx>
#include <svx/gallerybinarystoragelocations.hxx>
#include <svx/galleryfilestorage.hxx>
#include <tools/urlobj.hxx>
#include <sot/storage.hxx>
+#include <vcl/salctype.hxx>
#include <tools/datetime.hxx>
-#include <unotools/datetime.hxx>
#include <memory>
diff --git a/include/svx/gallerybinaryengineentry.hxx
b/include/svx/gallerybinaryengineentry.hxx
index 7637e3d8caae..042119ae7be2 100644
--- a/include/svx/gallerybinaryengineentry.hxx
+++ b/include/svx/gallerybinaryengineentry.hxx
@@ -20,10 +20,8 @@
#pragma once
#include <tools/urlobj.hxx>
-#include <svx/svxdllapi.h>
#include <svx/galtheme.hxx>
#include <svx/gallerybinaryengine.hxx>
-#include <svx/gallerystoragelocations.hxx>
#include <svx/gallerybinarystoragelocations.hxx>
#include <svx/galleryfilestorageentry.hxx>
diff --git a/include/svx/galleryobjectcollection.hxx
b/include/svx/galleryobjectcollection.hxx
index 8e322549b5eb..07a952b59f54 100644
--- a/include/svx/galleryobjectcollection.hxx
+++ b/include/svx/galleryobjectcollection.hxx
@@ -21,8 +21,7 @@
#include <svx/svxdllapi.h>
#include <svx/galmisc.hxx>
-#include <svx/galleryobjectxmlstorage.hxx>
-#include <svx/galleryobjectbinarystorage.hxx>
+#include <svx/galleryobjectstorage.hxx>
#include <vcl/bitmapex.hxx>
#include <tools/urlobj.hxx>
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 49310e63a619..6c45f7de65b3 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -23,7 +23,6 @@
#include <vcl/imap.hxx>
#include <svl/hint.hxx>
#include <vcl/transfer.hxx>
-#include <vcl/salctype.hxx>
#include <svx/svdobj.hxx>
#include <com/sun/star/uno/Reference.h>
#include <svx/svxdllapi.h>
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 7c8d9508cfc1..d2015b153437 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -27,12 +27,10 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <tools/datetime.hxx>
-#include <unotools/datetime.hxx>
#include <vcl/bitmapex.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <svx/galmisc.hxx>
#include <memory>
-#include <vector>
namespace weld { class ComboBox; }
diff --git a/include/svx/polypolygoneditor.hxx
b/include/svx/polypolygoneditor.hxx
index 347bbc4a92a5..57110b414ee7 100644
--- a/include/svx/polypolygoneditor.hxx
+++ b/include/svx/polypolygoneditor.hxx
@@ -25,7 +25,6 @@
#include <svx/ipolypolygoneditorcontroller.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <set>
#include <o3tl/sorted_vector.hxx>
namespace sdr
diff --git a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
index e24bb372a7ce..745b0b0f0968 100644
--- a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
@@ -23,6 +23,8 @@
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <svx/framelink.hxx>
+#include <memory>
+
// predefines
namespace drawinglayer::primitive2d
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx
b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 434a6397d4e2..4885810fa623 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -32,7 +32,6 @@
#include <sfx2/sidebar/PanelLayout.hxx>
#include <svl/intitem.hxx>
#include <svx/svxdllapi.h>
-#include <sfx2/sidebar/Panel.hxx>
class ToolbarUnoDispatcher;
class XFillFloatTransparenceItem;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index c759f3cfff14..2bc05e3b01ca 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -35,8 +35,6 @@
#include <tools/link.hxx>
#include <tools/weakbase.h>
#include <tools/gen.hxx>
-#include <osl/diagnose.h>
-#include <typeinfo>
#include <unordered_set>
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 5b08652e3e40..56b40a6f00df 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -23,7 +23,7 @@
#include <memory>
#include <svx/svdorect.hxx>
#include <svx/svxdllapi.h>
-#include <sfx2/linkmgr.hxx>
+#include <sfx2/lnkbase.hxx>
#include <com/sun/star/uno/Reference.h>
@@ -37,6 +37,7 @@ namespace embed { class XEmbeddedObject; }
namespace frame { class XModel; }
+namespace io { class XInputStream; }
}
namespace svt { class EmbeddedObjectRef; }
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 9d0b322a4374..927705943453 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -24,7 +24,6 @@
#include <svx/zoom_def.hxx>
#include <editeng/edtdlg.hxx>
-#include <svx/dstribut_enum.hxx>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
#include <svx/svxdllapi.h>
diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index 106a0d9d444c..21251c4b5451 100644
--- a/include/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
@@ -22,6 +22,7 @@
#include <svx/svxdllapi.h>
+#include <vcl/vclenum.hxx>
#include <vcl/metric.hxx>
#include <vector>
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 844c2aac23bb..1cd151d316ec 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -56,7 +56,6 @@
#include <comphelper/servicehelper.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase12.hxx>
class SfxItemSet;
diff --git a/include/toolkit/awt/vclxwindows.hxx
b/include/toolkit/awt/vclxwindows.hxx
index 492df058e3e6..1ac704320171 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
#define INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
-#include <config_options.h>
#include <toolkit/dllapi.h>
#include <com/sun/star/awt/XTextComponent.hpp>
diff --git a/include/toolkit/helper/vclunohelper.hxx
b/include/toolkit/helper/vclunohelper.hxx
index a4e1a061ee80..6066a8b72d01 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -28,7 +28,6 @@
#include <vcl/bitmapex.hxx>
#include <vcl/font.hxx>
#include <vcl/region.hxx>
-#include <vcl/vclptr.hxx>
#include <tools/mapunit.hxx>
#include <tools/fldunit.hxx>
#include <tools/poly.hxx>
diff --git a/include/tools/XmlWriter.hxx b/include/tools/XmlWriter.hxx
index a541f21f4e11..e8f6579b0e95 100644
--- a/include/tools/XmlWriter.hxx
+++ b/include/tools/XmlWriter.hxx
@@ -11,7 +11,7 @@
#define INCLUDED_TOOLS_XMLWRITER_HXX
#include <tools/toolsdllapi.h>
-#include <rtl/ustring.hxx>
+#include <rtl/string.hxx>
#include <memory>
#include <string_view>
#include <vector>
diff --git a/include/tools/helpers.hxx b/include/tools/helpers.hxx
index abce49b3d469..9340bf9f7294 100644
--- a/include/tools/helpers.hxx
+++ b/include/tools/helpers.hxx
@@ -11,7 +11,6 @@
#include <sal/config.h>
#include <sal/types.h>
#include <tools/long.hxx>
-#include <o3tl/safeint.hxx>
#include <cassert>
#include <type_traits>
diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx
index 176bd9984b53..878080fa5c45 100644
--- a/include/tools/multisel.hxx
+++ b/include/tools/multisel.hxx
@@ -24,7 +24,6 @@
#include <rtl/ustring.hxx>
#include <vector>
-#include <set>
#include <o3tl/sorted_vector.hxx>
#define SFX_ENDOFSELECTION (-1)
diff --git a/include/unotools/dynamicmenuoptions.hxx
b/include/unotools/dynamicmenuoptions.hxx
index c3526f9b141c..9b436d64488b 100644
--- a/include/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.hxx
@@ -21,8 +21,8 @@
#include <unotools/unotoolsdllapi.h>
#include <sal/types.h>
-#include <com/sun/star/uno/Sequence.h>
#include <unotools/options.hxx>
+#include <rtl/ustring.hxx>
#include <memory>
namespace com::sun::star::beans { struct PropertyValue; }
diff --git a/include/unotools/optionsdlg.hxx b/include/unotools/optionsdlg.hxx
index 20e7789ea81d..239740a0e4b3 100644
--- a/include/unotools/optionsdlg.hxx
+++ b/include/unotools/optionsdlg.hxx
@@ -24,7 +24,6 @@
#include <string_view>
#include <unotools/unotoolsdllapi.h>
-#include <rtl/ustring.hxx>
#include <unotools/options.hxx>
class SvtOptionsDlgOptions_Impl;
diff --git a/include/unotools/weakref.hxx b/include/unotools/weakref.hxx
index 7fdf5acba698..189df22d5359 100644
--- a/include/unotools/weakref.hxx
+++ b/include/unotools/weakref.hxx
@@ -24,11 +24,10 @@
#include <sal/config.h>
-#include <cstddef>
-
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/XInterface.hpp>
#include <cppuhelper/weakref.hxx>
+#include <cppuhelper/weak.hxx>
#include <rtl/ref.hxx>
namespace cppu
diff --git a/include/vcl/BitmapBuffer.hxx b/include/vcl/BitmapBuffer.hxx
index 4a4ec8404a08..79f202cdfa2d 100644
--- a/include/vcl/BitmapBuffer.hxx
+++ b/include/vcl/BitmapBuffer.hxx
@@ -24,6 +24,7 @@
#include <vcl/BitmapPalette.hxx>
#include <vcl/ColorMask.hxx>
#include <vcl/Scanline.hxx>
+#include <tools/long.hxx>
struct SalTwoRect;
diff --git a/include/vcl/GraphicNativeTransform.hxx
b/include/vcl/GraphicNativeTransform.hxx
index 3b5071e1639c..eedec3a4ee00 100644
--- a/include/vcl/GraphicNativeTransform.hxx
+++ b/include/vcl/GraphicNativeTransform.hxx
@@ -19,11 +19,11 @@
#pragma once
-#include <rtl/ustring.hxx>
#include <tools/degree.hxx>
-#include <sal/types.h>
#include <vcl/dllapi.h>
+#include <string_view>
+
class Graphic;
class VCL_DLLPUBLIC GraphicNativeTransform final
diff --git a/include/vcl/Scanline.hxx b/include/vcl/Scanline.hxx
index 6f40ce7a0c58..be33bc232983 100644
--- a/include/vcl/Scanline.hxx
+++ b/include/vcl/Scanline.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_VCL_SCANLINE_HXX
#include <o3tl/typed_flags_set.hxx>
+#include <sal/types.h>
typedef sal_uInt8* Scanline;
typedef const sal_uInt8* ConstScanline;
diff --git a/include/vcl/bitmap/BitmapTypes.hxx
b/include/vcl/bitmap/BitmapTypes.hxx
index 25eda29cbe80..10d0f5332c7b 100644
--- a/include/vcl/bitmap/BitmapTypes.hxx
+++ b/include/vcl/bitmap/BitmapTypes.hxx
@@ -10,6 +10,9 @@
#pragma once
+#include <sal/types.h>
+#include <cassert>
+
namespace vcl
{
/** Pixel format of the bitmap in bits per pixel */
diff --git a/include/vcl/filter/PDFiumLibrary.hxx
b/include/vcl/filter/PDFiumLibrary.hxx
index 9d2be861b520..3d6f379c683a 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -15,7 +15,6 @@
#include <com/sun/star/util/DateTime.hpp>
#include <vcl/dllapi.h>
-#include <rtl/instance.hxx>
#include <basegfx/vector/b2dsize.hxx>
#include <basegfx/range/b2drectangle.hxx>
#include <basegfx/point/b2dpoint.hxx>
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index ed5497480cf6..10a62f21bfb8 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -10,15 +10,10 @@
#ifndef INCLUDED_VCL_OPENGL_OPENGLCONTEXT_HXX
#define INCLUDED_VCL_OPENGL_OPENGLCONTEXT_HXX
-#include <epoxy/gl.h>
-
#include <vcl/dllapi.h>
#include <vcl/syschild.hxx>
#include <rtl/ref.hxx>
-#include <memory>
-#include <unordered_map>
-
/// Holds the information of our new child window
struct VCL_DLLPUBLIC GLWindow
{
diff --git a/include/vcl/outdevmap.hxx b/include/vcl/outdevmap.hxx
index 467dd688c612..3ab15a2a29ff 100644
--- a/include/vcl/outdevmap.hxx
+++ b/include/vcl/outdevmap.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_VCL_OUTDEVMAP_HXX
#define INCLUDED_VCL_OUTDEVMAP_HXX
+#include <tools/long.hxx>
+
struct ImplMapRes
{
tools::Long mnMapOfsX; // Offset in X direction
diff --git a/include/vcl/pdf/PDFAnnotationMarker.hxx
b/include/vcl/pdf/PDFAnnotationMarker.hxx
index d797115437e9..c4be54d69318 100644
--- a/include/vcl/pdf/PDFAnnotationMarker.hxx
+++ b/include/vcl/pdf/PDFAnnotationMarker.hxx
@@ -10,8 +10,10 @@
#pragma once
+#include <vcl/dllapi.h>
#include <tools/color.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/point/b2dpoint.hxx>
namespace vcl::pdf
{
diff --git a/include/vcl/pdf/PDFFindFlags.hxx b/include/vcl/pdf/PDFFindFlags.hxx
index f43efc7a6f7d..3ad8c77e39e6 100644
--- a/include/vcl/pdf/PDFFindFlags.hxx
+++ b/include/vcl/pdf/PDFFindFlags.hxx
@@ -11,6 +11,7 @@
#pragma once
#include <o3tl/typed_flags_set.hxx>
+#include <sal/types.h>
namespace vcl::pdf
{
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index a0e03a04e2a1..0f54ea186c65 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -25,9 +25,6 @@
#include <rtl/ustring.hxx>
#include <osl/mutex.hxx>
#include <vcl/dllapi.h>
-#include <comphelper/lok.hxx>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <boost/property_tree/json_parser.hpp>
#include <vcl/IDialogRenderable.hxx>
namespace com::sun::star::datatransfer::clipboard {
diff --git a/include/xmloff/SchXMLImportHelper.hxx
b/include/xmloff/SchXMLImportHelper.hxx
index 7fa12e16014c..bec8167fe7a0 100644
--- a/include/xmloff/SchXMLImportHelper.hxx
+++ b/include/xmloff/SchXMLImportHelper.hxx
@@ -19,11 +19,9 @@
#ifndef INCLUDED_XMLOFF_SCHXMLIMPORTHELPER_HXX
#define INCLUDED_XMLOFF_SCHXMLIMPORTHELPER_HXX
-#include <memory>
-
+#include <com/sun/star/uno/Reference.hxx>
#include <salhelper/simplereferenceobject.hxx>
#include <xmloff/families.hxx>
-#include <xmloff/xmltkmap.hxx>
namespace com::sun::star::chart { class XChartDocument; }
namespace com::sun::star::beans { class XPropertySet; }
diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx
b/include/xmloff/XMLTextShapeStyleContext.hxx
index bff4781526bc..43cd9807a8dc 100644
--- a/include/xmloff/XMLTextShapeStyleContext.hxx
+++ b/include/xmloff/XMLTextShapeStyleContext.hxx
@@ -22,6 +22,7 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <xmloff/XMLShapeStyleContext.hxx>
+#include <xmloff/XMLEventsImportContext.hxx>
class XMLOFF_DLLPUBLIC XMLTextShapeStyleContext final : public
XMLShapeStyleContext
{
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index f40ae8eaa803..5fa670a35445 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -27,6 +27,7 @@
#include <com/sun/star/drawing/ShadeMode.hpp>
#include <salhelper/simplereferenceobject.hxx>
#include <xmloff/xmlictxt.hxx>
+#include <sax/fastattribs.hxx>
#include <basegfx/vector/b3dvector.hxx>
#include <vector>
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 7216105fcd1f..9fabd7509996 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -27,7 +27,6 @@
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <rtl/ustring.hxx>
#include <xmloff/namespacemap.hxx>
-#include <sax/fastattribs.hxx>
#include <memory>
namespace com::sun::star::xml::sax { class XAttributeList; }
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index ff5e17d0b6eb..dc601abe56ab 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -18,6 +18,7 @@
*/
#include <xmloff/ProgressBarHelper.hxx>
#include <xmloff/xmlnamespace.hxx>
+#include <xmloff/xmltkmap.hxx>
#include "xmlReportElementBase.hxx"
#include "xmlfilter.hxx"
#include "xmlControlProperty.hxx"
diff --git a/reportdesign/source/ui/report/ReportSection.cxx
b/reportdesign/source/ui/report/ReportSection.cxx
index 2e1f294b24d8..acc0f7d0190c 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -51,6 +51,7 @@
#include <rptui_slotid.hrc>
#include <vcl/commandevent.hxx>
+#include <o3tl/safeint.hxx>
#include <svl/itempool.hxx>
#include <svtools/extcolorcfg.hxx>
diff --git a/reportdesign/source/ui/report/dlgedfac.cxx
b/reportdesign/source/ui/report/dlgedfac.cxx
index bc68d60b896d..ceb2d6402ee5 100644
--- a/reportdesign/source/ui/report/dlgedfac.cxx
+++ b/reportdesign/source/ui/report/dlgedfac.cxx
@@ -21,6 +21,7 @@
#include <RptObject.hxx>
#include <RptDef.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <osl/diagnose.h>
namespace rptui
{
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 924a8f18e839..7a90c00db4e6 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -55,6 +55,7 @@
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <svl/sharedstringpool.hxx>
+#include <osl/diagnose.h>
#include <cstdio>
#include <refdata.hxx>
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 27301007e433..deb9a8eaa6a1 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -44,6 +44,7 @@
#include <editeng/editobj.hxx>
#include <svl/sharedstring.hxx>
#include <unotools/collatorwrapper.hxx>
+#include <osl/diagnose.h>
#include <algorithm>
#include <vector>
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 7ad53e33394f..ce47333cd14c 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -35,6 +35,7 @@
#include <basic/basmgr.hxx>
#include <comphelper/threadpool.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <scmod.hxx>
#include <document.hxx>
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index e3da76da859c..b47c03c0e6fe 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -28,6 +28,7 @@
#include <sfx2/viewsh.hxx>
#include <vcl/svapp.hxx>
#include <osl/thread.hxx>
+#include <osl/diagnose.h>
#include <document.hxx>
#include <attrib.hxx>
#include <table.hxx>
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 9190ed109e44..aee431660d0a 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -22,6 +22,7 @@
#include <formula/token.hxx>
#include <sal/log.hxx>
#include <unotools/configmgr.hxx>
+#include <osl/diagnose.h>
#include <document.hxx>
#include <table.hxx>
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 137aec6947ea..eaaaf285c4b8 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -18,6 +18,7 @@
*/
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <document.hxx>
#include <brdcst.hxx>
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 1008cdff14f5..98ba25af1811 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -37,6 +37,7 @@
#include <svl/zformat.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index ff5eb488f858..5c6defa59f40 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -25,6 +25,7 @@
#include <editeng/langitem.hxx>
#include <o3tl/unit_conversion.hxx>
#include <osl/thread.h>
+#include <osl/diagnose.h>
#include <svl/asiancfg.hxx>
#include <svx/svditer.hxx>
#include <svx/svdograf.hxx>
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index ba9cee894875..9755bd74c90e 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -32,6 +32,7 @@
#include <unotools/transliterationwrapper.hxx>
#include <tools/urlobj.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <com/sun/star/text/WritingMode2.hpp>
#include <com/sun/star/script/vba/XVBACompatibility.hpp>
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 8e74fb8d1686..551b3c7db899 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -53,6 +53,7 @@
#include <vcl/settings.hxx>
#include <tools/globname.hxx>
#include <tools/UnitConversion.hxx>
+#include <osl/diagnose.h>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 0a2d84f7727b..0405a55a1cd9 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -24,6 +24,7 @@
#include <editeng/shaditem.hxx>
#include <editeng/brushitem.hxx>
#include <svx/framelink.hxx>
+#include <osl/diagnose.h>
#include <fillinfo.hxx>
#include <document.hxx>
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index bafd2e9e901b..84633a640de8 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -28,6 +28,7 @@
#include <editeng/outlobj.hxx>
#include <editeng/editobj.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
+#include <osl/diagnose.h>
#include <scitems.hxx>
#include <svx/xfillit0.hxx>
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index f018bfc03d4d..79a33320358c 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -23,6 +23,7 @@
#include <o3tl/unit_conversion.hxx>
#include <unotools/textsearch.hxx>
#include <unotools/charclass.hxx>
+#include <osl/diagnose.h>
#include <patattr.hxx>
#include <table.hxx>
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 833b4edd13f7..a94d07bf5032 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -59,6 +59,7 @@
#include <editeng/editobj.hxx>
#include <o3tl/safeint.hxx>
#include <o3tl/unit_conversion.hxx>
+#include <osl/diagnose.h>
#include <svl/poolcach.hxx>
#include <unotools/charclass.hxx>
#include <math.h>
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 58a0594f63b8..e1df9cae6332 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/i18n/KParseTokens.hpp>
#include <com/sun/star/i18n/KParseType.hpp>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <refdata.hxx>
#include <table.hxx>
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index e6c29a5a00e7..e3407715152f 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -27,6 +27,7 @@
#include <vcl/keycodes.hxx>
#include <rtl/math.hxx>
#include <unotools/charclass.hxx>
+#include <osl/diagnose.h>
#include <attrib.hxx>
#include <patattr.hxx>
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 21d2b11d8c6e..7af84bcd58dc 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -40,6 +40,8 @@
#include <com/sun/star/sheet/TablePageBreakData.hpp>
+#include <osl/diagnose.h>
+
#include <algorithm>
#include <limits>
diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index fc821133ef65..6ec79a90fd98 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -20,6 +20,7 @@
#include <drwlayer.hxx>
#include <compressedarray.hxx>
+#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <tools/stream.hxx>
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 2b525e8c0891..fc5014440645 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -45,6 +45,7 @@
#include <svx/sdtagitm.hxx>
#include <svx/sxcecitm.hxx>
#include <svl/whiter.hxx>
+#include <osl/diagnose.h>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/sc/source/filter/oox/drawingfragment.cxx
b/sc/source/filter/oox/drawingfragment.cxx
index 1f1f38b25c28..eb9b6627a120 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -44,6 +44,7 @@
#include <oox/token/tokens.hxx>
#include <oox/vml/vmlshape.hxx>
#include <oox/vml/vmlshapecontainer.hxx>
+#include <osl/diagnose.h>
#include <formulaparser.hxx>
#include <stylesbuffer.hxx>
#include <themebuffer.hxx>
diff --git a/sc/source/filter/rtf/eeimpars.cxx
b/sc/source/filter/rtf/eeimpars.cxx
index db15c1560e10..14cdf76d7349 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -34,6 +34,7 @@
#include <vcl/svapp.hxx>
#include <unotools/charclass.hxx>
#include <comphelper/string.hxx>
+#include <osl/diagnose.h>
#include <eeimport.hxx>
#include <global.hxx>
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
index 572b696f2528..21774de12bb0 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
@@ -23,6 +23,7 @@
#include "xmlimprt.hxx"
#include <xmloff/xmlnamespace.hxx>
+#include <xmloff/xmltkmap.hxx>
using namespace ::com::sun::star;
using namespace xmloff::token;
diff --git a/sc/source/filter/xml/celltextparacontext.cxx
b/sc/source/filter/xml/celltextparacontext.cxx
index 54981ed41bca..e2668dea28a5 100644
--- a/sc/source/filter/xml/celltextparacontext.cxx
+++ b/sc/source/filter/xml/celltextparacontext.cxx
@@ -13,6 +13,7 @@
#include <comphelper/string.hxx>
#include <xmloff/xmlnamespace.hxx>
+#include <xmloff/xmltkmap.hxx>
using namespace com::sun::star;
using namespace xmloff::token;
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 26d85c4768f4..638c2c5cba67 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -91,6 +91,7 @@
#include <com/sun/star/sheet/ValidationAlertStyle.hpp>
#include <rtl/ustrbuf.hxx>
+#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <i18nlangtag/lang.h>
diff --git a/sc/source/filter/xml/xmlcondformat.cxx
b/sc/source/filter/xml/xmlcondformat.cxx
index a1b54c036c30..996032f03498 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -11,6 +11,7 @@
#include "xmlcondformat.hxx"
#include "xmlimprt.hxx"
#include <xmloff/xmlnamespace.hxx>
+#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmlictxt.hxx>
#include <sal/log.hxx>
diff --git a/sc/source/filter/xml/xmlnexpi.cxx
b/sc/source/filter/xml/xmlnexpi.cxx
index 00a72cfd9df5..3d4286985d61 100644
--- a/sc/source/filter/xml/xmlnexpi.cxx
+++ b/sc/source/filter/xml/xmlnexpi.cxx
@@ -22,6 +22,7 @@
#include <document.hxx>
#include <xmloff/xmlnamespace.hxx>
+#include <xmloff/xmltkmap.hxx>
using namespace com::sun::star;
using namespace xmloff::token;
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index e575a837ec87..19081a32e067 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -44,6 +44,7 @@
#include <svl/itempool.hxx>
#include <svl/urlbmk.hxx>
#include <tools/urlobj.hxx>
+#include <osl/diagnose.h>
#include <drwtrans.hxx>
#include <docsh.hxx>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index c9b13dc709ae..64621cc72a0d 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -58,6 +58,7 @@
#include <formula/funcvarargs.h>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
#include <attrib.hxx>
#include <inputwin.hxx>
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index ce3624b27c85..7c50c1cf1b6f 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -25,6 +25,7 @@
#include <sfx2/docfile.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdouno.hxx>
+#include <osl/diagnose.h>
#include <seltrans.hxx>
#include <transobj.hxx>
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 53492205dbd2..9ed3e0f41ff1 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/sdb/CommandType.hpp>
#include <unotools/charclass.hxx>
#include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
#include <dbdocfun.hxx>
#include <dbdata.hxx>
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index e1498dd4424a..3a26bffadfa6 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -32,6 +32,7 @@
#include <svx/svdocapt.hxx>
#include <sal/log.hxx>
#include <unotools/charclass.hxx>
+#include <osl/diagnose.h>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/script/ModuleType.hpp>
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 37e1bc773859..8cb71adc0ac0 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -39,6 +39,7 @@
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
#include <vcl/weld.hxx>
+#include <osl/diagnose.h>
#include <docsh.hxx>
#include "docshimp.hxx"
diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx
b/sc/source/ui/docshell/documentlinkmgr.cxx
index 842c1052bb45..3652df5cca0a 100644
--- a/sc/source/ui/docshell/documentlinkmgr.cxx
+++ b/sc/source/ui/docshell/documentlinkmgr.cxx
@@ -24,6 +24,8 @@
#include <webservicelink.hxx>
#include <strings.hrc>
#include <scresid.hxx>
+#include <sfx2/linkmgr.hxx>
+#include <sfx2/linksrc.hxx>
#include <o3tl/deleter.hxx>
#include <svx/svdoole2.hxx>
#include <vcl/svapp.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx
b/sc/source/ui/drawfunc/drawsh5.cxx
index bec44bcab4d3..94e87dd29d27 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -31,6 +31,7 @@
#include <svx/extrusionbar.hxx>
#include <svx/fontworkbar.hxx>
#include <sfx2/docfile.hxx>
+#include <osl/diagnose.h>
#include <com/sun/star/form/FormButtonType.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx
b/sc/source/ui/drawfunc/fuconarc.cxx
index 5d85181eb300..95e5785868d0 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -25,6 +25,7 @@
#include <svx/svdocirc.hxx>
#include <svx/svxids.hrc>
#include <svx/sxciaitm.hxx>
+#include <osl/diagnose.h>
FuConstArc::FuConstArc(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView*
pViewP,
SdrModel* pDoc, const SfxRequest& rReq)
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx
b/sc/source/ui/drawfunc/fuconpol.cxx
index bdb6807dcd56..712b12a2bddf 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -24,6 +24,7 @@
// Create default drawing objects via keyboard
#include <svx/svdopath.hxx>
#include <svx/svxids.hrc>
+#include <osl/diagnose.h>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/point/b2dpoint.hxx>
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx
b/sc/source/ui/drawfunc/fuconrec.cxx
index 3ef1a03752cb..2a927f999164 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -34,6 +34,7 @@
#include <svx/xlnstit.hxx>
#include <svx/dialmgr.hxx>
#include <svx/svdomeas.hxx>
+#include <osl/diagnose.h>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 30ab23371d2f..8174506255a7 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -31,6 +31,7 @@
#include <svx/svxids.hrc>
#include <editeng/eeitem.hxx>
#include <svl/itemset.hxx>
+#include <osl/diagnose.h>
#include <futext.hxx>
#include <drwlayer.hxx>
diff --git a/sc/source/ui/drawfunc/futext3.cxx
b/sc/source/ui/drawfunc/futext3.cxx
index 8411f75f62ed..df601ea0d35c 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -20,6 +20,7 @@
#include <svx/svdocapt.hxx>
#include <svx/svdundo.hxx>
#include <vcl/cursor.hxx>
+#include <osl/diagnose.h>
#include <global.hxx>
#include <drwlayer.hxx>
diff --git a/sc/source/ui/inc/ChildWindowWrapper.hxx
b/sc/source/ui/inc/ChildWindowWrapper.hxx
index 572a76c32bb4..7db2b99c53a4 100644
--- a/sc/source/ui/inc/ChildWindowWrapper.hxx
+++ b/sc/source/ui/inc/ChildWindowWrapper.hxx
@@ -13,6 +13,7 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/childwin.hxx>
+#include <osl/diagnose.h>
#include "tabvwsh.hxx"
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index a30218118bcc..6738eb79bd06 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -24,6 +24,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
+#include <osl/diagnose.h>
#include <anyrefdg.hxx>
#include <sc.hrc>
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx
b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 577706782e98..d1be90274f5f 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -18,6 +18,7 @@
*/
#include <comphelper/string.hxx>
+#include <osl/diagnose.h>
#include <conflictsdlg.hxx>
#include <strings.hrc>
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx
b/sc/source/ui/miscdlgs/datafdlg.cxx
index c357718c2a53..0ed421cba831 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -15,6 +15,7 @@
#include <tabvwsh.hxx>
#include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
ScDataFormDlg::ScDataFormDlg(weld::Window* pParent, ScTabViewShell*
pTabViewShellOri)
: GenericDialogController(pParent, "modules/scalc/ui/dataform.ui",
"DataFormDialog")
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 6a08e44b2186..2ede5b43cd36 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -29,6 +29,7 @@
#include <sfx2/viewfrm.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
#include <tools/urlobj.hxx>
#include <sal/log.hxx>
#include <unotools/charclass.hxx>
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 33f5bad417a7..0dc4692645d9 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -23,6 +23,7 @@
#include <tools/lineend.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
+#include <osl/diagnose.h>
#include <global.hxx>
#include <document.hxx>
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 919d2b467582..6706b19adc0b 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -22,6 +22,7 @@
#include <editeng/boxitem.hxx>
#include <sfx2/app.hxx>
#include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
#include <undoblk.hxx>
#include <undoutil.hxx>
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 917fc67e3511..40f57412f960 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -29,6 +29,7 @@
#include <vcl/virdev.hxx>
#include <sfx2/app.hxx>
#include <svx/svdundo.hxx>
+#include <osl/diagnose.h>
#include <undoblk.hxx>
#include <globstr.hrc>
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 2e82399c879e..ce503934fe70 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -23,6 +23,7 @@
#include <editeng/editobj.hxx>
#include <sfx2/app.hxx>
#include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
#include <document.hxx>
#include <docpool.hxx>
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index c3a9476d7804..cd92934d1b6c 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -20,6 +20,7 @@
#include <sfx2/app.hxx>
#include <svx/svdundo.hxx>
#include <unotools/charclass.hxx>
+#include <osl/diagnose.h>
#include <undodat.hxx>
#include <undoutil.hxx>
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 0002fefa1ccb..51596baf9d42 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -21,6 +21,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <svl/hint.hxx>
+#include <osl/diagnose.h>
#include <undotab.hxx>
#include <document.hxx>
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx
index 76789b8b7857..fc0e71b69db5 100644
--- a/sc/source/ui/undo/undoutil.cxx
+++ b/sc/source/ui/undo/undoutil.cxx
@@ -26,6 +26,7 @@
#include <globalnames.hxx>
#include <global.hxx>
#include <markdata.hxx>
+#include <osl/diagnose.h>
void ScUndoUtil::MarkSimpleBlock( const ScDocShell* pDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index 3c366490de59..42f01761bd25 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -22,6 +22,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/request.hxx>
#include <vcl/EnumContext.hxx>
+#include <osl/diagnose.h>
#include <auditsh.hxx>
#include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index fb4b303e0833..13d6993634dd 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -18,6 +18,7 @@
*/
#include <sfx2/request.hxx>
+#include <osl/diagnose.h>
#include <cellsh.hxx>
#include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 8f9f8e3a52a2..82fb4f7f64a2 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -22,6 +22,7 @@
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <unotools/charclass.hxx>
+#include <osl/diagnose.h>
#include <dbfunc.hxx>
#include <docsh.hxx>
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 8bb263b71530..3ca2bb5e7fe5 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -62,6 +62,7 @@
#include <sortparam.hxx>
#include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
#include <memory>
#include <string_view>
diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx
index c8a6f48d0452..9f6719f9c01b 100644
--- a/sc/source/ui/view/dbfunc4.cxx
+++ b/sc/source/ui/view/dbfunc4.cxx
@@ -20,6 +20,7 @@
#include <svx/svditer.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdpage.hxx>
+#include <osl/diagnose.h>
#include <dbfunc.hxx>
#include <drwlayer.hxx>
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index b7d7af5fcc48..cd1851d81082 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -26,6 +26,7 @@
#include <tools/urlobj.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <drawview.hxx>
#include <global.hxx>
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index a1efca1748e4..9d23c064664f 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -42,6 +42,7 @@
#include <svx/sdr/contact/viewcontact.hxx>
#include <svx/sdrpagewindow.hxx>
#include <tools/UnitConversion.hxx>
+#include <osl/diagnose.h>
#include <drawview.hxx>
#include <global.hxx>
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 948f388ca866..cb8bc5393dc3 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -22,6 +22,7 @@
#include <editeng/sizeitem.hxx>
#include <sfx2/bindings.hxx>
#include <svl/ptitem.hxx>
+#include <osl/diagnose.h>
#include <tabvwsh.hxx>
#include <gridwin.hxx>
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 7dde48a0e4dc..d12ccee4f779 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -30,6 +30,7 @@
#include <vcl/cursor.hxx>
#include <vcl/settings.hxx>
#include <o3tl/unit_conversion.hxx>
+#include <osl/diagnose.h>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 50199cf790dd..34ebc328eb82 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -22,6 +22,7 @@
#include <vcl/help.hxx>
#include <vcl/settings.hxx>
#include <svtools/colorcfg.hxx>
+#include <osl/diagnose.h>
#include <tabvwsh.hxx>
#include <hdrcont.hxx>
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index 60cac1a63773..97b7682d8fad 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -24,6 +24,7 @@
#include <vcl/image.hxx>
#include <vcl/taskpanelist.hxx>
#include <vcl/settings.hxx>
+#include <osl/diagnose.h>
#include <olinewin.hxx>
#include <olinetab.hxx>
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index 47730c9b3cd2..eec75c39664d 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -25,6 +25,7 @@
#include <svx/svdview.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <osl/diagnose.h>
#include <output.hxx>
#include <drwlayer.hxx>
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 467ec9f43b73..3828c031cc3c 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -41,6 +41,7 @@
#include <tools/multisel.hxx>
#include <sfx2/docfile.hxx>
#include <tools/urlobj.hxx>
+#include <osl/diagnose.h>
#include <editutil.hxx>
#include <docsh.hxx>
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 89baed62a9f5..c2433e57c277 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -19,6 +19,7 @@
#include <tools/urlobj.hxx>
#include <sfx2/docfile.hxx>
+#include <osl/diagnose.h>
#include <select.hxx>
#include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/spelldialog.cxx
b/sc/source/ui/view/spelldialog.cxx
index 894157e578e1..aa535aca0aa2 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -25,6 +25,7 @@
#include <editeng/editview.hxx>
#include <editeng/unolingu.hxx>
#include <selectionstate.hxx>
+#include <osl/diagnose.h>
#include <spelleng.hxx>
#include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index 23b09806c98b..c9285866485a 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -29,6 +29,7 @@
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
+#include <osl/diagnose.h>
#include <spelldialog.hxx>
#include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 7e7368548f9a..f4581d394dd0 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -50,6 +50,7 @@
#include <spellcheckcontext.hxx>
#include <comphelper/lok.hxx>
#include <sfx2/lokhelper.hxx>
+#include <osl/diagnose.h>
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/json_parser.hpp>
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 787aa64fea71..0ec66ee6eb3c 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -21,6 +21,7 @@
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <sfx2/bindings.hxx>
+#include <osl/diagnose.h>
#include <attrib.hxx>
#include <pagedata.hxx>
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 46dea5fb338d..94ac00f7187b 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -31,6 +31,7 @@
#include <vcl/uitest/logger.hxx>
#include <vcl/uitest/eventdescription.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <IAnyRefDialog.hxx>
#include <tabview.hxx>
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 8f5963b9a189..d2158ebe6529 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -26,6 +26,7 @@
#include <sfx2/lokhelper.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewfrm.hxx>
+#include <osl/diagnose.h>
#include <tabview.hxx>
#include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 948cfd5d5328..668e10aae8f3 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -26,6 +26,7 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewfrm.hxx>
+#include <osl/diagnose.h>
#include <tabvwsh.hxx>
#include <global.hxx>
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 51489544ade8..84b883a25924 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -20,6 +20,7 @@
#include <comphelper/string.hxx>
#include <comphelper/lok.hxx>
#include <editeng/eeitem.hxx>
+#include <osl/diagnose.h>
#include <editeng/editview.hxx>
#include <editeng/flditem.hxx>
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index fa939bb6317c..26d67585301b 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -24,6 +24,7 @@
#include <svx/svdouno.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
+#include <osl/diagnose.h>
#include <com/sun/star/form/FormButtonType.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
index f178175046fd..8eb262187b0e 100644
--- a/sc/source/ui/view/tabvwshh.cxx
+++ b/sc/source/ui/view/tabvwshh.cxx
@@ -29,6 +29,7 @@
#include <svl/stritem.hxx>
#include <svl/whiter.hxx>
#include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
#include <tabvwsh.hxx>
#include <document.hxx>
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 112226405232..43021d09c02d 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -39,6 +39,7 @@
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <vcl/waitobj.hxx>
+#include <osl/diagnose.h>
#include <viewfunc.hxx>
#include <vcl/uitest/logger.hxx>
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index e6439ffc04b9..db5987e8b2a8 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -32,6 +32,7 @@
#include <vcl/uitest/logger.hxx>
#include <vcl/uitest/eventdescription.hxx>
#include <vcl/TypeSerializer.hxx>
+#include <osl/diagnose.h>
#include <attrib.hxx>
#include <patattr.hxx>
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 8b09321620c4..c151099b098f 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -44,6 +44,7 @@
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <avmedia/mediawindow.hxx>
+#include <osl/diagnose.h>
#include <comphelper/storagehelper.hxx>
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index d58c4300a684..9dafd25a64a1 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -32,6 +32,7 @@
#include <sfx2/ipclient.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/embed/Aspects.hpp>
+#include <osl/diagnose.h>
#include <document.hxx>
#include <viewfunc.hxx>
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 8e20a8348678..bef26c640673 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -39,6 +39,7 @@
#include <unotools/charclass.hxx>
#include <vcl/uitest/logger.hxx>
#include <vcl/uitest/eventdescription.hxx>
+#include <osl/diagnose.h>
#include <viewfunc.hxx>
#include <tabvwsh.hxx>
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 22431385ea17..a55c9b61f023 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -91,6 +91,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/graphicmimetype.hxx>
#include <comphelper/lok.hxx>
+#include <sfx2/linkmgr.hxx>
#include <vcl/filter/PngImageReader.hxx>
#include <vcl/BitmapReadAccess.hxx>
#include <vcl/dibtools.hxx>
diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx
index 879302f5fa43..0991cc464a57 100644
--- a/sd/source/core/shapelist.cxx
+++ b/sd/source/core/shapelist.cxx
@@ -18,6 +18,7 @@
*/
#include <svx/svdobj.hxx>
+#include <osl/diagnose.h>
#include <shapelist.hxx>
#include <algorithm>
diff --git a/sd/source/filter/pdf/sdpdffilter.cxx
b/sd/source/filter/pdf/sdpdffilter.cxx
index c34fa1bc78a6..efa0a0bce0b5 100644
--- a/sd/source/filter/pdf/sdpdffilter.cxx
+++ b/sd/source/filter/pdf/sdpdffilter.cxx
@@ -21,6 +21,7 @@
#include <sfx2/docfile.hxx>
#include <svx/svdograf.hxx>
+#include <o3tl/safeint.hxx>
#include <sdpage.hxx>
#include <drawdoc.hxx>
diff --git a/sd/source/filter/ppt/ppt97animations.cxx
b/sd/source/filter/ppt/ppt97animations.cxx
index cc0b37afd913..7c623020c0a0 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -24,6 +24,7 @@
#include <tools/stream.hxx>
#include <svx/unoapi.hxx>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <CustomAnimationPreset.hxx>
#include <com/sun/star/presentation/TextAnimationType.hpp>
#include <com/sun/star/presentation/EffectNodeType.hpp>
diff --git a/sd/source/filter/ppt/pptinanimations.cxx
b/sd/source/filter/ppt/pptinanimations.cxx
index 02afa719863d..48f354a67a1d 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -57,6 +57,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
#include <svx/svdotext.hxx>
#include <editeng/outlobj.hxx>
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index a9fcbc511f79..a5eb94e7d739 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -26,6 +26,7 @@
#include <tools/helpers.hxx>
#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
+#include <osl/diagnose.h>
#include <optsitem.hxx>
#include <FrameView.hxx>
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 2ea60b588ef9..20ff418808df 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -28,6 +28,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/docfile.hxx>
+#include <osl/diagnose.h>
#include <editeng/measfld.hxx>
#include <editeng/editstat.hxx>
diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx
b/sd/source/ui/dlg/masterlayoutdlg.cxx
index d5bac1c6a328..ce4e069b0737 100644
--- a/sd/source/ui/dlg/masterlayoutdlg.cxx
+++ b/sd/source/ui/dlg/masterlayoutdlg.cxx
@@ -20,6 +20,7 @@
#include <masterlayoutdlg.hxx>
#include <drawdoc.hxx>
#include <sdpage.hxx>
+#include <osl/diagnose.h>
using namespace ::sd;
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index d782010fd87a..63fd24cb91aa 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -44,6 +44,7 @@
#include <svl/urihelper.hxx>
#include <sfx2/filedlghelper.hxx>
#include <svx/drawitem.hxx>
+#include <osl/diagnose.h>
#include <View.hxx>
#include <sdresid.hxx>
#include <tpaction.hxx>
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 093d0a70f916..d0370457f869 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -25,6 +25,7 @@
#include <sfx2/dispatch.hxx>
#include <svx/svdobj.hxx>
#include <sfx2/viewfrm.hxx>
+#include <osl/diagnose.h>
#include <svx/svxids.hrc>
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index ee7099819bdf..f88c0d6bf463 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -27,6 +27,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
+#include <osl/diagnose.h>
#include <svx/svxids.hrc>
#include <svx/svdpagv.hxx>
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 0d303efaedf5..26be546af0c9 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -60,6 +60,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <svx/xfillit0.hxx>
#include <svx/signaturelinehelper.hxx>
+#include <osl/diagnose.h>
#include <sdresid.hxx>
#include <View.hxx>
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index be5a00c89c44..11e97a3bc7ed 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -43,6 +43,7 @@
#include <svx/sdr/overlay/overlaymanager.hxx>
#include <sfx2/docfile.hxx>
#include <editeng/outlobj.hxx>
+#include <osl/diagnose.h>
#include <editeng/frmdiritem.hxx>
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 3a7f691ad804..fbad335c4b26 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -28,6 +28,7 @@
#include "MasterPageDescriptor.hxx"
#include <EventMultiplexer.hxx>
#include <DrawDocShell.hxx>
+#include <osl/diagnose.h>
#include <helpids.h>
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx
b/sd/source/ui/sidebar/MasterPageContainer.cxx
index db070d25bb4c..a37b3b6ddeb0 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -45,6 +45,7 @@
#include <osl/getglobalmutex.hxx>
#include <xmloff/autolayout.hxx>
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index e79112d06743..025eb7fab554 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -19,6 +19,7 @@
#include <controller/SlsAnimator.hxx>
#include <view/SlideSorterView.hxx>
+#include <osl/diagnose.h>
namespace sd::slidesorter::controller {
diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index 538187cdfb8a..c07bbe5b4363 100644
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -32,6 +32,7 @@
#include <FrameView.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XController.hpp>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
index 1c7be02427b8..59027f5a8177 100644
--- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
@@ -27,6 +27,7 @@
#include <model/SlsPageDescriptor.hxx>
#include <view/SlideSorterView.hxx>
#include <view/SlsLayouter.hxx>
+#include <osl/diagnose.h>
#include <Window.hxx>
#include <sdpage.hxx>
diff --git
a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
index 7c89c89dc925..afa802fec852 100644
--- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
@@ -25,6 +25,7 @@
#include <model/SlideSorterModel.hxx>
#include <model/SlsPageEnumerationProvider.hxx>
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
+#include <osl/diagnose.h>
#include <SlideSorter.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index df639ae41d48..9854f900c964 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -28,6 +28,7 @@
#include <model/SlsPageEnumerationProvider.hxx>
#include <model/SlideSorterModel.hxx>
#include <view/SlideSorterView.hxx>
+#include <osl/diagnose.h>
#include <sdpage.hxx>
#include <tools/debug.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index ce1a843f42a0..c3e4b74ff761 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -29,6 +29,7 @@
#include <view/SlsLayouter.hxx>
#include <Window.hxx>
#include <sdpage.hxx>
+#include <osl/diagnose.h>
#include <vcl/scrbar.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index e3daba4d98b3..27cabfefd921 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -41,6 +41,7 @@
#include <view/SlideSorterView.hxx>
#include <view/SlsLayouter.hxx>
#include <framework/FrameworkHelper.hxx>
+#include <osl/diagnose.h>
#include <Window.hxx>
#include <sdpage.hxx>
#include <drawdoc.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index ea2cc281f01f..952303c67db1 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -24,6 +24,7 @@
#include <controller/SlsPageSelector.hxx>
#include <controller/SlsFocusManager.hxx>
#include <sdpage.hxx>
+#include <osl/diagnose.h>
namespace sd::slidesorter::controller
{
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index f13aa1b7eb09..c56bd41cff83 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -41,6 +41,7 @@
#include <Window.hxx>
#include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
#include <vcl/svapp.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index 9bdefa2ef522..63f89b9ca1c1 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -25,6 +25,7 @@
#include <model/SlideSorterModel.hxx>
#include <SlideSorter.hxx>
#include <Window.hxx>
+#include <osl/diagnose.h>
#include <memory>
#include <set>
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 6dc956516269..be6ce4b3ef2c 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -31,6 +31,7 @@
#include <sdpage.hxx>
#include <vcl/virdev.hxx>
#include <CustomAnimationEffect.hxx>
+#include <osl/diagnose.h>
#include <memory>
using namespace ::drawinglayer::primitive2d;
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 374df4b6328e..fa24cbd4c94c 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -27,6 +27,7 @@
#include <sdresid.hxx>
#include <strings.hrc>
+#include <osl/diagnose.h>
#include <vcl/settings.hxx>
#include <vcl/help.hxx>
diff --git a/sd/source/ui/view/FormShellManager.cxx
b/sd/source/ui/view/FormShellManager.cxx
index d780b0c4e0d1..c9126714cc24 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -26,6 +26,7 @@
#include <Window.hxx>
#include <vcl/vclevent.hxx>
#include <svx/fmshell.hxx>
+#include <osl/diagnose.h>
namespace sd {
diff --git a/sd/source/ui/view/OutlinerIterator.cxx
b/sd/source/ui/view/OutlinerIterator.cxx
index c37c737023a8..e839e71b9ba4 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -21,6 +21,7 @@
#include <OutlinerIteratorImpl.hxx>
#include <svx/svditer.hxx>
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
#include <Outliner.hxx>
#include <drawdoc.hxx>
diff --git a/sd/source/ui/view/ToolBarManager.cxx
b/sd/source/ui/view/ToolBarManager.cxx
index eb91e49ab928..413199c0e7d3 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -41,6 +41,7 @@
#include <tools/debug.hxx>
#include <tools/link.hxx>
#include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
#include <map>
#include <utility>
diff --git a/sd/source/ui/view/ViewShellManager.cxx
b/sd/source/ui/view/ViewShellManager.cxx
index 08081f9b153e..0628fd865420 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -29,6 +29,7 @@
#include <svx/svxids.hrc>
#include <svx/fmshell.hxx>
#include <vcl/vclevent.hxx>
+#include <osl/diagnose.h>
#include <iterator>
#include <list>
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index fb730f599da3..5bc741c91269 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -22,6 +22,7 @@
#include <sfx2/dispatch.hxx>
#include <svx/fmshell.hxx>
#include <svx/svxdlg.hxx>
+#include <osl/diagnose.h>
#include <app.hrc>
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 691580927671..9729fe2d4b97 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -26,6 +26,7 @@
#include <unokywds.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
#include <vector>
#include <ViewShell.hxx>
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 90a1f599d2fe..4bca10f3b797 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -45,6 +45,7 @@
#include <svx/svxids.hrc>
#include <toolkit/helper/vclunohelper.hxx>
#include <svtools/embedhlp.hxx>
+#include <osl/diagnose.h>
#include <DrawDocShell.hxx>
#include <fupoor.hxx>
#include <tablefunction.hxx>
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 8d68fe58c017..818cc4e8d298 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -38,6 +38,7 @@
#include <svtools/sfxecode.hxx>
#include <unotools/moduleoptions.hxx>
#include <comphelper/classids.hxx>
+#include <osl/diagnose.h>
#include <strings.hrc>
#include <app.hrc>
diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index a57021b37a19..292b25548aef 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -12,6 +12,7 @@
#include <sfx2/devtools/ObjectInspectorTreeHandler.hxx>
#include <sfx2/sfxresid.hxx>
+#include <vcl/svapp.hxx>
#include "DevToolsStrings.hrc"
#include <com/sun/star/beans/theIntrospection.hpp>
diff --git a/svx/source/dialog/dialcontrol.cxx
b/svx/source/dialog/dialcontrol.cxx
index ff8f0eee1529..0a62215fd60e 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -18,6 +18,7 @@
*/
#include <svx/dialcontrol.hxx>
+#include <svx/svdtrans.hxx>
#include <cmath>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index c7769519c0e1..d0555edf6334 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -44,6 +44,7 @@
#include <svx/svdopath.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <osl/diagnose.h>
#include "dlgunit.hxx"
#include <memory>
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index 6d1f1a2c0cf6..e518319aab1e 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -27,6 +27,7 @@
#include <svx/fmpage.hxx>
#include <sfx2/objsh.hxx>
+#include <osl/diagnose.h>
#include <optional>
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 705d7f9e1e6a..c4f0bcad55f5 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -30,6 +30,7 @@
#include <tools/urlobj.hxx>
#include <vcl/help.hxx>
#include <vcl/window.hxx>
+#include <osl/diagnose.h>
#include <fmprop.hxx>
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index ff100ee2ef95..1d388203a2a9 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -49,6 +49,7 @@
#include <map>
#include <memory>
#include <cppuhelper/implbase.hxx>
+#include <osl/diagnose.h>
GalleryBrowserMode GalleryBrowser2::meInitMode = GALLERYBROWSERMODE_ICON;
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index eb90fd0895d4..ed603c0de66e 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -40,6 +40,7 @@
#include <svx/strings.hrc>
#include <svx/galtheme.hxx>
#include <svx/galmisc.hxx>
+#include <osl/diagnose.h>
#include <com/sun/star/awt/XProgressMonitor.hpp>
#include <com/sun/star/ucb/TransferInfo.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 07d5e529fbd0..b9ce64c36f17 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -40,6 +40,7 @@
#include <svx/galtheme.hxx>
#include <svx/svdpage.hxx>
#include <svx/galleryobjectcollection.hxx>
+#include <svx/galleryobjectbinarystorage.hxx>
#include <galobj.hxx>
#include <svx/gallery1.hxx>
#include "gallerydrawmodel.hxx"
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index fc9154d42c6a..8b2fa387a836 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -69,6 +69,7 @@
#include <svx/svdmodel.hxx>
#include <svx/xflbmsli.hxx>
#include <editeng/editstat.hxx>
+#include <osl/diagnose.h>
#include <drawinglayer/attribute/fillhatchattribute.hxx>
#include <drawinglayer/attribute/fillgradientattribute.hxx>
#include <sdr/attribute/sdreffectstextattribute.hxx>
diff --git a/svx/source/sdr/properties/attributeproperties.cxx
b/svx/source/sdr/properties/attributeproperties.cxx
index 5ed41b9c4c99..e67e560c1505 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -36,6 +36,7 @@
#include <svx/xflhtit.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
+#include <osl/diagnose.h>
namespace sdr::properties
{
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx
b/svx/source/sdr/properties/e3dsceneproperties.cxx
index de99a18352c1..e4ebfe194e4c 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -22,6 +22,7 @@
#include <svl/whiter.hxx>
#include <svx/svddef.hxx>
#include <svx/scene3d.hxx>
+#include <osl/diagnose.h>
#include <memory>
diff --git a/svx/source/sdr/properties/groupproperties.cxx
b/svx/source/sdr/properties/groupproperties.cxx
index 4ccd517f4d82..923bed6ade17 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -24,6 +24,7 @@
#include <svl/whiter.hxx>
#include <svx/svdogrp.hxx>
#include <svx/svdpage.hxx>
+#include <osl/diagnose.h>
namespace sdr::properties
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 727c2f30e386..8234ee9c4dbf 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -26,6 +26,7 @@
#include <svx/xfltrit.hxx>
#include <svx/xflftrit.hxx>
#include <svx/xtable.hxx>
+#include <sfx2/sidebar/Panel.hxx>
#include <sfx2/opengrf.hxx>
#include <sfx2/weldutils.hxx>
#include <tools/urlobj.hxx>
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index bd5c0249f31f..9807a53bd99e 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -35,6 +35,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
#include <svx/sdrpagewindow.hxx>
+#include <osl/diagnose.h>
using namespace sdr;
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 3470a8d91458..2288db38cc7b 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -35,6 +35,7 @@
#include <svx/svdogrp.hxx>
#include <svx/scene3d.hxx>
#include <svx/xfillit0.hxx>
+#include <osl/diagnose.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 5b17b8852462..247fb8060b4b 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -69,6 +69,7 @@
#include <rtl/ustring.hxx>
#include <sfx2/viewsh.hxx>
#include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
// EditView
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index ef1a1c43e89b..481ffb8d690d 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -51,6 +51,7 @@
#include <vcl/graph.hxx>
#include <svx/svxids.hrc>
#include <svx/dstribut_enum.hxx>
+#include <osl/diagnose.h>
using namespace com::sun::star;
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 504f5990dab4..5f8185f93325 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -73,6 +73,7 @@
#include <svx/svditer.hxx>
#include <svx/svdogrp.hxx>
#include <vcl/BitmapTools.hxx>
+#include <osl/diagnose.h>
using namespace com::sun::star;
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index 8a7f5637517a..810732e2b16c 100644
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -21,6 +21,7 @@
#include <svx/svdpage.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdmark.hxx>
+#include <osl/diagnose.h>
SdrObjListIter::SdrObjListIter(const SdrObjList* pObjList, SdrIterMode eMode,
bool bReverse)
: maObjList(),
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 866de4920c15..e3c77bda1e74 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -32,6 +32,7 @@
#include <svx/scene3d.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <svx/svdoedge.hxx>
+#include <osl/diagnose.h>
#include <cassert>
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index f32830f75caf..5f1d65ef185b 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -24,6 +24,7 @@
#include <svx/svdpage.hxx>
#include <svx/svdotable.hxx>
+#include <osl/diagnose.h>
#include <osl/thread.h>
#include <rtl/strbuf.hxx>
#include <svx/svdoole2.hxx>
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 0d0ae8dc2bfe..89ec0c5dc199 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -20,6 +20,7 @@
#include <svx/svdmrkv.hxx>
#include <svx/svdpagv.hxx>
+#include <osl/diagnose.h>
// Point Selection
diff --git a/svx/source/svdraw/svdobjplusdata.cxx
b/svx/source/svdraw/svdobjplusdata.cxx
index c7da1c80083a..af27c5629fa8 100644
--- a/svx/source/svdraw/svdobjplusdata.cxx
+++ b/svx/source/svdraw/svdobjplusdata.cxx
@@ -12,6 +12,7 @@
#include <o3tl/deleter.hxx>
#include <svx/svdglue.hxx>
#include <svl/SfxBroadcaster.hxx>
+#include <osl/diagnose.h>
SdrObjPlusData::SdrObjPlusData()
{
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 2eafff7605fc..5f19e3fc26a6 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -19,6 +19,7 @@
#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
+#include <osl/diagnose.h>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 15f612c1f4e7..d335f9eab90c 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -49,6 +49,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/ipclient.hxx>
#include <sfx2/lnkbase.hxx>
+#include <sfx2/linkmgr.hxx>
#include <tools/debug.hxx>
#include <tools/globname.hxx>
#include <tools/diagnose_ex.h>
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index be0fbf786a11..75c40504f115 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -47,6 +47,7 @@
#include <vcl/ptrstyle.hxx>
#include <memory>
#include <sal/log.hxx>
+#include <osl/diagnose.h>
using namespace sdr;
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 60ee002f1f54..553fd94380ab 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -31,6 +31,7 @@
#include <rtl/ustrbuf.hxx>
#include <tools/debug.hxx>
#include <vcl/ptrstyle.hxx>
+#include <osl/diagnose.h>
using namespace com::sun::star;
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index c793d453734f..7b156881d0c3 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -34,6 +34,7 @@
#include <comphelper/lok.hxx>
#include <comphelper/scopeguard.hxx>
#include <basegfx/range/b2irectangle.hxx>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index 125b26f0da01..adb68732d0cb 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
