tdf#42949 Fix IWYU warnings in sd/source/ui/inc/{framework,tools,view}/*

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

Also a typo fix :)

Change-Id: I7c96e8459f6fb75b07f6447715e8165800ecba53
Reviewed-on: https://gerrit.libreoffice.org/62259
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index dbae85a..0e1203f 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -134,4 +134,55 @@ blacklist:
    - com/sun/star/drawing/framework/XTabBar.hpp
    - com/sun/star/drawing/framework/XToolBar.hpp
    - com/sun/star/lang/XUnoTunnel.hpp

    sd/source/ui/inc/framework/Configuration.hxx:
    # base class has to be a complete type
    - com/sun/star/container/XNamed.hpp
    - com/sun/star/drawing/framework/XConfiguration.hpp
    - com/sun/star/lang/XServiceInfo.hpp
    sd/source/ui/inc/framework/ConfigurationController.hxx:
    # base class has to be a complete type
    - com/sun/star/drawing/framework/XConfigurationController.hpp
    - com/sun/star/lang/XInitialization.hpp
    sd/source/ui/inc/framework/DrawModule.hxx:
    # Needed for css shortcut
    - sal/types.h
    sd/source/ui/inc/framework/ImpressModule.hxx:
    # Needed for css shortcut
    - sal/types.h
    sd/source/ui/inc/framework/ModuleController.hxx:
    # base class has to be a complete type
    - com/sun/star/drawing/framework/XModuleController.hpp
    - com/sun/star/lang/XInitialization.hpp
    sd/source/ui/inc/framework/Pane.hxx:
    # base class has to be a complete type
    - com/sun/star/drawing/framework/XPane.hpp
    - com/sun/star/drawing/framework/XPane2.hpp
    - com/sun/star/lang/XUnoTunnel.hpp
    sd/source/ui/inc/framework/PresentationModule.hxx:
    # Needed for css shortcut
    - sal/types.h
    sd/source/ui/inc/framework/PresentationFactory.hxx:
    # base class has to be a complete type
    - com/sun/star/drawing/framework/XResourceFactory.hpp
    - com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
    sd/source/ui/inc/framework/ResourceId.hxx:
    # base class has to be a complete type
    - com/sun/star/drawing/framework/XResourceId.hpp
    - com/sun/star/lang/XInitialization.hpp
    - com/sun/star/lang/XServiceInfo.hpp
    sd/source/ui/inc/framework/ViewShellWrapper.hxx:
    # base class has to be a complete type
    - com/sun/star/awt/XWindowListener.hpp
    - com/sun/star/drawing/framework/XRelocatableResource.hpp
    - com/sun/star/drawing/framework/XView.hpp
    - com/sun/star/lang/XUnoTunnel.hpp
    - com/sun/star/view/XSelectionSupplier.hpp
    sd/source/ui/inc/tools/IdleDetection.hxx:
    # Needed for template
    - o3tl/typed_flags_set.hxx
    sd/source/ui/inc/tools/PropertySet.hxx:
    # base class has to be a complete type
    - com/sun/star/beans/XPropertySet.hpp
    sd/source/ui/inc/tools/SlotStateListener.hxx:
    # base class has to be a complete type
    - com/sun/star/frame/XStatusListener.hpp
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 86729c8..1d9639c 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -21,6 +21,8 @@

#include <framework/FrameworkHelper.hxx>

#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp>
#include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.hpp>
#include <comphelper/sequence.hxx>
#include <facreg.hxx>
#include <sal/log.hxx>
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 762a3ff..eefe774 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -18,6 +18,9 @@
 */

#include <framework/ModuleController.hxx>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/container/XNameAccess.hpp>

#include <tools/ConfigurationAccess.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index 8bbef28..927cfbf4 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SD_SOURCE_UI_INC_MASTERPAGEOBSERVER_HXX

#include <rtl/ustring.hxx>
#include <tools/link.hxx>
#include "tools/SdGlobalResourceContainer.hxx"
#include <memory>
#include <set>
diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx
index 8ebb634..18b2eec 100644
--- a/sd/source/ui/inc/framework/Configuration.hxx
+++ b/sd/source/ui/inc/framework/Configuration.hxx
@@ -22,14 +22,15 @@

#include <MutexOwner.hxx>
#include <com/sun/star/drawing/framework/XConfiguration.hpp>
#include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <cppuhelper/compbase.hxx>

#include <memory>

namespace com { namespace sun { namespace star { namespace util { class XCloneable; } } } }
namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationControllerBroadcaster; } } } } }

namespace sd { namespace framework {

typedef ::cppu::WeakComponentImplHelper <
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index 7fee8dc..3b0bfd6 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -23,21 +23,17 @@
#include <MutexOwner.hxx>

#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
#include <com/sun/star/drawing/framework/XConfiguration.hpp>
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
#include <com/sun/star/drawing/framework/XResourceFactoryManager.hpp>
#include <com/sun/star/drawing/framework/XResourceId.hpp>
#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>

#include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx>

#include <memory>

namespace sd { class ViewShellBase; }

namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationChangeRequest; } } } } }
namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
namespace com { namespace sun { namespace star { namespace drawing { namespace framework { struct ConfigurationChangeEvent; } } } } }

namespace sd { namespace framework {

diff --git a/sd/source/ui/inc/framework/DrawModule.hxx b/sd/source/ui/inc/framework/DrawModule.hxx
index 40d8347..0870c96 100644
--- a/sd/source/ui/inc/framework/DrawModule.hxx
+++ b/sd/source/ui/inc/framework/DrawModule.hxx
@@ -20,7 +20,10 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_FRAMEWORK_DRAWMODULE_HXX
#define INCLUDED_SD_SOURCE_UI_INC_FRAMEWORK_DRAWMODULE_HXX

#include <com/sun/star/frame/XController.hpp>
#include <sal/types.h>

namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }

namespace sd { namespace framework {

diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index d5651406..f4e44fa 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -24,16 +24,16 @@

#include <tools/SdGlobalResourceContainer.hxx>

#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/drawing/framework/XView.hpp>
#include <com/sun/star/lang/XEventListener.hpp>

#include <functional>
#include <map>
#include <memory>

namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XView; } } } } }
namespace com { namespace sun { namespace star { namespace drawing { namespace framework { struct ConfigurationChangeEvent; } } } } }

namespace sd {
class ViewShell;
class ViewShellBase;
}

diff --git a/sd/source/ui/inc/framework/ImpressModule.hxx b/sd/source/ui/inc/framework/ImpressModule.hxx
index 5446a6d..b8d51d0 100644
--- a/sd/source/ui/inc/framework/ImpressModule.hxx
+++ b/sd/source/ui/inc/framework/ImpressModule.hxx
@@ -20,7 +20,10 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_FRAMEWORK_IMPRESSMODULE_HXX
#define INCLUDED_SD_SOURCE_UI_INC_FRAMEWORK_IMPRESSMODULE_HXX

#include <com/sun/star/frame/XController.hpp>
#include <sal/types.h>

namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }

namespace sd { namespace framework {

diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index 934b582..40d9980 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -23,13 +23,13 @@
#include <MutexOwner.hxx>

#include <com/sun/star/drawing/framework/XModuleController.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <cppuhelper/compbase.hxx>

#include <memory>
#include <set>

namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }

namespace sd { namespace framework {

@@ -38,7 +38,7 @@ typedef ::cppu::WeakComponentImplHelper <
    css::lang::XInitialization
    > ModuleControllerInterfaceBase;

/** The ModuleController has to tasks:
/** The ModuleController has two tasks:

    1. It reads the
    org.openoffice.Office.Impress/MultiPaneGUI/Framework/ResourceFactories
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index d40e1b1db..e244147 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -24,11 +24,9 @@

#include <com/sun/star/drawing/framework/XPane.hpp>
#include <com/sun/star/drawing/framework/XPane2.hpp>
#include <com/sun/star/drawing/framework/TabBarButton.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/compbase.hxx>
#include <vcl/vclptr.hxx>
#include <memory>

namespace vcl { class Window; }

diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index 3b042b8..4897154 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -24,13 +24,10 @@

#include <com/sun/star/drawing/framework/XResourceFactory.hpp>
#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/compbase.hxx>

#include <memory>
namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }

namespace sd { namespace framework {

diff --git a/sd/source/ui/inc/framework/PresentationModule.hxx b/sd/source/ui/inc/framework/PresentationModule.hxx
index 13e4595..05919b0 100644
--- a/sd/source/ui/inc/framework/PresentationModule.hxx
+++ b/sd/source/ui/inc/framework/PresentationModule.hxx
@@ -20,7 +20,10 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_FRAMEWORK_PRESENTATIONMODULE_HXX
#define INCLUDED_SD_SOURCE_UI_INC_FRAMEWORK_PRESENTATIONMODULE_HXX

#include <com/sun/star/frame/XController.hpp>
#include <sal/types.h>

namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }

namespace sd { namespace framework {

diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx
index a31a756..3404389 100644
--- a/sd/source/ui/inc/framework/ResourceId.hxx
+++ b/sd/source/ui/inc/framework/ResourceId.hxx
@@ -27,12 +27,13 @@
#include <com/sun/star/drawing/framework/XResourceId.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>

#include <memory>

namespace com { namespace sun { namespace star { namespace util { class XURLTransformer; } } } }
namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class WeakReference; } } } }

namespace sd { namespace framework {

typedef ::cppu::WeakImplHelper <
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index 9b2c612..cea58ad 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -24,15 +24,15 @@
#include <com/sun/star/drawing/framework/XView.hpp>
#include <com/sun/star/drawing/framework/XRelocatableResource.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/awt/XWindowListener.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase.hxx>

#include <memory>

namespace sd { class ViewShell; }
namespace sd { namespace slidesorter { class SlideSorterViewShell; } }
namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }

namespace sd { namespace framework {

diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
index c7bf620..03973e7 100644
--- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx
+++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
@@ -21,14 +21,16 @@
#define INCLUDED_SD_SOURCE_UI_INC_TOOLS_CONFIGURATIONACCESS_HXX

#include <rtl/ustring.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XInterface.hpp>

#include <vector>
#include <functional>

namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } } } }
namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }

namespace sd { namespace tools {

/** This class gives access to the configuration.  Create an object of this
diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx b/sd/source/ui/inc/tools/IdleDetection.hxx
index 3289db4..54234d09 100644
--- a/sd/source/ui/inc/tools/IdleDetection.hxx
+++ b/sd/source/ui/inc/tools/IdleDetection.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_TOOLS_IDLEDETECTION_HXX
#define INCLUDED_SD_SOURCE_UI_INC_TOOLS_IDLEDETECTION_HXX

#include <sal/types.h>
#include <o3tl/typed_flags_set.hxx>

namespace vcl { class Window; }
diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
index 6409bff..2fb0b61 100644
--- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
+++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
@@ -20,10 +20,12 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_TOOLS_SDGLOBALRESOURCECONTAINER_HXX
#define INCLUDED_SD_SOURCE_UI_INC_TOOLS_SDGLOBALRESOURCECONTAINER_HXX

#include <sdmod.hxx>
#include <memory>
#include <o3tl/deleter.hxx>
#include <com/sun/star/uno/XInterface.hpp>
#include <sal/types.h>

namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
namespace o3tl { template <typename T> struct default_delete; }

namespace sd {

diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx
index 0cbf94d..b644254 100644
--- a/sd/source/ui/inc/tools/SlotStateListener.hxx
+++ b/sd/source/ui/inc/tools/SlotStateListener.hxx
@@ -22,13 +22,14 @@

#include <MutexOwner.hxx>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <com/sun/star/frame/FeatureStateEvent.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <cppuhelper/compbase.hxx>
#include <tools/link.hxx>

namespace com { namespace sun { namespace star { namespace frame { class XDispatch; } } } }
namespace com { namespace sun { namespace star { namespace frame { class XDispatchProvider; } } } }
namespace com { namespace sun { namespace star { namespace frame { class XStatusListener; } } } }
namespace com { namespace sun { namespace star { namespace frame { struct FeatureStateEvent; } } } }

namespace sd { namespace tools {

typedef cppu::WeakComponentImplHelper<
diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx
index 49fbef2..3189e1c 100644
--- a/sd/source/ui/inc/view/viewoverlaymanager.hxx
+++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx
@@ -20,12 +20,16 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_VIEW_VIEWOVERLAYMANAGER_HXX
#define INCLUDED_SD_SOURCE_UI_INC_VIEW_VIEWOVERLAYMANAGER_HXX

#include <vcl/image.hxx>
#include <rtl/ref.hxx>
#include <tools/link.hxx>
#include <svl/lstner.hxx>
#include <EventMultiplexer.hxx>
#include <ViewShellBase.hxx>

#include <vector>

namespace sd { class SmartTag; }
namespace sd { namespace tools { class EventMultiplexerEvent; } }
namespace sd { class ViewShellBase; }
struct ImplSVEvent;

namespace sd
{
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index a3c50ad..13c554a 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -26,6 +26,7 @@
#include <glob.hxx>
#include <helpids.h>
#include <pres.hxx>
#include <sdmod.hxx>

#include <sdpage.hxx>
#include <sdresid.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 202ed5c..002c924 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -62,6 +62,7 @@
#include <svx/svdpagv.hxx>
#include <svx/svxids.hrc>
#include <boost/optional.hpp>
#include <sdmod.hxx>

namespace {
static const sal_uInt32 SINGLE_CLICK             (0x00000001);
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index e46dd4e..d336a31 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -65,6 +65,7 @@
#include <unmodpg.hxx>
#include <DrawViewShell.hxx>
#include <sdabstdlg.hxx>
#include <sdmod.hxx>

#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 9e71eee..dfb5933 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -61,6 +61,7 @@
#include <Window.hxx>
#include <drawview.hxx>
#include <undo/undoobjects.hxx>
#include <sdmod.hxx>

#include <memory>

diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index 0857a17..8db7f75 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/util/XChangesBatch.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/propertysequence.hxx>
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index c99ea43..6143485 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
#include <com/sun/star/drawing/framework/XView.hpp>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/compbase.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
index 3eab147..2eb9d1b 100644
--- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx
+++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
@@ -26,6 +26,7 @@

#include <com/sun/star/frame/Desktop.hpp>

#include <o3tl/deleter.hxx>
#include <rtl/instance.hxx>
#include <sal/log.hxx>

diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index a5c135d..680bf5c 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -52,6 +52,7 @@
#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>
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index d3caaa0..c2ebaa7 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -36,6 +36,7 @@
#include <com/sun/star/drawing/framework/ResourceId.hpp>
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/drawing/framework/XView.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/servicehelper.hxx>
#include <tools/diagnose_ex.h>
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 8366b99..90ae9fb 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -182,6 +182,7 @@
#include <unmodpg.hxx>
#include <sfx2/sidebar/Sidebar.hxx>
#include <sfx2/classificationhelper.hxx>
#include <sdmod.hxx>

#include <ViewShellBase.hxx>
#include <memory>
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 05f8b04..4645d63 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -96,6 +96,7 @@
#include <Window.hxx>
#include <fuformatpaintbrush.hxx>
#include <fuzoom.hxx>
#include <sdmod.hxx>

using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index da4bf1b..aadd982 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -22,6 +22,7 @@
#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>
#include <unokywds.hxx>
#include <vcl/settings.hxx>
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index e774bdf..e17f3f8 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -46,6 +46,7 @@
#include <bitmaps.hlst>
#include <sdresid.hxx>
#include <EventMultiplexer.hxx>
#include <ViewShellBase.hxx>
#include <ViewShellManager.hxx>
#include <sdpage.hxx>
#include <drawdoc.hxx>