tdf#62699 Drop pass-through header file include/svx/svdattr.hxx

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

80 files changed, 115 insertions, 1 deletions

diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index f47173587ddb..1ee750c66cf6 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -313,7 +313,6 @@
 #include <svx/sdtmfitm.hxx>
 #include <svx/sdynitm.hxx>
 #include <svx/shapeproperty.hxx>
-#include <svx/svdattr.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svdhlpln.hxx>
 #include <svx/svdoattr.hxx>
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 84e42ad42ff7..fce330067d9f 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
+#include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/aeitem.hxx>
 #include <editeng/colritem.hxx>
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx
index 25cd15c63131..9c7b6381e56d 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -36,6 +36,8 @@
 #include <svx/svdomedia.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/xflclit.hxx>
+#include <svx/sdooitm.hxx>
+#include <svx/sdmetitm.hxx>
 #include <animations/animationnodehelper.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <rtl/ustring.hxx>
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 566818755c5b..5423296ec30e 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -41,6 +41,9 @@
 #include <svx/xlineit0.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
+#include <svx/sdasitm.hxx>
+#include <svx/sdmetitm.hxx>
+#include <svx/sdooitm.hxx>
 #include <animations/animationnodehelper.hxx>
 #include <sax/tools/converter.hxx>
 
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 2c177c199675..a35fdc6bf785 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -33,6 +33,8 @@
 #include <sfx2/viewfrm.hxx>
 #include <svl/srchitem.hxx>
 #include <svl/slstitm.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <comphelper/lok.hxx>
 #include <svx/svdotable.hxx>
 #include <svx/svdoutl.hxx>
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 97199978cec1..2a633f17de8a 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/animations/AnimationFill.hpp>
 #include <com/sun/star/animations/XAnimate.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
+#include <tools/debug.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdopath.hxx>
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 8647f74846ad..d2d7d4c713c2 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -30,6 +30,7 @@
 #include <svl/srchitem.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/scriptspaceitem.hxx>
+#include <tools/debug.hxx>
 
 #include <unotools/configmgr.hxx>
 #include <unotools/useroptions.hxx>
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index ba420d20ab03..8638ec8a00b6 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -20,6 +20,7 @@
 #include <vcl/settings.hxx>
 
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/viewsh.hxx>
 #include <editeng/paperinf.hxx>
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 17ac70da7b2a..b6721acbc0e6 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/docfilt.hxx>
 #include <sfx2/app.hxx>
 #include <svl/itemset.hxx>
+#include <tools/debug.hxx>
 
 #include <sfx2/fcontnr.hxx>
 #include <svl/style.hxx>
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 1018cf763f96..0a07572a7511 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -81,6 +81,11 @@
 #include <svx/xlnclit.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdogrp.hxx>
+#include <svx/sdsxyitm.hxx>
+#include <svx/sdshcitm.hxx>
+#include <svx/sdtditm.hxx>
+#include <svx/sdtaitm.hxx>
+#include <svx/sdynitm.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/unolingu.hxx>
 #include <svl/itempool.hxx>
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index e37602afcf9e..1735104c4089 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -45,6 +45,9 @@
 #include <svx/sdr/contact/displayinfo.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdlayer.hxx>
+#include <svx/sdtmfitm.hxx>
+#include <svx/sdtagitm.hxx>
+#include <svx/sdtcfitm.hxx>
 #include <com/sun/star/animations/XAnimationNode.hpp>
 #include <com/sun/star/animations/XTimeContainer.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 393160b81926..3ad8f1aa788d 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -42,6 +42,11 @@
 #include <svx/unoshprp.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/svdpool.hxx>
+#include <svx/sdtaaitm.hxx>
+#include <svx/sdtacitm.hxx>
+#include <svx/sdtayitm.hxx>
+#include <svx/sdtaiitm.hxx>
+#include <svx/xit.hxx>
 #include <tools/diagnose_ex.h>
 #include <stlsheet.hxx>
 #include <sdresid.hxx>
diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx
index e4d93e580e4b..9af99eb5a7e8 100644
--- a/sd/source/core/undo/undoobjects.cxx
+++ b/sd/source/core/undo/undoobjects.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/debug.hxx>
 #include <undo/undoobjects.hxx>
 #include <sdpage.hxx>
 #include <CustomAnimationEffect.hxx>
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 301eca27213c..7b7bb2f9d1bb 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -60,6 +60,7 @@
 #include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <drawdoc.hxx>
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index ff513074f61a..1e1ba2722922 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -28,7 +28,11 @@
 #include <sfx2/docfile.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdlayer.hxx>
+#include <svx/sdmetitm.hxx>
+#include <svx/sdtmfitm.hxx>
+#include <svx/sdtagitm.hxx>
 #include <svl/style.hxx>
+#include <svl/intitem.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/editeng.hxx>
 #include <svx/svdoutl.hxx>
@@ -45,6 +49,7 @@
 #include <stlpool.hxx>
 #include <anminfo.hxx>
 #include <svx/gallery.hxx>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <svx/svdopage.hxx>
 #include <svx/svdomedia.hxx>
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index e4f0db29015d..ba1d4a725a51 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -54,6 +54,7 @@
 #include <oox/ppt/pptfilterhelpers.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
+#include <tools/debug.hxx>
 
 #include <svx/svdotext.hxx>
 #include <editeng/outlobj.hxx>
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index ff99f940c8bf..ae783b311a29 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <sfx2/objsh.hxx>
+#include <tools/debug.hxx>
 
 #include <cppuhelper/queryinterface.hxx>
 #include <svx/svdobj.hxx>
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index ae7ae8d9d45e..a9d7ca12e4fd 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -32,6 +32,7 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 #include <svx/AccessibleShape.hxx>
 #include <svx/ChildrenManager.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 6f0a3efbd62e..20248f664f5e 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -46,6 +46,7 @@
 #include <svtools/ctrlbox.hxx>
 #include <svtools/ctrltool.hxx>
 #include <sfx2/objsh.hxx>
+#include <tools/debug.hxx>
 
 #include <editeng/flstitem.hxx>
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 9e34ada5d8d1..c5b0385b56f8 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -38,6 +38,7 @@
 #include <comphelper/processfactory.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <tools/debug.hxx>
 #include "STLPropertySet.hxx"
 #include "CustomAnimationPane.hxx"
 #include "CustomAnimationDialog.hxx"
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index fe8ee55e3344..64de1149578e 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -34,6 +34,7 @@
 #include <EventMultiplexer.hxx>
 
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 #include <svx/gallery.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 4a112b0d6c7f..ac07ef84594a 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -30,6 +30,7 @@
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrpaintwindow.hxx>
 #include <svx/svddrgmt.hxx>
+#include <tools/debug.hxx>
 
 #include <View.hxx>
 #include <sdresid.hxx>
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index c77e01990245..8dec8fc79e2d 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -22,6 +22,7 @@
 #include <o3tl/any.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svxids.hrc>
+#include <tools/debug.hxx>
 #include <tools/helpers.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 20c60e5f87c4..2949cdad454d 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <svl/lckbitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <unotools/moduleoptions.hxx>
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index fd57e3f4cc14..49f98e184bf3 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -19,6 +19,7 @@
 
 #include <time.h>
 #include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 15e2f1933a35..7d747ba8675e 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -21,6 +21,7 @@
 #include <svx/colorbox.hxx>
 #include <sfx2/module.hxx>
 #include <svx/xcolit.hxx>
+#include <svl/intitem.hxx>
 
 #include <unotools/viewoptions.hxx>
 #include <svtools/unitconv.hxx>
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index a019f5da544f..f62057f8ce41 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -25,6 +25,7 @@
 
 #include <editeng/numitem.hxx>
 
+#include <tools/debug.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svdmark.hxx>
 #include <View.hxx>
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index a101c6973241..001db4635141 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -18,9 +18,11 @@
  */
 
 #include <svx/svxids.hrc>
+#include <svl/intitem.hxx>
 #include <svl/itempool.hxx>
 #include <svl/aeitem.hxx>
 #include <svtools/unitconv.hxx>
+#include <tools/debug.hxx>
 
 #include <sdattr.hrc>
 #include <View.hxx>
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index b51ef75bb3c6..4e88df4262ff 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -25,6 +25,7 @@
 #include <editeng/editeng.hxx>
 #include <editeng/outlobj.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <tools/debug.hxx>
 
 #include <vcl/button.hxx>
 #include <vcl/edit.hxx>
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 723c5dc70e8f..5edca44aa8a3 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -31,11 +31,13 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/strings.hrc>
 
+#include <tools/debug.hxx>
 #include <vcl/waitobj.hxx>
 #include <sfx2/app.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svx/svdograf.hxx>
 #include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/svdoole2.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/xtable.hxx>
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index fac60d97e850..92e1024158fd 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -36,6 +36,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <rtl/character.hxx>
+#include <tools/debug.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index 32f55f5a02b4..5cbb20d429ea 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -23,6 +23,7 @@
 #include <svx/svxids.hrc>
 
 #include <svx/ofaitem.hxx>
+#include <svl/stritem.hxx>
 #include <svl/srchitem.hxx>
 #include <svl/languageoptions.hxx>
 #include <svtools/langtab.hxx>
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index b21dd27ab9d6..5b5ddfdce17e 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -39,6 +39,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svl/whiter.hxx>
 #include <svl/itempool.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/langtab.hxx>
 #include <comphelper/classids.hxx>
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index 11a0eaa3deb7..41c3f73406ea 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -19,6 +19,7 @@
 
 #include <Client.hxx>
 #include <svx/svdoole2.hxx>
+#include <tools/debug.hxx>
 
 #include <ViewShell.hxx>
 #include <View.hxx>
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 1f2e1c9877ff..3711d87c0ec9 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -36,6 +36,8 @@
 #include <sfx2/request.hxx>
 #include <svl/ctloptions.hxx>
 #include <svl/itempool.hxx>
+#include <svl/stritem.hxx>
+#include <tools/debug.hxx>
 
 #include <svx/svxdlg.hxx>
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index 5c5a0a7f0203..a406b5819d82 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -35,6 +35,7 @@
 #include <ToolBarManager.hxx>
 #include <svx/gallery.hxx>
 #include <svl/itempool.hxx>
+#include <svl/stritem.hxx>
 
 #include <View.hxx>
 #include <Window.hxx>
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 6cf702a5d4c9..0963f9e5de47 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -45,6 +45,8 @@
 #include <svx/xtable.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/xflclit.hxx>
+#include <svx/sdtagitm.hxx>
+#include <svx/sdtditm.hxx>
 
 #include <svx/svdocapt.hxx>
 
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index d5ab09812688..e4eb8b3eda5f 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -25,6 +25,7 @@
 #include <svx/xfillit0.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <tools/debug.hxx>
 
 #include <app.hrc>
 #include <strings.hrc>
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 69298c352a86..32b682e01db0 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -19,6 +19,7 @@
 
 #include <fucopy.hxx>
 #include <sfx2/progress.hxx>
+#include <svl/intitem.hxx>
 
 #include <sdattr.hrc>
 #include <sdresid.hxx>
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index d0093616d858..3ce7708cb4f9 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 
+#include <svl/stritem.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/msg.hxx>
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index a105c95275f6..7f8b9302f23e 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -27,7 +27,9 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/svdopath.hxx>
+#include <tools/debug.hxx>
 
 #include <strings.hrc>
 #include <drawdoc.hxx>
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 6680ebfc4761..7c1322b7673f 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -19,6 +19,7 @@
 
 #include <fuolbull.hxx>
 #include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
 #include <sfx2/request.hxx>
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index 9131de20c4d8..2364f2c14d51 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -25,6 +25,8 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/dispatch.hxx>
+#include <tools/debug.hxx>
+#include <svl/stritem.hxx>
 
 #include <svx/svxids.hrc>
 #include <app.hrc>
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index 06480b5bf6a3..6a455f5d1e87 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -27,6 +27,7 @@
 #include <editeng/editdata.hxx>
 #include <editeng/lrspitem.hxx>
 #include <svx/svdoutl.hxx>
+#include <svl/intitem.hxx>
 
 #include <View.hxx>
 #include <ViewShell.hxx>
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index f1c7154d45d1..da06f2add357 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -27,6 +27,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
+#include <svl/stritem.hxx>
 
 #include <app.hrc>
 #include <fusel.hxx>
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index a0a7e399fd68..08b608717e63 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -22,6 +22,7 @@
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
+#include <svl/stritem.hxx>
 
 #include <sdattr.hrc>
 #include <drawdoc.hxx>
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 03eb1d8462b5..cabd3cff40fc 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -19,9 +19,11 @@
 
 #include <fuprobjs.hxx>
 
+#include <svl/stritem.hxx>
 #include <svl/style.hxx>
 #include <editeng/outliner.hxx>
 #include <svl/hint.hxx>
+#include <tools/debug.hxx>
 
 #include <app.hrc>
 
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index ea8d0bc035d5..5e11089d84ff 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -19,6 +19,7 @@
 
 #include <fusnapln.hxx>
 #include <svl/aeitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/svxids.hrc>
 
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 5d918ddbd193..ad6651453c9a 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -35,6 +35,7 @@
 #include <editeng/brushitem.hxx>
 #include <svx/svditer.hxx>
 #include <svx/sdr/properties/properties.hxx>
+#include <svl/intitem.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <svx/xlndsit.hxx>
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 0650d033290e..e4582497a8d3 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -21,14 +21,19 @@
 #include <editeng/eeitem.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrpaintwindow.hxx>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/help.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/svdotext.hxx>
 #include <editeng/flditem.hxx>
 #include <svl/style.hxx>
 #include <svx/svdpagv.hxx>
+#include <svx/sdtmfitm.hxx>
+#include <svx/sdtagitm.hxx>
+#include <svx/sdtfsitm.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx
index 75926c3c46b1..e30ac5e2ea5e 100644
--- a/sd/source/ui/func/futhes.cxx
+++ b/sd/source/ui/func/futhes.cxx
@@ -23,6 +23,7 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdotext.hxx>
 #include <editeng/eeitem.hxx>
+#include <tools/debug.hxx>
 
 #include <svx/svxerr.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index f7d648108d77..072f95a4ddc7 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -49,6 +49,8 @@
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/languageoptions.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/image.hxx>
 #include <vcl/floatwin.hxx>
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 5fec836f5090..93a07f9ed637 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -30,6 +30,7 @@
 #include <vcl/wrkwin.hxx>
 #include <svx/svdpool.hxx>
 #include <svl/itemprop.hxx>
+#include <tools/debug.hxx>
 
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index e7562b170e53..c8ec19cdaecd 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/presentation/SlideShow.hpp>
 #include <com/sun/star/media/XPlayer.hpp>
 #include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
 #include <svl/urihelper.hxx>
 #include <unotools/saveopt.hxx>
 #include <basic/sbstar.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 2ca2e62d46c7..604b4e609b01 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/frame/FrameActionEvent.hpp>
 #include <com/sun/star/frame/FrameAction.hpp>
 #include <sfx2/viewfrm.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star::accessibility;
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index 145313679a1a..327acbb0e16e 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -37,6 +37,7 @@
 #include <ViewShellBase.hxx>
 #include <com/sun/star/drawing/XDrawView.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <tools/debug.hxx>
 #include <memory>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 5009238fb57e..8ab8161f09cf 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -34,6 +34,7 @@
 #include <ViewShellManager.hxx>
 #include <Window.hxx>
 
+#include <tools/debug.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index d764c4299900..5b7faa4f1e74 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -31,7 +31,9 @@
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 
+#include <tools/debug.hxx>
 #include <svl/style.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 339f2cc76e41..4d15f465510a 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -43,6 +43,9 @@
 #include <svx/svxdlg.hxx>
 
 #include <svl/itempool.hxx>
+#include <svl/intitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index d3b6aed2da73..2b14ed74fcf3 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -28,6 +28,7 @@
 #include <vcl/EnumContext.hxx>
 #include <svl/whiter.hxx>
 #include <svl/itempool.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index 8e44502e341a..23f8e8ac1767 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -26,6 +26,7 @@
 #include <SlideSorterViewShell.hxx>
 #include <framework/FrameworkHelper.hxx>
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 91590534edf3..10941c629d07 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -127,6 +127,7 @@
 #include <drawinglayer/primitive2d/structuretagprimitive2d.hxx>
 
 #include <sfx2/lokcharthelper.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
 #define TWIPS_PER_PIXEL 15
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 71a9c0130085..4ee7abb1e749 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -59,6 +59,7 @@
 #include <svx/svdogrp.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <vcl/svapp.hxx>
+#include <tools/debug.hxx>
 
 #include <anminfo.hxx>
 #include "unoobj.hxx"
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index 7be7281816bf..7417a781e369 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -27,6 +27,7 @@
 #include <svx/svdpool.hxx>
 #include <svx/unoprov.hxx>
 #include <editeng/unotext.hxx>
+#include <tools/debug.hxx>
 
 #include <unoprnms.hxx>
 #include <unosrch.hxx>
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index b161e0c8b335..a98ad3cd0065 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -24,6 +24,7 @@
 #include <vcl/svapp.hxx>
 
 #include <svl/srchitem.hxx>
+#include <svl/intitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/editstat.hxx>
@@ -48,6 +49,7 @@
 #include <vcl/metric.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svtools/langtab.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <strings.hrc>
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index f4a8cb06460d..63e4288b7009 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -22,6 +22,7 @@
 #include <svx/svditer.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <tools/debug.hxx>
 #include <Outliner.hxx>
 
 #include <drawdoc.hxx>
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 0ce566462a5b..5010323ee51f 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -43,6 +43,7 @@
 #include <svx/svxids.hrc>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
+#include <tools/debug.hxx>
 #include <tools/link.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index ee999b73926b..b6d4369cfc91 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -48,6 +48,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sidebar/Sidebar.hxx>
 #include <svl/aeitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/imapdlg.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sberrors.hxx>
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 629cecbecfd3..fb89f6290d6f 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -34,6 +34,7 @@
 #include <sfx2/app.hxx>
 #include <svl/whiter.hxx>
 #include <svl/itempool.hxx>
+#include <svl/stritem.hxx>
 #include <svl/style.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/request.hxx>
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 1ac63a5029a9..e72080fe00fd 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -45,6 +45,7 @@
 #include <svx/fmglob.hxx>
 #include <editeng/outliner.hxx>
 #include <svx/dialogs.hrc>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <view/viewoverlaymanager.hxx>
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 7eaf561e3eb9..391bff60b99b 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -91,6 +91,7 @@
 #include <svx/xlnedwit.hxx>
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnwtit.hxx>
+#include <svx/sdtfsitm.hxx>
 
 #include <tools/diagnose_ex.h>
 
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 30495a1e3b5a..b478b6d93658 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -50,6 +50,7 @@
 #include <svx/fmshell.hxx>
 #include <svx/f3dchild.hxx>
 #include <svx/float3d.hxx>
+#include <svx/sdmetitm.hxx>
 #include <optsitem.hxx>
 
 #include <app.hrc>
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index fee45c5cedca..31bcd12d03b9 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -22,6 +22,9 @@
 #include <DrawViewShell.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <svl/urlbmk.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdundo.hxx>
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 8bcab029e914..8326b87438d9 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -37,6 +37,7 @@
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
 #include <avmedia/mediaplayer.hxx>
+#include <svl/intitem.hxx>
 
 #include <app.hrc>
 #include <strings.hrc>
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 7d39044eaf97..e0a0e031f89f 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -29,6 +29,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <svl/whiter.hxx>
 #include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <svl/itempool.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index d43c40cd764f..7a5eeb2f4dfd 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -29,6 +29,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/sxelditm.hxx>
+#include <svx/sdtfsitm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <svx/svdopath.hxx>
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 85ab5688c609..0f8edde16318 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -47,6 +47,7 @@
 #include <vcl/settings.hxx>
 
 #include <sal/log.hxx>
+#include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
 #include <editeng/editstat.hxx>
 #include <svl/itempool.hxx>
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 01b495295546..06840e6345c5 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -43,6 +43,7 @@
 #include <uiobject.hxx>
 
 #include <sal/log.hxx>
+#include <tools/debug.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index af7c753836c7..06272b0b8d9b 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <svx/svdviter.hxx>
 #include <svx/svdview.hxx>
+#include <tools/debug.hxx>
 
 #include <strings.hrc>
 #include <strings.hxx>
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 09b321866f2e..8679f069b734 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -88,6 +88,7 @@
 #include <editeng/eeitem.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
+#include <svl/intitem.hxx>
 #include <svl/poolitem.hxx>
 #include <strings.hxx>
 #include <sdmod.hxx>