tdf#42949 Fix IWYU warnings in sd/source/ui/d*/*cxx

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

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

52 files changed, 65 insertions, 268 deletions

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index dc21a4cb683a..b1c320db4a4c 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -88,6 +88,13 @@ blacklist:
     sd/source/ui/app/sdmod.cxx:
     # Needed to inherit linker visibility from SdResId declaration
     - sdresid.hxx
+    sd/source/ui/dlg/headerfooterdlg.cxx:
+    # Needed for unique_ptr type
+    - editeng/outlobj.hxx
+    sd/source/ui/dlg/prntopts.cxx:
+    # Needed on MACOSX
+    - svl/intitem.hxx
+    - app.hrc
     sd/source/ui/framework/configuration/ConfigurationTracer.hxx:
     # Needed for css shortcut
     - sal/types.h
diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx
index fac4329c9262..2f221fc9ef3e 100644
--- a/sd/source/ui/dlg/AnimationChildWindow.cxx
+++ b/sd/source/ui/dlg/AnimationChildWindow.cxx
@@ -21,9 +21,7 @@
 
 #include <app.hrc>
 #include <animobjs.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/childwin.hxx>
-#include <sfx2/dockwin.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index 59aca5f9c99b..8309aff19094 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -24,14 +24,11 @@
 #include <vcl/weld.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <sdattr.hxx>
-#include <sdmod.hxx>
 #include <helpids.h>
 #include <app.hrc>
 #include <strings.hrc>
 
 #include <DrawViewShell.hxx>
-#include <Window.hxx>
 #include <View.hxx>
 #include <drawdoc.hxx>
 #include <sdresid.hxx>
diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx
index 2daabfb4cab2..2af28a0bfd44 100644
--- a/sd/source/ui/dlg/NavigatorChildWindow.cxx
+++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx
@@ -20,7 +20,6 @@
 #include <NavigatorChildWindow.hxx>
 #include <navigatr.hxx>
 #include <app.hrc>
-#include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/navigat.hxx>
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index 7a22c968174a..d4d4bab39d5d 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -25,11 +25,9 @@
 #include <strings.hrc>
 #include <sdresid.hxx>
 
-#include <sfx2/app.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include <tools/diagnose_ex.h>
 
 namespace sd {
 
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx
index f86374b9f9da..d2d5e4a70a71 100644
--- a/sd/source/ui/dlg/PaneDockingWindow.cxx
+++ b/sd/source/ui/dlg/PaneDockingWindow.cxx
@@ -18,15 +18,11 @@
  */
 
 #include <PaneDockingWindow.hxx>
-#include <Window.hxx>
 #include <ViewShellBase.hxx>
 #include <framework/FrameworkHelper.hxx>
 
 #include <sfx2/dispatch.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/taskpanelist.hxx>
 #include <vcl/splitwin.hxx>
-#include <vcl/svapp.hxx>
 #include <tools/wintypes.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 094aa8e1e97b..8c8f33407416 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -11,27 +11,21 @@
 #include <comphelper/processfactory.hxx>
 #include <svl/itemset.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-#include <com/sun/star/text/XText.hpp>
 
 #include <sfx2/filedlghelper.hxx>
 #include <tools/urlobj.hxx>
 
 #include <sal/log.hxx>
 #include <unotools/pathoptions.hxx>
-#include <unotools/useroptions.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <officecfg/Office/Impress.hxx>
-#include <svx/svdview.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <svx/unoshape.hxx>
 #include <svx/xfltrit.hxx>
-#include <svx/xfillit.hxx>
+#include <svx/xflclit.hxx>
 #include <tools/diagnose_ex.h>
 #include <xmloff/autolayout.hxx>
 
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index 836acc6c98c3..2298d4a243fd 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -7,9 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <sdattr.hxx>
-#include <cusshow.hxx>
-
 #include "RemoteDialog.hxx"
 #include <RemoteServer.hxx>
 
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 10cb9b687372..3e976b90c6dd 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -24,9 +24,6 @@
 #include "RemoteDialogClientBox.hxx"
 #include <RemoteServer.hxx>
 
-#include <com/sun/star/i18n/CollatorOptions.hpp>
-#include <com/sun/star/deployment/DependencyException.hpp>
-#include <com/sun/star/deployment/DeploymentException.hpp>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index 78664e516151..beab37d8543e 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -25,10 +25,6 @@
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
 
-#include <cppuhelper/implbase.hxx>
-
-#include <com/sun/star/lang/XEventListener.hpp>
-
 #include <memory>
 
 namespace sd {
@@ -58,7 +54,6 @@ struct ClientBoxEntry
 };
 
 // class ExtensionBox_Impl
-class ClientBox;
 
 class ClientBox : public Control
 {
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index 1d9acfbd5b19..14e53a6b6fa2 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -22,13 +22,9 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/documentconstants.hxx>
 
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <sfx2/doctempl.hxx>
 #include <com/sun/star/frame/DocumentTemplates.hpp>
 #include <com/sun/star/frame/XDocumentTemplates.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 2d55f0a3d7f0..8b26299b78ad 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -17,12 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/xoutbmp.hxx>
 #include <time.h>
 #include <svl/eitem.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
-#include <sfx2/basedlgs.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/progress.hxx>
 #include <vcl/svapp.hxx>
@@ -44,7 +42,6 @@
 
 #include <EffectMigration.hxx>
 
-#include <string>
 #include <algorithm>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx
index dda1db947d9e..3dc8820b832c 100644
--- a/sd/source/ui/dlg/assclass.cxx
+++ b/sd/source/ui/dlg/assclass.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <tools/debug.hxx>
-#include <vcl/ctrl.hxx>
+#include <vcl/window.hxx>
 
 #include <assclass.hxx>
 
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index a34a445d0932..f0c14e065f2c 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -20,14 +20,11 @@
 #include <BreakDlg.hxx>
 #include <sfx2/progress.hxx>
 
-#include <svx/svdedtv.hxx>
 #include <svx/svdetc.hxx>
-#include <sfx2/app.hxx>
 #include <vcl/weld.hxx>
+#include <vcl/svapp.hxx>
 
-#include <sdattr.hxx>
 #include <sdresid.hxx>
-#include <View.hxx>
 #include <drawview.hxx>
 #include <strings.hrc>
 #include <DrawDocShell.hxx>
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 9abcb751787f..4968f6bf7807 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -19,19 +19,13 @@
 
 #include <copydlg.hxx>
 #include <svx/colorbox.hxx>
-#include <svx/dlgutil.hxx>
 #include <sfx2/module.hxx>
 #include <svx/xcolit.hxx>
-#include <svx/xflclit.hxx>
-#include <svx/xdef.hxx>
-#include <svx/xfillit0.hxx>
-#include <svx/xenum.hxx>
 
-#include <sfx2/app.hxx>
 #include <unotools/viewoptions.hxx>
+#include <svtools/unitconv.hxx>
 
-#include <sdattr.hxx>
-
+#include <sdattr.hrc>
 #include <View.hxx>
 #include <drawdoc.hxx>
 
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index a56cd9bdcf0a..b18a6e05e5d2 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -25,11 +25,9 @@
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
 #include <cusshow.hxx>
-#include <sdmod.hxx>
 #include <customshowlist.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/treelistentry.hxx>
 #include <unotools/charclass.hxx>
 #include <tools/debug.hxx>
 
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index 1c8e5f9902c7..db2c534e26f4 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -18,9 +18,7 @@
  */
 
 #include <svl/intitem.hxx>
-#include <svx/dialogs.hrc>
 
-#include <sdattr.hxx>
 #include <strings.hrc>
 
 #include <diactrl.hxx>
@@ -28,10 +26,6 @@
 #include <sdresid.hxx>
 #include <app.hrc>
 
-#include <sfx2/dispatch.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/app.hxx>
-
 using namespace ::com::sun::star;
 
 SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaPages,  SfxUInt16Item )
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index 298e0e69ae01..d2c349c30545 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -21,7 +21,7 @@
 #include <editeng/flstitem.hxx>
 #include <svx/flagsdef.hxx>
 #include <sfx2/objsh.hxx>
-#include <svx/svxdlg.hxx>
+#include <sfx2/sfxdlg.hxx>
 
 #include <dlg_char.hxx>
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 324429601d33..39d45022cca0 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -17,10 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/editeng.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
-#include <svl/zforlist.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <svl/itemset.hxx>
@@ -29,11 +27,9 @@
 #include <unotools/useroptions.hxx>
 
 #include <strings.hrc>
-#include <sdattr.hxx>
 #include <sdresid.hxx>
 #include <sdmod.hxx>
 #include <dlgfield.hxx>
-#include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
 
 /**
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index bbbc3fb24968..0ffad3c6c36c 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -21,15 +21,11 @@
 #include <OutlineBulletDlg.hxx>
 
 #include <svx/svxids.hrc>
-#include <sfx2/objsh.hxx>
-#include <svx/drawitem.hxx>
-#include <editeng/bulletitem.hxx>
 #include <editeng/eeitem.hxx>
 
 #include <editeng/numitem.hxx>
 
 #include <svx/dialogs.hrc>
-#include <svl/intitem.hxx>
 #include <svx/svdmark.hxx>
 #include <View.hxx>
 #include <svx/svdobj.hxx>
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index 97e03977ef1a..7eacc2c63256 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -21,14 +21,13 @@
 #include <svx/dialogs.hrc>
 #include <svx/drawitem.hxx>
 #include <i18nutil/paper.hxx>
+#include <sfx2/objsh.hxx>
+#include <sfx2/sfxdlg.hxx>
 
 #include <dlgpage.hxx>
 
-#include <DrawDocShell.hxx>
 #include <svl/aeitem.hxx>
 #include <svx/flagsdef.hxx>
-#include <svx/svxdlg.hxx>
-#include <editeng/svxenum.hxx>
 
 /**
  * Constructor of tab dialog: appends pages to the dialog
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index 2a579ef812f8..a101c6973241 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -18,11 +18,11 @@
  */
 
 #include <svx/svxids.hrc>
-#include <svx/dlgutil.hxx>
 #include <svl/itempool.hxx>
 #include <svl/aeitem.hxx>
+#include <svtools/unitconv.hxx>
 
-#include <sdattr.hxx>
+#include <sdattr.hrc>
 #include <View.hxx>
 #include <drawdoc.hxx>
 #include <dlgsnap.hxx>
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 3513f0e63621..dca7a4798402 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -17,33 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/animations/XAnimationNode.hpp>
 #include <slideshow.hxx>
-#include <sfx2/objsh.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/virdev.hxx>
-#include <fadedef.h>
 #include <vcl/ctrl.hxx>
-#include <vcl/builder.hxx>
 #include <vcl/settings.hxx>
-#include <svx/svdoutl.hxx>
-#include <svx/svdpagv.hxx>
-#include <svx/svdorect.hxx>
 
 #include <docprev.hxx>
-#include <drawdoc.hxx>
-#include <DrawDocShell.hxx>
 #include <ViewShell.hxx>
-#include <ViewShellBase.hxx>
-#include <drawview.hxx>
-#include <sdpage.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/builderfactory.hxx>
 
-using ::com::sun::star::drawing::XDrawPage;
-using ::com::sun::star::animations::XAnimationNode;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index ab9653fdc766..0ace03169023 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -20,19 +20,11 @@
 #include <config_features.h>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
+#include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
 #include <vcl/idle.hxx>
-#include <sal/types.h>
-#include <osl/thread.hxx>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -40,7 +32,6 @@
 #include <filedlg.hxx>
 #include <sdresid.hxx>
 #include <strings.hrc>
-#include <vcl/graphicfilter.hxx>
 #include <officecfg/Office/Impress.hxx>
 
 // -----------      SdFileDialog_Imp        ---------------------------
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 1ee97fbab057..26227ff9dfb7 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -17,15 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string>
-
-#include <svx/dialogs.hrc>
 #include <svx/svdglue.hxx>
 #include <svl/intitem.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
 #include <vcl/toolbox.hxx>
-#include <sfx2/viewfrm.hxx>
 
 #include <strings.hrc>
 #include <gluectrl.hxx>
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index b0bd74a4ea3d..b51ef75bb3c6 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -17,14 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/dialogs.hrc>
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/langitem.hxx>
-#include <editeng/outlobj.hxx>
 #include <svx/langbox.hxx>
 #include <svx/svdotext.hxx>
 #include <editeng/editeng.hxx>
+#include <editeng/outlobj.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <vcl/button.hxx>
@@ -44,9 +43,6 @@
 #include <tools/color.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svx/xlndsit.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/xlnclit.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/builderfactory.hxx>
 
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 02a012e7f9ac..162e2841ebc5 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <inspagob.hxx>
+#include <sdtreelb.hxx>
 
 #include <strings.hrc>
 
diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx
index 95d4e44a4898..881ed7b5bf36 100644
--- a/sd/source/ui/dlg/masterlayoutdlg.cxx
+++ b/sd/source/ui/dlg/masterlayoutdlg.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/dialogs.hrc>
-
 #include <masterlayoutdlg.hxx>
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index 434a57d7f034..ec751d414952 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -23,10 +23,8 @@
 #include <sdiocmpt.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xlineit0.hxx>
-#include <svx/xenum.hxx>
 #include <svx/svdobj.hxx>
 #include <svl/itemset.hxx>
-#include <svl/itempool.hxx>
 #include <com/sun/star/drawing/LineStyle.hpp>
 
 using namespace com::sun::star;
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 05666bfb8d97..f3170a445993 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -23,19 +23,14 @@
 #include <osl/file.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
-#include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svx/svxids.hrc>
 
 #include <vcl/menu.hxx>
-#include <vcl/settings.hxx>
 
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/dockwin.hxx>
 
 #include <pres.hxx>
 #include <navigatr.hxx>
@@ -49,7 +44,6 @@
 #include <sdresid.hxx>
 #include <ViewShell.hxx>
 #include <ViewShellBase.hxx>
-#include <DrawViewShell.hxx>
 #include <slideshow.hxx>
 #include <FrameView.hxx>
 #include <helpids.h>
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index feb8f507dcb9..7afe097a1336 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -23,12 +23,9 @@
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 
-#include <editeng/editdata.hxx>
 #include <svx/dialogs.hrc>
-#include <editeng/eeitem.hxx>
 #include <svx/flagsdef.hxx>
 
-#include <editeng/outliner.hxx>
 #include <paragr.hxx>
 #include <sdattr.hrc>
 
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 99b283d13116..244cfd218880 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -17,22 +17,19 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <svl/itemset.hxx>
 #include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/svapp.hxx>
 
-#include <sdattr.hxx>
+#include <sdattr.hrc>
 #include <present.hxx>
 #include <cusshow.hxx>
 #include <customshowlist.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::beans;
 
 SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs,
                                   const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList)
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 68f2faf5476c..84de9a186423 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -17,33 +17,25 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/outliner.hxx>
-
 #include <sal/log.hxx>
 #include <svx/dialogs.hrc>
-#include <svx/svxdlg.hxx>
 #include <editeng/flstitem.hxx>
 #include <svx/drawitem.hxx>
 #include <svl/style.hxx>
-#include <svx/tabline.hxx>
-#include <editeng/bulletitem.hxx>
+#include <svx/svdobj.hxx>
 #include <editeng/eeitem.hxx>
-#include <editeng/brushitem.hxx>
-#include <vcl/graph.hxx>
-#include <editeng/lrspitem.hxx>
 #include <editeng/numitem.hxx>
-#include <editeng/colritem.hxx>
 #include <svl/cjkoptions.hxx>
+#include <sfx2/objsh.hxx>
+#include <sfx2/sfxdlg.hxx>
 
-#include <DrawDocShell.hxx>
 #include <strings.hrc>
 #include <sdresid.hxx>
 #include <prltempl.hxx>
 #include <bulmaper.hxx>
 #include <svl/intitem.hxx>
-#include <svx/svxgrahicitem.hxx>
 #include <svx/flagsdef.hxx>
-#include <drawdoc.hxx>
+
 #define IS_OUTLINE(x) (x >= PO_OUTLINE_1 && x <= PO_OUTLINE_9)
 
 /**
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index ea553b13be7c..2c8131e28104 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -17,12 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sdattr.hxx>
+#include <sdattr.hrc>
 #include <optsitem.hxx>
 #include <prntopts.hxx>
 #include <app.hrc>
 #include <svl/intitem.hxx>
-#include <sfx2/request.hxx>
 
 /**
  *  dialog to adjust print options
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index 4b56b82c61fd..796f9c083bef 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
-
 #include <sdabstdlg.hxx>
 
 #include <osl/module.hxx>
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index c29066beca1f..0f8507b9a6dd 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -17,18 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/objsh.hxx>
 #include "sddlgfact.hxx"
 #include <BreakDlg.hxx>
 #include <copydlg.hxx>
-#include <svx/xtable.hxx>
 #include <custsdlg.hxx>
 #include <dlg_char.hxx>
 #include <dlgpage.hxx>
 #include <dlgfield.hxx>
 #include <dlgsnap.hxx>
 #include <layeroptionsdlg.hxx>
-#include <ins_paste.hxx>
 #include <inspagob.hxx>
 #include <morphdlg.hxx>
 #include <OutlineBulletDlg.hxx>
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 8f419d943036..b14705c519ee 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -23,6 +23,22 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/sfxdlg.hxx>
 
+#include <morphdlg.hxx>
+#include <copydlg.hxx>
+#include <BreakDlg.hxx>
+#include <headerfooterdlg.hxx>
+#include <masterlayoutdlg.hxx>
+#include <custsdlg.hxx>
+#include <layeroptionsdlg.hxx>
+#include <inspagob.hxx>
+#include <dlgfield.hxx>
+#include <sdpreslt.hxx>
+#include <prltempl.hxx>
+#include <pubdlg.hxx>
+#include <dlgsnap.hxx>
+#include <present.hxx>
+#include <vectdlg.hxx>
+
 #define DECL_ABSTDLG_BASE(Class,DialogClass)            \
     ScopedVclPtr<DialogClass> pDlg;                     \
 public:                                                 \
@@ -55,13 +71,13 @@ bool Class::StartExecuteAsync(AsyncContext &ctx) \
     return pDlg->StartExecuteAsync(ctx);            \
 }
 
-namespace sd {
-    class MorphDlg;
-    class CopyDlg;
-    class BreakDlg;
-    class HeaderFooterDialog;
-    class MasterLayoutDialog;
-}
+//namespace sd {
+//    class MorphDlg;
+//    class CopyDlg;
+//    class BreakDlg;
+//    class HeaderFooterDialog;
+//    class MasterLayoutDialog;
+//}
 
 class SdVclAbstractDialog_Impl : public VclAbstractDialog
 {
@@ -110,7 +126,6 @@ public:
     virtual void    GetAttr( SfxItemSet& rOutAttrs ) override;
 };
 
-class SdCustomShowDlg;
 class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg
 {
 private:
@@ -161,7 +176,6 @@ public:
     virtual void        SetText( const OUString& rStr ) override;
 };
 
-class SdPresLayoutTemplateDlg;
 class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog
 {
     std::shared_ptr<SdPresLayoutTemplateDlg> m_xDlg;
@@ -180,7 +194,6 @@ public:
     virtual void        SetText( const OUString& rStr ) override;
 };
 
-class SdModifyFieldDlg;
 class AbstractSdModifyFieldDlg_Impl : public AbstractSdModifyFieldDlg
 {
 private:
@@ -195,7 +208,6 @@ public:
     virtual SfxItemSet          GetItemSet() override;
 };
 
-class SdSnapLineDlg;
 class AbstractSdSnapLineDlg_Impl : public AbstractSdSnapLineDlg
 {
 private:
@@ -214,7 +226,6 @@ public:
     virtual void    SetText( const OUString& rStr ) override;
 };
 
-class SdInsertLayerDlg;
 class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg
 {
 private:
@@ -230,7 +241,6 @@ public:
     virtual void    SetHelpId( const OString& rHelpId ) override ;
 };
 
-class SdInsertPagesObjsDlg;
 class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg
 {
 private:
@@ -262,7 +272,6 @@ public:
     virtual bool            IsOrientationFade() const override ;
 };
 
-class SdStartPresentationDlg;
 class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg
 {
 private:
@@ -276,7 +285,6 @@ public:
     virtual void    GetAttr( SfxItemSet& rOutAttrs ) override;
 };
 
-class SdPresLayoutDlg;
 class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg
 {
 private:
@@ -304,7 +312,6 @@ public:
     virtual void    SetText( const OUString& rStr ) override;
 };
 
-class SdVectorizeDlg;
 class AbstractSdVectorizeDlg_Impl :public AbstractSdVectorizeDlg
 {
 private:
@@ -318,7 +325,6 @@ public:
     virtual const GDIMetaFile&  GetGDIMetaFile() const override ;
 };
 
-class SdPublishingDlg;
 class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg
 {
     DECL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl,SdPublishingDlg)
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 5482bb3f1719..11ed552099dc 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -18,14 +18,17 @@
  */
 
 #include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/new.hxx>
 #include <svtools/valueset.hxx>
+#include <tools/debug.hxx>
 
 #include <strings.hrc>
 
 #include <bitmaps.hlst>
 #include <sdpreslt.hxx>
-#include <sdattr.hxx>
+#include <sdattr.hrc>
 #include <sdresid.hxx>
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 499dc866cbb8..ff1de866826c 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -20,20 +20,16 @@
 #include <sal/types.h>
 #include <sal/log.hxx>
 #include <sot/formats.hxx>
-#include <sot/storage.hxx>
 #include <vcl/weld.hxx>
-#include <svl/urihelper.hxx>
 #include <svx/svditer.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/svdoole2.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/builderfactory.hxx>
 #include <cusshow.hxx>
-#include <sfx2/childwin.hxx>
 
 #include <sfx2/viewfrm.hxx>
 
-#include <strmname.h>
 #include <sdtreelb.hxx>
 #include <DrawDocShell.hxx>
 #include <drawdoc.hxx>
diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx
index d5e97ad4154d..14a4351ba06b 100644
--- a/sd/source/ui/dlg/sduiexp.cxx
+++ b/sd/source/ui/dlg/sduiexp.cxx
@@ -18,21 +18,8 @@
  */
 
 #include "sddlgfact.hxx"
-#include <morphdlg.hxx>
-#include <present.hxx>
-#include <inspagob.hxx>
-#include <vectdlg.hxx>
-#include <sdpreslt.hxx>
-#include <headerfooterdlg.hxx>
-#include <pubdlg.hxx>
-#include <ins_paste.hxx>
-#include <layeroptionsdlg.hxx>
-#include <dlgsnap.hxx>
-#include <dlgfield.hxx>
-#include <prltempl.hxx>
-#include <custsdlg.hxx>
-#include <copydlg.hxx>
 #include <sal/types.h>
+
 class SdAbstractDialogFactory;
 
 extern "C"
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index 9edd2d5a9207..a730fb91c8de 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -24,23 +24,13 @@
 #include <svx/drawitem.hxx>
 #include <svl/intitem.hxx>
 #include <svx/ofaitem.hxx>
-#include <svx/svdmark.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/svdview.hxx>
-#include <svx/svxgrahicitem.hxx>
 #include <svl/cjkoptions.hxx>
-
+#include <sfx2/objsh.hxx>
 #include <svx/dialogs.hrc>
-
-#include <svx/svxdlg.hxx>
-#include <svx/tabline.hxx>
 #include <svl/style.hxx>
-#include <svx/xtable.hxx>
 
-#include <DrawDocShell.hxx>
 #include <tabtempl.hxx>
-#include <dlg_char.hxx>
-#include <paragr.hxx>
 #include <svx/flagsdef.hxx>
 
 /**
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index a349767a1858..c581fc3d15e1 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -26,27 +26,18 @@
 #include <com/sun/star/embed/VerbAttributes.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
-#include <sdattr.hxx>
+#include <sdattr.hrc>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/strings.hrc>
 
 #include <vcl/waitobj.hxx>
-#include <osl/file.hxx>
 #include <sfx2/app.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svx/svdograf.hxx>
-#include <svx/svdpagv.hxx>
-#include <unotools/localfilehelper.hxx>
 #include <svl/aeitem.hxx>
-#include <editeng/colritem.hxx>
 #include <svx/svdoole2.hxx>
 #include <sfx2/docfile.hxx>
-#include <sot/storage.hxx>
-#include <basic/sbmeth.hxx>
-#include <basic/sbmod.hxx>
-#include <basic/sbstar.hxx>
 #include <svx/xtable.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/lstbox.hxx>
 #include <svl/urihelper.hxx>
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 406c8552d42d..71f7017e0154 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -18,30 +18,25 @@
  */
 
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <sfx2/module.hxx>
-#include <sfx2/app.hxx>
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
 #include <svx/strarray.hxx>
-#include <svx/dlgutil.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+#include <svtools/unitconv.hxx>
 
-#include <sdattr.hxx>
+#include <sdattr.hrc>
 #include <sdresid.hxx>
 #include <optsitem.hxx>
 #include <tpoption.hxx>
 #include <strings.hrc>
 #include <app.hrc>
 #include <svl/intitem.hxx>
-#include <sfx2/request.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 27fd59ef2ebd..bcb12f0d807f 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <vcl/vclenum.hxx>
-#include <vcl/wrkwin.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/BitmapSimpleColorQuantizationFilter.hxx>
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 224c7f2aeb50..fac60d97e850 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -21,21 +21,17 @@
 #include <DrawDocShell.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
 
 #include <helpids.h>
 #include <ViewShell.hxx>
-#include <drawview.hxx>
 #include <FrameView.hxx>
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
-#include <View.hxx>
 #include <ClientView.hxx>
 #include <Window.hxx>
 #include <strings.hrc>
 
 #include <sdresid.hxx>
-#include <strmname.h>
 #include <fupoor.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index deb709850f45..009b264a033e 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -20,24 +20,16 @@
 #include <Window.hxx>
 #include <DrawDocShell.hxx>
 
-#include <app.hrc>
-
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
 
 #include <svx/ofaitem.hxx>
-#include <svx/svxerr.hxx>
 #include <svl/srchitem.hxx>
 #include <svl/languageoptions.hxx>
 #include <svtools/langtab.hxx>
-#include <svx/srchdlg.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <vcl/abstdlg.hxx>
-#include <vcl/window.hxx>
-#include <svl/style.hxx>
 #include <svx/drawitem.hxx>
-#include <editeng/unolingu.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/eeitem.hxx>
 #include <com/sun/star/i18n/TextConversionOption.hpp>
@@ -45,11 +37,8 @@
 
 #include <sdmod.hxx>
 #include <drawdoc.hxx>
-#include <sdpage.hxx>
-#include <sdattr.hxx>
 #include <fusearch.hxx>
 #include <ViewShell.hxx>
-#include <View.hxx>
 #include <slideshow.hxx>
 #include <fuhhconv.hxx>
 #include <memory>
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index f82bc11b165b..d86d94985adb 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -27,14 +27,11 @@
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
 #include <editeng/outlobj.hxx>
 #include <tools/urlobj.hxx>
-#include <sfx2/progress.hxx>
 #include <vcl/waitobj.hxx>
 #include <svx/svxids.hrc>
 #include <editeng/editeng.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/flstitem.hxx>
-#include <editeng/eeitem.hxx>
-#include <svl/aeitem.hxx>
 #include <svl/flagitem.hxx>
 #include <sot/storage.hxx>
 #include <sfx2/dinfdlg.hxx>
@@ -42,17 +39,11 @@
 #include <sfx2/docfilt.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdotext.hxx>
-#include <svl/style.hxx>
 #include <sfx2/printer.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svtools/sfxecode.hxx>
 #include <comphelper/classids.hxx>
 #include <sot/formats.hxx>
-#include <sfx2/request.hxx>
-#include <unotools/fltrcfg.hxx>
-#include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <unotools/saveopt.hxx>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
 
@@ -62,7 +53,7 @@
 #include <FrameView.hxx>
 #include <optsitem.hxx>
 #include <Outliner.hxx>
-#include <sdattr.hxx>
+#include <sdattr.hrc>
 #include <drawdoc.hxx>
 #include <ViewShell.hxx>
 #include <sdmod.hxx>
@@ -84,8 +75,6 @@
 #include <sdpdffilter.hxx>
 #include <framework/FrameworkHelper.hxx>
 
-#include <SdUnoDrawView.hxx>
-
 #include <sfx2/zoomitem.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 98bbda78ffaa..218fe6c9d6e4 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -20,13 +20,10 @@
 #include <DrawDocShell.hxx>
 
 #include <officecfg/Office/Common.hxx>
-#include <unotools/moduleoptions.hxx>
 #include <unotools/configmgr.hxx>
 
-#include <vcl/svapp.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/objface.hxx>
-#include <sfx2/request.hxx>
 #include <svx/svxids.hrc>
 #include <svl/srchitem.hxx>
 #include <svx/srchdlg.hxx>
@@ -36,36 +33,25 @@
 #include <editeng/eeitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include <svl/slstitm.hxx>
 #include <sfx2/printer.hxx>
-#include <sfx2/docfile.hxx>
 #include <svx/drawitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svl/whiter.hxx>
 #include <svl/itempool.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/langtab.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <comphelper/classids.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/visitem.hxx>
 
-#include <sfx2/fcontnr.hxx>
-
 #include <app.hrc>
 #include <sdmod.hxx>
-#include <strmname.h>
-#include <stlpool.hxx>
 #include <View.hxx>
 #include <drawdoc.hxx>
-#include <sdpage.hxx>
 
 #include <fupoor.hxx>
 #include <fusearch.hxx>
 #include <ViewShell.hxx>
-#include <slideshow.hxx>
-#include <drawview.hxx>
-#include <FrameView.hxx>
 #include <unomodel.hxx>
 #include <undo/undomanager.hxx>
 #include <undo/undofactory.hxx>
diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx
index 09f72bb40226..7dc8a7d6f615 100644
--- a/sd/source/ui/docshell/grdocsh.cxx
+++ b/sd/source/ui/docshell/grdocsh.cxx
@@ -18,19 +18,14 @@
  */
 
 #include <svx/svxids.hrc>
-#include <sfx2/app.hxx>
-#include <sfx2/request.hxx>
-#include <svl/srchitem.hxx>
 #include <tools/globname.hxx>
 
 #include <comphelper/classids.hxx>
 
 #include <sfx2/objface.hxx>
 
-#include <app.hrc>
 #include <GraphicDocShell.hxx>
 #include <DrawDocShell.hxx>
-#include <drawdoc.hxx>
 
 using namespace sd;
 #define ShellClass_GraphicDocShell
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index 07a8c0e4326c..11a0eaa3deb7 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -18,15 +18,10 @@
  */
 
 #include <Client.hxx>
-#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <svx/svdoole2.hxx>
-#include <svx/svdograf.hxx>
-#include <svx/svdpagv.hxx>
 
 #include <ViewShell.hxx>
-#include <DrawViewShell.hxx>
 #include <View.hxx>
-#include <Window.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace com::sun::star;
diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx
index e31122b15232..425980093027 100644
--- a/sd/source/ui/inc/inspagob.hxx
+++ b/sd/source/ui/inc/inspagob.hxx
@@ -21,9 +21,10 @@
 #define INCLUDED_SD_SOURCE_UI_INC_INSPAGOB_HXX
 
 #include <vcl/weld.hxx>
-#include "sdtreelb.hxx"
 
 class SdDrawDocument;
+class SdPageObjsTLV;
+class SfxMedium;
 
 class SdInsertPagesObjsDlg : public weld::GenericDialogController
 {
diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx
index 365bbefc5461..7c30676927f4 100644
--- a/sd/source/ui/inc/morphdlg.hxx
+++ b/sd/source/ui/inc/morphdlg.hxx
@@ -45,8 +45,8 @@ private:
     void            LoadSettings();
 };
 
-#endif
-
 } // end of namespace sd
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */