tdf#42949 Fix IWYU warnings in sd/source/ui/[u-v]*/*cxx

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

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

70 files changed, 55 insertions, 598 deletions

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 741457fa5e36..cf0361f74de5 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -461,3 +461,21 @@ blacklist:
     sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx:
     # Needed for instantiation of function template specialization
     - Window.hxx
+    sd/source/ui/view/GraphicObjectBar.cxx:
+    # Needed by a sdslots.hxx constant
+    - svx/svxids.hrc
+    sd/source/ui/view/Outliner.cxx:
+    # comphelper::ScopeGuard is actually used
+    - comphelper/scopeguard.hxx
+    sd/source/ui/view/drviews1.cxx:
+    # comphelper::ScopeGuard is actually used
+    - comphelper/scopeguard.hxx
+    sd/source/ui/view/drviews2.cxx:
+    # comphelper::ScopeGuard is actually used
+    - comphelper/scopeguard.hxx
+    sd/source/ui/view/drvwshrg.cxx:
+    # Needed by a sdslots.hxx constant
+    - app.hrc
+    sd/source/ui/view/presvish.cxx:
+    # Needed by a sdslots.hxx constant
+    - svx/svxids.hrc
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 558d9f5fb3fd..a3d43b454d6d 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -20,7 +20,6 @@
 #include <DrawController.hxx>
 #include <DrawDocShell.hxx>
 
-#include <DrawSubController.hxx>
 #include <sdpage.hxx>
 #include <ViewShell.hxx>
 #include <ViewShellBase.hxx>
@@ -31,14 +30,13 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/framework/ConfigurationController.hpp>
 #include <com/sun/star/drawing/framework/ModuleController.hpp>
+#include <com/sun/star/drawing/XDrawSubController.hpp>
 #include <com/sun/star/drawing/XLayer.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 9877c41ca733..46b9c4876a9f 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -25,7 +25,6 @@
 #include <drawdoc.hxx>
 #include "unolayer.hxx"
 #include <unomodel.hxx>
-#include <unopage.hxx>
 #include <Window.hxx>
 #include <pres.hxx>
 
@@ -34,6 +33,7 @@
 #include <sfx2/dispatch.hxx>
 #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>
diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
index 5fd7e56000cf..4d066898a7d3 100644
--- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx
+++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
@@ -22,11 +22,9 @@
 #include <DrawController.hxx>
 #include <OutlineViewShell.hxx>
 #include <sdpage.hxx>
-#include <unopage.hxx>
 
 #include <cppuhelper/supportsservice.hxx>
 #include <svx/unopage.hxx>
-#include <vcl/svapp.hxx>
 
 using namespace ::cppu;
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx
index 1a31540bf68e..52141ff6fc8a 100644
--- a/sd/source/ui/unoidl/SdUnoSlideView.cxx
+++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx
@@ -27,7 +27,6 @@
 #include <controller/SlsPageSelector.hxx>
 #include <controller/SlsCurrentSlideManager.hxx>
 #include <model/SlsPageEnumerationProvider.hxx>
-#include <model/SlideSorterModel.hxx>
 #include <model/SlsPageDescriptor.hxx>
 #include <sdpage.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index f1228da14f18..77970bb24df1 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -21,7 +21,6 @@
 
 #include <memory>
 #include <utility>
-#include <vector>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
@@ -46,10 +45,8 @@
 #include <optsitem.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <sdattr.hxx>
+#include <sdattr.hrc>
 #include <sdmod.hxx>
-#include <ViewShell.hxx>
-#include <FrameView.hxx>
 #include <Outliner.hxx>
 #include <xmloff/settingsstore.hxx>
 #include <editeng/editstat.hxx>
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index b6268254dfff..dc93ddb06810 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -17,19 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <facreg.hxx>
 #include <sddll.hxx>
 
-#include <cppuhelper/factory.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
 #include <sal/types.h>
 
-#include <string.h>
-#include <memory>
 #include <unordered_map>
 
 using namespace com::sun::star;
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index 24c0ac99d4cd..64fcfd6b32b5 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -35,7 +35,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/mutex.hxx>
 #include <CustomAnimationPreset.hxx>
-#include <facreg.hxx>
 #include <randomnode.hxx>
 
 using ::osl::Mutex;
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 51aeebf11439..5a7ed99dcc8b 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -19,15 +19,12 @@
 
 #include "sddetect.hxx"
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/supportsservice.hxx>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <vcl/graphicfilter.hxx>
-#include <rtl/ustring.h>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx
index b5a5d895e081..813b291cc4db 100644
--- a/sd/source/ui/unoidl/unodoc.cxx
+++ b/sd/source/ui/unoidl/unodoc.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <rtl/ustring.hxx>
-#include <sfx2/docfac.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index df4259d6fc5c..c30132fc0374 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -41,11 +41,9 @@
 #include <DrawViewShell.hxx>
 #include <View.hxx>
 #include <ViewShell.hxx>
-#include <app.hrc>
 #include <strings.hrc>
 #include <sdresid.hxx>
 
-#include <unokywds.hxx>
 #include "unowcntr.hxx"
 #include <vcl/svapp.hxx>
 
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index c3c54fd2ef59..878db5a6175f 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/document/IndexedPropertyValues.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -45,17 +44,13 @@
 #include <notifydocumentevent.hxx>
 #include <unomodel.hxx>
 #include "unopool.hxx"
-#include <sfx2/dispatch.hxx>
-#include <sfx2/bindings.hxx>
 #include <sfx2/lokhelper.hxx>
-#include <vcl/commandevent.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
 #include <editeng/UnoForbiddenCharsTable.hxx>
 #include <svx/svdoutl.hxx>
-#include <editeng/forbiddencharacterstable.hxx>
 #include <o3tl/safeint.hxx>
 #include <svx/UnoNamespaceMap.hxx>
 #include <svx/svdlayer.hxx>
@@ -63,13 +58,10 @@
 #include <svx/svdundo.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/unofill.hxx>
-#include <svx/unopool.hxx>
-#include <svx/svdorect.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/fontitem.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
 #include <svx/svdpool.hxx>
-#include <editeng/unolingu.hxx>
 #include <svx/svdpagv.hxx>
 #include <svtools/unoimap.hxx>
 #include <svx/unoshape.hxx>
@@ -95,7 +87,6 @@
 #include <strings.hrc>
 #include <strings.hxx>
 #include "unolayer.hxx"
-#include <unoprnms.hxx>
 #include <unopage.hxx>
 #include "unocpres.hxx"
 #include "unoobj.hxx"
@@ -108,7 +99,6 @@
 #include <DrawViewShell.hxx>
 #include <ViewShell.hxx>
 #include <Window.hxx>
-#include <app.hrc>
 #include <optsitem.hxx>
 
 #include <vcl/pdfextoutdevdata.hxx>
diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx
index 063a5ce20552..813bfcdb2aff 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -17,11 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <facreg.hxx>
 #include <sddll.hxx>
 #include <sdmod.hxx>
 #include "unomodule.hxx"
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index f17c43694bdb..872c3a71458e 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -25,9 +25,7 @@
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/presentation/ClickAction.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/style.hxx>
@@ -42,9 +40,7 @@
 #include <comphelper/extract.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <svx/unoprov.hxx>
 #include <svx/unoshape.hxx>
-#include <svx/svditer.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/svdopath.hxx>
@@ -54,7 +50,6 @@
 #include <filter/msfilter/msdffimp.hxx>
 #include <svl/instrm.hxx>
 #include <editeng/outlobj.hxx>
-#include <CustomAnimationPreset.hxx>
 #include <Outliner.hxx>
 #include <comphelper/serviceinfohelper.hxx>
 #include <svx/svdogrp.hxx>
@@ -70,11 +65,8 @@
 #include <sdmod.hxx>
 #include <sdpage.hxx>
 #include <ViewShell.hxx>
-#include <unokywds.hxx>
 #include <unopage.hxx>
 #include <DrawDocShell.hxx>
-#include <glob.hxx>
-#include "unolayer.hxx"
 #include <EffectMigration.hxx>
 
 using namespace ::sd;
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 4b2982ca115f..0d6bc61f2dab 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -33,34 +33,27 @@
 #include <vcl/metaact.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <AnnotationEnumeration.hxx>
 #include <createunopageimpl.hxx>
 #include <unomodel.hxx>
 #include <unopage.hxx>
-#include <svx/svxids.hrc>
 #include <svl/itemset.hxx>
 #include <svx/svdmodel.hxx>
 #include <sdresid.hxx>
 #include <strings.hrc>
 #include <sdpage.hxx>
 #include <unoprnms.hxx>
-#include <sdattr.hxx>
 #include <drawdoc.hxx>
 #include <svx/unoshape.hxx>
-#include <com/sun/star/style/XStyle.hpp>
-#include <svx/svdorect.hxx>
 #include <svl/style.hxx>
 #include <comphelper/serviceinfohelper.hxx>
 #include <comphelper/extract.hxx>
-#include <list>
 #include <svx/svditer.hxx>
 #include <vcl/wmf.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdview.hxx>
 #include <svx/xfillit0.hxx>
-#include <View.hxx>
 #include <DrawDocShell.hxx>
 #include <ViewShell.hxx>
 #include <DrawViewShell.hxx>
@@ -71,8 +64,6 @@
 #include <unokywds.hxx>
 #include "unopback.hxx"
 #include <vcl/dibtools.hxx>
-#include <svx/svdograf.hxx>
-#include <svx/svdoashp.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 58ba1631fd6d..6ee195ea8b47 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -25,7 +25,6 @@
 #include <svx/xflbstit.hxx>
 #include <svx/xflbmtit.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/unoprov.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/unoshprp.hxx>
 
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index 657786649c3d..45177d2adfd4 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -20,12 +20,13 @@
 #include <memory>
 #include <sal/config.h>
 
+#include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <vcl/svapp.hxx>
 
-#include <svx/unoshape.hxx>
+#include <svx/svdobj.hxx>
 #include <svx/svdpool.hxx>
-#include <svx/unoprov.hxx>
+#include <editeng/unoipset.hxx>
 #include <editeng/unotext.hxx>
 #include <tools/debug.hxx>
 
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index d849181cf84f..55328b79d051 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -25,11 +25,8 @@
 
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
-#include <optsitem.hxx>
 #include <sdresid.hxx>
 #include <strings.hrc>
-#include <sdattr.hxx>
-#include <Window.hxx>
 #include <drawview.hxx>
 #include <DrawViewShell.hxx>
 #include <FrameView.hxx>
@@ -44,7 +41,6 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <comphelper/sequence.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <sfx2/printer.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/svdetc.hxx>
@@ -56,6 +52,7 @@
 #include <svx/xlnclit.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <vcl/print.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <unotools/moduleoptions.hxx>
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index e4974b1758fd..452f2585a40d 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -19,30 +19,19 @@
 
 #include <GraphicObjectBar.hxx>
 
-#include <limits.h>
-#include <svl/whiter.hxx>
-#include <svl/itempool.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/shell.hxx>
 #include <svx/svxids.hrc>
 #include <sfx2/request.hxx>
-#include <sfx2/basedlgs.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/grfflt.hxx>
-#include <svl/aeitem.hxx>
 #include <svx/grafctrl.hxx>
 
 #include <sfx2/objface.hxx>
 
-#include <app.hrc>
-
 #include <strings.hrc>
 #include <DrawDocShell.hxx>
 #include <ViewShell.hxx>
-#include <Window.hxx>
-#include <drawview.hxx>
 #include <sdresid.hxx>
-#include <drawdoc.hxx>
 
 using namespace sd;
 #define ShellClass_GraphicObjectBar
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index fef4899810ef..e891dc7cf662 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -20,22 +20,16 @@
 #include <MediaObjectBar.hxx>
 #include <avmedia/mediaitem.hxx>
 #include <sfx2/msg.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
 #include <svl/whiter.hxx>
-#include <svl/itempool.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 
-#include <app.hrc>
-
 #include <strings.hrc>
 #include <DrawDocShell.hxx>
 #include <ViewShell.hxx>
-#include <Window.hxx>
-#include <drawview.hxx>
 #include <sdresid.hxx>
 #include <drawdoc.hxx>
 #include <memory>
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 91dddd08cdbd..04a239c0d270 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -19,42 +19,28 @@
 
 #include <Outliner.hxx>
 #include <boost/property_tree/json_parser.hpp>
-#include <vcl/wrkwin.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
 #include <svl/srchitem.hxx>
 #include <svl/intitem.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/eeitem.hxx>
 #include <editeng/editstat.hxx>
 #include <vcl/outdev.hxx>
-#include <svx/dlgutil.hxx>
-#include <svx/xtable.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/printer.hxx>
-#include <svx/svxerr.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/svdotable.hxx>
 #include <editeng/unolingu.hxx>
-#include <svx/svditer.hxx>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <editeng/forbiddencharacterstable.hxx>
 #include <svx/srchdlg.hxx>
 #include <unotools/linguprops.hxx>
 #include <unotools/lingucfg.hxx>
 #include <editeng/editeng.hxx>
-#include <vcl/metric.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/langtab.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <strings.hrc>
 #include <editeng/outliner.hxx>
-#include <sdpage.hxx>
 #include <sdmod.hxx>
 #include <Window.hxx>
 #include <sdresid.hxx>
@@ -63,15 +49,11 @@
 #include <OutlineViewShell.hxx>
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
-#include <FrameView.hxx>
-#include <optsitem.hxx>
 #include <drawview.hxx>
 #include <ViewShellBase.hxx>
 #include <SpellDialogChildWindow.hxx>
-#include <ToolBarManager.hxx>
 #include <framework/FrameworkHelper.hxx>
 #include <svx/svxids.hrc>
-#include <editeng/editerr.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/string.hxx>
 #include <comphelper/lok.hxx>
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index 8546b9f63264..aa7bb51b1184 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -20,18 +20,12 @@
 #include <OutlinerIterator.hxx>
 #include <OutlinerIteratorImpl.hxx>
 #include <svx/svditer.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <tools/debug.hxx>
 #include <Outliner.hxx>
 
 #include <drawdoc.hxx>
 #include <DrawViewShell.hxx>
-#include <drawview.hxx>
 #include <sdpage.hxx>
-#include <FrameView.hxx>
-#include <DrawDocShell.hxx>
-#include <Window.hxx>
 
 namespace sd { namespace outliner {
 
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index e24ff1b12447..b8ea8b70bfcb 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -25,21 +25,16 @@
 #include <ViewShellManager.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
-#include <com/sun/star/ui/UIElementType.hpp>
 
 #include <sal/log.hxx>
 #include <osl/mutex.hxx>
 #include <o3tl/deleter.hxx>
 #include <o3tl/enumrange.hxx>
-#include <rtl/ref.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/toolbarids.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/eitem.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 4a875076d561..5da8d9c9219d 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -28,8 +28,6 @@
 #include <unokywds.hxx>
 #include <svx/svxids.hrc>
 #include <DrawDocShell.hxx>
-#include <sfx2/app.hxx>
-#include <PaneChildWindows.hxx>
 #include <ViewShellManager.hxx>
 #include <DrawController.hxx>
 #include <FrameView.hxx>
@@ -41,20 +39,14 @@
 #include <sfx2/request.hxx>
 #include <sfx2/printer.hxx>
 #include <DrawViewShell.hxx>
-#include <GraphicViewShell.hxx>
-#include <OutlineViewShell.hxx>
-#include <SlideSorterViewShell.hxx>
-#include <PresentationViewShell.hxx>
 #include <FormShellManager.hxx>
 #include <ToolBarManager.hxx>
 #include <Window.hxx>
 #include <framework/ConfigurationController.hxx>
 #include <DocumentRenderer.hxx>
-#include <sdattr.hxx>
 #include <optsitem.hxx>
 #include <sdmod.hxx>
 
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index b36d7d197c9f..284c71b94ac2 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -27,19 +27,10 @@
 #include <unokywds.hxx>
 #include <strings.hrc>
 #include <app.hrc>
-#include <sdattr.hxx>
-#include <sdabstdlg.hxx>
 #include <unmodpg.hxx>
-#include <Window.hxx>
-#include <optsitem.hxx>
 #include <DrawDocShell.hxx>
-#include <DrawController.hxx>
 #include <FactoryIds.hxx>
-#include <slideshow.hxx>
 #include <ViewShellBase.hxx>
-#include <FrameView.hxx>
-#include <DrawViewShell.hxx>
-#include <ViewShellHint.hxx>
 
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
@@ -47,8 +38,8 @@
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sidebar/Sidebar.hxx>
-#include <svl/aeitem.hxx>
 #include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/imapdlg.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sberrors.hxx>
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 1d5b4b1e93d1..e7f2426b56a1 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -22,7 +22,6 @@
 #include <ViewShellBase.hxx>
 #include <Window.hxx>
 #include <DrawDocShell.hxx>
-#include <FormShellManager.hxx>
 
 #include <sal/log.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 9c9abdabb2c1..36e10e6ce37a 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -19,10 +19,7 @@
 
 #include <ViewTabBar.hxx>
 
-#include <ViewShell.hxx>
 #include <ViewShellBase.hxx>
-#include <DrawViewShell.hxx>
-#include <FrameView.hxx>
 #include <framework/FrameworkHelper.hxx>
 #include <framework/Pane.hxx>
 #include <DrawController.hxx>
diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx
index 1d00dd849bca..2726833637ee 100644
--- a/sd/source/ui/view/WindowUpdater.cxx
+++ b/sd/source/ui/view/WindowUpdater.cxx
@@ -18,14 +18,11 @@
  */
 
 #include <WindowUpdater.hxx>
-#include <ViewShell.hxx>
-#include <Window.hxx>
 #include <drawdoc.hxx>
-#include <View.hxx>
 
-#include <vcl/split.hxx>
-#include <sfx2/childwin.hxx>
-#include <sfx2/viewfrm.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/vclptr.hxx>
+#include <vcl/window.hxx>
 
 #include <algorithm>
 
diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx
index a73bd292314f..58b12cb37e52 100644
--- a/sd/source/ui/view/clview.cxx
+++ b/sd/source/ui/view/clview.cxx
@@ -17,11 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/app.hxx>
-
 #include <ClientView.hxx>
 #include <drawview.hxx>
-#include <sdpage.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 5bc53d0700fa..7956b6241ed1 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -17,40 +17,24 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/dispatch.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <svx/svdpagv.hxx>
-#include <sfx2/request.hxx>
 #include <svl/style.hxx>
 #include <editeng/outliner.hxx>
-#include <svx/view3d.hxx>
-#include <svx/svxids.hrc>
 #include <svx/svdotext.hxx>
-#include <svx/svdograf.hxx>
-#include <svx/svdogrp.hxx>
-#include <svx/svdorect.hxx>
 #include <svl/poolitem.hxx>
 #include <editeng/eeitem.hxx>
-#include <editeng/bulletitem.hxx>
-#include <svl/itempool.hxx>
 #include <editeng/numitem.hxx>
 #include <svl/whiter.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/objface.hxx>
-#include <stlsheet.hxx>
-
-#include <svx/svdoutl.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
 #include <strings.hrc>
 #include <View.hxx>
-#include <sdattr.hxx>
 #include <drawview.hxx>
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
@@ -59,16 +43,8 @@
 #include <DrawViewShell.hxx>
 #include <pres.hxx>
 #include <sdresid.hxx>
-#include <Window.hxx>
 #include <unchss.hxx>
-#include <FrameView.hxx>
-#include <anminfo.hxx>
 #include <slideshow.hxx>
-#include <vcl/virdev.hxx>
-#include <svx/sdrpaintwindow.hxx>
-#include <svx/sdr/contact/viewobjectcontact.hxx>
-#include <svx/sdr/contact/viewcontact.hxx>
-#include <svx/sdr/contact/displayinfo.hxx>
 
 #include <undo/undomanager.hxx>
 
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index 877f0f7b1022..2ab2bc56be3f 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <BezierObjectBar.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objface.hxx>
@@ -27,7 +26,6 @@
 #include <svl/eitem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/svdopath.hxx>
-#include <svl/aeitem.hxx>
 #include <svx/svdundo.hxx>
 #include <sfx2/dispatch.hxx>
 
@@ -38,8 +36,6 @@
 
 #include <DrawDocShell.hxx>
 #include <ViewShell.hxx>
-#include <Window.hxx>
-#include <drawview.hxx>
 #include <drawdoc.hxx>
 #include <fusel.hxx>
 #include <fuconbez.hxx>
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 5a0f0334277a..34e1aa381b97 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -17,26 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <memory>
 #include <TextObjectBar.hxx>
 
 #include <svx/svxids.hrc>
 
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 
-#include <i18nlangtag/mslangid.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/editview.hxx>
-#include <editeng/editeng.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/unolingu.hxx>
 #include <editeng/kernitem.hxx>
-#include <vcl/vclenum.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/request.hxx>
 #include <svl/whiter.hxx>
 #include <svl/itempool.hxx>
 #include <svl/stritem.hxx>
@@ -45,24 +39,17 @@
 #include <sfx2/tplpitem.hxx>
 #include <editeng/escapementitem.hxx>
 #include <svx/svdoutl.hxx>
-#include <svl/intitem.hxx>
 #include <editeng/scripttypeitem.hxx>
-#include <editeng/outlobj.hxx>
 #include <editeng/writingmodeitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/fhgtitem.hxx>
 
 #include <sfx2/objface.hxx>
 
-#include <app.hrc>
-
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
 #include <DrawViewShell.hxx>
 #include <OutlineViewShell.hxx>
-#include <ViewShellBase.hxx>
-#include <ToolBarManager.hxx>
-#include <futempl.hxx>
 #include <Window.hxx>
 #include <OutlineView.hxx>
 
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 066aa51cd135..4bdb32ecc627 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -23,20 +23,14 @@
 
 #include <editeng/eeitem.hxx>
 #include <editeng/editview.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/unolingu.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/numitem.hxx>
-#include <vcl/vclenum.hxx>
-#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>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
@@ -48,16 +42,11 @@
 #include <editeng/contouritem.hxx>
 #include <editeng/shdditem.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/xtable.hxx>
 #include <svx/svdobj.hxx>
-#include <editeng/outlobj.hxx>
 #include <editeng/flstitem.hxx>
-#include <svl/intitem.hxx>
 #include <editeng/scripttypeitem.hxx>
-#include <svx/svdoutl.hxx>
 #include <editeng/writingmodeitem.hxx>
 #include <editeng/frmdiritem.hxx>
-#include <svl/itemiter.hxx>
 #include <editeng/cmapitem.hxx>
 
 #include <app.hrc>
@@ -65,7 +54,6 @@
 #include <sdresid.hxx>
 #include <prlayout.hxx>
 #include <ViewShell.hxx>
-#include <drawview.hxx>
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
 #include <stlpool.hxx>
@@ -74,7 +62,6 @@
 #include <Window.hxx>
 #include <futempl.hxx>
 #include <DrawDocShell.hxx>
-#include <Outliner.hxx>
 #include <futext.hxx>
 
 #include <memory>
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 176f337868c0..cf6c62c5bea0 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -21,14 +21,10 @@
 #include <ViewShellImplementation.hxx>
 
 #include <DrawController.hxx>
-#include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 
-#include <comphelper/anytostring.hxx>
 #include <comphelper/scopeguard.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 #include <rtl/ref.hxx>
-#include <sal/log.hxx>
 
 #include <svx/svxids.hrc>
 #include <svx/svdpagv.hxx>
@@ -36,31 +32,21 @@
 #include <sfx2/bindings.hxx>
 #include <svx/svdoole2.hxx>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/module.hxx>
 #include <vcl/scrbar.hxx>
-#include <svx/svdograf.hxx>
 #include <svx/svdopage.hxx>
-#include <sot/storage.hxx>
 #include <svx/fmshell.hxx>
-#include <svx/globl3d.hxx>
-#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>
 
-#include <strings.hrc>
 #include <app.hrc>
 
-#include <sdmod.hxx>
 #include <fupoor.hxx>
-#include <sdresid.hxx>
 #include <unokywds.hxx>
-#include <fusel.hxx>
 #include <sdpage.hxx>
 #include <FrameView.hxx>
-#include <stlpool.hxx>
 #include <Window.hxx>
 #include <drawview.hxx>
 #include <drawdoc.hxx>
@@ -68,11 +54,7 @@
 #include <Ruler.hxx>
 #include <Client.hxx>
 #include <slideshow.hxx>
-#include <optsitem.hxx>
-#include <fusearch.hxx>
-#include <Outliner.hxx>
 #include <AnimationChildWindow.hxx>
-#include <SdUnoDrawView.hxx>
 #include <ToolBarManager.hxx>
 #include <FormShellManager.hxx>
 #include <ViewShellBase.hxx>
@@ -84,7 +66,6 @@
 #include <controller/SlideSorterController.hxx>
 #include <controller/SlsPageSelector.hxx>
 
-#include <sfx2/request.hxx>
 #include <comphelper/lok.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <vcl/uitest/logger.hxx>
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index c03fa7583c27..ea2a4147d533 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/scanner/XScannerManager2.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
@@ -43,7 +42,6 @@
 #include <editeng/editdata.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
-#include <editeng/editeng.hxx>
 #include <editeng/section.hxx>
 #include <editeng/editobj.hxx>
 #include <editeng/CustomPropertyField.hxx>
@@ -60,16 +58,10 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/zoomitem.hxx>
 
-#include <svl/aeitem.hxx>
-
-#include <svx/SpellDialogChildWindow.hxx>
 #include <svx/compressgraphicdialog.hxx>
 #include <svx/ClassificationDialog.hxx>
 #include <svx/ClassificationCommon.hxx>
-#include <svx/ClassificationEditView.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/bmpmask.hxx>
-#include <svx/colrctrl.hxx>
 #include <svx/extedit.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/f3dchild.hxx>
@@ -79,8 +71,6 @@
 #include <svx/hlnkitem.hxx>
 #include <svx/imapdlg.hxx>
 #include <svx/sdtagitm.hxx>
-#include <svx/sdtmfitm.hxx>
-#include <svx/svdoattr.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdoutl.hxx>
@@ -88,13 +78,8 @@
 #include <svx/svdundo.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/svxids.hrc>
-#include <svx/xfillit0.hxx>
-#include <svx/xflclit.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/xlnedwit.hxx>
-#include <svx/xlnstwit.hxx>
-#include <svx/xlnwtit.hxx>
 #include <svx/sdtfsitm.hxx>
+#include <svx/sdmetitm.hxx>
 
 #include <tools/diagnose_ex.h>
 
@@ -114,31 +99,26 @@
 #include <editeng/postitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/crossedoutitem.hxx>
-#include <editeng/contouritem.hxx>
 #include <editeng/shdditem.hxx>
 #include <editeng/numitem.hxx>
-#include <svx/xtable.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/SvxColorChildWindow.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/flstitem.hxx>
-#include <editeng/scripttypeitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/colritem.hxx>
-#include <editeng/brushitem.hxx>
 
+#include <svl/poolitem.hxx>
+#include <svl/style.hxx>
 #include <svl/whiter.hxx>
 
 #include <app.hrc>
 #include <strings.hrc>
 
-#include <framework/FrameworkHelper.hxx>
-
 #include <AnimationChildWindow.hxx>
 #include <DrawDocShell.hxx>
 #include <DrawViewShell.hxx>
-#include <GraphicViewShell.hxx>
 #include <LayerTabBar.hxx>
 #include <Outliner.hxx>
 #include <ViewShellHint.hxx>
@@ -179,17 +159,14 @@
 #include <fuvect.hxx>
 #include <futext.hxx>
 #include <helpids.h>
-#include <optsitem.hxx>
 #include <sdabstdlg.hxx>
 #include <sdattr.hxx>
-#include <sdgrffilter.hxx>
 #include <sdpage.hxx>
 #include <sdresid.hxx>
 #include <unokywds.hxx>
 #include <slideshow.hxx>
-#include <stlpool.hxx>
+#include <stlsheet.hxx>
 #include <undolayer.hxx>
-#include <unmodpg.hxx>
 #include <sfx2/sidebar/Sidebar.hxx>
 #include <sfx2/classificationhelper.hxx>
 #include <sdmod.hxx>
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 7057906dac0c..5664219e83ca 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -32,13 +32,11 @@
 #include <svx/svdotable.hxx>
 #include <editeng/numitem.hxx>
 #include <svx/rulritem.hxx>
-#include <sfx2/zoomitem.hxx>
 #include <svx/svxids.hrc>
 #include <svx/svdpagv.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
-#include <svl/aeitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/rectitem.hxx>
 #include <svl/stritem.hxx>
@@ -51,28 +49,21 @@
 #include <svx/f3dchild.hxx>
 #include <svx/float3d.hxx>
 #include <svx/sdmetitm.hxx>
-#include <optsitem.hxx>
 
 #include <app.hrc>
 #include <strings.hrc>
 
 #include <sdundogr.hxx>
 #include <undopage.hxx>
-#include <glob.hxx>
-#include <sdmod.hxx>
 #include <fupoor.hxx>
 #include <slideshow.hxx>
-#include <FrameView.hxx>
 #include <sdpage.hxx>
 #include <Window.hxx>
 #include <sdresid.hxx>
 #include <unokywds.hxx>
 #include <drawview.hxx>
 #include <drawdoc.hxx>
-#include <Ruler.hxx>
 #include <DrawDocShell.hxx>
-#include <headerfooterdlg.hxx>
-#include <masterlayoutdlg.hxx>
 #include <sdabstdlg.hxx>
 #include <sfx2/ipclient.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index f487ce7b4c46..78c4635f279e 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -27,8 +27,6 @@
 #include <svl/stritem.hxx>
 #include <svl/urlbmk.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/svdundo.hxx>
-#include <svx/fmglob.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <svx/svxids.hrc>
@@ -36,7 +34,6 @@
 #include <svx/globl3d.hxx>
 #include <editeng/outliner.hxx>
 #include <sfx2/ipclient.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdopath.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -51,14 +48,11 @@
 #include <drawdoc.hxx>
 #include <Window.hxx>
 #include <fupoor.hxx>
-#include <fusnapln.hxx>
 #include <sdmod.hxx>
 #include <Ruler.hxx>
 #include <sdresid.hxx>
-#include <GraphicViewShell.hxx>
 #include <sdpage.hxx>
 #include <slideshow.hxx>
-#include <anminfo.hxx>
 #include <sdpopup.hxx>
 #include <drawview.hxx>
 #include <svx/bmpmask.hxx>
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 38e0d38ffe54..dab56e56aa6b 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -18,21 +18,20 @@
  */
 
 #include <DrawViewShell.hxx>
-#include <PresentationViewShell.hxx>
 #include <editeng/outliner.hxx>
 #include <svx/svxids.hrc>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdpagv.hxx>
+#include <svx/svdoutl.hxx>
+
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <sdcommands.h>
 #include <sal/log.hxx>
 
-#include <tools/poly.hxx>
 #include <svx/fmshell.hxx>
 #include <editeng/eeitem.hxx>
-#include <svtools/colorcfg.hxx>
 #include <AccessibleDrawDocumentView.hxx>
 
 #include <sfx2/viewfrm.hxx>
@@ -43,16 +42,10 @@
 #include <optsitem.hxx>
 #include <sdmod.hxx>
 #include <FrameView.hxx>
-#include <sdattr.hxx>
-#include <futext.hxx>
-#include <sdpage.hxx>
-#include <stlpool.hxx>
-#include <prntopts.hxx>
 #include <Window.hxx>
 #include <drawview.hxx>
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
-#include <Outliner.hxx>
 #include <Client.hxx>
 #include <slideshow.hxx>
 #include <unokywds.hxx>
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 8326b87438d9..28995b287b92 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -20,9 +20,7 @@
 #include <config_features.h>
 
 #include <DrawViewShell.hxx>
-#include <vcl/metaact.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/dispatch.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -33,29 +31,18 @@
 #include <svx/imapdlg.hxx>
 #include <svx/SvxColorChildWindow.hxx>
 #include <svx/f3dchild.hxx>
-#include <optsitem.hxx>
-#include <svx/extrusionbar.hxx>
-#include <svx/fontworkbar.hxx>
 #include <avmedia/mediaplayer.hxx>
 #include <svl/intitem.hxx>
 
 #include <app.hrc>
 #include <strings.hrc>
 
-#include <sdmod.hxx>
 #include <animobjs.hxx>
 #include <AnimationChildWindow.hxx>
-#include <NavigatorChildWindow.hxx>
 #include <sdresid.hxx>
 #include <drawdoc.hxx>
 #include <drawview.hxx>
-#include <FrameView.hxx>
-#include <Window.hxx>
-#include <DrawDocShell.hxx>
-#include <sdabstdlg.hxx>
-#include <framework/FrameworkHelper.hxx>
 #include <svx/svdoashp.hxx>
-#include <sfx2/sidebar/Sidebar.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 0671905ba363..bb12920ef246 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -25,10 +25,7 @@
 #include <utility>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
-#include <svx/fmglob.hxx>
-#include <svx/globl3d.hxx>
 #include <svx/pageitem.hxx>
 #include <svx/rulritem.hxx>
 #include <svx/svdouno.hxx>
@@ -36,23 +33,17 @@
 #include <editeng/flditem.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/sizeitem.hxx>
-#include <editeng/ulspitem.hxx>
-#include <editeng/lrspitem.hxx>
-#include <officecfg/Office/Common.hxx>
 #include <officecfg/Office/Impress.hxx>
 #include <svx/svxids.hrc>
 #include <svx/svdpagv.hxx>
 #include <svx/clipfmtitem.hxx>
-#include <svx/fmshell.hxx>
 #include <svl/eitem.hxx>
-#include <svl/aeitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <svl/visitem.hxx>
 #include <svl/whiter.hxx>
-#include <sfx2/dispatch.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
@@ -64,35 +55,29 @@
 #include <svx/fontworkbar.hxx>
 
 // #UndoRedo#
-#include <svl/slstitm.hxx>
-#include <sfx2/app.hxx>
 #include <svtools/insdlg.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svl/languageoptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/request.hxx>
 
-#include <svx/grafctrl.hxx>
 #include <svtools/cliplistener.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <app.hrc>
-#include <strings.hrc>
 
 #include <PresentationViewShell.hxx>
 
-#include <Outliner.hxx>
 #include <drawdoc.hxx>
 #include <DrawViewShell.hxx>
 #include <sdmod.hxx>
 #include <unokywds.hxx>
 #include <sdpage.hxx>
-#include <Client.hxx>
 #include <DrawDocShell.hxx>
 #include <zoomlist.hxx>
 #include <slideshow.hxx>
 #include <drawview.hxx>
-#include <View.hxx>
 #include <ViewShellBase.hxx>
 #include <ViewShellManager.hxx>
 #include <LayerTabBar.hxx>
@@ -104,8 +89,6 @@
 #include <fuformatpaintbrush.hxx>
 #include <stlsheet.hxx>
 
-#include <config_features.h>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index d21a3ad1eaa1..12f3bbf58001 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -19,25 +19,17 @@
 
 #include <DrawViewShell.hxx>
 
-#include <ViewShellHint.hxx>
-
 #include <com/sun/star/scanner/XScannerManager2.hpp>
 #include <editeng/outlobj.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <sfx2/dispatch.hxx>
 #include <svx/svxids.hrc>
-#include <svx/svddef.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdpagv.hxx>
 
-#include <app.hrc>
-
 #include <Window.hxx>
 #include <drawview.hxx>
-#include <zoomlist.hxx>
 #include <tools/helpers.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 18567d7d98e6..bd30940d6d5d 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -21,7 +21,6 @@
 
 #include <DrawViewShell.hxx>
 #include <editeng/outlobj.hxx>
-#include <vcl/wrkwin.hxx>
 #include <svx/xgrad.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/xfillit0.hxx>
@@ -36,16 +35,12 @@
 
 #include <sfx2/dispatch.hxx>
 #include <svl/intitem.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
 #include <svl/stritem.hxx>
 #include <svx/svxids.hrc>
 #include <svx/xtable.hxx>
-#include <svx/gallery.hxx>
 #include <vcl/graph.hxx>
 #include <svx/svdograf.hxx>
-#include <svx/svdoole2.hxx>
-#include <sot/storage.hxx>
 #include <svl/whiter.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sberrors.hxx>
@@ -59,7 +54,6 @@
 #include <drawview.hxx>
 #include <DrawDocShell.hxx>
 #include <sdresid.hxx>
-#include <fupoor.hxx>
 
 #include <svx/galleryitem.hxx>
 #include <com/sun/star/gallery/GalleryItemType.hpp>
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index c4781e6612bb..e9437eaed638 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -29,20 +29,14 @@
 #include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svx/svdopath.hxx>
-#include <sfx2/docfile.hxx>
 #include <svx/zoomslideritem.hxx>
 #include <svl/eitem.hxx>
 
 #include <sdcommands.h>
-#include <svx/dialogs.hrc>
-#include <svx/extrusionbar.hxx>
 #include <svx/f3dchild.hxx>
-#include <svx/fontworkbar.hxx>
 #include <svx/clipfmtitem.hxx>
 
 #include <sfx2/viewfrm.hxx>
-#include <svx/fmshell.hxx>
 #include <svtools/cliplistener.hxx>
 #include <svx/float3d.hxx>
 #include <svx/extedit.hxx>
@@ -67,7 +61,6 @@
 #include <SdUnoDrawView.hxx>
 #include <ViewShellBase.hxx>
 #include <slideshow.hxx>
-#include <ToolBarManager.hxx>
 #include <annotationmanager.hxx>
 #include <DrawController.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 6e8509e8c166..fb730f599da3 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -17,33 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
 #include <svx/svdlayer.hxx>
-#include <svx/svxids.hrc>
-#include <sfx2/msgpool.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svx/hlnkitem.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/flditem.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svx/svdorect.hxx>
-#include <sfx2/docfile.hxx>
-#include <basic/sbstar.hxx>
-#include <basic/sberrors.hxx>
 #include <svx/fmshell.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
-#include <unotools/useroptions.hxx>
-#include <tools/diagnose_ex.h>
 
 #include <app.hrc>
-#include <strings.hrc>
 
-#include <Outliner.hxx>
-#include <Window.hxx>
-#include <sdmod.hxx>
-#include <sdattr.hxx>
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
 #include <unokywds.hxx>
@@ -51,11 +32,9 @@
 #include <DrawViewShell.hxx>
 #include <drawview.hxx>
 #include <unmodpg.hxx>
-#include <undolayer.hxx>
 #include <ViewShellBase.hxx>
 #include <FormShellManager.hxx>
 #include <LayerTabBar.hxx>
-#include <sdabstdlg.hxx>
 #include <SlideSorterViewShell.hxx>
 #include <SlideSorter.hxx>
 #include <controller/SlideSorterController.hxx>
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index b4e4a04c4063..6be86e63cb8d 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -18,33 +18,17 @@
  */
 
 #include <DrawViewShell.hxx>
-#include <ViewShellImplementation.hxx>
-#include <vcl/waitobj.hxx>
 
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
 #include <svx/imapdlg.hxx>
-#include <sfx2/request.hxx>
-#include <svx/svdogrp.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/ImageMapInfo.hxx>
-#include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
-#include <svl/style.hxx>
-#include <svx/svdpagv.hxx>
-#include <svx/grafctrl.hxx>
-#include <stlsheet.hxx>
 
 #include <sfx2/viewfrm.hxx>
 
-#include <app.hrc>
-#include <Window.hxx>
 #include <drawdoc.hxx>
-#include <DrawDocShell.hxx>
 #include <drawview.hxx>
-#include <sdabstdlg.hxx>
 #include <memory>
 
 namespace sd {
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index 9cf67d815859..0858e554ad64 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -22,6 +22,7 @@
 #include <svx/svxids.hrc>
 #include <svl/aeitem.hxx>
 #include <svl/stritem.hxx>
+#include <sfx2/childwin.hxx>
 #include <sfx2/docfile.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/bindings.hxx>
@@ -36,7 +37,6 @@
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
 #include <pgjump.hxx>
-#include <NavigatorChildWindow.hxx>
 #include <navigatr.hxx>
 #include <drawview.hxx>
 
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 9b2b0e8f5fa7..7ba9914706a7 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -29,36 +29,31 @@
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
-#include <undo/undomanager.hxx>
 #include <vcl/waitobj.hxx>
-#include <svl/aeitem.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/outlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <svl/urlbmk.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/fmshell.hxx>
-#include <vcl/scrbar.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdorect.hxx>
-#include <svx/svdograf.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/stritem.hxx>
 #include <editeng/eeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
 #include <svx/svxids.hrc>
 #include <editeng/flditem.hxx>
-#include <svx/ruler.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <tools/urlobj.hxx>
-#include <svl/slstitm.hxx>
 #include <sfx2/ipclient.hxx>
 #include <avmedia/mediawindow.hxx>
 #include <svl/urihelper.hxx>
@@ -67,7 +62,6 @@
 
 #include <DrawViewShell.hxx>
 #include <slideshow.hxx>
-#include <ViewShellImplementation.hxx>
 #include <ViewShellHint.hxx>
 #include <framework/FrameworkHelper.hxx>
 #include <app.hrc>
@@ -86,13 +80,11 @@
 #include <sdresid.hxx>
 #include <unokywds.hxx>
 #include <Outliner.hxx>
-#include <PresentationViewShell.hxx>
 #include <sdpage.hxx>
 #include <FrameView.hxx>
 #include <zoomlist.hxx>
 #include <drawview.hxx>
 #include <DrawDocShell.hxx>
-#include <sdattr.hxx>
 #include <ViewShellBase.hxx>
 #include <ToolBarManager.hxx>
 #include <anminfo.hxx>
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index d420c6f49f03..0c28df0d34be 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/string.hxx>
 #include <svx/svxids.hrc>
-#include <svx/globl3d.hxx>
 #include <svx/hlnkitem.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
@@ -33,17 +32,12 @@
 #include <svl/itempool.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/templdlg.hxx>
 #include <svx/xdef.hxx>
-#include <svx/svddef.hxx>
-#include <svx/fmglob.hxx>
+#include <svx/svdoutl.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/fmshell.hxx>
 #include <svl/cjkoptions.hxx>
 
-#include <FrameView.hxx>
-#include <Outliner.hxx>
 #include <app.hrc>
 
 #include <sdmod.hxx>
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 2b699d322e4e..e3930fa7e6e5 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -23,21 +23,17 @@
 #include <svx/svxids.hrc>
 #include <svx/imapdlg.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/svdograf.hxx>
-#include <svx/svdoole2.hxx>
 #include <svx/ImageMapInfo.hxx>
 
 #include <app.hrc>
 
 #include <drawdoc.hxx>
-#include <slideshow.hxx>
 #include <sdmod.hxx>
 #include <optsitem.hxx>
 #include <FrameView.hxx>
 #include <drawview.hxx>
-#include <fupoor.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index f2b48ca30cb0..5b714de73837 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -18,24 +18,11 @@
  */
 
 #include <DrawViewShell.hxx>
-#include <svl/aeitem.hxx>
-#include <svl/itemset.hxx>
-#include <sfx2/request.hxx>
-#include <svx/svxids.hrc>
 
 #include <sal/log.hxx>
-#include <svx/fmshell.hxx>
-#include <sfx2/dispatch.hxx>
 #include <comphelper/lok.hxx>
 
-#include <app.hrc>
-#include <sdpage.hxx>
-#include <FrameView.hxx>
-#include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
-#include <Window.hxx>
-#include <GraphicViewShell.hxx>
-#include <drawview.hxx>
 
 #include <slideshow.hxx>
 
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index cde60865c4b4..e83e175a9d9f 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -19,32 +19,18 @@
 
 #include <DrawViewShell.hxx>
 #include <svx/xfillit0.hxx>
-#include <svx/xtable.hxx>
-#include <sdattr.hxx>
-#include <svl/aeitem.hxx>
 #include <editeng/eeitem.hxx>
 #include <sfx2/request.hxx>
-#include <svx/svditer.hxx>
-#include <editeng/colritem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/svxids.hrc>
-#include <svx/svdundo.hxx>
-#include <svx/view3d.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/float3d.hxx>
 #include <svx/f3dchild.hxx>
-#include <svx/dialogs.hrc>
 #include <vcl/weld.hxx>
 
-#include <app.hrc>
 #include <strings.hrc>
 
 #include <drawdoc.hxx>
-#include <DrawDocShell.hxx>
-#include <anminfo.hxx>
-#include <unoaprms.hxx>
-#include <sdundogr.hxx>
-#include <drawview.hxx>
 #include <Window.hxx>
 #include <sdresid.hxx>
 
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 92917a72bf67..165a9c3038d5 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -21,36 +21,22 @@
 #include <com/sun/star/embed/EmbedMisc.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/presentation/ClickAction.hpp>
-#include <svl/aeitem.hxx>
 #include <svx/svxids.hrc>
-#include <svx/globl3d.hxx>
-#include <editeng/eeitem.hxx>
+#include <svx/sdmetitm.hxx>
 #include <editeng/flditem.hxx>
 #include <svx/svdogrp.hxx>
 #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>
 #include <svx/obj3d.hxx>
 #include <svx/scene3d.hxx>
-#include <sfx2/event.hxx>
-#include <sfx2/docfile.hxx>
-#include <rtl/ustrbuf.hxx>
 
 #include <app.hrc>
 
 #include <anminfo.hxx>
-#include <Outliner.hxx>
-#include <sdpage.hxx>
-#include <fupoor.hxx>
-#include <fusel.hxx>
 #include <drawdoc.hxx>
-#include <DrawDocShell.hxx>
 #include <drawview.hxx>
-#include <optsitem.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index 45a7e55dd85b..f82911d26f09 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -20,8 +20,6 @@
 #include <config_features.h>
 
 #include <DrawViewShell.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/templdlg.hxx>
 #include <sfx2/infobar.hxx>
 
 #include <svx/fontwork.hxx>
@@ -39,11 +37,8 @@
 #include <app.hrc>
 
 #include <SpellDialogChildWindow.hxx>
-#include <DrawDocShell.hxx>
-#include <GraphicDocShell.hxx>
 #include <GraphicViewShell.hxx>
 #include <AnimationChildWindow.hxx>
-#include <NavigatorChildWindow.hxx>
 
 using namespace sd;
 #define ShellClass_DrawViewShell
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index a05d2bea5b44..2e1d5b755883 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -20,7 +20,6 @@
 #include <FrameView.hxx>
 
 #include <svx/svxids.hrc>
-#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/drawing/framework/ResourceId.hpp>
 #include <com/sun/star/drawing/framework/XView.hpp>
 #include <rtl/ustrbuf.hxx>
@@ -34,12 +33,8 @@
 #include <DrawDocShell.hxx>
 #include <optsitem.hxx>
 #include <ViewShellBase.hxx>
-#include <DrawViewShell.hxx>
-#include <OutlineViewShell.hxx>
 #include <sdmod.hxx>
 #include <pres.hxx>
-#include <strings.hrc>
-#include <sdiocmpt.hxx>
 #include <framework/FrameworkHelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx
index db9b9225efee..9ab5501c14e6 100644
--- a/sd/source/ui/view/grviewsh.cxx
+++ b/sd/source/ui/view/grviewsh.cxx
@@ -22,10 +22,6 @@
 #include <FrameView.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <vcl/scrbar.hxx>
-#include <vcl/settings.hxx>
-
-#include <tools/helpers.hxx>
 
 constexpr sal_Int32 TAB_HEIGHT_MARGIN = 10;
 
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index ce58f2c6696c..a11d9b28282e 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -19,29 +19,23 @@
 
 #include <OutlineViewShell.hxx>
 
-#include <com/sun/star/beans/PropertyValue.hpp>
-
 #include <app.hrc>
 #include <svx/hlnkitem.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
-#include <svl/eitem.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <svx/svxids.hrc>
+#include <svx/svdoutl.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/editstat.hxx>
-#include <optsitem.hxx>
 #include <unotools/useroptions.hxx>
 
 #include <sfx2/viewfrm.hxx>
-#include <Outliner.hxx>
 #include <Window.hxx>
 #include <fubullet.hxx>
 #include <fuolbull.hxx>
-#include <FrameView.hxx>
-#include <fuzoom.hxx>
 #include <fuscale.hxx>
 #include <fuchar.hxx>
 #include <fuinsfil.hxx>
@@ -53,11 +47,7 @@
 #include <fuexpand.hxx>
 #include <fusumry.hxx>
 #include <fucushow.hxx>
-#include <drawdoc.hxx>
-#include <sdattr.hxx>
-#include <ViewShellBase.hxx>
 #include <sdabstdlg.hxx>
-#include <framework/FrameworkHelper.hxx>
 #include <DrawDocShell.hxx>
 #include <DrawViewShell.hxx>
 #include <OutlineView.hxx>
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 235890e7870e..53d55b60e46e 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -19,7 +19,6 @@
 
 #include <OutlineViewShell.hxx>
 
-#include <ViewShellImplementation.hxx>
 #include <helpids.h>
 #include <app.hrc>
 #include <svx/hyperdlg.hxx>
@@ -28,18 +27,15 @@
 
 #include <sfx2/infobar.hxx>
 #include <sfx2/objface.hxx>
-#include <sot/exchange.hxx>
-#include <svx/ruler.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <sfx2/shell.hxx>
-#include <sfx2/templdlg.hxx>
-#include <sfx2/viewfac.hxx>
 #include <sfx2/request.hxx>
 #include <svx/hlnkitem.hxx>
 #include <svx/svdotext.hxx>
+#include <svx/svdoutl.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/commandevent.hxx>
@@ -54,7 +50,6 @@
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
 #include <vcl/EnumContext.hxx>
-#include <svx/svdorect.hxx>
 #include <sot/formats.hxx>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <editeng/unolingu.hxx>
@@ -64,13 +59,10 @@
 #include <svl/srchitem.hxx>
 #include <editeng/editobj.hxx>
 #include <fubullet.hxx>
-#include <optsitem.hxx>
 
 #include <strings.hrc>
 
-#include <Outliner.hxx>
 #include <Window.hxx>
-#include <TextObjectBar.hxx>
 #include <drawdoc.hxx>
 #include <sdresid.hxx>
 #include <sdpage.hxx>
@@ -78,13 +70,11 @@
 #include <FrameView.hxx>
 #include <zoomlist.hxx>
 #include <stlsheet.hxx>
-#include <slideshow.hxx>
 #include <SdUnoOutlineView.hxx>
 #include <SpellDialogChildWindow.hxx>
 
 #include <AccessibleOutlineView.hxx>
 #include <ViewShellBase.hxx>
-#include <ViewShellManager.hxx>
 #include <DrawController.hxx>
 #include <DrawDocShell.hxx>
 #include <OutlineView.hxx>
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index a99e7ebec393..67605076550d 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -18,39 +18,28 @@
  */
 
 #include <OutlineView.hxx>
-#include <editeng/forbiddencharacterstable.hxx>
 #include <sfx2/progress.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
 #include <svx/svxids.hrc>
 #include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/lrspitem.hxx>
 #include <svx/svdotext.hxx>
-#include <sfx2/printer.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svl/itempool.hxx>
 #include <svl/style.hxx>
-#include <svx/svdorect.hxx>
 #include <svx/svdundo.hxx>
-#include <editeng/adjustitem.hxx>
-#include <editeng/tstpitem.hxx>
-#include <editeng/lspcitem.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/editeng.hxx>
 #include <xmloff/autolayout.hxx>
+#include <tools/debug.hxx>
 
 #include <editeng/editobj.hxx>
 #include <editeng/editund2.hxx>
 
 #include <editeng/editview.hxx>
-#include <editeng/svxfont.hxx>
-#include <editeng/fhgtitem.hxx>
 
 #include <com/sun/star/frame/XFrame.hpp>
 
@@ -68,7 +57,6 @@
 #include <EventMultiplexer.hxx>
 #include <ViewShellBase.hxx>
 #include <ViewShellManager.hxx>
-#include <undo/undoobjects.hxx>
 #include <undo/undomanager.hxx>
 #include <stlsheet.hxx>
 
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index e1e03875236b..e324b5803f7b 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -21,9 +21,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <PresentationViewShell.hxx>
-#include <optsitem.hxx>
-#include <sddll.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -32,13 +29,8 @@
 #include <FrameView.hxx>
 #include <DrawDocShell.hxx>
 #include <slideshow.hxx>
-#include <sdattr.hxx>
-#include <sdpage.hxx>
-#include <drawdoc.hxx>
-#include <drawview.hxx>
 #include <app.hrc>
 #include <ViewShellBase.hxx>
-#include <FactoryIds.hxx>
 
 #include <fupoor.hxx>
 #include <Window.hxx>
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 2a78f8f8a24a..e1f822411bc4 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -24,11 +24,9 @@
 #include <View.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/unolingu.hxx>
-#include <sfx2/request.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/fmview.hxx>
 #include <editeng/outliner.hxx>
-#include <svx/svxids.hrc>
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdundo.hxx>
@@ -36,26 +34,16 @@
 #include <vcl/settings.hxx>
 
 #include <sfx2/dispatch.hxx>
-#include <sfx2/app.hxx>
 #include <svx/svdpagv.hxx>
-#include <sfx2/docfile.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 
 #include <svx/svdetc.hxx>
 #include <editeng/editstat.hxx>
 
-#include <svx/dialogs.hrc>
 #include <sfx2/viewfrm.hxx>
-#include <vcl/EnumContext.hxx>
-#include <svx/svdopage.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svx/xfillit0.hxx>
-#include <svx/xlndsit.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/xlnclit.hxx>
-#include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
-#include <vcl/virdev.hxx>
 
 #include <app.hrc>
 #include <strings.hrc>
@@ -67,12 +55,6 @@
 #include <sdpage.hxx>
 #include <sdresid.hxx>
 #include <unokywds.hxx>
-#include <DrawViewShell.hxx>
-#include <futext.hxx>
-#include <fuinsfil.hxx>
-#include <slideshow.hxx>
-#include <stlpool.hxx>
-#include <FrameView.hxx>
 #include <ViewClipboard.hxx>
 #include <undo/undomanager.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
@@ -80,13 +62,12 @@
 #include <svx/svdotable.hxx>
 #include <EventMultiplexer.hxx>
 #include <ViewShellBase.hxx>
-#include <ViewShellManager.hxx>
+#include <ViewShell.hxx>
 
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/color/bcolor.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
-#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
 #include <svx/sdr/contact/objectcontact.hxx>
 #include <svx/sdr/table/tablecontroller.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -96,8 +77,6 @@
 #include <comphelper/lok.hxx>
 #include <sfx2/lokhelper.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <svl/itemiter.hxx>
-#include <editeng/editeng.hxx>
 #include <DrawController.hxx>
 
 #include <memory>
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index fafe96ebb842..da69acdad1a1 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -23,14 +23,9 @@
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <comphelper/sequenceashashmap.hxx>
 #include <tools/urlobj.hxx>
-#include <svx/svdetc.hxx>
 #include <svx/svdoole2.hxx>
-#include <svx/svdograf.hxx>
-#include <vcl/graph.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
 #include <sfx2/docfile.hxx>
-#include <sfx2/childwin.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdpagv.hxx>
 #include <svl/urlbmk.hxx>
@@ -38,19 +33,16 @@
 #include <svx/xflclit.hxx>
 #include <sot/formats.hxx>
 #include <editeng/editeng.hxx>
-#include <svx/svditer.hxx>
-#include <svx/obj3d.hxx>
-#include <svx/scene3d.hxx>
 
-#include <sfx2/objsh.hxx>
 #include <svtools/embedtransfer.hxx>
+#include <tools/debug.hxx>
 
-#include <navigatr.hxx>
 #include <anminfo.hxx>
 #include <strings.hrc>
 #include <sdxfer.hxx>
 #include <sdresid.hxx>
 #include <sdmod.hxx>
+#include <sdtreelb.hxx>
 #include <DrawViewShell.hxx>
 #include <DrawDocShell.hxx>
 #include <fudraw.hxx>
@@ -58,7 +50,6 @@
 #include <Window.hxx>
 #include <sdpage.hxx>
 #include <unoaprms.hxx>
-#include <drawview.hxx>
 #include <helpids.h>
 #include <vcl/svapp.hxx>
 
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index c06e91eeead4..e45441d1affe 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -23,29 +23,18 @@
 #include <com/sun/star/embed/MSOLEObjectSystemCreator.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <sot/filelist.hxx>
-#include <unotools/pathoptions.hxx>
 #include <editeng/editdata.hxx>
-#include <svl/urlbmk.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/svdpagv.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/colritem.hxx>
 #include <sfx2/docfile.hxx>
-#include <svx/svditer.hxx>
-#include <svx/svdogrp.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdograf.hxx>
-#include <svx/svdetc.hxx>
 #include <svx/svdundo.hxx>
-#include <sfx2/app.hxx>
 #include <svl/itempool.hxx>
-#include <comphelper/classids.hxx>
-#include <svx/fmmodel.hxx>
 #include <sot/formats.hxx>
 #include <editeng/outliner.hxx>
-#include <editeng/editeng.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/e3dundo.hxx>
 #include <svx/unomodel.hxx>
@@ -61,13 +50,11 @@
 #include <Window.hxx>
 #include <sdxfer.hxx>
 #include <sdpage.hxx>
-#include <DrawViewShell.hxx>
 #include <drawdoc.hxx>
 #include <sdmod.hxx>
 #include <sdresid.hxx>
 #include <strings.hrc>
 #include <SlideSorterViewShell.hxx>
-#include <strmname.h>
 #include <unomodel.hxx>
 #include <ViewClipboard.hxx>
 #include <sfx2/ipclient.hxx>
@@ -75,8 +62,6 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <tools/stream.hxx>
-#include <vcl/cvtgrf.hxx>
 #include <svx/sdrhittesthelper.hxx>
 #include <svx/xbtmpit.hxx>
 #include <memory>
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 27fe058851fc..0bf877f6fc02 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -30,17 +30,14 @@
 #include <sfx2/sfxsids.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <svl/urlbmk.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/xfillit0.hxx>
-#include <svx/xoutbmp.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/ImageMapInfo.hxx>
-#include <sot/storage.hxx>
 #include <sfx2/app.hxx>
 #include <avmedia/mediawindow.hxx>
 #include <svtools/ehdl.hxx>
@@ -57,15 +54,12 @@
 #include <strings.hrc>
 #include <sdpage.hxx>
 #include <view/SlideSorterView.hxx>
-#include <undo/undoobjects.hxx>
-#include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <svtools/soerr.hxx>
 #include <sfx2/ipclient.hxx>
-#include <svx/svdoashp.hxx>
 #include <tools/debug.hxx>
 
 using namespace com::sun::star;
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 236a6e4b6d7d..35448c4a623e 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <Window.hxx>
-#include <sfx2/dispatch.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
 
 #include <sfx2/viewfrm.hxx>
@@ -37,7 +37,6 @@
 #include <FrameView.hxx>
 #include <OutlineViewShell.hxx>
 #include <drawdoc.hxx>
-#include <AccessibleDrawDocumentView.hxx>
 #include <WindowUpdater.hxx>
 #include <ViewShellBase.hxx>
 #include <uiobject.hxx>
@@ -45,9 +44,7 @@
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <vcl/commandevent.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
 #include <sfx2/lokhelper.hxx>
 
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index add49a87292c..46eb48bbbc15 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -20,23 +20,15 @@
 #include <TabControl.hxx>
 
 #include <sfx2/viewfrm.hxx>
-#include <svx/svdlayer.hxx>
-#include <svx/svdpagv.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/commandevent.hxx>
 
-#include <sdattr.hxx>
-#include <sdmod.hxx>
 #include <app.hrc>
 
 #include <DrawViewShell.hxx>
-#include <GraphicViewShell.hxx>
 #include <helpids.h>
 #include <View.hxx>
-#include <sdpage.hxx>
 #include <drawdoc.hxx>
-#include <Window.hxx>
-#include <unmodpg.hxx>
 #include <DrawDocShell.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index cd12eff979bb..02e5956b6867 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -17,12 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sddll.hxx>
-
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 
 #include <vcl/help.hxx>
@@ -32,10 +28,8 @@
 
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrpaintwindow.hxx>
-#include <svx/sdr/overlay/overlayanimatedbitmapex.hxx>
 #include <svx/sdr/overlay/overlaybitmapex.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <svx/sdr/contact/objectcontact.hxx>
 #include <svx/svxids.hrc>
 #include <svx/svdpagv.hxx>
 
@@ -43,16 +37,14 @@
 
 
 #include <DrawDocShell.hxx>
-#include <DrawViewShell.hxx>
-#include <DrawController.hxx>
 #include <strings.hrc>
 #include <bitmaps.hlst>
 #include <sdresid.hxx>
 #include <EventMultiplexer.hxx>
+#include <View.hxx>
 #include <ViewShellBase.hxx>
-#include <ViewShellManager.hxx>
+#include <ViewShell.hxx>
 #include <sdpage.hxx>
-#include <drawdoc.hxx>
 #include <smarttag.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 707b8ac4c511..f06f7bcea7f9 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -18,12 +18,7 @@
  */
 
 #include <com/sun/star/embed/EmbedVerbs.hpp>
-#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
 
 #include <ViewShell.hxx>
 #include <ViewShellHint.hxx>
@@ -35,17 +30,13 @@
 #include <vcl/scrbar.hxx>
 #include <svx/svdpagv.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/app.hxx>
 #include <svx/ruler.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/outliner.hxx>
 #include <svtools/ehdl.hxx>
 #include <svx/svdoole2.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svx/fmshell.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <svx/dialogs.hrc>
 #include <comphelper/classids.hxx>
 
 #include <strings.hrc>
@@ -54,15 +45,12 @@
 
 #include <sdundogr.hxx>
 #include <FrameView.hxx>
-#include <undopage.hxx>
 #include <sdresid.hxx>
 #include <drawdoc.hxx>
 #include <View.hxx>
 #include <fupoor.hxx>
 #include <Client.hxx>
 #include <DrawDocShell.hxx>
-#include <fusearch.hxx>
-#include <slideshow.hxx>
 #include <sdpage.hxx>
 #include <DrawViewShell.hxx>
 #include <ViewShellBase.hxx>
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index c09b539a34cf..4ffa985b0ed5 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -20,62 +20,33 @@
 #include <config_features.h>
 
 #include <ViewShell.hxx>
-#include <GraphicViewShell.hxx>
-#include <GraphicViewShellBase.hxx>
+#include <ViewShellBase.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <svtools/strings.hrc>
-#include <com/sun/star/lang/Locale.hpp>
 #include <svtools/svtresid.hxx>
-#include <utility>
-#include <vector>
 
 #include <app.hrc>
 #include <strings.hrc>
 
-#include <sdabstdlg.hxx>
-
 #include <sal/log.hxx>
-#include <fupoor.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svx/svdopage.hxx>
-#include <sfx2/progress.hxx>
-#include <svx/svdobj.hxx>
 #include <sfx2/bindings.hxx>
-#include <svx/svdpagv.hxx>
-#include <svx/svdetc.hxx>
 #include <svx/svdundo.hxx>
-#include <editeng/outliner.hxx>
-#include <editeng/editstat.hxx>
-#include <tools/multisel.hxx>
 #include <svl/intitem.hxx>
 #include <svl/style.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <rtl/ustrbuf.hxx>
+#include <svl/stritem.hxx>
 #include <stlsheet.hxx>
-#include <WindowUpdater.hxx>
 #include <DrawViewShell.hxx>
-#include <OutlineViewShell.hxx>
-#include <drawview.hxx>
 
-#include <sdattr.hxx>
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
-#include <unoaprms.hxx>
-#include <sdundogr.hxx>
-#include <Window.hxx>
 #include <DrawDocShell.hxx>
-#include <FrameView.hxx>
-#include <framework/FrameworkHelper.hxx>
-#include <optsitem.hxx>
 #include <sdresid.hxx>
 #include <unokywds.hxx>
-#include <undo/undomanager.hxx>
 
 #include <svx/svxids.hrc>
 #include <sfx2/request.hxx>
-#include <sfx2/templdlg.hxx>
-#include <svl/aeitem.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sberrors.hxx>
 #include <xmloff/autolayout.hxx>
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index af87a87d271b..d2101ec67f3e 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -22,7 +22,6 @@
 #include <ViewShellImplementation.hxx>
 #include <createtableobjectbar.hxx>
 
-#include <com/sun/star/embed/EmbedStates.hpp>
 #include <ViewShellBase.hxx>
 #include <ShellFactory.hxx>
 #include <DrawController.hxx>
@@ -39,21 +38,18 @@
 #include <svx/svxids.hrc>
 #include <svx/fmshell.hxx>
 #include <WindowUpdater.hxx>
-#include <GraphicViewShell.hxx>
-#include <sfx2/childwin.hxx>
 #include <sdxfer.hxx>
 
 #include <app.hrc>
 
 #include <OutlineView.hxx>
-#include <Client.hxx>
+#include <DrawViewShell.hxx>
 #include <DrawDocShell.hxx>
 #include <slideshow.hxx>
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
 #include <zoomlist.hxx>
 #include <FrameView.hxx>
-#include <optsitem.hxx>
 #include <BezierObjectBar.hxx>
 #include <TextObjectBar.hxx>
 #include <GraphicObjectBar.hxx>
@@ -62,11 +58,9 @@
 #include <SlideSorterViewShell.hxx>
 #include <ViewShellManager.hxx>
 #include <FormShellManager.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
 #include <svx/svdoutl.hxx>
-#include <tools/diagnose_ex.h>
 #include <tools/svborder.hxx>
 #include <comphelper/lok.hxx>
 
diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx
index fe2fffbb1b70..2d09926c2558 100644
--- a/sd/source/ui/view/zoomlist.cxx
+++ b/sd/source/ui/view/zoomlist.cxx
@@ -22,7 +22,6 @@
 #include <svx/svxids.hrc>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/viewsh.hxx>
 
 #include <ViewShell.hxx>