summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2018-06-10 13:48:58 +0200
committerJochen Nitschke <j.nitschke+logerrit@ok.de>2018-06-16 11:44:09 +0200
commit8ea8ad4e492583e6d1ff278ff0dc679531c8a20e (patch)
tree79aadb64fc1964f7b0e4e98cd4939dc16a775434
parente92e240693ca13ac2ee38da3518b12f57d3974db (diff)
tdf#42949 Fix IWYU warnings in sd/source/ui/inc/[dDE]*
Found with bin/find-unneeded-includes Only removal proposals are dealt with here and a bit of fallout management. Change-Id: Ie86a34f7f091525f21369f989165a56eace70513 Reviewed-on: https://gerrit.libreoffice.org/55558 Tested-by: Jenkins Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
-rw-r--r--sd/IwyuFilter_sd.yaml14
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx1
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx1
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx1
-rw-r--r--sd/source/ui/app/sdxfer.cxx1
-rw-r--r--sd/source/ui/dlg/diactrl.cxx1
-rw-r--r--sd/source/ui/dlg/dlgfield.cxx1
-rw-r--r--sd/source/ui/dlg/dlgpage.cxx1
-rw-r--r--sd/source/ui/dlg/dlgsnap.cxx1
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx1
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx1
-rw-r--r--sd/source/ui/func/fusumry.cxx1
-rw-r--r--sd/source/ui/inc/DocumentRenderer.hxx4
-rw-r--r--sd/source/ui/inc/DrawController.hxx20
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx3
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx10
-rw-r--r--sd/source/ui/inc/EventMultiplexer.hxx6
-rw-r--r--sd/source/ui/inc/diactrl.hxx9
-rw-r--r--sd/source/ui/inc/dlgfield.hxx5
-rw-r--r--sd/source/ui/inc/dlgsnap.hxx1
-rw-r--r--sd/source/ui/inc/docprev.hxx3
-rw-r--r--sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx1
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx1
-rw-r--r--sd/source/ui/unoidl/DrawController.cxx1
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx1
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx1
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx1
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx1
-rw-r--r--sd/source/ui/view/ViewClipboard.cxx1
-rw-r--r--sd/source/ui/view/drviews2.cxx1
-rw-r--r--sd/source/ui/view/drviews7.cxx1
-rw-r--r--sd/source/ui/view/drviews8.cxx1
-rw-r--r--sd/source/ui/view/drviewsa.cxx3
-rw-r--r--sd/source/ui/view/drviewsd.cxx2
-rw-r--r--sd/source/ui/view/outlview.cxx1
-rw-r--r--sd/source/ui/view/sdview3.cxx1
-rw-r--r--sd/source/ui/view/viewshel.cxx1
37 files changed, 65 insertions, 40 deletions
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index a0316591746f..e2f247d74408 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -111,3 +111,17 @@ blacklist:
sd/source/ui/inc/BezierObjectBar.hxx:
# Used via macro, really needed to compile
- class SfxModule
+ sd/source/ui/inc/DrawDocShell.hxx:
+ # base class has to be a complete type
+ - fupoor.hxx
+ sd/source/ui/inc/DocumentRenderer.hxx:
+ # base class has to be a complete type
+ - com/sun/star/view/XRenderable.hpp
+ sd/source/ui/inc/DrawController.hxx:
+ # base class has to be a complete type
+ - com/sun/star/drawing/XDrawView.hpp
+ - com/sun/star/drawing/framework/XControllerManager.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/view/XFormLayerAccess.hpp
+ - com/sun/star/view/XSelectionSupplier.hpp
+ - sfx2/sfxbasecontroller.hxx
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index c70252fae6df..ddeb44fc778c 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -28,6 +28,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/sfxsids.hrc>
+#include <sot/storage.hxx>
#include <drawdoc.hxx>
#include <sdpage.hxx>
#include <Outliner.hxx>
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 991b35dbe6e8..cd51f1cf36a9 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 <sdmod.hxx>
#include <sdpage.hxx>
#include <filedlg.hxx>
#include <strings.hrc>
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index dfd97e4a057a..668f555b6cb5 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -82,6 +82,7 @@
#include <drawdoc.hxx>
#include <textapi.hxx>
#include <optsitem.hxx>
+#include <sdmod.hxx>
#include <memory>
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index b55b5327d284..a8118228cc9e 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -54,6 +54,7 @@
#include <svtools/embedtransfer.hxx>
#include <DrawDocShell.hxx>
#include <View.hxx>
+#include <sdmod.hxx>
#include <sdpage.hxx>
#include <drawview.hxx>
#include <drawdoc.hxx>
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index 636ffa6db47e..1958b6271433 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <svl/intitem.hxx>
#include <svx/dialogs.hrc>
#include <sdattr.hxx>
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 0f185c25813f..2b0ec21af5a8 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -24,6 +24,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
#include <svl/itemset.hxx>
+#include <svx/langbox.hxx>
#include <editeng/langitem.hxx>
#include <unotools/useroptions.hxx>
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index 1556efdfdccb..75933ae73271 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -20,6 +20,7 @@
#include <svl/intitem.hxx>
#include <svx/dialogs.hrc>
#include <svx/drawitem.hxx>
+#include <i18nutil/paper.hxx>
#include <dlgpage.hxx>
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index 6e2677806865..61bae299892d 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -26,6 +26,7 @@
#include <View.hxx>
#include <drawdoc.hxx>
#include <dlgsnap.hxx>
+#include <sdenumdef.hxx>
/**
* dialog to adjust grid (scarcely ESO!)
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index c12440065220..0963fb1023c0 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -37,6 +37,7 @@
#include <DrawDocShell.hxx>
#include <drawdoc.hxx>
#include <ViewShell.hxx>
+#include <sdmod.hxx>
// preview control for presentation layout
#include <vcl/ctrl.hxx>
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 99eea6a6a9cd..1dce1f187321 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -37,6 +37,7 @@
#include <DrawDocShell.hxx>
#include <drawdoc.hxx>
#include <sdpage.hxx>
+#include <sdmod.hxx>
#include <sdresid.hxx>
#include <navigatr.hxx>
#include <strings.hrc>
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index 7020db5f9eeb..09f4eccbe98d 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -35,6 +35,7 @@
#include <drawdoc.hxx>
#include <ViewShell.hxx>
#include <DrawDocShell.hxx>
+#include <sdmod.hxx>
#include <sdresid.hxx>
#include <optsitem.hxx>
#include <DrawViewShell.hxx>
diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx
index 5ca57eb8c0f4..f0ac5669d218 100644
--- a/sd/source/ui/inc/DocumentRenderer.hxx
+++ b/sd/source/ui/inc/DocumentRenderer.hxx
@@ -20,13 +20,13 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_DOCUMENTRENDERER_HXX
#define INCLUDED_SD_SOURCE_UI_INC_DOCUMENTRENDERER_HXX
-#include "ViewShellBase.hxx"
-
#include <com/sun/star/view/XRenderable.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <memory>
+namespace sd { class ViewShellBase; }
+
namespace sd {
typedef ::cppu::WeakComponentImplHelper <
diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx
index d6ecc0d837f9..835460f643e0 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -20,26 +20,26 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_DRAWCONTROLLER_HXX
#define INCLUDED_SD_SOURCE_UI_INC_DRAWCONTROLLER_HXX
-#include "ViewShell.hxx"
-
-#include <osl/mutex.hxx>
#include <cppuhelper/propshlp.hxx>
#include <sfx2/sfxbasecontroller.hxx>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/view/XFormLayerAccess.hpp>
-#include <com/sun/star/drawing/XDrawSubController.hpp>
#include <com/sun/star/drawing/XDrawView.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
-#include <com/sun/star/drawing/framework/ModuleController.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase.hxx>
-#include <tools/weakbase.hxx>
+#include <tools/weakbase.h>
#include <memory>
#include <vector>
-#include <com/sun/star/drawing/XLayer.hpp>
+
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawSubController; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XModuleController; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XLayer; } } } }
+namespace osl { class Mutex; }
+
+class SdPage;
namespace sd {
@@ -61,9 +61,7 @@ public:
::cppu::OBroadcastHelper maBroadcastHelper;
};
-class DrawSubController;
class ViewShellBase;
-class ViewShell;
/** The DrawController is the UNO controller for Impress and Draw. It
relies objects that implement the DrawSubController interface for view
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index a823be100156..4c6bc4528cc1 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -24,14 +24,11 @@
#include <sfx2/docfac.hxx>
#include <sfx2/objsh.hxx>
-#include <vcl/jobset.hxx>
#include <glob.hxx>
-#include <sdmod.hxx>
#include <pres.hxx>
#include <sddllapi.h>
#include "fupoor.hxx"
-class SfxStyleSheetBasePool;
class FontList;
class SdDrawDocument;
class SdPage;
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 1db285351c1b..37afa1bcb039 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -23,21 +23,19 @@
#include <memory>
#include "ViewShell.hxx"
#include "tools/AsynchronousCall.hxx"
-#include <sfx2/viewfac.hxx>
-#include <sfx2/viewsh.hxx>
#include "TabControl.hxx"
#include <pres.hxx>
-#include <svx/sidebar/SelectionChangeHandler.hxx>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/scanner/XScannerManager2.hpp>
#include <unotools/caserotate.hxx>
#include <unotools/options.hxx>
+namespace svx { namespace sidebar { class SelectionChangeHandler; } }
+namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } }
+namespace com { namespace sun { namespace star { namespace scanner { class XScannerManager2; } } } }
+
class Outliner;
class SdPage;
class SdStyleSheet;
class SdrExternalToolEdit;
-class DrawDocShell;
class TabBar;
class SdrObject;
class SdrPageView;
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx
index 6c002093ae67..f1578bed321b 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -23,12 +23,8 @@
#include <sal/config.h>
#include <rtl/ref.hxx>
-#include <svl/lstner.hxx>
-#include <tools/link.hxx>
-#include <o3tl/typed_flags_set.hxx>
-#include <set>
-#include <memory>
+template <typename Arg, typename Ret> class Link;
namespace sd {
class ViewShellBase;
diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx
index 4723d5bac1d5..908731a80fb1 100644
--- a/sd/source/ui/inc/diactrl.hxx
+++ b/sd/source/ui/inc/diactrl.hxx
@@ -20,14 +20,11 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_DIACTRL_HXX
#define INCLUDED_SD_SOURCE_UI_INC_DIACTRL_HXX
-#include <svl/intitem.hxx>
-#include <sfx2/bindings.hxx>
#include <svx/itemwin.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <vcl/toolbox.hxx>
#include <sfx2/tbxctrl.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
+
+namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+class SfxUInt16Item;
// SdPagesField:
diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx
index 4fa9e740e99e..2fbe43662959 100644
--- a/sd/source/ui/inc/dlgfield.hxx
+++ b/sd/source/ui/inc/dlgfield.hxx
@@ -21,8 +21,11 @@
#define INCLUDED_SD_SOURCE_UI_INC_DLGFIELD_HXX
#include <vcl/weld.hxx>
-#include <svx/langbox.hxx>
+#include <memory>
+#include <svl/itemset.hxx>
+
class SvxFieldData;
+class LanguageBox;
/**
* dialog to adjust field-commands
diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx
index a54279494e6d..0b5ebede9542 100644
--- a/sd/source/ui/inc/dlgsnap.hxx
+++ b/sd/source/ui/inc/dlgsnap.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SD_SOURCE_UI_INC_DLGSNAP_HXX
#include <tools/fract.hxx>
-#include <sdenumdef.hxx>
#include <vcl/weld.hxx>
/************************************************************************/
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index f5df073d6558..d13ddea47abe 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -20,15 +20,12 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_DOCPREV_HXX
#define INCLUDED_SD_SOURCE_UI_INC_DOCPREV_HXX
-#include <vcl/window.hxx>
#include <tools/gen.hxx>
#include <tools/wintypes.hxx>
#include <rtl/ref.hxx>
#include <svl/lstner.hxx>
-#include <svtools/colorcfg.hxx>
-#include <fadedef.h>
#include <sddllapi.h>
namespace sd {
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index b32e72878a79..fdbf1c3119cb 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -35,6 +35,7 @@
#include <drawdoc.hxx>
#include <app.hrc>
#include <sdtreelb.hxx>
+#include <sdmod.hxx>
#include <sfx2/bindings.hxx>
namespace sd { namespace slidesorter { namespace controller {
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index b4fd0e4d35cb..9b01ee63a290 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -43,6 +43,7 @@
#include <ViewShell.hxx>
#include <Window.hxx>
#include <drawview.hxx>
+#include <sdmod.hxx>
#include <sdresid.hxx>
#include <drawdoc.hxx>
#include <DrawViewShell.hxx>
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 0e851cc5054f..db12f9444158 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -37,6 +37,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/drawing/framework/ConfigurationController.hpp>
#include <com/sun/star/drawing/framework/ModuleController.hpp>
+#include <com/sun/star/drawing/XLayer.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <slideshow.hxx>
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index f2aed578ff89..c2ef28948604 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -46,6 +46,7 @@
#include <optsitem.hxx>
#include <sfx2/printer.hxx>
#include <sdattr.hxx>
+#include <sdmod.hxx>
#include <ViewShell.hxx>
#include <FrameView.hxx>
#include <Outliner.hxx>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index e93d4662d1de..97b3a1109bc2 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -85,6 +85,7 @@
#include <Annotation.hxx>
#include <drawdoc.hxx>
+#include <sdmod.hxx>
#include <sdresid.hxx>
#include <sdpage.hxx>
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 72df58e77918..6f73d9799102 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -64,6 +64,7 @@
#include <unoprnms.hxx>
#include <unomodel.hxx>
#include <drawdoc.hxx>
+#include <sdmod.hxx>
#include <sdpage.hxx>
#include <ViewShell.hxx>
#include <unokywds.hxx>
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index a67a05912ec9..184b22be9151 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -21,6 +21,7 @@
#include <DocumentRenderer.hxx>
#include <DocumentRenderer.hrc>
+#include <ViewShellBase.hxx>
#include <drawdoc.hxx>
#include <sdpage.hxx>
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index d388b0499cc8..f70147316439 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -26,6 +26,7 @@
#include <Window.hxx>
#include <drawdoc.hxx>
+#include <sdmod.hxx>
#include <sdpage.hxx>
#include <sdxfer.hxx>
#include <strings.hxx>
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 1db662685938..c9879eec60ae 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -32,6 +32,7 @@
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/scanner/XScannerManager2.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/scopeguard.hxx>
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 230d75c2e853..33fdf1edf914 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -79,6 +79,7 @@
#include <Outliner.hxx>
#include <drawdoc.hxx>
#include <DrawViewShell.hxx>
+#include <sdmod.hxx>
#include <sdresid.hxx>
#include <sdpage.hxx>
#include <Client.hxx>
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index e396b8ec6ea8..ca2128ccd556 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -21,6 +21,7 @@
#include <ViewShellHint.hxx>
+#include <com/sun/star/scanner/XScannerManager2.hpp>
#include <toolkit/helper/vclunohelper.hxx>
#include <sfx2/dispatch.hxx>
#include <svx/svxids.hrc>
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index f894b074bd8f..924b274af28c 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -46,12 +46,13 @@
#include <svx/float3d.hxx>
#include <svx/extedit.hxx>
#include <svx/sidebar/SelectionAnalyzer.hxx>
+#include <svx/sidebar/SelectionChangeHandler.hxx>
#include <helpids.h>
#include <view/viewoverlaymanager.hxx>
#include <app.hrc>
#include <strings.hrc>
-
+#include <sdmod.hxx>
#include <sdpage.hxx>
#include <FrameView.hxx>
#include <drawdoc.hxx>
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index 8ec28f5b2cf0..9cf67d815859 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -31,7 +31,7 @@
#include <sfx2/viewfrm.hxx>
#include <app.hrc>
-
+#include <sdmod.hxx>
#include <sdpage.hxx>
#include <drawdoc.hxx>
#include <DrawDocShell.hxx>
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index d850f1598428..1d04b5ecc3c1 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -58,6 +58,7 @@
#include <OutlineViewShell.hxx>
#include <app.hrc>
#include <strings.hrc>
+#include <sdmod.hxx>
#include <sdresid.hxx>
#include <Outliner.hxx>
#include <EventMultiplexer.hxx>
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 634e59e7ce93..45382087aa8b 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -62,6 +62,7 @@
#include <sdpage.hxx>
#include <DrawViewShell.hxx>
#include <drawdoc.hxx>
+#include <sdmod.hxx>
#include <sdresid.hxx>
#include <strings.hrc>
#include <imapinfo.hxx>
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index a9d30903b107..be1c561a096a 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -87,6 +87,7 @@
#include <editeng/editeng.hxx>
#include <svl/poolitem.hxx>
#include <strings.hxx>
+#include <sdmod.hxx>
#include <AccessibleDocumentViewBase.hxx>
using namespace ::com::sun::star;