tdf#42949 Fix IWYU warnings in sd/source/ui/inc/[n-s]*hxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Also a bit of fallout management overreaching into
include/

Change-Id: I99bd4527ecf34e5193602f0e9dcb33b504e8c9e1
Reviewed-on: https://gerrit.libreoffice.org/58808
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

55 files changed, 71 insertions, 74 deletions

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 963b62da4088..75705e2b5156 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -121,3 +121,10 @@ blacklist:
     sd/source/ui/inc/fupage.hxx:
     # base class has to be a complete type
     - vcl/weld.hxx
+    sd/source/ui/inc/OutlineView.hxx:
+    #std::unique_ptr deleter type has to be complete
+    - o3tl/deleter.hxx
+    sd/source/ui/inc/slideshow.hxx:
+    # typedef needs a complete type
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/presentation/XPresentation2.hpp
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index bdf47e2ff488..9b002537a849 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -40,6 +40,8 @@
 #include <Window.hxx>
 #include <ViewShell.hxx>
 #include <OutlineViewShell.hxx>
+#include <DrawDocShell.hxx>
+#include <OutlineView.hxx>
 #include <View.hxx>
 #include <AccessibleOutlineView.hxx>
 #include <AccessibleOutlineEditSource.hxx>
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index b1b49d649000..f7a01f67643b 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -34,6 +34,7 @@
 #include <strings.hrc>
 #include <DrawController.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <EventMultiplexer.hxx>
 
 #include <sal/log.hxx>
 #include <svtools/controldims.hxx>
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index a575c6ad7639..7bc2370302ab 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -53,6 +53,7 @@
 #include <assclass.hxx>
 #include <sdenumdef.hxx>
 #include <sdresid.hxx>
+#include <OutlineView.hxx>
 #include <OutlineViewShell.hxx>
 #include <ViewShellBase.hxx>
 #include <FrameView.hxx>
diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx
index 83d8d38c8c8e..446a82ab5f9f 100644
--- a/sd/source/ui/dlg/masterlayoutdlg.cxx
+++ b/sd/source/ui/dlg/masterlayoutdlg.cxx
@@ -21,6 +21,7 @@
 
 #include <masterlayoutdlg.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 
 using namespace ::sd;
 
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 288e0b15c9df..cfe41f9d940c 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -75,6 +75,7 @@
 #include <DrawViewShell.hxx>
 #include <ViewShellBase.hxx>
 #include <Window.hxx>
+#include <OutlineView.hxx>
 #include <OutlineViewShell.hxx>
 #include <sdxmlwrp.hxx>
 #include <sdpptwrp.hxx>
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index ea854db7de37..606f38c0b94f 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -23,6 +23,7 @@
 #include <editeng/eeitem.hxx>
 #include <svl/poolitem.hxx>
 #include <editeng/fontitem.hxx>
+#include <OutlineView.hxx>
 #include <OutlineViewShell.hxx>
 #include <DrawViewShell.hxx>
 #include <ViewShellBase.hxx>
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index aeedf65ff0fd..95882960479c 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -56,6 +56,7 @@
 #include <strmname.h>
 #include <ViewShellBase.hxx>
 #include <DrawViewShell.hxx>
+#include <OutlineView.hxx>
 #include <OutlineViewShell.hxx>
 #include <DrawDocShell.hxx>
 #include <GraphicDocShell.hxx>
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index ee657c01e5c8..d0737a420641 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -30,6 +30,7 @@
 #include <svx/svxids.hrc>
 #include <OutlineView.hxx>
 #include <OutlineViewShell.hxx>
+#include <DrawDocShell.hxx>
 #include <DrawViewShell.hxx>
 #include <Window.hxx>
 #include <drawdoc.hxx>
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index c9e81ec38c44..e66471390533 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -29,6 +29,8 @@
 
 #include <drawdoc.hxx>
 #include <sfx2/sfxdlg.hxx>
+#include <DrawDocShell.hxx>
+#include <OutlineView.hxx>
 #include <OutlineViewShell.hxx>
 #include <ViewShell.hxx>
 #include <Window.hxx>
diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx
index 741d3ba439bc..c0e0c95ff461 100644
--- a/sd/source/ui/func/fusearch.cxx
+++ b/sd/source/ui/func/fusearch.cxx
@@ -32,6 +32,7 @@
 #include <sdmod.hxx>
 #include <View.hxx>
 #include <Outliner.hxx>
+#include <DrawDocShell.hxx>
 #include <DrawViewShell.hxx>
 #include <OutlineViewShell.hxx>
 #include <ViewShellBase.hxx>
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 3b70f0513bc9..534939dbb30a 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -62,6 +62,7 @@
 #include <prlayout.hxx>
 #include <svx/xfillit.hxx>
 #include <sdresid.hxx>
+#include <OutlineView.hxx>
 #include <OutlineViewShell.hxx>
 #include <helpids.h>
 #include <sdabstdlg.hxx>
diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index f73db7239c86..42ece6d72640 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -22,10 +22,11 @@
 
 #include <rtl/ustring.hxx>
 #include "tools/SdGlobalResourceContainer.hxx"
-#include <osl/mutex.hxx>
 #include <memory>
 #include <set>
 
+namespace osl { class Mutex; }
+
 class SdDrawDocument;
 
 namespace sd {
diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx
index 70d42b6ea19d..8a2b26967c52 100644
--- a/sd/source/ui/inc/MediaObjectBar.hxx
+++ b/sd/source/ui/inc/MediaObjectBar.hxx
@@ -20,10 +20,14 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_MEDIAOBJECTBAR_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_MEDIAOBJECTBAR_HXX
 
-#include <sfx2/module.hxx>
 #include <sfx2/shell.hxx>
 #include <glob.hxx>
 
+class SfxInterface;
+class SfxItemSet;
+class SfxModule;
+class SfxRequest;
+
 namespace sd {
 
 class View;
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index c22b782a6407..37194258634f 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -28,11 +28,8 @@
 
 class SdPage;
 class SdrPage;
-class Paragraph;
 class SdrTextObj;
-class Outliner;
 class SfxProgress;
-struct PaintFirstLineInfo;
 struct PasteOrDropInfos;
 class EditView;
 
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index de8927022c55..1ed13bbb7025 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_OUTLINEVIEWSHELL_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_OUTLINEVIEWSHELL_HXX
 
-#include "DrawDocShell.hxx"
 #include "ViewShell.hxx"
-#include "OutlineView.hxx"
 
 class SdPage;
 class TransferableDataHelper;
 class TransferableClipboardListener;
 
+namespace sd { class OutlineView; }
+
 namespace sd {
 
 /** Show a textual overview of the text contents of all slides.
diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
index 7d71cb17a0c4..0181b5ac0c75 100644
--- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx
+++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_OUTLINERITERATORIMPL_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_OUTLINERITERATORIMPL_HXX
 
-#include <svx/svdobj.hxx>
 #include <OutlinerIterator.hxx>
 #include <memory>
 
@@ -34,8 +33,6 @@ class ViewShell;
 
 namespace outliner {
 
-class IteratorImplBase;
-
 /** Base class for the polymorphic implementation class of the
     <type>Iterator</type> class.  The iterators based on this class are
     basically uni directional iterators.  Their direction can, however, be
diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx
index a0dd38b82e0d..e4912b341ee1 100644
--- a/sd/source/ui/inc/PaneDockingWindow.hxx
+++ b/sd/source/ui/inc/PaneDockingWindow.hxx
@@ -21,11 +21,6 @@
 #define INCLUDED_SD_SOURCE_UI_INC_PANEDOCKINGWINDOW_HXX
 
 #include <sfx2/titledockwin.hxx>
-#include <sfx2/viewfrm.hxx>
-
-#include <memory>
-
-class SplitWindow;
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx
index 9bf190e52954..ae33b2009f53 100644
--- a/sd/source/ui/inc/PaneShells.hxx
+++ b/sd/source/ui/inc/PaneShells.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_PANESHELLS_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_PANESHELLS_HXX
 
-#include <sfx2/module.hxx>
 #include <sfx2/shell.hxx>
 #include <glob.hxx>
 
diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx
index 5ac928ee905f..88f3ab4de1b8 100644
--- a/sd/source/ui/inc/PreviewRenderer.hxx
+++ b/sd/source/ui/inc/PreviewRenderer.hxx
@@ -20,13 +20,11 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_PREVIEWRENDERER_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_PREVIEWRENDERER_HXX
 
-#include "drawview.hxx"
 #include <vcl/image.hxx>
-#include <vcl/virdev.hxx>
-#include <svl/listener.hxx>
 #include <memory>
 
-class OutputDevice;
+#include <svl/lstner.hxx>
+
 class SdPage;
 class VirtualDevice;
 
diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx
index 79cdd024ccdd..4b6be214dde4 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -10,24 +10,18 @@
 #define INCLUDED_SD_SOURCE_UI_INC_REMOTESERVER_HXX
 
 // SERVER
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef _WIN32
-#include <unistd.h>
-#endif
-#include <sys/types.h>
 #include <memory>
 #include <vector>
 
-#include <osl/mutex.hxx>
-#include <osl/socket.hxx>
-#include <rtl/ref.hxx>
+#include <osl/socket_decl.hxx>
 #include <salhelper/thread.hxx>
 
-#include <com/sun/star/presentation/XSlideShowController.hpp>
-
 #include <sddllapi.h>
 
+namespace osl { class Mutex; }
+namespace com { namespace sun { namespace star { namespace presentation { class XSlideShowController; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+
 /**
 * The port for use for the main communication between LibO and remote control app.
 */
@@ -38,7 +32,6 @@
 namespace sd
 {
     class Communicator;
-    class BufferedStreamSocket;
 
     struct ClientInfo
     {
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index 9dbd1a9a3fb7..d06519a40d00 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SD_SOURCE_UI_INC_SDUNODRAWVIEW_HXX
 
 #include "DrawSubController.hxx"
-#include "DrawViewShell.hxx"
 #include <cppuhelper/basemutex.hxx>
 
 class SdXImpressDocument;
@@ -33,6 +32,7 @@ class XLayer;
 namespace sd {
 
 class DrawViewShell;
+class View;
 
 /** This class implements the DrawViewShell specific part of the controller.
 */
diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx
index a4d0fa746b59..8cc47b987a2d 100644
--- a/sd/source/ui/inc/SdUnoOutlineView.hxx
+++ b/sd/source/ui/inc/SdUnoOutlineView.hxx
@@ -22,7 +22,6 @@
 
 #include "DrawSubController.hxx"
 #include <cppuhelper/basemutex.hxx>
-#include <com/sun/star/lang/EventObject.hpp>
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx
index 3c7621de31b8..d0dfe14ac25c 100644
--- a/sd/source/ui/inc/SdUnoSlideView.hxx
+++ b/sd/source/ui/inc/SdUnoSlideView.hxx
@@ -22,11 +22,11 @@
 
 #include "DrawSubController.hxx"
 #include <cppuhelper/basemutex.hxx>
-#include <com/sun/star/drawing/XDrawPage.hpp>
 
 namespace sd { namespace slidesorter {
 class SlideSorter;
 } }
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/ShellFactory.hxx b/sd/source/ui/inc/ShellFactory.hxx
index 4681df0e6b23..42f0b8d9e6f2 100644
--- a/sd/source/ui/inc/ShellFactory.hxx
+++ b/sd/source/ui/inc/ShellFactory.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_SHELLFACTORY_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_SHELLFACTORY_HXX
 
-#include <sal/types.h>
 #include <sfx2/toolbarids.hxx>
 
 namespace vcl { class Window; }
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 1d58f574ccea..9ae38c845a14 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -20,23 +20,20 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_SLIDESORTER_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_SLIDESORTER_HXX
 
-#include "fupoor.hxx"
-#include "Window.hxx"
-#include <com/sun/star/frame/XController.hpp>
 #include <cppuhelper/weakref.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <vcl/scrbar.hxx>
 #include <sddllapi.h>
 #include <memory>
 
-class ScrollBar;
-class ScrollBarBox;
 namespace vcl { class Window; }
+namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace rtl { template <class reference_type> class Reference; }
 
 namespace sd {
 class ViewShell;
 class ViewShellBase;
 class Window;
+class FuPoor;
 }
 
 namespace sd { namespace slidesorter { namespace model {
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 29baec79a8e7..196134a32974 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -23,7 +23,6 @@
 #include "ViewShell.hxx"
 #include <glob.hxx>
 #include <sfx2/shell.hxx>
-#include <sfx2/viewfac.hxx>
 #include <sddllapi.h>
 #include <memory>
 #include <vector>
diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx
index f3cdb048ba18..e584501e921b 100644
--- a/sd/source/ui/inc/SlideTransitionPane.hxx
+++ b/sd/source/ui/inc/SlideTransitionPane.hxx
@@ -19,27 +19,24 @@
 #ifndef INCLUDED_SD_SOURCE_UI_ANIMATIONS_SLIDETRANSITIONPANE_HXX
 #define INCLUDED_SD_SOURCE_UI_ANIMATIONS_SLIDETRANSITIONPANE_HXX
 
-#include "EventMultiplexer.hxx"
-
 #include "SlideSorterViewShell.hxx"
-#include <TransitionPreset.hxx>
 
-#include <vcl/ctrl.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
 #include <svtools/valueset.hxx>
 #include <svx/sidebar/PanelLayout.hxx>
-#include <sfx2/sidebar/ControlFactory.hxx>
-#include <com/sun/star/drawing/XDrawView.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 
 #include <vector>
 #include <map>
 
 class SdDrawDocument;
 
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawView; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace sd { namespace tools { class EventMultiplexerEvent; } }
+
 namespace sd
 {
 
diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx
index 6bd9dcfd4fad..4b956c5c29c0 100644
--- a/sd/source/ui/inc/masterlayoutdlg.hxx
+++ b/sd/source/ui/inc/masterlayoutdlg.hxx
@@ -21,9 +21,10 @@
 
 #include <vcl/weld.hxx>
 
-#include <sdpage.hxx>
+#include <pres.hxx>
 
 class SdDrawDocument;
+class SdPage;
 
 namespace sd
 {
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index a66e66878df0..3febf4d9eaed 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_NAVIGATR_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_NAVIGATR_HXX
 
-#include <vcl/window.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/toolbox.hxx>
 #include <sfx2/ctrlitem.hxx>
@@ -29,6 +28,8 @@
 #include <pres.hxx>
 
 // forward
+namespace vcl { class Window; }
+
 namespace sd {
 class DrawDocShell;
 class NavigatorChildWindow;
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 18e836a71e16..7c62ab57e957 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -22,10 +22,7 @@
 
 #include <unotools/configitem.hxx>
 #include <sfx2/module.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <svx/optgrid.hxx>
-#include <svx/dlgutil.hxx>
 #include <sddllapi.h>
 #include <memory>
 
diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx
index 85f09e92a9e4..b147b54606d5 100644
--- a/sd/source/ui/inc/present.hxx
+++ b/sd/source/ui/inc/present.hxx
@@ -23,7 +23,6 @@
 #include <vcl/weld.hxx>
 
 class SfxItemSet;
-class List;
 class SdCustomShowList;
 
 /**
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index 1f2c03eb7ffc..e86d5dc6469f 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SD_SOURCE_UI_INC_PRLTEMPL_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <svx/tabarea.hxx>
+#include <svx/xtable.hxx>
 
 #include <prlayout.hxx>
 
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index bf3074247f16..067a394a024b 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -20,13 +20,9 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_PRNTOPTS_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_PRNTOPTS_HXX
 
-#include <vcl/group.hxx>
-
 #include <vcl/button.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <vcl/fixed.hxx>
 
-class SdModule;
 class SdPrintOptions : public SfxTabPage
 {
  friend class SdModule;
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index 345c96de6908..72461301e64e 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -20,31 +20,27 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_PUBDLG_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_PUBDLG_HXX
 
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/fixed.hxx>
-#include <vcl/group.hxx>
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/layout.hxx>
-#include <resltn.hxx>
 #include <pres.hxx>
 #include "assclass.hxx"
 
 #include <memory>
 #include <vector>
 
-class FixedText;
-class RadioButton;
 class ListBox;
-class ComboBox;
 class Edit;
-class MultiLineEdit;
 class ValueSet;
 class SdHtmlAttrPreview;
 class SdPublishingDesign;
 class ButtonSet;
 
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+
 // *********************************************************************
 // Html-Export Autopilot
 // *********************************************************************
diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx
index a36351e41961..548b2c604aea 100644
--- a/sd/source/ui/inc/sdpreslt.hxx
+++ b/sd/source/ui/inc/sdpreslt.hxx
@@ -24,7 +24,6 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
 #include <svtools/valueset.hxx>
 
 class SfxItemSet;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index ccfc59d2e95e..fccba2ac93cf 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_SDTREELB_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_SDTREELB_HXX
 
-#include <svtools/transfer.hxx>
-
 #include <pres.hxx>
 #include <sddllapi.h>
 #include <svtools/treelistbox.hxx>
diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx
index 8df761007548..3f85edf49e40 100644
--- a/sd/source/ui/inc/sdundogr.hxx
+++ b/sd/source/ui/inc/sdundogr.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_SDUNDOGR_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_SDUNDOGR_HXX
 
-#include <tools/contnr.hxx>
 #include <sdundo.hxx>
 #include <sddllapi.h>
 
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index e50d4248d377..f3f4da1337d8 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SD_SOURCE_UI_INC_SDXFER_HXX
 
 #include <svtools/transfer.hxx>
-#include <vcl/graph.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/lstner.hxx>
 
diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx
index 98e13f88f687..d5ec7fa79eae 100644
--- a/sd/source/ui/inc/smarttag.hxx
+++ b/sd/source/ui/inc/smarttag.hxx
@@ -28,7 +28,6 @@
 
 class KeyEvent;
 class MouseEvent;
-class SdrHdlList;
 
 namespace sd {
 
diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
index 1bfcca069b49..c766054251fc 100644
--- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
@@ -23,6 +23,7 @@
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
 #include <PreviewRenderer.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/thumbnailview.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index fdbf1c3119cb..9990d9182746 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -33,6 +33,7 @@
 #include <controller/SlsTransferableData.hxx>
 #include <DrawDocShell.hxx>
 #include <drawdoc.hxx>
+#include <Window.hxx>
 #include <app.hrc>
 #include <sdtreelb.hxx>
 #include <sdmod.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
index 44e40a8c2240..fab565c07883 100644
--- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
@@ -27,6 +27,7 @@
 #include <controller/SlsAnimationFunction.hxx>
 #include <controller/SlsScrollBarManager.hxx>
 #include <controller/SlsCurrentSlideManager.hxx>
+#include <Window.hxx>
 
 namespace sd { namespace slidesorter { namespace controller {
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
index 3c9658a4f340..3f3b2ea24291 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
@@ -22,6 +22,7 @@
 
 #include <SlideSorter.hxx>
 #include <model/SlsSharedPageDescriptor.hxx>
+#include <vcl/timer.hxx>
 
 namespace sd { namespace slidesorter { namespace view {
 
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index e41f02760881..b53d8479a6b0 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -24,6 +24,7 @@
 #include <view/SlsLayouter.hxx>
 #include <model/SlideSorterModel.hxx>
 #include <model/SlsPageEnumerationProvider.hxx>
+#include <Window.hxx>
 
 #include <memory>
 #include <set>
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index 8c8988e5224a..5615003f89ec 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -32,6 +32,7 @@
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
 #include <sdmod.hxx>
+#include <Window.hxx>
 
 #include <vcl/virdev.hxx>
 #include <basegfx/range/b2drectangle.hxx>
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index c608c2cb5a9a..1ae2bd57e3b1 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "SlsLayeredDevice.hxx"
+#include <Window.hxx>
 
 #include <vcl/window.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 5d341e35ada1..d33f32a368c9 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -21,6 +21,7 @@
 #include <view/SlideSorterView.hxx>
 #include <view/SlsLayouter.hxx>
 #include <view/SlsTheme.hxx>
+#include <Window.hxx>
 #include <sdpage.hxx>
 #include <sdresid.hxx>
 #include <strings.hrc>
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 31c8afae0a8d..6dc303791f8f 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -45,6 +45,7 @@
 
 #include <optsitem.hxx>
 #include <sfx2/printer.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <sdattr.hxx>
 #include <sdmod.hxx>
 #include <ViewShell.hxx>
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 26f24bb3e583..ccfef3e9e8e1 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -36,6 +36,7 @@
 #include <Outliner.hxx>
 #include <OutlineViewShell.hxx>
 #include <SlideSorterViewShell.hxx>
+#include <DrawDocShell.hxx>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -56,6 +57,7 @@
 #include <vcl/weld.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <xmloff/autolayout.hxx>
+#include <sfx2/objsh.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 52d482b1a95f..f0513c0f16f1 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -56,6 +56,7 @@
 #include <Window.hxx>
 #include <sdresid.hxx>
 #include <DrawViewShell.hxx>
+#include <OutlineView.hxx>
 #include <OutlineViewShell.hxx>
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 80344d76b1d9..51d7938f86ed 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -54,6 +54,7 @@
 #include <app.hrc>
 
 #include <drawdoc.hxx>
+#include <DrawDocShell.hxx>
 #include <DrawViewShell.hxx>
 #include <OutlineViewShell.hxx>
 #include <ViewShellBase.hxx>
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index f20a0fdcc644..7526d58275e0 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -58,7 +58,9 @@
 #include <ViewShellBase.hxx>
 #include <sdabstdlg.hxx>
 #include <framework/FrameworkHelper.hxx>
+#include <DrawDocShell.hxx>
 #include <DrawViewShell.hxx>
+#include <OutlineView.hxx>
 #include <slideshow.hxx>
 #include <memory>
 
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index fd5178d01a02..54918ec30a42 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -83,6 +83,8 @@
 #include <ViewShellBase.hxx>
 #include <ViewShellManager.hxx>
 #include <DrawController.hxx>
+#include <DrawDocShell.hxx>
+#include <OutlineView.hxx>
 #include <framework/FrameworkHelper.hxx>
 
 #include <memory>
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index b807e2997bbb..74fa4fbc2ef0 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -31,6 +31,7 @@
 #include <app.hrc>
 #include <ViewShell.hxx>
 #include <DrawViewShell.hxx>
+#include <DrawDocShell.hxx>
 #include <PresentationViewShell.hxx>
 #include <View.hxx>
 #include <FrameView.hxx>