tdf#42949 Fix more IWYU warnings in sd/inc/

Found with bin/find-unneeded-includes
A lot of fallout needed fixing, unfortunately

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

54 files changed, 90 insertions, 45 deletions

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 106f91d4aa6f..09bb304b60c9 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -29,6 +29,18 @@ blacklist:
     sd/inc/sderror.hxx:
     # needed for defines
     - vcl/errcode.hxx
+    sd/inc/sdfilter.hxx:
+    # base class has to be a complete type
+    - com/sun/star/frame/XModel.hpp
+    - com/sun/star/task/XStatusIndicator.hpp
+    sd/inc/sdmod.hxx:
+    # base class has to be a complete type
+    - com/sun/star/beans/XPropertySetInfo.hpp
+    - sot/storage.hxx
+    sd/inc/sdpage.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/XDrawPage.hpp
+    - com/sun/star/office/XAnnotation.hpp
     sd/inc/stlfamily.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertySet.hpp
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 672fd1ac4dbb..adbf0c31ab1a 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -20,14 +20,12 @@
 #ifndef INCLUDED_SD_INC_OUTLINER_HXX
 #define INCLUDED_SD_INC_OUTLINER_HXX
 
-#include <svx/svdobj.hxx>
 #include <svx/svdoutl.hxx>
 #include "pres.hxx"
 #include "OutlinerIterator.hxx"
 #include <editeng/SpellPortions.hxx>
 #include <memory>
 
-class Dialog;
 class SdrObject;
 class SdrTextObj;
 class SdDrawDocument;
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index a302fa6eb726..625c2289c3b4 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -20,25 +20,21 @@
 #ifndef INCLUDED_SD_INC_DRAWDOC_HXX
 #define INCLUDED_SD_INC_DRAWDOC_HXX
 
-#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/text/WritingMode.hpp>
-#include <vcl/print.hxx>
-#include <vcl/idle.hxx>
-#include <svx/fmmodel.hxx>
-#include "pres.hxx"
-#include <svx/pageitem.hxx>
-#include <unotools/charclass.hxx>
-#include <sot/storage.hxx>
 #include <svl/style.hxx>
-#include <com/sun/star/xml/dom/XNode.hpp>
-
-#include <svx/svdundo.hxx>
+#include <svx/fmmodel.hxx>
+#include <vcl/prntypes.hxx>
+#include <xmloff/autolayout.hxx>
 
 #include <vector>
 #include <memory>
 
 #include "sddllapi.h"
-#include "sdpage.hxx"
+#include "pres.hxx"
+
+namespace com { namespace sun { namespace star { namespace xml { namespace dom { class XNode; } } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace vcl { class Font; }
 
 namespace com
 {
@@ -54,11 +50,6 @@ namespace com
     }
 }
 
-namespace sd
-{
-    class FrameView;
-}
-
 class SdOutliner;
 class Timer;
 class SfxObjectShell;
@@ -71,13 +62,21 @@ class SfxMedium;
 class SvxSearchItem;
 class EditStatus;
 class Point;
-namespace vcl { class Window; }
 class SdTransferable;
 struct SpellCallbackInfo;
-class SdDrawDocument;
-class SdCustomShow;
 class SdCustomShowList;
 class SdUndoGroup;
+class SdrObject;
+class CharClass;
+class Idle;
+class ImageMap;
+class Outliner;
+class SdrModel;
+class SdrOutliner;
+class SdrPage;
+class SdrTextObj;
+class SfxItemPool;
+class Size;
 
 namespace sd
 {
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 076555758960..332312ae77ba 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -21,15 +21,12 @@
 
 #include <vector>
 
-#include <rtl/ref.hxx>
 #include <rtl/string.hxx>
+#include <sfx2/tabdlg.hxx>
+#include <svl/itemset.hxx>
 #include <tools/solar.h>
-#include <sfx2/sfxdlg.hxx>
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
+#include <vcl/abstdlg.hxx>
 #include "prlayout.hxx"
-#include "sdenumdef.hxx"
 #include "pres.hxx"
 #include "sddllapi.h"
 
@@ -41,10 +38,8 @@ namespace sd {
 }
 
 class SfxObjectShell;
-class SfxObjectShellLock;
 class SvxFieldData;
 class GDIMetaFile;
-class XColorList;
 class SdDrawDocument;
 class SfxMedium;
 class SdrObject;
@@ -53,11 +48,11 @@ class SfxStyleSheetBase;
 class SdrModel;
 class SdrView;
 class Bitmap;
-class List;
 namespace vcl { class Window; }
 class SdPage;
-class TabPage;
 class SdCustomShowList;
+class SfxAbstractDialog;
+class SfxAbstractTabDialog;
 
 class AbstractCopyDlg : public VclAbstractDialog
 {
diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx
index 8fa1f6247f95..5c3b876d6c66 100644
--- a/sd/inc/sddll.hxx
+++ b/sd/inc/sddll.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SD_INC_SDDLL_HXX
 #define INCLUDED_SD_INC_SDDLL_HXX
 
-#include <sfx2/module.hxx>
 #include "sddllapi.h"
 
 class SdModule;
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index df1421f51727..dbf6d27a9ff4 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -20,11 +20,9 @@
 #ifndef INCLUDED_SD_INC_SDFILTER_HXX
 #define INCLUDED_SD_INC_SDFILTER_HXX
 
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
-#include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
 
 // SdFilter
 class SfxMedium;
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx
index 2846914e24cd..2b34ecf93e52 100644
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
@@ -20,10 +20,8 @@
 #ifndef INCLUDED_SD_INC_SDGRFFILTER_HXX
 #define INCLUDED_SD_INC_SDGRFFILTER_HXX
 
-#include <com/sun/star/drawing/XShape.hpp>
-
-#include <vcl/errinf.hxx>
 #include "sdfilter.hxx"
+class ErrCode;
 
 // SdCGMFilter
 class SdGRFFilter : public SdFilter
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 51085fcc1cf1..74160c6a512b 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -28,8 +28,6 @@
 #include <svl/lstner.hxx>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <sfx2/module.hxx>
-#include <vcl/vclevent.hxx>
-#include <vcl/virdev.hxx>
 #include <sal/types.h>
 #include <map>
 #include <memory>
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 3e49c4f78e06..932643014f4a 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -24,15 +24,12 @@
 #include <com/sun/star/presentation/FadeEffect.hpp>
 #include <com/sun/star/office/XAnnotation.hpp>
 
-#include <functional>
-#include <list>
 #include <memory>
 #include <vector>
 #include <editeng/flditem.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/fmpage.hxx>
 #include <xmloff/autolayout.hxx>
-#include "fadedef.h"
 #include "diadef.h"
 #include "pres.hxx"
 #include "shapelist.hxx"
diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx
index 32f4b1301de2..8ac4ea45405e 100644
--- a/sd/inc/sdresid.hxx
+++ b/sd/inc/sdresid.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SD_INC_SDRESID_HXX
 #define INCLUDED_SD_INC_SDRESID_HXX
 
+#include <rtl/ustring.hxx>
 #include "sddllapi.h"
-#include "sdmod.hxx"
 
 SD_DLLPUBLIC OUString SdResId(const char* pId);
 
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index d884a4f8e21f..9bbd2c00a667 100644
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -20,9 +20,11 @@
 #define INCLUDED_SD_INC_SDXMLWRP_HXX
 
 #include <comphelper/fileformat.h>
-#include <vcl/errcode.hxx>
+#include <tools/solar.h>
 #include "sdfilter.hxx"
 
+class ErrCode;
+
 // SdXMLFilter
 enum SdXMLFilterMode
 {
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 739560b0b74d..041c90b10398 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -72,6 +72,8 @@
 #include <config_features.h>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
+#include <sdpage.hxx>
+
 using namespace css;
 using namespace css::animations;
 
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 165d212fd956..d14becc09924 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -8,6 +8,8 @@
  */
 #include <officecfg/Office/Common.hxx>
 #include "sdmodeltestbase.hxx"
+#include <sdpage.hxx>
+
 #include <Outliner.hxx>
 #include <svl/stritem.hxx>
 #include <editeng/editobj.hxx>
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 28474a88d4bb..c77d77480178 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -9,6 +9,7 @@
 
 #include <config_poppler.h>
 #include <ostream>
+#include <sdpage.hxx>
 
 #include "sdmodeltestbase.hxx"
 
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index ace77cdcc96e..a1b83e8ccf7d 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -48,6 +48,7 @@
 #include <undo/undomanager.hxx>
 #include <DrawViewShell.hxx>
 #include <chrono>
+#include <sdpage.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sd/qa/unit/uimpress.cxx b/sd/qa/unit/uimpress.cxx
index edc9dd9505f7..eeedd3e7ce60 100644
--- a/sd/qa/unit/uimpress.cxx
+++ b/sd/qa/unit/uimpress.cxx
@@ -23,6 +23,9 @@
 #include <iostream>
 #include <vector>
 
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
 using namespace ::com::sun::star;
 
 namespace {
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index 6ac1ac4c2815..b1840b89547f 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -36,6 +36,7 @@
 #include <tools/datetime.hxx>
 
 #include <sfx2/viewsh.hxx>
+#include <svx/svdundo.hxx>
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 69462124ce27..4965b84a471b 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -31,6 +31,7 @@
 #include <editeng/unoipset.hxx>
 #include <Outliner.hxx>
 #include <svx/svdpool.hxx>
+#include <svx/svdundo.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index f227c8dbd67e..c70252fae6df 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -29,6 +29,7 @@
 #include <sfx2/docfilt.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <Outliner.hxx>
 #include <unotools/streamwrap.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index c7384415d1a5..991b35dbe6e8 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -28,6 +28,7 @@
 #include <DrawDocShell.hxx>
 #include <SlideSorterViewShell.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <filedlg.hxx>
 #include <strings.hrc>
 #include <DrawController.hxx>
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index a90e0a7bf535..7f7b971cefb4 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -26,6 +26,7 @@
 #include <tmplctrl.hxx>
 #include <ViewShellBase.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <sdattr.hrc>
 #include <app.hrc>
 #include <sdresid.hxx>
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index fb97d5c6f636..3ecd1d32e2d1 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -21,6 +21,7 @@
 
 #include <sdabstdlg.hxx>
 #include <sfx2/basedlgs.hxx>
+#include <sfx2/sfxdlg.hxx>
 
 #define DECL_ABSTDLG_BASE(Class,DialogClass)            \
     ScopedVclPtr<DialogClass> pDlg;                     \
diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx
index e4b92c0e14be..d5e97ad4154d 100644
--- a/sd/source/ui/dlg/sduiexp.cxx
+++ b/sd/source/ui/dlg/sduiexp.cxx
@@ -33,6 +33,7 @@
 #include <custsdlg.hxx>
 #include <copydlg.hxx>
 #include <sal/types.h>
+class SdAbstractDialogFactory;
 
 extern "C"
 {
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index a0f80d8ac365..3e83b4245881 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -20,6 +20,7 @@
 #include <fuchar.hxx>
 #include <svx/dialogs.hrc>
 #include <sfx2/viewfrm.hxx>
+#include <sfx2/sfxdlg.hxx>
 
 #include <editeng/editdata.hxx>
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 87ccd670215e..28aadb7c3da8 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -39,6 +39,7 @@
 #include <Window.hxx>
 #include <ToolBarManager.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index bcdf46996c5c..47c401498f58 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -26,6 +26,7 @@
 #include <svx/globl3d.hxx>
 #include <svx/svxids.hrc>
 #include <svx/svdotable.hxx>
+#include <svx/svdundo.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/editeng.hxx>
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 59da1f106faf..3f910c973047 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -76,12 +76,14 @@
 #include <GraphicDocShell.hxx>
 #include <strings.hrc>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <sdgrffilter.hxx>
 #include <sdxfer.hxx>
 #include <vcl/svapp.hxx>
 #include <undo/undoobjects.hxx>
 #include <memory>
 #include <vcl/weld.hxx>
+#include <vcl/errinf.hxx>
 
 #include <vcl/GraphicNativeTransform.hxx>
 #include <vcl/GraphicNativeMetadata.hxx>
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 9b56cdc45028..ab6f3a51b7c8 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -28,6 +28,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <svl/aeitem.hxx>
 #include <svx/xtable.hxx>
 
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index f0a50dd10e83..a46166e95dcc 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -22,6 +22,7 @@
 #include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <editeng/numitem.hxx>
 #include <strings.hxx>
 
@@ -37,6 +38,7 @@
 #include <svx/nbdtmgfact.hxx>
 #include <svx/svdoutl.hxx>
 #include <memory>
+
 using namespace svx::sidebar;
 namespace sd {
 
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 17527c912d3f..58d359b72bc5 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -23,6 +23,7 @@
 
 // arrange Tab-Page
 
+#include <sfx2/sfxdlg.hxx>
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
 #include <svl/itempool.hxx>
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index 48d61597d26b..986089feb53f 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <svx/svxids.hrc>
 #include <editeng/editdata.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 3e4b1af411c8..da8032d7f8f8 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -28,6 +28,7 @@
 #include <strings.hxx>
 
 #include <drawdoc.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <OutlineViewShell.hxx>
 #include <ViewShell.hxx>
 #include <Window.hxx>
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 8b6d0024b540..3b70f0513bc9 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -31,6 +31,7 @@
 #include <sfx2/dispatch.hxx>
 #include <editeng/eeitem.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx
index 6b1f2a211f13..12ae4c860864 100644
--- a/sd/source/ui/inc/unopage.hxx
+++ b/sd/source/ui/inc/unopage.hxx
@@ -38,6 +38,7 @@
 #include <cppuhelper/implbase.hxx>
 
 #include "unosrch.hxx"
+#include <sdpage.hxx>
 
 class SdPage;
 class SdrObject;
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 28cb5f18b6a6..0fbedb325146 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -16,6 +16,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/configuration.hxx>
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index 7198a19217d8..63d41e996140 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <stlpool.hxx>
 #include <svx/xfillit0.hxx>
+#include <svx/svdundo.hxx>
 #include <tools/diagnose_ex.h>
 #include <xmloff/autolayout.hxx>
 
diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
index 8e1e9163fedd..a58edf36cae5 100644
--- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx
@@ -21,6 +21,7 @@
 
 #include <DrawDocShell.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <PreviewRenderer.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 7ce4bb4e6aa7..08042defd663 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -27,6 +27,7 @@
 #include <DrawDocShell.hxx>
 #include <SlideSorterViewShell.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <filedlg.hxx>
 #include "PageMarginUtils.hxx"
 #include <strings.hrc>
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 3c89620a2231..3afc36b63bbc 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -48,6 +48,7 @@
 #include <DrawController.hxx>
 #include <customshowlist.hxx>
 #include <unopage.hxx>
+#include <sdpage.hxx>
 
 using ::com::sun::star::presentation::XSlideShowController;
 using ::sd::framework::FrameworkHelper;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 43cd19080218..14874a26e91f 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -73,6 +73,7 @@
 #include <RemoteServer.hxx>
 #include <customshowlist.hxx>
 #include <unopage.hxx>
+#include <sdpage.hxx>
 
 #define CM_SLIDES       21
 
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index bc1828521f42..07dcbda5be92 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -19,6 +19,7 @@
 
 #include "slideshowviewimpl.hxx"
 #include "slideshowimpl.hxx"
+#include <sdpage.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/awt/Pointer.hpp>
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index a17f181dd9f2..0f040a368313 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "SlsRequestQueue.hxx"
+#include <sdpage.hxx>
 
 #include <set>
 
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index e31fee0b884d..7e9e05c097a5 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -33,6 +33,7 @@
 #include <cache/SlsPageCache.hxx>
 #include <cache/SlsPageCacheManager.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <DrawDocShell.hxx>
 
 #include <ViewShellBase.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index 156427c820ea..88687d81a6b8 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -36,6 +36,7 @@
 #include <view/SlideSorterView.hxx>
 #include <view/SlsLayouter.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <drawview.hxx>
 #include <DrawViewShell.hxx>
 #include <ViewShellBase.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index 5e954ddb92e0..ff3dcad81c0d 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -27,6 +27,7 @@
 #include <model/SlsPageDescriptor.hxx>
 #include <svx/svdmodel.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 
 namespace sd { namespace slidesorter { namespace controller {
 
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 551110e73b7b..ca3be2f90439 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -39,6 +39,7 @@
 #include <framework/FrameworkHelper.hxx>
 #include <ViewShellBase.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <app.hrc>
 #include <sdattr.hrc>
 #include <AccessibleSlideSorterView.hxx>
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 4e6892574088..fb54c8a3ba26 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -56,6 +56,7 @@
 #include <tablefunction.hxx>
 #include <DrawViewShell.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <DrawDocShell.hxx>
 #include <Window.hxx>
 #include <drawview.hxx>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 416e936c20bc..e93d4662d1de 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -57,6 +57,7 @@
 #include <svx/UnoNamespaceMap.hxx>
 #include <svx/svdlayer.hxx>
 #include <svx/svdsob.hxx>
+#include <svx/svdundo.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/unofill.hxx>
 #include <svx/unopool.hxx>
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index ecb42f830904..a67a05912ec9 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -23,6 +23,7 @@
 #include <DocumentRenderer.hrc>
 
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <optsitem.hxx>
 #include <sdresid.hxx>
 #include <strings.hrc>
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 22dcf4538640..5b32b7e8dbb1 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -36,6 +36,7 @@
 #include <ViewTabBar.hxx>
 #include <sfx2/event.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/printer.hxx>
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index cdb8b2d85112..9c0491ae4cdd 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -41,6 +41,7 @@
 #include <stlsheet.hxx>
 
 #include <svx/svdoutl.hxx>
+#include <svx/svdundo.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index bd90cfdfc1f7..eb00b2d08ae6 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -63,6 +63,7 @@
 #include <ViewShell.hxx>
 #include <drawview.hxx>
 #include <drawdoc.hxx>
+#include <sdpage.hxx>
 #include <stlpool.hxx>
 #include <stlsheet.hxx>
 #include <OutlineView.hxx>
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 21ecec524955..2434813299e6 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -24,6 +24,7 @@
 #include <app.hrc>
 #include <svx/hyperdlg.hxx>
 #include <svx/zoomslideritem.hxx>
+#include <svx/svdundo.hxx>
 
 #include <sfx2/infobar.hxx>
 #include <sfx2/objface.hxx>
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 17ccfe5c3eff..507724c68ce2 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -43,6 +43,7 @@
 #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>