Recheck modules sd* with IWYU

See tdf#42949 for motivation

Change-Id: I97c1a0e8c7f26807b12e6062581066d09ea13086
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130114
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

75 files changed, 49 insertions, 92 deletions

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 288f567758fe..3a1aed9d21d3 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -424,6 +424,7 @@ excludelist:
     - svx/xlnwtit.hxx
     - svx/xtextit0.hxx
     - svx/zoomslideritem.hxx
+    - svx/sdangitm.hxx
     sd/source/core/drawdoc.cxx:
     # Needed for template
     - com/sun/star/frame/XModel.hpp
@@ -464,6 +465,12 @@ excludelist:
     sd/source/ui/annotations/annotationtag.cxx:
     # Needed for template
     - com/sun/star/office/XAnnotation.hpp
+    sd/source/ui/animations/CustomAnimationList.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
+    sd/source/ui/animations/CustomAnimationPane.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
     sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx:
     # Needed for DEBUG_SD_CONFIGURATION_TRACE
     - ConfigurationTracer.hxx
@@ -544,9 +551,15 @@ excludelist:
     sd/source/ui/view/drviews2.cxx:
     # comphelper::ScopeGuard is actually used
     - comphelper/scopeguard.hxx
+    sd/source/ui/view/drviewsf.cxx:
+    # Needed for template
+    - svx/sdmetitm.hxx
     sd/source/ui/view/drvwshrg.cxx:
     # Needed by a sdslots.hxx constant
     - app.hrc
+    sd/source/ui/view/MediaObjectBar.cxx:
+    # Needed by a sdslots.hxx constant
+    - sfx2/sfxsids.hrc
     sd/source/ui/view/sdview2.cxx:
     # Needed for template
     - com/sun/star/embed/XEmbeddedObject.hpp
diff --git a/sd/inc/family.hrc b/sd/inc/family.hrc
index dcfd31e17d46..ad2617a302cc 100644
--- a/sd/inc/family.hrc
+++ b/sd/inc/family.hrc
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <svl/style.hxx>
+#include <unotools/resmgr.hxx>
 
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 4fecceea99ec..18e898ee7333 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <rtl/string.hxx>
+
 inline constexpr OStringLiteral HID_SDDRAWVIEWSHELL = "SD_HID_SDDRAWVIEWSHELL";
 inline constexpr OStringLiteral HID_SDGRAPHICVIEWSHELL = "SD_HID_SDGRAPHICVIEWSHELL";
 inline constexpr OStringLiteral HID_SDOUTLINEVIEWSHELL = "SD_HID_SDOUTLINEVIEWSHELL";
diff --git a/sd/inc/pageformatpanel.hrc b/sd/inc/pageformatpanel.hrc
index bf29cc9b4602..ea3c04a9ce7c 100644
--- a/sd/inc/pageformatpanel.hrc
+++ b/sd/inc/pageformatpanel.hrc
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include <unotools/resmgr.hxx>
+
 #include <utility>
 
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index e27afa5ab520..829e5d50a73c 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -18,6 +18,8 @@
  */
 #pragma once
 
+#include <rtl/string.hxx>
+
 inline constexpr OStringLiteral CMD_SID_HANDOUT_MASTER_MODE = ".uno:HandoutMode";
 inline constexpr OStringLiteral CMD_SID_NOTES_MODE = ".uno:NotesMode";
 
diff --git a/sd/inc/strings.hxx b/sd/inc/strings.hxx
index 609664109313..ed8fb7dd3738 100644
--- a/sd/inc/strings.hxx
+++ b/sd/inc/strings.hxx
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include <rtl/ustring.hxx>
+
 /* do not translate */
 inline constexpr OUStringLiteral STR_LAYOUT_TITLE = u"Titel";
 inline constexpr OUStringLiteral STR_LAYOUT_OUTLINE = u"Gliederung";
diff --git a/sd/qa/unit/PNGExportTests.cxx b/sd/qa/unit/PNGExportTests.cxx
index 471c9d2b5760..12533d1bcf90 100644
--- a/sd/qa/unit/PNGExportTests.cxx
+++ b/sd/qa/unit/PNGExportTests.cxx
@@ -10,10 +10,6 @@
 
 #include <sal/config.h>
 
-#include <config_poppler.h>
-#include <memory>
-#include <ostream>
-#include <sdpage.hxx>
 #include "sdmodeltestbase.hxx"
 
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 08326f923c0d..f69938ab1326 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -9,9 +9,11 @@
 
 #include "sdmodeltestbase.hxx"
 #include <comphelper/propertysequence.hxx>
+#include <editeng/flditem.hxx>
 
 #include <svx/svdomedia.hxx>
 #include <svx/svdotable.hxx>
+#include <svx/svdpage.hxx>
 
 #include <com/sun/star/animations/TransitionType.hpp>
 #include <com/sun/star/animations/TransitionSubType.hpp>
@@ -23,8 +25,6 @@
 
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
-#include <sdpage.hxx>
-
 #include <rtl/character.hxx>
 
 using namespace css;
diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx
index e0aa2290e799..cb1ad50ac2ed 100644
--- a/sd/qa/unit/export-tests-ooxml3.cxx
+++ b/sd/qa/unit/export-tests-ooxml3.cxx
@@ -23,10 +23,9 @@
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/frame/XLoadable.hpp>
+#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/text/GraphicCrop.hpp>
 
-#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-
 #include <sdpage.hxx>
 
 class SdOOXMLExportTest3 : public SdModelTestBaseXML
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index f1d0281aab0d..8d4898feb6a7 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -42,7 +42,6 @@
 #include <com/sun/star/text/XTextColumns.hpp>
 
 #include <svx/svdotable.hxx>
-#include <svx/unoapi.hxx>
 #include <vcl/filter/PDFiumLibrary.hxx>
 
 using namespace css;
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 9c51c05be955..7e8d8f2ade0e 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -53,10 +53,8 @@
 #include <com/sun/star/presentation/XCustomPresentationSupplier.hpp>
 
 #include <stlpool.hxx>
-#include <comphelper/propertyvalue.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/lok.hxx>
-#include <vcl/BitmapReadAccess.hxx>
 #include <svx/svdograf.hxx>
 #include <vcl/filter/PDFiumLibrary.hxx>
 
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index dc2f4324c240..1dcc2566afb4 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -50,7 +50,6 @@
 #include <chrono>
 #include <sdpage.hxx>
 #include <comphelper/base64.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <LayerTabBar.hxx>
 #include <vcl/event.hxx>
 #include <vcl/keycodes.hxx>
@@ -59,7 +58,6 @@
 #include <svx/view3d.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/sdmetitm.hxx>
-#include <svx/unoapi.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sd/qa/unit/tiledrendering/CallbackRecorder.hxx b/sd/qa/unit/tiledrendering/CallbackRecorder.hxx
index 306a90f8d3bd..c37ec57d9495 100644
--- a/sd/qa/unit/tiledrendering/CallbackRecorder.hxx
+++ b/sd/qa/unit/tiledrendering/CallbackRecorder.hxx
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include <cppunit/TestAssert.h>
+
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <boost/property_tree/json_parser.hpp>
 #include <comphelper/string.hxx>
@@ -16,6 +18,8 @@
 #include <sfx2/viewsh.hxx>
 #include <test/lokcallback.hxx>
 
+using namespace css;
+
 namespace
 {
 std::vector<OUString> lcl_convertSeparated(const OUString& rString, sal_Unicode nSeparator)
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index c1fcca8be963..56487deb5c76 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -9,8 +9,6 @@
 
 #include "../sdmodeltestbase.hxx"
 
-#include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp>
-
 #include <app.hrc>
 #include <test/bootstrapfixture.hxx>
 #include <test/helper/transferable.hxx>
@@ -42,7 +40,6 @@
 #include <svx/svdotable.hxx>
 #include <svx/svdoutl.hxx>
 #include <unotools/datetime.hxx>
-#include <tools/UnitConversion.hxx>
 #include <test/lokcallback.hxx>
 
 #include <DrawDocShell.hxx>
@@ -59,7 +56,6 @@
 #include <vcl/cursor.hxx>
 #include <vcl/scheduler.hxx>
 #include <vcl/vclevent.hxx>
-#include <vcl/unohelp2.hxx>
 
 #include <chrono>
 #include <cstdlib>
diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index 0c3930457776..446170b1e05a 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -38,7 +38,6 @@
 #include <SlideSorterViewShell.hxx>
 #include <SlideSorter.hxx>
 #include <controller/SlideSorterController.hxx>
-#include <controller/SlsClipboard.hxx>
 #include <controller/SlsPageSelector.hxx>
 #include <svl/stritem.hxx>
 #include <undo/undomanager.hxx>
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index d9d88443ebe5..9af6a3f648d6 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -51,7 +51,6 @@
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/scopeguard.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/i18n/BreakIterator.hpp>
@@ -75,7 +74,6 @@
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/unoapi.hxx>
 #include <CustomAnimationEffect.hxx>
 #include <CustomAnimationPreset.hxx>
 #include <animations.hxx>
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 0bb74770b732..e6b9fff68807 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -19,17 +19,14 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/util/XCloneable.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/XFastParser.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
 #include <com/sun/star/presentation/EffectPresetClass.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <osl/diagnose.h>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/getexpandeduri.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 992c5a1e0b7e..8d3a9d1d115f 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -37,7 +37,6 @@
 #include <tools/diagnose_ex.h>
 
 #include <sal/log.hxx>
-#include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 
 #include <CustomAnimationPreset.hxx>
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index b31fa4ed42a3..6f58d919eee2 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -24,12 +24,12 @@
 #include <tools/globname.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/stream.hxx>
-#include <svx/unoapi.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.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/drawing/XDrawPage.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/office/XAnnotation.hpp>
 #include <com/sun/star/office/XAnnotationAccess.hpp>
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index a85af722f0f3..41126aedf82d 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -34,7 +34,6 @@
 #include <vcl/graph.hxx>
 #include <editeng/svxenum.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/unoapi.hxx>
 #include <com/sun/star/awt/FontFamily.hpp>
 #include <com/sun/star/awt/FontPitch.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
@@ -43,6 +42,7 @@
 #include <com/sun/star/style/TabStop.hpp>
 #include <com/sun/star/drawing/CircleKind.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index f6e78d357ead..c96db47eb3cc 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -60,7 +60,6 @@
 #include "../ppt/pptanimations.hxx"
 
 #include <i18nlangtag/languagetag.hxx>
-#include <svl/languageoptions.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/unoapi.hxx>
 #include <sdmod.hxx>
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 126d031a03be..906c3dc4f7f3 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -60,7 +60,6 @@
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <editeng/eeitem.hxx>
-#include <unotools/saveopt.hxx>
 
 // include necessary for XML progress bar at load time
 #include <svl/itemset.hxx>
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 5a84029cb534..fa0b5782a01d 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -35,7 +35,6 @@
 #include <svx/svdobj.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <Window.hxx>
-#include <vcl/svapp.hxx>
 #include <OutlineViewShell.hxx>
 
 #include <svx/svdlayer.hxx>
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 4d5524ac8c3e..f6111962a8a2 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -37,7 +37,6 @@
 #include <svx/AccessibleShape.hxx>
 #include <svx/ChildrenManager.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/unoapi.hxx>
 #include <vcl/svapp.hxx>
 
 #include <ViewShell.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 09822606d67d..c5690a0c113f 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -40,7 +40,6 @@
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
 #include <tools/diagnose_ex.h>
-#include <osl/diagnose.h>
 
 #include <sdresid.hxx>
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 3f52abb544b3..5f1364a187a4 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -51,12 +51,9 @@
 #include <comphelper/lok.hxx>
 #include <comphelper/sequence.hxx>
 #include <sfx2/frame.hxx>
-#include <sfx2/sidebar/Theme.hxx>
 #include <tools/diagnose_ex.h>
 
-#include <svx/unoapi.hxx>
 #include <svx/svxids.hrc>
-#include <svx/colorwindow.hxx>
 #include <DrawDocShell.hxx>
 #include <ViewShellBase.hxx>
 #include <DrawViewShell.hxx>
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index efb58db6b3cd..b3e7ca647405 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -36,7 +36,6 @@
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <svx/gallery.hxx>
-#include <svx/colorwindow.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
@@ -47,7 +46,6 @@
 #include <optsitem.hxx>
 
 #include <o3tl/safeint.hxx>
-#include <sfx2/sidebar/Theme.hxx>
 
 #include <algorithm>
 
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index cfa4a6048eca..fc44a5877307 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -26,7 +26,6 @@
 #include <comphelper/lok.hxx>
 #include <svx/svxids.hrc>
 
-#include <vcl/commandinfoprovider.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
@@ -54,9 +53,6 @@
 #include <editeng/fhgtitem.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/postitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/crossedoutitem.hxx>
 
 #include <svx/postattr.hxx>
 
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index 740e1acb6936..c5871d90c75a 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -34,6 +34,7 @@ namespace com::sun::star::office { class XAnnotation; }
 class SfxRequest;
 class SdPage;
 class SdDrawDocument;
+struct ImplSVEvent;
 
 namespace sd
 {
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index 1c10a2db3c97..23dcde13a3a8 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <vcl/vclevent.hxx>
+
 #include <smarttag.hxx>
 #include "annotationwindow.hxx"
 
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index fe5023413ed4..558cc61651a6 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -21,7 +21,6 @@
 
 #include <vcl/weld.hxx>
 #include <tools/long.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include <svx/weldeditview.hxx>
 
 namespace com::sun::star::office { class XAnnotation; }
diff --git a/sd/source/ui/app/scalectrl.cxx b/sd/source/ui/app/scalectrl.cxx
index 6d61f351d145..0444163b5847 100644
--- a/sd/source/ui/app/scalectrl.cxx
+++ b/sd/source/ui/app/scalectrl.cxx
@@ -22,7 +22,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/status.hxx>
 #include <vcl/weldutils.hxx>
-#include <sfx2/dispatch.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 2711bcc04fe0..c7d56831dbb2 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -27,7 +27,6 @@
 #include <svl/intitem.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/objface.hxx>
-#include <svl/zforlist.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svtools/ehdl.hxx>
 
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 55a4d0419b82..251548a22353 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -26,7 +26,6 @@
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/toolbox.hxx>
 
-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 
 #include <svtools/toolbarmenu.hxx>
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 9c00afe4cdc4..f63afe7bb322 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 <unotools/pathoptions.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 251cefa9a775..03f3080ba22e 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -33,7 +33,6 @@
 #include <o3tl/safeint.hxx>
 #include <tools/debug.hxx>
 #include <sfx2/app.hxx>
-#include <unotools/pathoptions.hxx>
 #include <svx/svdograf.hxx>
 #include <svl/stritem.hxx>
 #include <svx/svdoole2.hxx>
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index 5b4a57337ec0..8f0fcd976537 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -33,7 +33,6 @@
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <osl/mutex.hxx>
 #include <sal/log.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 1b830abadc12..108af78b11af 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -35,7 +35,6 @@
 #include <svx/svdoutl.hxx>
 #include <sfx2/request.hxx>
 #include <svl/ctloptions.hxx>
-#include <svl/itempool.hxx>
 #include <svl/stritem.hxx>
 #include <tools/debug.hxx>
 
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index 6a670671b46c..111f7b141282 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -30,7 +30,6 @@
 #include <svx/cube3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/camera3d.hxx>
-#include <svx/def3d.hxx>
 
 #include <vcl/weld.hxx>
 
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index dd9e3a7202da..5d95335e48ca 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -21,7 +21,6 @@
 
 #include <fuinsert.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <editeng/outlobj.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svx/svxdlg.hxx>
@@ -32,7 +31,6 @@
 #include <com/sun/star/chart2/XChartDocument.hpp>
 
 #include <svl/stritem.hxx>
-#include <sfx2/docfile.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/msg.hxx>
 #include <svtools/insdlg.hxx>
@@ -67,7 +65,6 @@
 #include <sdpage.hxx>
 #include <sdgrffilter.hxx>
 #include <vcl/svapp.hxx>
-#include <memory>
 #include <vcl/weld.hxx>
 #include <vcl/errinf.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 245b9ed64be4..da9cc795fdbf 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -27,7 +27,6 @@
 #include <View.hxx>
 #include <drawdoc.hxx>
 #include <svx/svxdlg.hxx>
-#include <memory>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index a0a354392425..c2f94b440c3c 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -26,7 +26,6 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdogrp.hxx>
 #include <editeng/eeitem.hxx>
-#include <editeng/outlobj.hxx>
 
 #include <View.hxx>
 #include <Window.hxx>
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index cd4d4e92ca3b..4efc6cc153d1 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -24,7 +24,6 @@
 #include <comphelper/compbase.hxx>
 #include <cppuhelper/weakref.hxx>
 
-#include <memory>
 #include <unordered_map>
 
 namespace com::sun::star::frame { class XController; }
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 9b0b272c62df..f04f50fddfce 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -23,6 +23,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <svx/xtable.hxx>
+#include <unotools/resmgr.hxx>
 #include "sdtreelb.hxx"
 
 #include <vector>
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 7b078c11410b..37a03d3d6b31 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <sal/config.h>
+#include <rtl/ustring.hxx>
 
 // SdUnoPseudoStyleFamily
 inline constexpr OUStringLiteral sUNO_PseudoSheet_Background = u"background";
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 046aad1d42db..81b2801ac5c1 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 65564a00d280..fc3eeff54255 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -15,7 +15,6 @@
 #include <string_view>
 
 #include <sal/log.hxx>
-#include <osl/socket.hxx>
 
 #ifdef LINUX_BLUETOOTH
   #include <glib.h>
diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx
index ad5fb3c32b79..b0645e72d430 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -16,7 +16,6 @@
 #include <comphelper/documentinfo.hxx>
 #include <config_version.h>
 #include <rtl/string.hxx>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 
 #include "Communicator.hxx"
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index cf0043387403..bdd0b51c8002 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -11,7 +11,6 @@
 #include <string.h>
 #include <iostream>
 
-#include <rtl/strbuf.hxx>
 #include <osl/socket.hxx>
 #include <config_features.h>
 #include <sal/log.hxx>
@@ -33,7 +32,6 @@
   #include <unistd.h>
   #include <sys/socket.h>
   #include <netinet/in.h>
-  #include <arpa/inet.h>
 #endif
 
 #ifdef MACOSX
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 860dc394649a..ba8d2c1f3309 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -25,7 +25,6 @@
 #include <comphelper/propertyvalue.hxx>
 #include <osl/file.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sd/source/ui/sidebar/DocumentHelper.hxx b/sd/source/ui/sidebar/DocumentHelper.hxx
index 68f5069d03d1..61ba5f810e35 100644
--- a/sd/source/ui/sidebar/DocumentHelper.hxx
+++ b/sd/source/ui/sidebar/DocumentHelper.hxx
@@ -19,7 +19,9 @@
 
 #pragma once
 
-#include <rtl/ustring.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+
 #include <memory>
 #include <string_view>
 #include <vector>
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 17ca028c2caf..23521df0ef89 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -46,13 +46,11 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/image.hxx>
-#include <vcl/weldutils.hxx>
 #include <xmloff/autolayout.hxx>
 
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index d5f332148cb5..979726910a19 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -35,9 +35,7 @@
 #include "PreviewValueSet.hxx"
 #include <ViewShellBase.hxx>
 #include <o3tl/safeint.hxx>
-#include <vcl/commandevent.hxx>
 #include <vcl/image.hxx>
-#include <vcl/weldutils.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sidebar/Theme.hxx>
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx
index ea064ae8f765..6632d796f1ef 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.hxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <sfx2/sidebar/ILayoutableWindow.hxx>
-#include <sfx2/sidebar/PanelLayout.hxx>
 #include <navigatr.hxx>
 
 class SfxBindings;
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index e060053aa450..25af0a4af24b 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -26,6 +26,8 @@
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
 #include <vcl/EnumContext.hxx>
 
+#include <com/sun/star/frame/XFrame.hpp>
+
 namespace sd { class ViewShellBase; }
 namespace sd::tools { class EventMultiplexerEvent; }
 
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 83bd0511e758..51d3116bf70e 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -40,7 +40,6 @@
 #include <officecfg/Office/Common.hxx>
 #include <svl/stritem.hxx>
 #include <svl/urihelper.hxx>
-#include <unotools/saveopt.hxx>
 #include <basic/sbstar.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
@@ -51,7 +50,6 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svx/unoapi.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/f3dchild.hxx>
 #include <svx/imapdlg.hxx>
@@ -72,11 +70,9 @@
 #include <sdresid.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/commandevent.hxx>
-#include <vcl/commandinfoprovider.hxx>
 #include <vcl/weldutils.hxx>
 
 #include <vcl/settings.hxx>
-#include <vcl/scheduler.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 6d2b1613d029..4bc450a40ab4 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -21,7 +21,6 @@
 #include "slideshowimpl.hxx"
 #include <sdpage.hxx>
 
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/awt/Pointer.hpp>
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index d4f52838c859..160077e6426d 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <cassert>
-#include <cstdlib>
 
 #include <controller/SlsClipboard.hxx>
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 107df47dc918..4b611859078a 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -62,7 +62,6 @@
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/sidebar/Sidebar.hxx>
 #include <svx/svxids.hrc>
 #include <svx/svxdlg.hxx>
diff --git a/sd/source/ui/tools/GraphicSizeCheck.cxx b/sd/source/ui/tools/GraphicSizeCheck.cxx
index ae15769e80c0..b9456d7c28a7 100644
--- a/sd/source/ui/tools/GraphicSizeCheck.cxx
+++ b/sd/source/ui/tools/GraphicSizeCheck.cxx
@@ -17,8 +17,8 @@
 #include <sfx2/dispatch.hxx>
 
 #include <sdresid.hxx>
-#include <DrawViewShell.hxx>
 #include <DrawDocShell.hxx>
+#include <ViewShell.hxx>
 
 namespace sd
 {
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 6a5f76a6a55c..379a2956f6fe 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -34,7 +34,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/unopage.hxx>
-#include <svx/unoshape.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <com/sun/star/drawing/DrawViewMode.hpp>
 #include <com/sun/star/drawing/ShapeCollection.hpp>
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 3ffc7249d9a6..c6bc3cdf398b 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -23,8 +23,10 @@
 #include "unolayer.hxx"
 
 #include <comphelper/extract.hxx>
+#include <editeng/unoipset.hxx>
+#include <osl/diagnose.h>
+#include <svl/itemprop.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/unoshape.hxx>
 #include <svx/svdobj.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index c7653501babe..8c705f2a48a4 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -72,7 +72,6 @@
 #include <editeng/unonrule.hxx>
 #include <editeng/eeitem.hxx>
 #include <unotools/datetime.hxx>
-#include <unotools/saveopt.hxx>
 #include <xmloff/autolayout.hxx>
 
 // Support creation of GraphicStorageHandler and EmbeddedObjectResolver
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 5f15d010ba1b..a095dd4d8bad 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -43,7 +43,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/unoapi.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdograf.hxx>
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 8d77b5b8c501..232535240e82 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -28,7 +28,6 @@
 #include <ViewShell.hxx>
 #include <sdresid.hxx>
 #include <drawdoc.hxx>
-#include <memory>
 
 using namespace sd;
 using namespace svx;
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 092fdb1c3ebc..085bc93f2a85 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -71,7 +71,6 @@
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <vcl/uitest/logger.hxx>
 #include <vcl/uitest/eventdescription.hxx>
-#include <svl/intitem.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 19eea777637e..54cccf78654b 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -28,7 +28,6 @@
 #include <editeng/protitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/adjustitem.hxx>
-#include <svx/ruler.hxx>
 #include <svx/svdotable.hxx>
 #include <editeng/numitem.hxx>
 #include <svx/rulritem.hxx>
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 0a4fe894468d..0f94af51feb8 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -38,7 +38,6 @@
 #include <svx/clipfmtitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <svl/visitem.hxx>
@@ -56,7 +55,6 @@
 // #UndoRedo#
 #include <svtools/insdlg.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/request.hxx>
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 10703fbc4158..e5ae5cd975fa 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -20,7 +20,6 @@
 #include <DrawViewShell.hxx>
 
 #include <com/sun/star/scanner/XScannerManager2.hpp>
-#include <editeng/outlobj.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svx/svxids.hrc>
 #include <sfx2/bindings.hxx>
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 064c6949fabf..f80419587729 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -20,7 +20,6 @@
 #include <config_features.h>
 
 #include <DrawViewShell.hxx>
-#include <editeng/outlobj.hxx>
 #include <svx/xgrad.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/xfillit0.hxx>
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index 0926e02990e5..31fe06dde0df 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -31,7 +31,6 @@
 #include <sfx2/viewfrm.hxx>
 
 #include <app.hrc>
-#include <sdmod.hxx>
 #include <sdpage.hxx>
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 5b04fb8a2adc..b1ddd90c95cf 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -68,8 +68,10 @@
 
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/color/bcolor.hxx>
-#include <drawinglayer/primitive2d/PolygonStrokeArrowPrimitive2D.hxx>
+#include <drawinglayer/attribute/lineattribute.hxx>
+#include <drawinglayer/attribute/strokeattribute.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
+#include <drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx>
 #include <svx/sdr/contact/objectcontact.hxx>
 #include <svx/sdr/table/tablecontroller.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 5b7d5387d2c8..2b08a5a041f8 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -23,7 +23,6 @@
 
 #include <comphelper/propertyvalue.hxx>
 #include <osl/file.hxx>
-#include <editeng/outlobj.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/docfilt.hxx>
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 184b8cbdc475..3cdfb9787337 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <string_view>
-
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 9431efb9eb34..8b16124ba44e 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -31,7 +31,6 @@
 #include <svx/svdpagv.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/ruler.hxx>
-#include <editeng/outlobj.hxx>
 #include <editeng/outliner.hxx>
 #include <svtools/ehdl.hxx>
 #include <svx/svdoole2.hxx>