basctl/source/basicide/basides1.cxx                    |    1 +
 cui/source/dialogs/zoom.cxx                            |    1 +
 cui/source/options/optsave.cxx                         |    1 +
 cui/source/options/treeopt.cxx                         |    1 +
 cui/source/tabpages/border.cxx                         |    1 +
 cui/source/tabpages/chardlg.cxx                        |    1 +
 cui/source/tabpages/connect.cxx                        |    1 +
 cui/source/tabpages/labdlg.cxx                         |    1 +
 cui/source/tabpages/measure.cxx                        |    1 +
 cui/source/tabpages/numfmt.cxx                         |    1 +
 cui/source/tabpages/numpages.cxx                       |    1 +
 cui/source/tabpages/page.cxx                           |    1 +
 cui/source/tabpages/paragrph.cxx                       |    1 +
 cui/source/tabpages/textattr.cxx                       |    1 +
 cui/source/tabpages/tpbitmap.cxx                       |    1 +
 cui/source/tabpages/tpline.cxx                         |    1 +
 cui/source/tabpages/tplnedef.cxx                       |    1 +
 cui/source/tabpages/tplneend.cxx                       |    1 +
 cui/source/tabpages/transfrm.cxx                       |    1 +
 editeng/source/items/frmitems.cxx                      |    1 +
 editeng/source/items/textitem.cxx                      |    1 +
 editeng/source/outliner/outliner.cxx                   |    1 +
 editeng/source/rtf/rtfitem.cxx                         |    1 +
 extensions/source/propctrlr/formcomponenthandler.cxx   |    1 +
 filter/source/msfilter/svdfppt.cxx                     |    1 +
 include/svl/cintitem.hxx                               |    1 -
 include/svl/flagitem.hxx                               |    1 -
 include/svl/itempool.hxx                               |    1 -
 include/svl/itemset.hxx                                |    1 -
 include/svl/nfengine.hxx                               |    2 --
 include/svl/numformat.hxx                              |    2 ++
 include/svl/poolitem.hxx                               |    1 -
 include/svl/ptitem.hxx                                 |    1 -
 include/svl/stritem.hxx                                |    2 --
 include/svl/style.hxx                                  |    1 -
 include/svl/svdde.hxx                                  |    1 -
 include/svl/undo.hxx                                   |    1 -
 reportdesign/source/ui/report/ReportController.cxx     |    1 +
 sc/source/ui/sidebar/NumberFormatControl.cxx           |    1 +
 sc/source/ui/view/drawview.cxx                         |    1 +
 sd/source/core/sdpage.cxx                              |    1 +
 sd/source/core/stlpool.cxx                             |    1 +
 sd/source/core/stlsheet.cxx                            |    1 +
 sd/source/ui/animations/motionpathtag.cxx              |    1 +
 sd/source/ui/app/sdmod2.cxx                            |    1 +
 sd/source/ui/dlg/BulletAndPositionDlg.cxx              |    1 +
 sd/source/ui/dlg/diactrl.cxx                           |    1 +
 sd/source/ui/docshell/docshel4.cxx                     |    1 +
 sd/source/ui/func/fuconrec.cxx                         |    1 +
 sd/source/ui/func/fupage.cxx                           |    1 +
 sd/source/ui/inc/optsitem.hxx                          |    1 +
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |    1 +
 sd/source/ui/view/drviews7.cxx                         |    1 +
 sd/source/ui/view/drviewse.cxx                         |    1 +
 sd/source/ui/view/outlnvsh.cxx                         |    1 +
 sfx2/source/appl/appopen.cxx                           |    1 +
 sfx2/source/appl/appserv.cxx                           |    1 +
 sfx2/source/dialog/filedlghelper.cxx                   |    1 +
 sfx2/source/dialog/securitypage.cxx                    |    1 +
 sfx2/source/doc/docfile.cxx                            |    1 +
 sfx2/source/doc/docinsert.cxx                          |    1 +
 sfx2/source/doc/objcont.cxx                            |    1 +
 sfx2/source/doc/objmisc.cxx                            |    1 +
 sfx2/source/doc/objserv.cxx                            |    1 +
 sfx2/source/doc/objstor.cxx                            |    1 +
 sfx2/source/view/frame.cxx                             |    1 +
 sfx2/source/view/viewfrm.cxx                           |    1 +
 sfx2/source/view/viewsh.cxx                            |    1 +
 svl/source/undo/undo.cxx                               |    1 +
 svx/source/customshapes/EnhancedCustomShape2d.cxx      |    1 +
 svx/source/customshapes/EnhancedCustomShape3d.cxx      |    1 +
 svx/source/dialog/fntctrl.cxx                          |    1 +
 svx/source/dialog/hdft.cxx                             |    1 +
 svx/source/dialog/imapwnd.cxx                          |    1 +
 svx/source/form/tbxform.cxx                            |    1 +
 svx/source/sdr/contact/viewcontactofe3d.cxx            |    1 +
 svx/source/sdr/contact/viewcontactofe3dscene.cxx       |    1 +
 svx/source/sdr/properties/textproperties.cxx           |    1 +
 svx/source/sidebar/paragraph/ParaSpacingControl.cxx    |    1 +
 svx/source/stbctrls/selctrl.cxx                        |    1 +
 svx/source/stbctrls/zoomsliderctrl.cxx                 |    1 +
 svx/source/svdraw/svdedtv1.cxx                         |    1 +
 svx/source/svdraw/svdmrkv.cxx                          |    1 +
 svx/source/svdraw/svdoashp.cxx                         |    1 +
 svx/source/svdraw/svdobj.cxx                           |    1 +
 svx/source/table/svdotable.cxx                         |    1 +
 svx/source/tbxctrls/grafctrl.cxx                       |    1 +
 svx/source/tbxctrls/linewidthctrl.cxx                  |    1 +
 svx/source/tbxctrls/tbcontrl.cxx                       |    1 +
 svx/source/toolbars/extrusionbar.cxx                   |    1 +
 svx/source/toolbars/fontworkbar.cxx                    |    1 +
 svx/source/unodraw/unoshape.cxx                        |    1 +
 92 files changed, 82 insertions(+), 13 deletions(-)

New commits:
commit 4d240076321d4e7f131afcfb1fe435b12491563d
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Fri Nov 7 12:54:20 2025 +0100
Commit:     Gabor Kelemen <[email protected]>
CommitDate: Sat Nov 29 13:59:05 2025 +0100

    tdf#146619 Run IWYU again on include/svl/
    
    Change-Id: I5dc8757a6d06ab6917a9af733550295008fde5b8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193914
    Reviewed-by: Gabor Kelemen <[email protected]>
    Tested-by: Jenkins

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index b76afa43b13d..ac8ab4512bb1 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -55,6 +55,7 @@
 #include <svl/intitem.hxx>
 #include <svl/visitem.hxx>
 #include <svl/whiter.hxx>
+#include <tools/debug.hxx>
 #include <vcl/texteng.hxx>
 #include <vcl/textview.hxx>
 #include <vcl/svapp.hxx>
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 88b12baae3ec..a8331f2ed476 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -25,6 +25,7 @@
 #include <sfx2/zoomitem.hxx>
 #include <svx/viewlayoutitem.hxx>
 #include <svx/zoom_def.hxx>
+#include <tools/debug.hxx>
 
 namespace
 {
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index b95f468c4bd0..eea1be7952fc 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/docfilt.hxx>
+#include <tools/debug.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/diagnose_ex.hxx>
 #include <officecfg/Office/Recovery.hxx>
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 7873134ba4d8..69a7e7a726ce 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -29,6 +29,7 @@
 
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
+#include <tools/debug.hxx>
 
 #include <treeopt.hrc>
 #include <helpids.h>
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index dec5de00d836..013bf2b6a78f 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/objsh.hxx>
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
+#include <tools/debug.hxx>
 
 #include <strings.hrc>
 #include <bitmaps.hlst>
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 52d4f681d115..646fd8cf81a2 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -64,6 +64,7 @@
 #include <osl/diagnose.h>
 #include <o3tl/unit_conversion.hxx>
 #include <o3tl/string_view.hxx>
+#include <tools/debug.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 56bea8179636..b5546a92937d 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -30,6 +30,7 @@
 #include <svx/sxelditm.hxx>
 #include <svx/sxenditm.hxx>
 #include <svtools/unitconv.hxx>
+#include <tools/debug.hxx>
 
 #include <connect.hxx>
 
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 9ab89ed68a40..ea1e2026b07c 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -20,6 +20,7 @@
 #include <swpossizetabpage.hxx>
 #include <o3tl/untaint.hxx>
 #include <svtools/unitconv.hxx>
+#include <tools/debug.hxx>
 
 #include <svx/svddef.hxx>
 #include <svx/sxcecitm.hxx>
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 9a70b8d98b75..e30af3e493a9 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -33,6 +33,7 @@
 #include <svx/sxmtritm.hxx>
 #include <svx/sxmuitm.hxx>
 #include <svtools/unitconv.hxx>
+#include <tools/debug.hxx>
 
 #include <measure.hxx>
 
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 836f72440d05..9a22e0ddecb0 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -28,6 +28,7 @@
 #include <i18nlangtag/lang.h>
 #include <svx/svxids.hrc>
 #include <svtools/colorcfg.hxx>
+#include <tools/debug.hxx>
 
 #include <numcategories.hrc>
 #include <strings.hrc>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 3bef7ea46a21..3d3e5083294f 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -22,6 +22,7 @@
 #include <numpages.hxx>
 #include <dialmgr.hxx>
 #include <o3tl/untaint.hxx>
+#include <tools/debug.hxx>
 #include <tools/mapunit.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <editeng/numitem.hxx>
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index df709022d540..54a6730315a4 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -29,6 +29,7 @@
 #include <vcl/weld.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 427fb7356654..3ed39ff47ac6 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -26,6 +26,7 @@
 #include <svx/flagsdef.hxx>
 #include <svx/svxids.hrc>
 #include <svx/sdtaitm.hxx>
+#include <tools/debug.hxx>
 
 #include <svl/cjkoptions.hxx>
 #include <editeng/pgrditem.hxx>
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 119a5420d53a..5e587658caf7 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -31,6 +31,7 @@
 #include <editeng/writingmodeitem.hxx>
 #include <svtools/unitconv.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 7f5d869bd7cf..494348fefd88 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -51,6 +51,7 @@
 #include <sal/log.hxx>
 #include <comphelper/lok.hxx>
 #include <svtools/unitconv.hxx>
+#include <tools/debug.hxx>
 
 using namespace com::sun::star;
 
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 4a6b1c2418bf..a49ef2ca4de4 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -21,6 +21,7 @@
 #include <editeng/sizeitem.hxx>
 #include <o3tl/untaint.hxx>
 #include <osl/file.hxx>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 
 #include <strings.hrc>
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 7a5a3663641e..60db346a902b 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 1f49142d8411..34a3164d3b68 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index c154cb325828..df9b8d79f1df 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -37,6 +37,7 @@
 #include <svx/anchorid.hxx>
 #include <svl/rectitem.hxx>
 #include <swpossizetabpage.hxx>
+#include <tools/debug.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/fieldvalues.hxx>
 
diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index c6ab052e62ff..b3742fc9b06c 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -47,6 +47,7 @@
 #include <svl/memberid.h>
 #include <rtl/math.hxx>
 #include <rtl/ustring.hxx>
+#include <tools/debug.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/UnitConversion.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index 40cc2d3c7bb8..76754ca005ad 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -35,6 +35,7 @@
 #include <editeng/editids.hrc>
 #include <editeng/editrids.hrc>
 #include <tools/bigint.hxx>
+#include <tools/debug.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/UnitConversion.hxx>
 
diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 7c5b95a68602..760b7dca4eb0 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -44,6 +44,7 @@
 #include <svl/itempool.hxx>
 #include <libxml/xmlwriter.h>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 #include <o3tl/safeint.hxx>
 #include <o3tl/string_view.hxx>
 #include <osl/diagnose.h>
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 1e547dc37c4b..addf148d124e 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -61,6 +61,7 @@
 #include <svl/itempool.hxx>
 #include <svl/itemiter.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 #include <vcl/font.hxx>
 
 #include <editeng/svxrtf.hxx>
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx 
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 2723a88df4f1..d44350bd475f 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -98,6 +98,7 @@
 #include <svx/numinf.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/svxids.hrc>
+#include <tools/debug.hxx>
 #include <vcl/ColorDialog.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/unohelp.hxx>
diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 550975191557..230f587baefe 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -24,6 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <unotools/tempfile.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <tools/debug.hxx>
 #include <tools/UnitConversion.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/editdata.hxx>
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index 4f1742ac57e5..da17fb7847e4 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVL_CINTITEM_HXX
 
 #include <svl/svldllapi.h>
-#include <tools/debug.hxx>
 #include <svl/poolitem.hxx>
 
 class SVL_DLLPUBLIC CntByteItem: public SfxPoolItem
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index 8a8f70b869b4..692da3e29b4a 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -21,7 +21,6 @@
 
 #include <svl/poolitem.hxx>
 #include <svl/svldllapi.h>
-#include <tools/debug.hxx>
 
 class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem
 {
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 923d1805ad43..39e3060f1f88 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -29,7 +29,6 @@
 #include <vector>
 #include <unordered_set>
 #include <unordered_map>
-#include <o3tl/sorted_vector.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <svl/SfxBroadcaster.hxx>
 
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 49fc4fcd2fd9..118e3da7f036 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -22,7 +22,6 @@
 
 #include <cassert>
 #include <memory>
-#include <utility>
 #include <unordered_map>
 
 #include <svl/svldllapi.h>
diff --git a/include/svl/nfengine.hxx b/include/svl/nfengine.hxx
index 7370370c6ac4..8ddb9ec83bbf 100644
--- a/include/svl/nfengine.hxx
+++ b/include/svl/nfengine.hxx
@@ -22,8 +22,6 @@
 #include <com/sun/star/i18n/XNumberFormatCode.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <i18nlangtag/lang.h>
-#include <tools/link.hxx>
-#include <svl/nfkeytab.hxx>
 #include <svl/ondemand.hxx>
 #include <svl/zforlist.hxx>
 #include <unotools/charclass.hxx>
diff --git a/include/svl/numformat.hxx b/include/svl/numformat.hxx
index 4c8f70e6f906..cbc29416df5a 100644
--- a/include/svl/numformat.hxx
+++ b/include/svl/numformat.hxx
@@ -21,6 +21,8 @@
 #include <svl/svldllapi.h>
 
 #include <svl/nfengine.hxx>
+#include <svl/nfkeytab.hxx>
+#include <tools/link.hxx>
 
 class SvNumberFormatterRegistry_Impl;
 class NfCurrencyTable;
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 96e94dca698e..ab574757b41a 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -23,7 +23,6 @@
 #include <sal/config.h>
 
 #include <memory>
-#include <vector>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <svl/hint.hxx>
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index f78d0f9a0851..d9da58dd5767 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
@@ -22,7 +22,6 @@
 #include <svl/svldllapi.h>
 #include <svl/poolitem.hxx>
 #include <tools/gen.hxx>
-#include <tools/debug.hxx>
 
 class SVL_DLLPUBLIC SfxPointItem final : public SfxPoolItem
 {
diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx
index 2a4e39a3c493..70c1dca19077 100644
--- a/include/svl/stritem.hxx
+++ b/include/svl/stritem.hxx
@@ -20,8 +20,6 @@
 
 #include <svl/svldllapi.h>
 #include <svl/poolitem.hxx>
-#include <cassert>
-#include <utility>
 
 
 class SVL_DLLPUBLIC SfxStringItem: public SfxPoolItem
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index e1f0707c2700..94f71375251d 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -32,7 +32,6 @@
 #include <svl/stylesheetuser.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <tools/mapunit.hxx>
-#include <tools/solar.h>
 
 #include <memory>
 #include <optional>
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index b7ebf4397a2a..1e6fabba03d6 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -25,7 +25,6 @@
 #include <svl/svldllapi.h>
 #include <sot/formats.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
 #include <tools/link.hxx>
 #include <tools/long.hxx>
 #include <memory>
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 5a0340d99f05..1a37cecf1d98 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -26,7 +26,6 @@
 #include <o3tl/strong_int.hxx>
 
 #include <memory>
-#include <optional>
 #include <vector>
 
 typedef o3tl::strong_int<sal_Int32, struct ViewShellIdTag> ViewShellId;
diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index 236d008dc278..309f9615f042 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -105,6 +105,7 @@
 #include <svx/flagsdef.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svxdlg.hxx>
+#include <tools/debug.hxx>
 
 #include <core_resource.hxx>
 #include <DesignView.hxx>
diff --git a/sc/source/ui/sidebar/NumberFormatControl.cxx 
b/sc/source/ui/sidebar/NumberFormatControl.cxx
index 1060f0f5db45..bfce6877eb22 100644
--- a/sc/source/ui/sidebar/NumberFormatControl.cxx
+++ b/sc/source/ui/sidebar/NumberFormatControl.cxx
@@ -20,6 +20,7 @@
 #include <NumberFormatControl.hxx>
 #include <cbnumberformat.hxx>
 #include <svl/intitem.hxx>
+#include <tools/debug.hxx>
 #include <vcl/toolbox.hxx>
 
 using namespace sc;
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 9012c9f033f2..6e645e95c8b3 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -41,6 +41,7 @@
 #include <svx/sdr/contact/viewobjectcontact.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/sdrpagewindow.hxx>
+#include <tools/debug.hxx>
 #include <tools/UnitConversion.hxx>
 #include <osl/diagnose.h>
 
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 7ee15ddeb7b1..6eb5138ca154 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -63,6 +63,7 @@
 #include <com/sun/star/xml/dom/XNamedNodeMap.hpp>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 #include <o3tl/enumarray.hxx>
 #include <o3tl/safeint.hxx>
 #include <o3tl/sorted_vector.hxx>
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 69a5fe18de37..7316a8f6a547 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -47,6 +47,7 @@
 #include <svx/sdr/table/tabledesign.hxx>
 #include <editeng/autokernitem.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <tools/debug.hxx>
 #include <tools/UnitConversion.hxx>
 
 #include <editeng/lrspitem.hxx>
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index db809a31c346..2d87918335f1 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/table/BorderLine.hpp>
 #include <com/sun/star/text/XTextColumns.hpp>
 
+#include <tools/debug.hxx>
 #include <o3tl/string_view.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sd/source/ui/animations/motionpathtag.cxx 
b/sd/source/ui/animations/motionpathtag.cxx
index 22a82491e351..ca41827e2ed2 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -44,6 +44,7 @@
 #include <svx/svxids.hrc>
 #include <svx/polypolygoneditor.hxx>
 #include <svx/svddrgmt.hxx>
+#include <tools/debug.hxx>
 
 #include <CustomAnimationPane.hxx>
 #include <View.hxx>
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 7a0687b26e15..3677d26bbac3 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -19,6 +19,7 @@
 
 #include <editeng/flditem.hxx>
 #include <editeng/CustomPropertyField.hxx>
+#include <tools/debug.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/styfitem.hxx>
 #include <svl/inethist.hxx>
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx 
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 8b548bfba3de..312dd7425487 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -31,6 +31,7 @@
 #include <vcl/graph.hxx>
 #include <svtools/unitconv.hxx>
 #include <svx/svxids.hrc>
+#include <tools/debug.hxx>
 
 #include <algorithm>
 #include <memory>
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index 64740c4ff691..4a988b2a86dc 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -26,6 +26,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <svl/intitem.hxx>
+#include <tools/debug.hxx>
 
 #include <strings.hrc>
 
diff --git a/sd/source/ui/docshell/docshel4.cxx 
b/sd/source/ui/docshell/docshel4.cxx
index 5e00d42bab2b..40f6d6e934a8 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -49,6 +49,7 @@
 #include <vcl/syswin.hxx>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
+#include <tools/debug.hxx>
 
 #include <app.hrc>
 #include <strings.hrc>
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index d3db4fcce388..8fffbaa3ac42 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -61,6 +61,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/signaturelinehelper.hxx>
+#include <tools/debug.hxx>
 #include <osl/diagnose.h>
 
 #include <sdresid.hxx>
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 59827af6147f..5ecfc3dc07d1 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -28,6 +28,7 @@
 #include <svl/itempool.hxx>
 #include <svl/grabbagitem.hxx>
 #include <sfx2/request.hxx>
+#include <tools/debug.hxx>
 #include <vcl/prntypes.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <stlsheet.hxx>
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index f19721c0988d..aa55997e7b80 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <unotools/configitem.hxx>
+#include <tools/solar.h>
 #include <sfx2/module.hxx>
 #include <svx/optgrid.hxx>
 #include <tools/degree.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx 
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index cb1126eea317..5d6f8b1dd796 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -73,6 +73,7 @@
 #include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 #include <memory>
 
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index bd847be0eb42..0084c405afc0 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -52,6 +52,7 @@
 #include <editeng/unolingu.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
+#include <tools/debug.hxx>
 
 // #UndoRedo#
 #include <svtools/insdlg.hxx>
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 39aabda91361..5d94d132275e 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -62,6 +62,7 @@
 #include <sfx2/notebookbar/SfxNotebookBar.hxx>
 #include <osl/diagnose.h>
 #include <svl/cryptosign.hxx>
+#include <tools/debug.hxx>
 
 #include <DrawViewShell.hxx>
 #include <slideshow.hxx>
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 46f2eaa225a3..1803297eae4d 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -40,6 +40,7 @@
 #include <svx/svdoutl.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <tools/debug.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index bd57052bfde1..508a703f0ff1 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -57,6 +57,7 @@
 #include <svtools/sfxecode.hxx>
 #include <preventduplicateinteraction.hxx>
 #include <svtools/ehdl.hxx>
+#include <tools/debug.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/securityoptions.hxx>
 #include <unotools/moduleoptions.hxx>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 55ad4355afce..2d2205c67b39 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -66,6 +66,7 @@
 #include <basic/sbstar.hxx>
 #include <basic/basrdll.hxx>
 #include <basic/sberrors.hxx>
+#include <tools/debug.hxx>
 #include <vcl/help.hxx>
 #include <sal/log.hxx>
 #include <osl/file.hxx>
diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index 4e0adb9fc7c8..bd21c0aa5d68 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -57,6 +57,7 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/help.hxx>
 #include <vcl/weld.hxx>
diff --git a/sfx2/source/dialog/securitypage.cxx 
b/sfx2/source/dialog/securitypage.cxx
index 99b8d2517f8b..dc2282222002 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -33,6 +33,7 @@
 #include <svl/poolitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/PasswordHelper.hxx>
+#include <tools/debug.hxx>
 #include <comphelper/docpasswordhelper.hxx>
 
 #include <sfx2/strings.hrc>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 52700eba495d..089f249dfc6d 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -73,6 +73,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
 #include <com/sun/star/security/XCertificate.hpp>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/fileutil.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 29391841eef4..124ffdd5c30d 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <svl/itemset.hxx>
 #include <svl/eitem.hxx>
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 60bcd6d24575..380d2aa15e49 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -35,6 +35,7 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/securityoptions.hxx>
 #include <tools/datetime.hxx>
+#include <tools/debug.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/helpers.hxx>
 #include <rtl/uri.hxx>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 85aef306e161..ca56f3b25bee 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -19,6 +19,7 @@
 
 #include <config_features.h>
 
+#include <tools/debug.hxx>
 #include <tools/inetmsg.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <svl/eitem.hxx>
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index c8d0d613c96c..d8cc78e8122a 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
 #include <comphelper/diagnose_ex.hxx>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <svl/whiter.hxx>
 #include <svl/intitem.hxx>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 64977270d5b4..c6a9ed3dc871 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -72,6 +72,7 @@
 #include <unotools/saveopt.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/securityoptions.hxx>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <comphelper/memorystream.hxx>
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 4717805fae3c..6f3fdb5583fd 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -28,6 +28,7 @@
 
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
+#include <tools/debug.hxx>
 #include <tools/svborder.hxx>
 #include <comphelper/diagnose_ex.hxx>
 
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 26acd5662fe8..977c2e928f43 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -135,6 +135,7 @@
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/cryptosign.hxx>
+#include <tools/debug.hxx>
 
 #define ShellClass_SfxViewFrame
 #include <sfxslots.hxx>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 3d106104d9fa..aa9dc9b58275 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -71,6 +71,7 @@
 #include <comphelper/OAccessible.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <editeng/unoprnms.hxx>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
 #include <svtools/soerr.hxx>
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 70f9411c28bf..8986ff76d7ac 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -29,6 +29,7 @@
 #include <unotools/datetime.hxx>
 
 #include <memory>
+#include <optional>
 #include <utility>
 #include <vector>
 #include <limits.h>
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index f09780ddcc7f..9f1cf355991a 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -57,6 +57,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 #include <algorithm>
 #include <cstdlib>
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx 
b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 58cd35803463..a080f6159783 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -21,6 +21,7 @@
 #include <o3tl/unit_conversion.hxx>
 #include <svx/deflt3d.hxx>
 #include <svx/svdmodel.hxx>
+#include <tools/debug.hxx>
 #include <tools/poly.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdobj.hxx>
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 164b19541a77..443eeca3fb5d 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -20,6 +20,7 @@
 #include <sfx2/dialoghelper.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/printer.hxx>
+#include <tools/debug.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index ada0d4584525..53bc257ba47b 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -35,6 +35,7 @@
 #include <svx/dlgutil.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 #include <editeng/brushitem.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index fcaa266d9437..289c3487a910 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -36,6 +36,7 @@
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
+#include <tools/debug.hxx>
 
 #include <sfx2/evntconf.hxx>
 
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 9e23caa8d2c1..9912099ccd25 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -23,6 +23,7 @@
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
+#include <tools/debug.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx 
b/svx/source/sdr/contact/viewcontactofe3d.cxx
index c824e784616c..840f36c550a4 100644
--- a/svx/source/sdr/contact/viewcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3d.cxx
@@ -23,6 +23,7 @@
 #include <drawinglayer/primitive2d/embedded3dprimitive2d.hxx>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
 #include <svx/scene3d.hxx>
+#include <tools/debug.hxx>
 #include <drawinglayer/primitive3d/transformprimitive3d.hxx>
 #include <drawinglayer/attribute/sdrsceneattribute3d.hxx>
 #include <drawinglayer/attribute/sdrlightingattribute3d.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx 
b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
index 63b031fdeb54..6bc1a1b4eda0 100644
--- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
@@ -29,6 +29,7 @@
 #include <drawinglayer/primitive3d/transformprimitive3d.hxx>
 #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/sdr/properties/textproperties.cxx 
b/svx/source/sdr/properties/textproperties.cxx
index 3a2990846621..04e4afb00fb9 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -41,6 +41,7 @@
 #include <editeng/flditem.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xlnwtit.hxx>
+#include <tools/debug.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx 
b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
index 528a73cb239c..67868abaffd7 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
@@ -24,6 +24,7 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/editids.hrc>
 #include <svx/ParaSpacingControl.hxx>
+#include <tools/debug.hxx>
 #include <vcl/toolbox.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svl/intitem.hxx>
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 344f7692fb24..6c5f7c592aa2 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -27,6 +27,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weldutils.hxx>
 #include <svl/intitem.hxx>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 
 #include <svx/selctrl.hxx>
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx 
b/svx/source/stbctrls/zoomsliderctrl.cxx
index 5acfce63a2f6..8672fb4ff07a 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -29,6 +29,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <basegfx/utils/zoomtools.hxx>
+#include <tools/debug.hxx>
 #include <bitmaps.hlst>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 963cdfbe837d..ef9c36668a72 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -25,6 +25,7 @@
 #include <sal/log.hxx>
 #include <svl/whiter.hxx>
 #include <tools/bigint.hxx>
+#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index b5d9c7a5cd60..5da43948e99f 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -28,6 +28,7 @@
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <rtl/strbuf.hxx>
+#include <tools/debug.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflgrit.hxx>
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index cc3473427911..4c4b94abfe26 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -84,6 +84,7 @@
 #include <basegfx/range/b2drange.hxx>
 #include <svdobjplusdata.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 #include <o3tl/string_view.hxx>
 #include "presetooxhandleadjustmentrelations.hxx"
 #include <editeng/frmdiritem.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 107be17e2fbd..66c35a1086da 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -117,6 +117,7 @@
 
 #include <svx/scene3d.hxx>
 #include <rtl/character.hxx>
+#include <tools/debug.hxx>
 #include <tools/UnitConversion.hxx>
 #include <o3tl/string_view.hxx>
 #include <tools/lazydelete.hxx>
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index f39b33662b00..87af9075a75b 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -52,6 +52,7 @@
 #include <editeng/frmdiritem.hxx>
 #include <libxml/xmlwriter.h>
 #include <comphelper/diagnose_ex.hxx>
+#include <tools/debug.hxx>
 
 #include <boost/property_tree/ptree.hpp>
 
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 3b851e80bc26..2e866cbc59a9 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -31,6 +31,7 @@
 #include <sfx2/basedlgs.hxx>
 #include <vcl/InterimItemWindow.hxx>
 #include <sfx2/sfxdlg.hxx>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 
 #include <svx/dialogs.hrc>
diff --git a/svx/source/tbxctrls/linewidthctrl.cxx 
b/svx/source/tbxctrls/linewidthctrl.cxx
index 8d23f1ab3c69..69ec86823a26 100644
--- a/svx/source/tbxctrls/linewidthctrl.cxx
+++ b/svx/source/tbxctrls/linewidthctrl.cxx
@@ -24,6 +24,7 @@
 #include <svx/svxids.hrc>
 #include <svx/xlnwtit.hxx>
 #include <svx/linectrl.hxx>
+#include <tools/debug.hxx>
 #include "linemetricbox.hxx"
 
 using namespace ::com::sun::star;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index c370aac324c0..4f95332a86c4 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -108,6 +108,7 @@
 #include <tools/json_writer.hxx>
 
 #include <editeng/editeng.hxx>
+#include <tools/debug.hxx>
 
 #define MAX_MRU_FONTNAME_ENTRIES    5
 
diff --git a/svx/source/toolbars/extrusionbar.cxx 
b/svx/source/toolbars/extrusionbar.cxx
index 3af209837379..db85a00b3cfe 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -42,6 +42,7 @@
 #include <svl/intitem.hxx>
 #include <rtl/math.hxx>
 #include <basegfx/numeric/ftools.hxx>
+#include <tools/debug.hxx>
 
 #include <svx/extrusionbar.hxx>
 #include <extrusiondepthdialog.hxx>
diff --git a/svx/source/toolbars/fontworkbar.cxx 
b/svx/source/toolbars/fontworkbar.cxx
index 11b5115fc95e..8f9c685be10b 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -44,6 +44,7 @@
 #include <svx/svxids.hrc>
 #include <svx/fontworkbar.hxx>
 #include <svx/fontworkgallery.hxx>
+#include <tools/debug.hxx>
 
 
 using namespace ::svx;
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index c19e2d707137..8299a96fb985 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -56,6 +56,7 @@
 #include <svx/svdomeas.hxx>
 #include <svx/svdpool.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/gen.hxx>
 #include <tools/UnitConversion.hxx>

Reply via email to