tdf#42949 Fix IWYU warnings in sd/source/{core,helper}/*hxx

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

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

24 files changed, 120 insertions, 154 deletions

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 8706f41a4f93..8d0edb64c426 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -308,4 +308,87 @@ blacklist:
     - com/sun/star/beans/XPropertyState.hpp
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/lang/XUnoTunnel.hpp
-
+    sd/source/core/annotations/AnnotationEnumeration.cxx:
+    # Avoid loplugin:unreffun error
+    - AnnotationEnumeration.hxx
+    sd/source/core/CustomAnimationCloner.cxx:
+    # Avoid loplugin:unreffun error
+    - CustomAnimationCloner.hxx
+    sd/source/core/EffectMigration.cxx:
+    # Needed for UnoType
+    - com/sun/star/presentation/ParagraphTarget.hpp
+    sd/source/core/stlsheet.cxx:
+    # Needed for UnoType
+    - com/sun/star/table/BorderLine.hpp
+    sd/source/core/typemap.cxx:
+    # Needed by sdslots.hxx to build
+    - config_options.h
+    - editeng/boxitem.hxx
+    - editeng/cmapitem.hxx
+    - editeng/colritem.hxx
+    - editeng/contouritem.hxx
+    - editeng/crossedoutitem.hxx
+    - editeng/fhgtitem.hxx
+    - editeng/fontitem.hxx
+    - editeng/kernitem.hxx
+    - editeng/langitem.hxx
+    - editeng/lineitem.hxx
+    - editeng/lrspitem.hxx
+    - editeng/lspcitem.hxx
+    - editeng/memberids.h
+    - editeng/postitem.hxx
+    - editeng/protitem.hxx
+    - editeng/shdditem.hxx
+    - editeng/sizeitem.hxx
+    - editeng/tstpitem.hxx
+    - editeng/udlnitem.hxx
+    - editeng/ulspitem.hxx
+    - editeng/wghtitem.hxx
+    - sfx2/frame.hxx
+    - sfx2/msg.hxx
+    - sfx2/tplpitem.hxx
+    - sfx2/zoomitem.hxx
+    - svl/globalnameitem.hxx
+    - svl/lckbitem.hxx
+    - svl/ptitem.hxx
+    - svl/rectitem.hxx
+    - svl/slstitm.hxx
+    - svl/srchitem.hxx
+    - svx/chrtitem.hxx
+    - svx/clipfmtitem.hxx
+    - svx/drawitem.hxx
+    - svx/galleryitem.hxx
+    - svx/hlnkitem.hxx
+    - svx/pageitem.hxx
+    - svx/postattr.hxx
+    - svx/rulritem.hxx
+    - svx/sdmetitm.hxx
+    - svx/sdooitm.hxx
+    - svx/sdprcitm.hxx
+    - svx/sdtfsitm.hxx
+    - svx/xbtmpit.hxx
+    - svx/xfillit0.hxx
+    - svx/xflclit.hxx
+    - svx/xflftrit.hxx
+    - svx/xflhtit.hxx
+    - svx/xftadit.hxx
+    - svx/xftdiit.hxx
+    - svx/xftmrit.hxx
+    - svx/xftouit.hxx
+    - svx/xftshcit.hxx
+    - svx/xftshit.hxx
+    - svx/xftshxy.hxx
+    - svx/xftstit.hxx
+    - svx/xlineit0.hxx
+    - svx/xlinjoit.hxx
+    - svx/xlncapit.hxx
+    - svx/xlnclit.hxx
+    - svx/xlndsit.hxx
+    - svx/xlnedit.hxx
+    - svx/xlnstit.hxx
+    - svx/xlnwtit.hxx
+    - svx/xtextit0.hxx
+    - svx/zoomslideritem.hxx
+    sd/source/core/text/textapi.cxx:
+    # Needed for macro defines
+    - editeng/unoprnms.hxx
diff --git a/sd/inc/customshowlist.hxx b/sd/inc/customshowlist.hxx
index 5c70f8a63522..666e43614ce2 100644
--- a/sd/inc/customshowlist.hxx
+++ b/sd/inc/customshowlist.hxx
@@ -21,9 +21,11 @@
 #define INCLUDED_SD_INC_CUSTOMSHOWLIST_HXX
 
 #include "sddllapi.h"
+#include "cusshow.hxx"
 #include <vector>
-
-class SdCustomShow;
+#include <memory>
+#include <algorithm>
+#include <cassert>
 
 class SD_DLLPUBLIC SdCustomShowList
 {
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index fdf3bea3904a..6e0aaac4fba3 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -34,7 +34,6 @@
 
 #include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <rtl/ref.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <animations/animationnodehelper.hxx>
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index f62d18f49e8b..c9dda0acafad 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/animations/IterateContainer.hpp>
 #include <com/sun/star/animations/ParallelTimeContainer.hpp>
 #include <com/sun/star/animations/SequenceTimeContainer.hpp>
-#include <com/sun/star/animations/Timing.hpp>
 #include <com/sun/star/animations/XCommand.hpp>
 #include <com/sun/star/animations/XIterateContainer.hpp>
 #include <com/sun/star/animations/XAnimateTransform.hpp>
@@ -59,7 +58,6 @@
 
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 3c481acbf3ca..1f2066e6af9c 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -18,18 +18,15 @@
  */
 
 #include <sal/config.h>
-#include <sal/log.hxx>
 
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/util/theMacroExpander.hpp>
 #include <com/sun/star/animations/XAnimationNodeSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/SAXParseException.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/presentation/EffectPresetClass.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <osl/diagnose.h>
@@ -38,12 +35,9 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/random.hxx>
-#include <unotools/pathoptions.hxx>
 #include <tools/stream.hxx>
 
 #include <tools/debug.hxx>
-#include <rtl/uri.hxx>
-#include <rtl/strbuf.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <CustomAnimationPreset.hxx>
@@ -59,7 +53,6 @@ using namespace ::com::sun::star::presentation;
 using ::com::sun::star::io::XInputStream;
 using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::container::XNameAccess;
-using ::com::sun::star::beans::PropertyValue;
 using ::com::sun::star::util::XCloneable;
 using ::com::sun::star::beans::NamedValue;
 
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 26c89f96bca5..7894b5c77561 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -22,29 +22,20 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/util/theMacroExpander.hpp>
 #include <com/sun/star/animations/AnimationNodeType.hpp>
-#include <vcl/svapp.hxx>
 #include <unotools/configmgr.hxx>
-#include <unotools/streamwrap.hxx>
 #include <comphelper/getexpandeduri.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
-#include <unotools/pathoptions.hxx>
 #include <officecfg/Office/UI/Effects.hxx>
-#include <tools/stream.hxx>
 
-#include <rtl/uri.hxx>
 #include <rtl/instance.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <CustomAnimationPreset.hxx>
 #include <TransitionPreset.hxx>
 
-#include <algorithm>
-
-#include <sdpage.hxx>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::animations;
 
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index 9979181b45fd..6f86ba054a7d 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -17,18 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/xtable.hxx>
-#include <svx/svdopath.hxx>
-#include <svl/urihelper.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/eeitem.hxx>
+#include <tools/debug.hxx>
 
 #include <anminfo.hxx>
 #include <glob.hxx>
-#include <sdiocmpt.hxx>
-#include <drawdoc.hxx>
-
-#include <tools/tenccvt.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index fa2cfb4cca41..89a05063458b 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -21,7 +21,6 @@
 
 #include <boost/property_tree/json_parser.hpp>
 
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/office/XAnnotation.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 
@@ -32,7 +31,6 @@
 #include <cppuhelper/basemutex.hxx>
 
 #include <unotools/datetime.hxx>
-#include <tools/datetime.hxx>
 #include <o3tl/make_unique.hxx>
 
 #include <sfx2/viewsh.hxx>
@@ -46,6 +44,8 @@
 #include <sdpage.hxx>
 #include <textapi.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx
index 83b569617354..19b0635fdded 100644
--- a/sd/source/core/cusshow.cxx
+++ b/sd/source/core/cusshow.cxx
@@ -20,14 +20,9 @@
 #include <com/sun/star/lang/XComponent.hpp>
 
 #include <createunocustomshow.hxx>
-#include <sdiocmpt.hxx>
 #include <cusshow.hxx>
-#include <sdpage.hxx>
-#include <drawdoc.hxx>
 #include <customshowlist.hxx>
 
-#include <tools/tenccvt.hxx>
-
 using namespace ::com::sun::star;
 
 /*************************************************************************
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 81fc4ade1891..90a503f0e180 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <editeng/forbiddencharacterstable.hxx>
 
-#include <svx/svxids.hrc>
 #include <svl/srchitem.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/scriptspaceitem.hxx>
@@ -36,72 +35,52 @@
 #include <unotools/useroptions.hxx>
 #include <officecfg/Office/Impress.hxx>
 
-#include <sfx2/printer.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/linkmgr.hxx>
-#include <svx/dialogs.hrc>
 #include <Outliner.hxx>
 #include <sdmod.hxx>
 #include <editeng/editstat.hxx>
-#include <editeng/fontitem.hxx>
-#include <svl/flagitem.hxx>
-#include <svx/svdoattr.hxx>
 #include <svx/svdotext.hxx>
-#include <editeng/bulletitem.hxx>
-#include <editeng/numitem.hxx>
-#include <svx/svditer.hxx>
 #include <editeng/unolingu.hxx>
 #include <svl/itempool.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <svx/xtable.hxx>
-#include <com/sun/star/linguistic2/XHyphenator.hpp>
-#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <editeng/outlobj.hxx>
-#include <unotools/saveopt.hxx>
 #include <comphelper/getexpandeduri.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/charclass.hxx>
 #include <comphelper/processfactory.hxx>
-#include <unotools/pathoptions.hxx>
 #include <unotools/lingucfg.hxx>
-#include <unotools/linguprops.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
-#include <com/sun/star/xml/dom/XNode.hpp>
 #include <com/sun/star/xml/dom/XNodeList.hpp>
 #include <com/sun/star/xml/dom/DocumentBuilder.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <rtl/ustring.hxx>
-#include <rtl/uri.hxx>
 
 #include <editeng/outliner.hxx>
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
-#include <pglink.hxx>
-#include <sdattr.hxx>
 #include <strings.hrc>
 #include <glob.hxx>
 #include <stlpool.hxx>
-#include <sdiocmpt.hxx>
 #include <sdresid.hxx>
-#include <cusshow.hxx>
 #include <customshowlist.hxx>
 #include <DrawDocShell.hxx>
 #include <GraphicDocShell.hxx>
 #include <sdxfer.hxx>
-#include <ViewShell.hxx>
 #include <optsitem.hxx>
 #include <FrameView.hxx>
 #include <undo/undomanager.hxx>
 #include <sdundogr.hxx>
 #include <undopage.hxx>
-#include <tools/tenccvt.hxx>
 #include <vcl/settings.hxx>
 #include <unokywds.hxx>
 
+namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenator; } } } }
+namespace com { namespace sun { namespace star { namespace linguistic2 { class XSpellChecker1; } } } }
+
 using namespace ::sd;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index c8eeb6e0830a..7b7215789266 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -17,57 +17,45 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/wrkwin.hxx>
 #include <vcl/settings.hxx>
 
 #include <sal/log.hxx>
 #include <sfx2/printer.hxx>
-#include <sfx2/app.hxx>
-#include <Outliner.hxx>
+#include <sfx2/viewsh.hxx>
 #include <editeng/paperinf.hxx>
 #include <svx/svdopage.hxx>
 #include <svx/svdoole2.hxx>
-#include <svx/svdotext.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdundo.hxx>
 #include <vcl/svapp.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/langitem.hxx>
 #include <svl/itempool.hxx>
-#include <svx/svdpool.hxx>
 #include <editeng/flditem.hxx>
 
 #include <sfx2/linkmgr.hxx>
-#include <editeng/editdata.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/svdoutl.hxx>
+#include <svx/svdlayer.hxx>
 
-#include <editeng/outliner.hxx>
 #include <svx/svditer.hxx>
 #include <vcl/imapobj.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <boost/property_tree/json_parser.hpp>
 #include <comphelper/lok.hxx>
 #include <xmloff/autolayout.hxx>
 
 #include <sdresid.hxx>
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
-#include <pglink.hxx>
 #include <strings.hrc>
 #include <glob.hxx>
 #include <stlpool.hxx>
-#include <sdiocmpt.hxx>
 #include <anminfo.hxx>
 #include <imapinfo.hxx>
-#include <cusshow.hxx>
 #include <undo/undomanager.hxx>
 
 #include <DrawDocShell.hxx>
-#include <FrameView.hxx>
 
 #include "PageListWatcher.hxx"
-#include <vcl/virdev.hxx>
-#include <customshowlist.hxx>
 #include <unokywds.hxx>
 
 using namespace ::sd;
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 1075d85bb14c..ae17d208721e 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -19,24 +19,16 @@
 
 
 #include <memory>
-#include <cppuhelper/exc_hlp.hxx>
 
-#include <vcl/wrkwin.hxx>
 #include <sfx2/docfile.hxx>
-#include <sot/storage.hxx>
 #include <sfx2/app.hxx>
 #include <svl/itemset.hxx>
 
 #include <sfx2/fcontnr.hxx>
-#include <svx/svdopath.hxx>
-#include <svx/svditer.hxx>
 #include <svl/style.hxx>
-#include <sfx2/linkmgr.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/svdogrp.hxx>
 #include <svx/svdundo.hxx>
 #include <vcl/weld.hxx>
-#include <sot/formats.hxx>
 #include <xmloff/autolayout.hxx>
 #include <o3tl/make_unique.hxx>
 
@@ -46,11 +38,7 @@
 #include <sdpage.hxx>
 #include <stlpool.hxx>
 #include <sdresid.hxx>
-#include <sdiocmpt.hxx>
-#include <strmname.h>
-#include <anminfo.hxx>
 #include <customshowlist.hxx>
-#include <cusshow.hxx>
 #include <sdxfer.hxx>
 
 #include <unmovss.hxx>
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index bf77df7a95a2..6aed664232b5 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
-#include <sfx2/docfile.hxx>
 #include <sfx2/dispatch.hxx>
 #include <Outliner.hxx>
 #include <editeng/outliner.hxx>
@@ -46,10 +45,8 @@
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <editeng/bulletitem.hxx>
-#include <svx/xtable.hxx>
 #include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
-#include <svx/xit.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/sdshitm.hxx>
 #include <svx/svdotext.hxx>
@@ -67,7 +64,6 @@
 #include <editeng/fontitem.hxx>
 #include <editeng/shdditem.hxx>
 #include <editeng/cmapitem.hxx>
-#include <editeng/memberids.h>
 #include <svx/xbtmpit.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/xflgrit.hxx>
@@ -84,15 +80,11 @@
 #include <svx/xlnclit.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdogrp.hxx>
-#include <svx/svdlayer.hxx>
 #include <editeng/numitem.hxx>
-#include <editeng/editeng.hxx>
 #include <editeng/unolingu.hxx>
-#include <com/sun/star/linguistic2/XHyphenator.hpp>
 #include <svl/itempool.hxx>
 #include <editeng/outlobj.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <editeng/langitem.hxx>
 #include <editeng/frmdiritem.hxx>
 
 #include <sdresid.hxx>
@@ -101,8 +93,6 @@
 #include <strings.hrc>
 #include <glob.hxx>
 #include <stlpool.hxx>
-#include <helpids.h>
-#include <sdiocmpt.hxx>
 #include <shapelist.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -110,6 +100,8 @@
 #include <app.hrc>
 #include <strings.hxx>
 
+namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenator; } } } }
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 78adba107798..bb66917562f4 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -27,7 +27,6 @@
 #include <editeng/eeitem.hxx>
 #include <svx/svdoutl.hxx>
 #include <editeng/editdata.hxx>
-#include <svx/pageitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/bulletitem.hxx>
 #include <svx/svdpagv.hxx>
@@ -36,14 +35,11 @@
 #include <svx/svdoole2.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdopage.hxx>
-#include <sfx2/printer.hxx>
-#include <basic/basmgr.hxx>
 #include <editeng/pbinitem.hxx>
 #include <svx/svdundo.hxx>
 #include <svl/hint.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/editobj.hxx>
-#include <editeng/scripttypeitem.hxx>
 #include <svx/unopage.hxx>
 #include <editeng/flditem.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
@@ -58,7 +54,6 @@
 #include <com/sun/star/xml/dom/XNamedNodeMap.hpp>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
-#include <basegfx/utils/tools.hxx>
 #include <o3tl/enumarray.hxx>
 #include <o3tl/make_unique.hxx>
 #include <xmloff/autolayout.hxx>
@@ -69,14 +64,12 @@
 #include <drawdoc.hxx>
 #include <sdmod.hxx>
 #include <sdpage.hxx>
-#include <pglink.hxx>
 #include <sdresid.hxx>
 #include <stlsheet.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <bitmaps.hlst>
 #include <glob.hxx>
-#include <helpids.h>
 #include <anminfo.hxx>
 #include <undo/undomanager.hxx>
 #include <undo/undoobjects.hxx>
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 6a6355c7de68..21c71757e8a3 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -21,16 +21,14 @@
 #include <libxml/xmlwriter.h>
 #include <o3tl/make_unique.hxx>
 #include <sfx2/docfile.hxx>
-#include <vcl/svapp.hxx>
-#include <editeng/outliner.hxx>
 #include <sfx2/linkmgr.hxx>
-#include <svx/svdotext.hxx>
 #include <svx/svdundo.hxx>
 #include <editeng/outlobj.hxx>
-#include <svl/urihelper.hxx>
 #include <editeng/xmlcnitm.hxx>
 #include <svx/svditer.hxx>
 #include <com/sun/star/text/XTextCopy.hpp>
+#include <tools/debug.hxx>
+#include <svx/svddef.hxx>
 
 #include <Annotation.hxx>
 #include <notifydocumentevent.hxx>
@@ -41,14 +39,11 @@
 #include <drawdoc.hxx>
 #include <stlpool.hxx>
 #include <pglink.hxx>
-#include <anminfo.hxx>
 
 #include <strings.hxx>
 #include <DrawDocShell.hxx>
 
-#include <tools/tenccvt.hxx>
 #include <svl/itemset.hxx>
-#include <rtl/strbuf.hxx>
 
 using namespace ::sd;
 using namespace ::com::sun::star;
diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx
index 70764332d502..379edc9eba4e 100644
--- a/sd/source/core/sdpage_animations.cxx
+++ b/sd/source/core/sdpage_animations.cxx
@@ -23,11 +23,8 @@
 #include <comphelper/processfactory.hxx>
 #include <editeng/outliner.hxx>
 #include <CustomAnimationCloner.hxx>
-#include <drawdoc.hxx>
+#include <CustomAnimationEffect.hxx>
 #include <sdpage.hxx>
-#include <CustomAnimationPreset.hxx>
-#include <TransitionPreset.hxx>
-#include <undoanim.hxx>
 #include <EffectMigration.hxx>
 
 using namespace ::sd;
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index c2feb3f1bec4..b47c130b27c2 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -26,14 +26,12 @@
 
 #include <svl/style.hxx>
 
-#include <svx/unoprov.hxx>
 #include <tools/debug.hxx>
 
 #include <strings.hrc>
 #include <stlfamily.hxx>
 #include <stlsheet.hxx>
 #include <sdresid.hxx>
-#include <drawdoc.hxx>
 #include <sdpage.hxx>
 #include <glob.hxx>
 
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 67651c71e21f..eb8cdd709918 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -30,25 +30,23 @@
 #include <editeng/wghtitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/fontitem.hxx>
-#include <svl/poolitem.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xlineit0.hxx>
+#include <svx/sdtaitm.hxx>
+#include <svx/sdtfsitm.hxx>
+#include <svx/sdtagitm.hxx>
+#include <svx/sdshitm.hxx>
+#include <svx/sdshcitm.hxx>
+#include <svx/sdsxyitm.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/numitem.hxx>
-#include <editeng/brushitem.hxx>
-#include <editeng/editeng.hxx>
 #include <editeng/cmapitem.hxx>
 #include <svl/hint.hxx>
-#include <editeng/langitem.hxx>
 #include <editeng/charreliefitem.hxx>
 #include <editeng/emphasismarkitem.hxx>
 #include <svx/sdr/table/tabledesign.hxx>
 #include <editeng/autokernitem.hxx>
 
-#include <svx/svdattr.hxx>
-#include <editeng/outliner.hxx>
-#include <svx/xtable.hxx>
-#include <editeng/bulletitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/numdef.hxx>
@@ -61,14 +59,12 @@
 #include <strings.hrc>
 #include <glob.hxx>
 #include <drawdoc.hxx>
-#include <sdmod.hxx>
-#include <sdpage.hxx>
-#include <helpids.h>
 #include <svl/itemset.hxx>
 #include <app.hrc>
 #include <strings.hxx>
 
 #include <com/sun/star/drawing/LineStyle.hpp>
+#include <com/sun/star/drawing/TextFitToSizeType.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index aad5dd7e7824..b33d681b8172 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -21,18 +21,16 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/style/XStyle.hpp>
+#include <com/sun/star/table/BorderLine.hpp>
 
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 
-#include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/fhgtitem.hxx>
-#include <svx/svdoattr.hxx>
 #include <editeng/ulspitem.hxx>
 #include <svl/hint.hxx>
 #include <svl/itemset.hxx>
@@ -53,10 +51,8 @@
 #include <app.hrc>
 #include <strings.hxx>
 #include <glob.hxx>
-#include <helpids.h>
 #include <DrawViewShell.hxx>
 #include <ViewShellBase.hxx>
-#include <editeng/boxitem.hxx>
 
 #include <cstddef>
 #include <memory>
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 75a106814378..87e46245b2fd 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/text/XTextField.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <textapi.hxx>
@@ -34,6 +32,9 @@
 #include <svx/svdundo.hxx>
 #include <o3tl/make_unique.hxx>
 
+namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
+namespace com { namespace sun { namespace star { namespace text { class XTextField; } } } }
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::beans;
diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx
index 6490035e0836..57e892184c2c 100644
--- a/sd/source/core/typemap.cxx
+++ b/sd/source/core/typemap.cxx
@@ -19,8 +19,6 @@
 
 #include <config_options.h>
 
-#include <editeng/outliner.hxx>
-#include <editeng/eeitem.hxx>
 #include <editeng/cmapitem.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/fhgtitem.hxx>
@@ -32,7 +30,6 @@
 #include <editeng/wghtitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/fontitem.hxx>
-#include <svl/poolitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <editeng/kernitem.hxx>
 #include <editeng/lspcitem.hxx>
@@ -44,21 +41,18 @@
 #include <svl/globalnameitem.hxx>
 #include <svx/hlnkitem.hxx>
 #include <svx/postattr.hxx>
-#include <editeng/editdata.hxx>
-#include <svx/srchdlg.hxx>
 #include <svx/rulritem.hxx>
 #include <svx/clipfmtitem.hxx>
 #include <svl/srchitem.hxx>
 #include <editeng/sizeitem.hxx>
-#include <editeng/svxenum.hxx>
-#include <svx/algitem.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/svdattr.hxx>
-#include <svx/grafctrl.hxx>
+#include <svx/sdooitm.hxx>
+#include <svx/sdtfsitm.hxx>
+#include <svx/sdprcitm.hxx>
+#include <svx/sdmetitm.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/lineitem.hxx>
-#include <sdattr.hxx>
 #include <svx/zoomslideritem.hxx>
 #include <editeng/memberids.h>
 #include <svx/xftstit.hxx>
@@ -70,8 +64,6 @@
 #include <svx/xfillit0.hxx>
 #include <svx/xlnedit.hxx>
 #include <svx/xlnstit.hxx>
-#include <svx/xgrad.hxx>
-#include <svx/xflgrit.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/xtextit0.hxx>
@@ -84,7 +76,6 @@
 #include <svx/xftshxy.hxx>
 #include <avmedia/mediaitem.hxx>
 #include <svx/drawitem.hxx>
-#include <svl/aeitem.hxx>
 
 // #UndoRedo#
 #include <svl/slstitm.hxx>
@@ -100,7 +91,6 @@
 #include <svx/xlncapit.hxx>
 #include <svx/xflftrit.hxx>
 #include <svx/xlinjoit.hxx>
-#include <svx/AffineMatrixItem.hxx>
 #include <svx/galleryitem.hxx>
 
 #define SFX_TYPEMAP
diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx
index bf1e926a0f8b..672fe00e1fd0 100644
--- a/sd/source/core/undo/undomanager.cxx
+++ b/sd/source/core/undo/undomanager.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/viewsh.hxx>
 #include <undo/undomanager.hxx>
 
 using namespace sd;
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index d4a69e62504e..9aed51aa89ad 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/animations/XAnimationNode.hpp>
 #include <CustomAnimationCloner.hxx>
 
 #include <undoanim.hxx>
@@ -29,6 +28,8 @@
 #include <CustomAnimationEffect.hxx>
 #include <drawdoc.hxx>
 
+namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; } } } }
+
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Exception;
 using namespace ::com::sun::star::animations;
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx
index b53e382693cb..e47341b85ba3 100644
--- a/sd/source/helper/simplereferencecomponent.cxx
+++ b/sd/source/helper/simplereferencecomponent.cxx
@@ -23,8 +23,6 @@
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 
-#include <new>
-
 using com::sun::star::uno::RuntimeException;
 using sd::SimpleReferenceComponent;