tdf#42949 Fix IWYU warnings in sd/

Recheck sd/ after recent refactorings and developments

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

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

34 files changed, 19 insertions, 106 deletions

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index cf0361f74de5..b5b715e0214e 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -97,6 +97,9 @@ blacklist:
     # Needed on MACOSX
     - svl/intitem.hxx
     - app.hrc
+    sd/source/ui/dlg/sdtreelb.cxx:
+    # comphelper::ScopeGuard is actually used
+    - comphelper/scopeguard.hxx
     sd/source/ui/framework/configuration/ConfigurationTracer.hxx:
     # Needed for css shortcut
     - sal/types.h
@@ -339,6 +342,11 @@ blacklist:
     sd/source/core/stlsheet.cxx:
     # Needed for UnoType
     - com/sun/star/table/BorderLine.hpp
+    # Needed for TypedWhichId macros
+    - svx/sdtaaitm.hxx
+    - svx/sdtacitm.hxx
+    - svx/sdtayitm.hxx
+    - svx/sdtaiitm.hxx
     sd/source/core/typemap.cxx:
     # Needed by sdslots.hxx to build
     - config_options.h
@@ -385,6 +393,7 @@ blacklist:
     - svx/sdooitm.hxx
     - svx/sdprcitm.hxx
     - svx/sdtfsitm.hxx
+    - svx/unomid.hxx
     - svx/xbtmpit.hxx
     - svx/xfillit0.hxx
     - svx/xflclit.hxx
@@ -443,6 +452,8 @@ blacklist:
     sd/source/ui/framework/configuration/ConfigurationUpdater.cxx:
     # Needed for DEBUG_SD_CONFIGURATION_TRACE
     - ConfigurationTracer.hxx
+    # comphelper::ScopeGuard is actually used
+    - comphelper/scopeguard.hxx
     sd/source/ui/framework/configuration/ResourceFactoryManager.cxx:
     # Needed for VERBOSE mode
     - sal/log.hxx
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index c8b266338631..ee44e48ee8ad 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <list>
+#include <map>
 #include <memory>
 #include <unordered_map>
 
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 64397dd9a960..a9d2172ca0f6 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/text/WritingMode.hpp>
 #include <svl/style.hxx>
 #include <svx/fmmodel.hxx>
-#include <svx/ImageMapInfo.hxx>
 #include <vcl/prntypes.hxx>
 #include <xmloff/autolayout.hxx>
 
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index 15b8c377408b..4fabb5117ae1 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -32,9 +32,6 @@
 
 #include <map>
 
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-#include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <animations/animationnodehelper.hxx>
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index b068fe1ff7d3..e54c67d95b5c 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -36,7 +36,6 @@
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/random.hxx>
 #include <comphelper/lok.hxx>
-#include <unotools/pathoptions.hxx>
 #include <unotools/syslocaleoptions.hxx>
 #include <tools/stream.hxx>
 
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 19728f35c37e..c290822a79bf 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -28,11 +28,9 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/lok.hxx>
-#include <unotools/pathoptions.hxx>
 #include <unotools/syslocaleoptions.hxx>
 #include <officecfg/Office/UI/Effects.hxx>
 
-#include <rtl/instance.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 5fdde48063c3..3aefb50e8e0a 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -26,7 +26,6 @@
 #include <editeng/paperinf.hxx>
 #include <svx/svdopage.hxx>
 #include <svx/svdoole2.hxx>
-#include <svx/svdograf.hxx>
 #include <svx/svdundo.hxx>
 #include <vcl/svapp.hxx>
 #include <editeng/eeitem.hxx>
@@ -39,8 +38,6 @@
 #include <svx/svdlayer.hxx>
 
 #include <svx/svditer.hxx>
-#include <svx/ImageMapInfo.hxx>
-#include <vcl/imapobj.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
 #include <xmloff/autolayout.hxx>
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 020d28a257b7..95b8facb6389 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -24,7 +24,6 @@
 #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>
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 163e9d8c8cbf..c648cf612c7b 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -27,9 +27,9 @@
 #include <svx/unoapi.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
-#include <svx/xfillit0.hxx>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/office/XAnnotation.hpp>
 #include <com/sun/star/office/XAnnotationAccess.hpp>
 #include <com/sun/star/office/XAnnotationEnumeration.hpp>
@@ -49,7 +49,6 @@
 #include <sfx2/docinf.hxx>
 #include <oox/export/utils.hxx>
 #include <oox/ole/olehelper.hxx>
-#include <rtl/math.hxx>
 #include <memory>
 
 class SfxObjectShell;
diff --git a/sd/source/filter/eppt/pptx-animations.cxx b/sd/source/filter/eppt/pptx-animations.cxx
index 9e1aaa0ce821..77c02e015bad 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -59,7 +59,6 @@
 #include "pptexanimations.hxx"
 #include "pptx-animations.hxx"
 #include "../ppt/pptanimations.hxx"
-#include <comphelper/stl_types.hxx>
 
 using namespace ::com::sun::star::animations;
 using namespace ::com::sun::star::container;
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx
index e89bcd3cbae0..c9a35ad87232 100644
--- a/sd/source/filter/html/htmlattr.cxx
+++ b/sd/source/filter/html/htmlattr.cxx
@@ -21,7 +21,6 @@
 #include <sdresid.hxx>
 #include <strings.hrc>
 #include <vcl/decoview.hxx>
-#include <vcl/builderfactory.hxx>
 
 SdHtmlAttrPreview::SdHtmlAttrPreview()
 {
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index cb06804eb6aa..622278de70c2 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -58,8 +58,6 @@
 #include <svx/ImageMapInfo.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/sfxecode.hxx>
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 99a78879557c..e11578a4c7fb 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -57,7 +57,6 @@
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <editeng/eeitem.hxx>
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx
index 03b3dd84da01..f405bc8ae485 100644
--- a/sd/source/helper/simplereferencecomponent.cxx
+++ b/sd/source/helper/simplereferencecomponent.cxx
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <osl/diagnose.h>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 using com::sun::star::uno::RuntimeException;
diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
index 73c8038bc713..89fef0c4b934 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
@@ -23,7 +23,6 @@
 
 #include <SdShapeTypes.hxx>
 
-#include <svx/DescriptionGenerator.hxx>
 #include <svx/ShapeTypeHandler.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
index f956cdcca38d..b396a7795f81 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
@@ -23,7 +23,6 @@
 
 #include <SdShapeTypes.hxx>
 
-#include <svx/DescriptionGenerator.hxx>
 #include <svx/ShapeTypeHandler.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
index 3b095ccea672..5fef2489825a 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
@@ -23,7 +23,6 @@
 
 #include <strings.hrc>
 #include <sdresid.hxx>
-#include <svx/DescriptionGenerator.hxx>
 #include <svx/ShapeTypeHandler.hxx>
 
 #include <com/sun/star/drawing/XShapeDescriptor.hpp>
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 7567478a6613..0a10c237501f 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -21,7 +21,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/resmgr.hxx>
 #include <tools/urlobj.hxx>
-#include <vcl/commandevent.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/intitem.hxx>
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index f22a659a4779..91552fd39816 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -17,46 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/text/HoriOrientation.hpp>
-#include <com/sun/star/text/VertOrientation.hpp>
-#include <com/sun/star/text/RelOrientation.hpp>
-
 #include <tools/mapunit.hxx>
-#include <i18nlangtag/languagetag.hxx>
-#include <i18nlangtag/mslangid.hxx>
+#include <tools/urlobj.hxx>
 #include <editeng/numitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/itempool.hxx>
-#include <vcl/svapp.hxx>
 #include <svx/colorbox.hxx>
 #include <svx/strarray.hxx>
 #include <svx/gallery.hxx>
-#include <svl/urihelper.hxx>
 #include <editeng/brushitem.hxx>
 #include <svl/intitem.hxx>
-#include <sfx2/objsh.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/settings.hxx>
-#include <editeng/flstitem.hxx>
-#include <svx/dlgutil.hxx>
-#include <svx/xtable.hxx>
-#include <svx/drawitem.hxx>
-#include <svx/numvset.hxx>
-#include <sfx2/htmlmode.hxx>
-#include <unotools/pathoptions.hxx>
-#include <svtools/ctrltool.hxx>
 #include <svtools/unitconv.hxx>
-#include <editeng/unolingu.hxx>
-#include <com/sun/star/style/NumberingType.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/text/DefaultNumberingProvider.hpp>
-#include <com/sun/star/text/XDefaultNumberingProvider.hpp>
-#include <com/sun/star/text/XNumberingFormatter.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/text/XNumberingTypeInfo.hpp>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 
 #include <algorithm>
@@ -65,27 +37,15 @@
 #include <sfx2/opengrf.hxx>
 
 #include <strings.hrc>
-#include <sfx2/request.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/stritem.hxx>
-#include <svl/slstitm.hxx>
-#include <sfx2/filedlghelper.hxx>
-#include <svx/gallery1.hxx>
-#include <svx/galtheme.hxx>
-#include <unotools/ucbstreamhelper.hxx>
-#include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <rtl/ustring.h>
 #include <sal/log.hxx>
-#include <vcl/cvtgrf.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <vcl/virdev.hxx>
 #include <svx/SvxNumOptionsTabPageHelper.hxx>
 #include <View.hxx>
 #include <drawdoc.hxx>
 #include <cui/cuicharmap.hxx>
 #include <BulletAndPositionDlg.hxx>
-#include <sdmod.hxx>
-#include <sdpage.hxx>
 #include <sdresid.hxx>
 
 #define SHOW_NUMBERING 0
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 58c7ecd3057d..5e8a82eb1edc 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -18,7 +18,6 @@
 #include <sfx2/filedlghelper.hxx>
 #include <tools/urlobj.hxx>
 
-#include <sal/log.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <officecfg/Office/Impress.hxx>
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 775047ae5e89..5b243953d362 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -19,18 +19,10 @@
 
 #include <vector>
 
-#include <svtools/controldims.hxx>
-
 #include "RemoteDialogClientBox.hxx"
 #include <RemoteServer.hxx>
 
-#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/commandevent.hxx>
-#include <vcl/event.hxx>
-
-#include <sdresid.hxx>
-#include <strings.hrc>
 
 using namespace std;
 
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index 33cda2d6b788..b2876f417889 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SD_SOURCE_UI_DLG_REMOTEDIALOGCLIENTBOX_HXX
 #define INCLUDED_SD_SOURCE_UI_DLG_REMOTEDIALOGCLIENTBOX_HXX
 
-#include <rtl/ustring.hxx>
 #include <vcl/weld.hxx>
 
 #include <memory>
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 5fea036b484f..b9607094810c 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -17,12 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/field.hxx>
-
 #include <svl/cjkoptions.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include <vcl/button.hxx>
 
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index b60125f167bf..3fbb1a7f1969 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -47,7 +47,6 @@
 
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <svtools/acceleratorexecute.hxx>
 #include <svtools/embedtransfer.hxx>
 #include <vcl/svlbitm.hxx>
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 550857e5e1de..7e86544a8fbb 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -42,7 +42,6 @@
 #include <sfx2/docfile.hxx>
 #include <svx/xtable.hxx>
 #include <vcl/mnemonic.hxx>
-#include <vcl/lstbox.hxx>
 #include <svl/urihelper.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <svx/drawitem.hxx>
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 917d3abb3b1b..d3687cb33f27 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -29,7 +29,7 @@
 #include <ViewShellHint.hxx>
 #include <app.hrc>
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XController.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <svl/lstner.hxx>
 
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 295f73a0f4c8..d6a85af98141 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -29,7 +29,7 @@
 #include <vcl/help.hxx>
 #include <svx/bmpmask.hxx>
 #include <svx/svdotext.hxx>
-#include <sfx2/app.hxx>
+#include <svx/ImageMapInfo.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/sfxhelp.hxx>
@@ -40,12 +40,10 @@
 #include <svx/scene3d.hxx>
 #include <sfx2/viewfrm.hxx>
 
-#include <anminfo.hxx>
 #include <strings.hrc>
 
 
 #include <sdmod.hxx>
-#include <GraphicDocShell.hxx>
 #include <fudraw.hxx>
 #include <ViewShell.hxx>
 #include <FrameView.hxx>
@@ -54,12 +52,9 @@
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
 #include <sdresid.hxx>
-#include <drawview.hxx>
 #include <fusel.hxx>
 #include <vcl/weld.hxx>
-#include <slideshow.hxx>
 #include <svx/sdrhittesthelper.hxx>
-#include <unotools/securityoptions.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sd/source/ui/func/fuexecuteinteraction.cxx b/sd/source/ui/func/fuexecuteinteraction.cxx
index 0a0f65186e48..8b037c41bed5 100644
--- a/sd/source/ui/func/fuexecuteinteraction.cxx
+++ b/sd/source/ui/func/fuexecuteinteraction.cxx
@@ -32,8 +32,6 @@
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/urihelper.hxx>
-#include <svx/svdpagv.hxx>
-#include <svx/xfillit0.hxx>
 #include <tools/urlobj.hxx>
 
 #include <DrawViewShell.hxx>
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 64b4b1507a9b..af372f003ff7 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -26,7 +26,6 @@
 #include <svx/svxdlg.hxx>
 #include <com/sun/star/embed/EmbedVerbs.hpp>
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
-#include <com/sun/star/embed/XComponentSupplier.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index cdd8fd33ece9..a5fe859d4f0a 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -23,7 +23,6 @@
 #include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/sfxdlg.hxx>
 #include <editeng/numitem.hxx>
 #include <strings.hxx>
 
@@ -38,7 +37,6 @@
 #include <svx/nbdtmgfact.hxx>
 #include <svx/svdoutl.hxx>
 #include <memory>
-#include <sdpage.hxx>
 
 using namespace svx::sidebar;
 namespace sd {
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 2c59e1826b19..a61e21a04d79 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -17,27 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
-
-#include <com/sun/star/media/XPlayer.hpp>
 #include <fusel.hxx>
-#include <basic/sbstar.hxx>
 #include <svx/svddrgmt.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/scene3d.hxx>
-#include <drawview.hxx>
 #include <vcl/imapobj.hxx>
-#include <svl/urihelper.hxx>
 #include <unotools/securityoptions.hxx>
 #include <svx/svxids.hrc>
 #include <svx/xfillit0.hxx>
-#include <sfx2/app.hxx>
+#include <svx/ImageMapInfo.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
-#include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
 #include <editeng/flditem.hxx>
 
@@ -45,11 +38,9 @@
 
 #include <app.hrc>
 
-#include <GraphicDocShell.hxx>
 #include <sdmod.hxx>
 #include <DrawDocShell.hxx>
 #include <stlpool.hxx>
-#include <anminfo.hxx>
 #include <fudraw.hxx>
 #include <ViewShell.hxx>
 #include <ViewShellBase.hxx>
@@ -59,13 +50,9 @@
 #include <drawdoc.hxx>
 #include <DrawViewShell.hxx>
 #include <ToolBarManager.hxx>
-#include <pgjump.hxx>
 #include <Client.hxx>
 
-#include <slideshow.hxx>
-
 #include <svx/svdundo.hxx>
-#include <avmedia/mediawindow.hxx>
 
 #include <svx/sdrhittesthelper.hxx>
 
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 7005684dc8a0..3d5abb848bc8 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -21,7 +21,6 @@
 #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>
diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx
index 4774f397cedd..dc8887d4eebf 100644
--- a/sd/source/ui/inc/assclass.hxx
+++ b/sd/source/ui/inc/assclass.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SD_SOURCE_UI_INC_ASSCLASS_HXX
 
 #include <memory>
+#include <vector>
 
 #include <sddllapi.h>
 
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index 1ea586bae855..1fd8272ace24 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_PUBDLG_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_PUBDLG_HXX
 
+#include <svtools/valueset.hxx>
 #include <vcl/weld.hxx>
 #include <pres.hxx>
 #include "assclass.hxx"