tdf#42949 Fix IWYU warnings in sd/source/ui/[a-r]*/*hxx

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

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

74 files changed, 256 insertions, 173 deletions

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index c15a2221d9c4..b9675be4067a 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -69,6 +69,55 @@ blacklist:
     sd/source/filter/eppt/eppt.hxx:
     # base class has to be a complete type
     - escherex.hxx
+    sd/source/ui/annotations/annotationmanagerimpl.hxx:
+    # base class has to be a complete type
+    - annotationtag.hxx
+    - com/sun/star/document/XEventListener.hpp
+    sd/source/ui/framework/configuration/ConfigurationTracer.hxx:
+    # Needed for css shortcut
+    - sal/types.h
+    sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XNamed.hpp
+    - com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp
+    sd/source/ui/framework/configuration/UpdateRequest.hxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XNamed.hpp
+    - com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp
+    sd/source/ui/framework/factories/BasicToolBarFactory.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XResourceFactory.hpp
+    - com/sun/star/lang/XInitialization.hpp
+    sd/source/ui/framework/factories/BasicPaneFactory.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
+    - com/sun/star/drawing/framework/XResourceFactory.hpp
+    - com/sun/star/lang/XInitialization.hpp
+    sd/source/ui/framework/factories/BasicViewFactory.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XResourceFactory.hpp
+    - com/sun/star/lang/XInitialization.hpp
+    sd/source/ui/framework/factories/ChildWindowPane.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XEventListener.hpp
+    - framework/Pane.hxx
+    sd/source/ui/framework/module/CenterViewFocusModule.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
+    sd/source/ui/framework/module/ShellStackGuard.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
+    sd/source/ui/framework/module/ToolBarModule.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
+    # Needed for template
+    - o3tl/deleter.hxx
+    sd/source/ui/framework/module/SlideSorterModule.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
+    sd/source/ui/framework/module/ViewTabBarModule.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
     sd/source/ui/inc/AccessibleDocumentViewBase.hxx:
     # base class has to be a complete type
     - com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp
@@ -186,3 +235,28 @@ blacklist:
     sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx:
     # Needed for template
     - o3tl/deleter.hxx
+    sd/source/ui/presenter/PresenterHelper.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/XPresenterHelper.hpp
+    - com/sun/star/lang/XInitialization.hpp
+    sd/source/ui/presenter/PresenterPreviewCache.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/XSlidePreviewCache.hpp
+    - com/sun/star/lang/XInitialization.hpp
+    sd/source/ui/presenter/PresenterCanvas.hxx:
+    # base class has to be a complete type
+    - com/sun/star/rendering/XSpriteCanvas.hpp
+    - com/sun/star/rendering/XBitmap.hpp
+    - com/sun/star/awt/XWindowListener.hpp
+    sd/source/ui/presenter/PresenterTextView.hxx:
+    # base class has to be a complete type
+    - tools/PropertySet.hxx
+    - com/sun/star/lang/XInitialization.hpp
+    sd/source/ui/presenter/SlideRenderer.hxx:
+    # base class has to be a complete type
+    - com/sun/star/drawing/XSlideRenderer.hpp
+    - com/sun/star/lang/XInitialization.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    sd/source/ui/remotecontrol/Listener.hxx:
+    # base class has to be a complete type
+    - com/sun/star/presentation/XSlideShowListener.hpp
diff --git a/sd/source/ui/animations/CategoryListBox.cxx b/sd/source/ui/animations/CategoryListBox.cxx
index 1d043272ee5a..1b5505abdf9f 100644
--- a/sd/source/ui/animations/CategoryListBox.cxx
+++ b/sd/source/ui/animations/CategoryListBox.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "CategoryListBox.hxx"
+#include <vcl/builderfactory.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/animations/CategoryListBox.hxx b/sd/source/ui/animations/CategoryListBox.hxx
index bf8ef932f117..8ae5af8365eb 100644
--- a/sd/source/ui/animations/CategoryListBox.hxx
+++ b/sd/source/ui/animations/CategoryListBox.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SD_SOURCE_UI_ANIMATIONS_CATEGORYLISTBOX_HXX
 
 #include <vcl/lstbox.hxx>
-#include <vcl/builderfactory.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index da0a3fdb6104..cc62a28e169c 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -68,6 +68,7 @@
 #include "CustomAnimationDialog.hxx"
 #include "CustomAnimationPane.hxx"
 #include "STLPropertySet.hxx"
+#include <CustomAnimationPreset.hxx>
 
 #include <avmedia/mediawindow.hxx>
 
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index d8a0f29384e6..9b674de7862b 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -20,16 +20,10 @@
 #ifndef INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATIONDIALOG_HXX
 #define INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATIONDIALOG_HXX
 
-#include <CustomAnimationEffect.hxx>
-#include <CustomAnimationPreset.hxx>
-#include <vcl/tabdlg.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
 
-class TabControl;
-class OKButton;
-class CancelButton;
-class HelpButton;
 namespace sd {
 
 // property handles
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 3cc6c40a8f71..8e322f885db1 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -24,15 +24,14 @@
 
 #include <memory>
 
-#include <com/sun/star/drawing/XShape.hpp>
 #include <vcl/treelistbox.hxx>
 #include <vcl/builder.hxx>
 #include <CustomAnimationEffect.hxx>
-#include <CustomAnimationPreset.hxx>
+
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
 
 namespace sd {
 
-class CustomAnimationEffect;
 typedef std::shared_ptr< CustomAnimationEffect > CustomAnimationEffectPtr;
 
 class ICustomAnimationListController
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index db2236ad32a5..e3a7a2654444 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -42,6 +42,8 @@
 #include "CustomAnimationPane.hxx"
 #include "CustomAnimationDialog.hxx"
 #include "CustomAnimationList.hxx"
+#include "motionpathtag.hxx"
+#include <CustomAnimationPreset.hxx>
 #include <createcustomanimationpanel.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 707ecf929155..9976207d5f75 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -20,25 +20,22 @@
 #ifndef INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATIONPANE_HXX
 #define INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATIONPANE_HXX
 
-#include <com/sun/star/drawing/XDrawView.hpp>
 #include <vcl/layout.hxx>
 #include <vcl/field.hxx>
 #include <svx/sidebar/PanelLayout.hxx>
-#include <sfx2/sidebar/ControlFactory.hxx>
-#include <CustomAnimationPreset.hxx>
 #include "CustomAnimationList.hxx"
 #include "CategoryListBox.hxx"
-#include "motionpathtag.hxx"
 #include <misc/scopelock.hxx>
 
 #include <vector>
 
-class PushButton;
-class FixedLine;
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawView; } } } }
+namespace sd { class CustomAnimationPresets; }
+namespace sd { class MotionPathTag; }
+
 class FixedText;
-class ListBox;
-class ComboBox;
-class CheckBox;
+namespace weld { class ComboBox; }
 
 enum class PathKind { NONE, CURVE, POLYGON, FREEFORM };
 
diff --git a/sd/source/ui/animations/STLPropertySet.cxx b/sd/source/ui/animations/STLPropertySet.cxx
index 60357bcfacfa..d7dff8df1a05 100644
--- a/sd/source/ui/animations/STLPropertySet.cxx
+++ b/sd/source/ui/animations/STLPropertySet.cxx
@@ -21,8 +21,6 @@
 
 #include <osl/diagnose.h>
 
-using namespace com::sun::star::beans;
-
 using com::sun::star::uno::Any;
 
 namespace sd
diff --git a/sd/source/ui/animations/STLPropertySet.hxx b/sd/source/ui/animations/STLPropertySet.hxx
index 1d6008b4daa5..5b7388edfdf9 100644
--- a/sd/source/ui/animations/STLPropertySet.hxx
+++ b/sd/source/ui/animations/STLPropertySet.hxx
@@ -20,10 +20,8 @@
 #ifndef INCLUDED_SD_SOURCE_UI_ANIMATIONS_STLPROPERTYSET_HXX
 #define INCLUDED_SD_SOURCE_UI_ANIMATIONS_STLPROPERTYSET_HXX
 
-#include <com/sun/star/beans/PropertyValue.hpp>
-
-#include <list>
 #include <map>
+#include <com/sun/star/uno/Any.hxx>
 
 namespace sd
 {
diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx
index 3158f95c2d8b..91604b183121 100644
--- a/sd/source/ui/animations/motionpathtag.hxx
+++ b/sd/source/ui/animations/motionpathtag.hxx
@@ -21,12 +21,11 @@
 #define INCLUDED_SD_SOURCE_UI_ANIMATIONS_MOTIONPATHTAG_HXX
 
 #include <com/sun/star/util/XChangesListener.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <smarttag.hxx>
 #include <CustomAnimationEffect.hxx>
 
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
 class SdrPathObj;
 
 namespace sd {
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index b1d117f87f09..f98c4c4d313f 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/geometry/RealPoint2D.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
+#include <com/sun/star/office/XAnnotationAccess.hpp>
 #include <comphelper/lok.hxx>
 #include <svx/svxids.hrc>
 
@@ -77,6 +78,7 @@
 #include <DrawController.hxx>
 #include <sdresid.hxx>
 #include <EventMultiplexer.hxx>
+#include <ViewShellBase.hxx>
 #include <ViewShellManager.hxx>
 #include <sdpage.hxx>
 #include <drawdoc.hxx>
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index daee8b8df347..19c0ce21929e 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -21,24 +21,26 @@
 #define INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONMANAGERIMPL_HXX
 
 #include <com/sun/star/document/XEventListener.hpp>
-#include <com/sun/star/office/XAnnotationAccess.hpp>
-#include <com/sun/star/drawing/XDrawView.hpp>
 
 #include <rtl/ustring.hxx>
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
-#include <ViewShellBase.hxx>
-
 #include "annotationtag.hxx"
 
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawView; } } } }
+namespace com { namespace sun { namespace star { namespace office { class XAnnotationAccess; } } } }
+namespace com { namespace sun { namespace star { namespace office { class XAnnotation; } } } }
+
 class SfxRequest;
 class SdPage;
+class SdDrawDocument;
 
 namespace sd
 {
 
+class ViewShellBase;
 typedef std::vector< rtl::Reference< AnnotationTag > > AnnotationTagVector;
 
 namespace tools {
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index f2fe252cd761..2f843609ec29 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -20,11 +20,10 @@
 #ifndef INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONTAG_HXX
 #define INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONTAG_HXX
 
-#include <com/sun/star/office/XAnnotation.hpp>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <smarttag.hxx>
 
+namespace com { namespace sun { namespace star { namespace office { class XAnnotation; } } } }
+
 namespace sd {
 
 class View;
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 757cda4e8727..29d21d46e301 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -77,6 +77,7 @@
 #include "annotationwindow.hxx"
 #include "annotationmanagerimpl.hxx"
 
+#include <com/sun/star/office/XAnnotation.hpp>
 #include <DrawDocShell.hxx>
 #include <ViewShell.hxx>
 #include <drawdoc.hxx>
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index b4767b08be86..10e055d01a08 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -20,16 +20,12 @@
 #ifndef INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONWINDOW_HXX
 #define INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONWINDOW_HXX
 
-#include <com/sun/star/office/XAnnotation.hpp>
-
 #include <vcl/ctrl.hxx>
-#include <vcl/lineinfo.hxx>
 #include <vcl/floatwin.hxx>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 
-#include <svx/sdr/overlay/overlayobject.hxx>
-#include <editeng/editstat.hxx>
+namespace com { namespace sun { namespace star { namespace office { class XAnnotation; } } } }
 
 class OutlinerView;
 class Outliner;
@@ -44,7 +40,6 @@ class AnnotationManagerImpl;
 class AnnotationWindow;
 class DrawDocShell;
 class TextApiObject;
-class View;
 
 class AnnotationTextWindow : public Control
 {
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 934e3be37217..bf03cd86b415 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -13,7 +13,7 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-
+#include <com/sun/star/graphic/GraphicProvider.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/text/XText.hpp>
 
@@ -26,6 +26,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <officecfg/Office/Impress.hxx>
 #include <svx/svdview.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <svx/unoshape.hxx>
@@ -36,6 +37,8 @@
 #include "PhotoAlbumDialog.hxx"
 #include <strings.hrc>
 #include <sdresid.hxx>
+#include <drawdoc.hxx>
+#include <sdpage.hxx>
 
 namespace sd
 {
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index 937edbe8a509..f8f1b4e503ce 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -11,29 +11,20 @@
 #define INCLUDED_SD_SOURCE_UI_DLG_PHOTOALBUMDIALOG_HXX
 
 #include <tools/link.hxx>
-#include <sdpage.hxx>
-#include <pres.hxx>
-#include <drawdoc.hxx>
 
 #include <vcl/weld.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <svx/graphctl.hxx>
-#include <svx/svdotext.hxx>
-#include <svx/svdobj.hxx>
+#include <xmloff/autolayout.hxx>
 
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/drawing/XDrawPages.hpp>
-#include <com/sun/star/graphic/GraphicProvider.hpp>
-#include <com/sun/star/graphic/XGraphicProvider.hpp>
-#include <com/sun/star/configuration/theDefaultProvider.hpp>
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPages; } } } }
+namespace com { namespace sun { namespace star { namespace graphic { class XGraphicProvider; } } } }
 
-class SdrTextObj;
 class SdDrawDocument;
-class SdPage;
+class GraphicFilter;
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::presentation;
 
 namespace sd
 {
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index 6ab8522d65f3..ffd49436817f 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -22,16 +22,12 @@
 
 #include <rtl/ustring.hxx>
 #include <vcl/scrbar.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
 
-#include <svtools/extensionlistbox.hxx>
 #include <cppuhelper/implbase.hxx>
 
-#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/deployment/XPackage.hpp>
 
 #include <memory>
 
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 0bf499416d93..6e206bbeb7b1 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -56,10 +56,8 @@ namespace sd {
     class BreakDlg;
     class HeaderFooterDialog;
     class MasterLayoutDialog;
-    class OutlineBulletDlg;
 }
 
-class Dialog;
 class SdVclAbstractDialog_Impl : public VclAbstractDialog
 {
     DECL_ABSTDLG_BASE(SdVclAbstractDialog_Impl,Dialog)
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
index a3ba43ed5f22..402774412274 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
@@ -20,10 +20,12 @@
 #ifndef INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_CHANGEREQUESTQUEUE_HXX
 #define INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_CHANGEREQUESTQUEUE_HXX
 
-#include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <list>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationChangeRequest; } } } } }
+
 namespace sd { namespace framework {
 
 /** The ChangeRequestQueue stores the pending requests for changes to the
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
index 9acb58fdf25e..17696fb25ce7 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
@@ -22,20 +22,18 @@
 
 #include "ChangeRequestQueue.hxx"
 #include <osl/mutex.hxx>
-#include <rtl/ref.hxx>
-#include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
-#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp>
 
-#include <cppuhelper/interfacecontainer.hxx>
 #include <tools/link.hxx>
 
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationChangeRequest; } } } } }
+
 struct ImplSVEvent;
 
 namespace sd { namespace framework {
 
-class ConfigurationController;
 class ConfigurationUpdater;
 
 /** The ChangeRequestQueueProcessor ownes the ChangeRequestQueue and
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
index a53ec16229ca..9bd9e19efa76 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
@@ -20,6 +20,7 @@
 #include "ConfigurationClassifier.hxx"
 
 #include <framework/FrameworkHelper.hxx>
+#include <com/sun/star/drawing/framework/XConfiguration.hpp>
 #include <sal/log.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
index 82f32c6f6abd..25b07f1bdcb3 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
@@ -21,11 +21,13 @@
 #define INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_CONFIGURATIONCLASSIFIER_HXX
 
 #include "debugtrace.hxx"
-
-#include <com/sun/star/drawing/framework/XConfiguration.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+
 namespace sd { namespace framework {
 
 /** A ConfigurationClassifier object compares two configurations of
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 28db962a0eb2..3c4fcf4bb147 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -24,6 +24,7 @@
 #include "ConfigurationControllerBroadcaster.hxx"
 #include "ConfigurationTracer.hxx"
 #include "GenericConfigurationChangeRequest.hxx"
+#include "ConfigurationControllerResourceManager.hxx"
 #include "ResourceFactoryManager.hxx"
 #include "UpdateRequest.hxx"
 #include "ChangeRequestQueueProcessor.hxx"
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index 55eead6e0d96..afc535173f47 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "ConfigurationControllerBroadcaster.hxx"
+#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <tools/diagnose_ex.h>
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
index 45b7d05fe5c2..768308941d04 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
@@ -20,13 +20,17 @@
 #ifndef INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_CONFIGURATIONCONTROLLERBROADCASTER_HXX
 #define INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_CONFIGURATIONCONTROLLERBROADCASTER_HXX
 
-#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
-#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <unordered_map>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationChangeListener; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResource; } } } } }
+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 {
 
 /** This class manages the set of XConfigurationChangeListeners and
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index 51b648a959cf..8bc71472a6e7 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -22,6 +22,8 @@
 #include "ResourceFactoryManager.hxx"
 #include <framework/FrameworkHelper.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/drawing/framework/XConfiguration.hpp>
+#include <com/sun/star/drawing/framework/XResourceFactory.hpp>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 #include <algorithm>
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
index 55744ed2b089..03e8e62d30f8 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
@@ -20,15 +20,19 @@
 #ifndef INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_CONFIGURATIONCONTROLLERRESOURCEMANAGER_HXX
 #define INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_CONFIGURATIONCONTROLLERRESOURCEMANAGER_HXX
 
-#include <com/sun/star/drawing/framework/XConfiguration.hpp>
-#include <com/sun/star/drawing/framework/XResource.hpp>
-#include <com/sun/star/drawing/framework/XResourceFactory.hpp>
 #include <osl/mutex.hxx>
 
+#include <com/sun/star/uno/Reference.hxx>
+
 #include <map>
 #include <memory>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceFactory; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResource; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+
 namespace sd { namespace framework {
 
 class ConfigurationControllerBroadcaster;
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx
index 991141843728..c2fc122b499a 100644
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_CONFIGURATIONTRACER_HXX
 #define INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_CONFIGURATIONTRACER_HXX
 
-#include <com/sun/star/drawing/framework/XConfiguration.hpp>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
 
 namespace sd { namespace framework {
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index e6e332b53fad..f13c17bb9538 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -21,9 +21,11 @@
 #include "ConfigurationTracer.hxx"
 #include "ConfigurationClassifier.hxx"
 #include "ConfigurationControllerBroadcaster.hxx"
+#include "ConfigurationControllerResourceManager.hxx"
 #include <framework/Configuration.hxx>
 #include <framework/FrameworkHelper.hxx>
 
+#include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <comphelper/scopeguard.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index 1b2c12eed1bb..682f07b17dfb 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -20,18 +20,21 @@
 #ifndef INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_CONFIGURATIONUPDATER_HXX
 #define INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_CONFIGURATIONUPDATER_HXX
 
-#include "ConfigurationControllerResourceManager.hxx"
-#include <com/sun/star/drawing/framework/XResourceId.hpp>
-#include <com/sun/star/drawing/framework/XConfiguration.hpp>
-#include <com/sun/star/drawing/framework/XControllerManager.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <vcl/timer.hxx>
 #include <memory>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XControllerManager; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+
 namespace sd { namespace framework {
 
 class ConfigurationClassifier;
 class ConfigurationUpdaterLock;
+class ConfigurationControllerResourceManager;
+class ConfigurationControllerBroadcaster;
 
 /** This is a helper class for the ConfigurationController.  It handles the
     update of the current configuration so that it looks like a requested
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
index a94199a5331a..657c1b0f1f95 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
@@ -23,12 +23,11 @@
 #include <MutexOwner.hxx>
 #include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/drawing/framework/XConfiguration.hpp>
-#include <com/sun/star/drawing/framework/XResourceId.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
 #include <cppuhelper/compbase.hxx>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+
 namespace sd { namespace framework {
 
 typedef ::cppu::WeakComponentImplHelper <
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
index 10941783dce7..ba296968e879 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
+#include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sal/log.hxx>
 
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
index 34ee07446d9e..9b8ce6163b83 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
@@ -26,12 +26,14 @@
 #include <utility>
 #include <vector>
 
-#include <com/sun/star/drawing/framework/XControllerManager.hpp>
-#include <com/sun/star/drawing/framework/XModuleController.hpp>
-#include <com/sun/star/drawing/framework/XResourceFactoryManager.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XControllerManager; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceFactory; } } } } }
+namespace com { namespace sun { namespace star { namespace util { class XURLTransformer; } } } }
+
 namespace sd { namespace framework {
 
 /** Container of resource factories of the drawing framework.
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx
index bd6575d56056..5fb779cac636 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.hxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx
@@ -23,9 +23,10 @@
 #include <MutexOwner.hxx>
 #include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/drawing/framework/XConfiguration.hpp>
 #include <cppuhelper/compbase.hxx>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfiguration; } } } } }
+
 namespace sd { namespace framework {
 
 typedef ::cppu::WeakComponentImplHelper <
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 44a64d838cb9..d4a3755e6512 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -30,6 +30,7 @@
 #include "FullScreenPane.hxx"
 
 #include <framework/FrameworkHelper.hxx>
+#include <PaneShells.hxx>
 #include <ViewShellBase.hxx>
 #include <PaneChildWindows.hxx>
 #include <DrawController.hxx>
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index 6c353bd7c960..28f7fa870f65 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -20,19 +20,18 @@
 #ifndef INCLUDED_SD_SOURCE_UI_FRAMEWORK_FACTORIES_BASICPANEFACTORY_HXX
 #define INCLUDED_SD_SOURCE_UI_FRAMEWORK_FACTORIES_BASICPANEFACTORY_HXX
 
-#include <MutexOwner.hxx>
-
 #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/basemutex.hxx>
 #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 com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 namespace sd {
 
 class ViewShellBase;
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
index 29349af5f4ab..780710d8cfb0 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
@@ -20,19 +20,14 @@
 #ifndef INCLUDED_SD_SOURCE_UI_FRAMEWORK_FACTORIES_BASICTOOLBARFACTORY_HXX
 #define INCLUDED_SD_SOURCE_UI_FRAMEWORK_FACTORIES_BASICTOOLBARFACTORY_HXX
 
-#include <MutexOwner.hxx>
-
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/drawing/framework/XResourceFactory.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
-#include <com/sun/star/drawing/framework/XResourceId.hpp>
-#include <com/sun/star/frame/XController.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
-namespace sd {
-class ViewShellBase;
-}
+namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
 
 namespace sd { namespace framework {
 
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index 2bf465850a8c..e4aaf65f3396 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -23,8 +23,6 @@
 #include <MutexOwner.hxx>
 
 #include <com/sun/star/drawing/framework/XResourceFactory.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
-#include <com/sun/star/drawing/framework/XPane.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 
 #include <cppuhelper/compbase.hxx>
@@ -32,6 +30,9 @@
 #include <vcl/vclptr.hxx>
 #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 XPane; } } } } }
+
 namespace sd {
 class ViewShell;
 class ViewShellBase;
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx
index b8a5db883af8..b9b54235518b 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.hxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx
@@ -21,16 +21,17 @@
 #define INCLUDED_SD_SOURCE_UI_FRAMEWORK_FACTORIES_CHILDWINDOWPANE_HXX
 
 #include <framework/Pane.hxx>
-#include <PaneShells.hxx>
 
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/drawing/framework/XResourceId.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <memory>
 
+class SfxShell;
+
 namespace sd { class ViewShellBase; }
+namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
 
 namespace sd { namespace framework {
 
diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx
index 6c8956aee4ba..2f4af60c0b1e 100644
--- a/sd/source/ui/framework/factories/FrameWindowPane.hxx
+++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx
@@ -22,7 +22,7 @@
 
 #include <framework/Pane.hxx>
 
-#include <com/sun/star/drawing/framework/XResourceId.hpp>
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } }
 
 namespace sd { namespace framework {
 
diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx
index 011c612ff2f4..de957cf635c4 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.hxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.hxx
@@ -21,14 +21,13 @@
 #define INCLUDED_SD_SOURCE_UI_FRAMEWORK_FACTORIES_FULLSCREENPANE_HXX
 
 #include "FrameWindowPane.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <vcl/vclevent.hxx>
-#include <vcl/window.hxx>
-#include <memory>
+#include <tools/link.hxx>
 
 class WorkWindow;
+class VclWindowEvent;
 
-namespace sd { class ViewShellBase; }
+namespace vcl { class Window; }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 namespace sd { namespace framework {
 
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
index b9c7d141a8e0..61081be1e703 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
@@ -23,10 +23,11 @@
 #include <MutexOwner.hxx>
 
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
-#include <com/sun/star/frame/XController.hpp>
 #include <cppuhelper/compbase.hxx>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+
 namespace sd {
 
 class ViewShellBase;
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 5df2f20b8940..7d25863a6d97 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -25,14 +25,14 @@
 #include <framework/ConfigurationController.hxx>
 
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
-#include <com/sun/star/frame/XController.hpp>
 
-#include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #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 {
 
 class ViewShellBase;
diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx
index 5102d9108059..f70457d43dad 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.hxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.hxx
@@ -22,14 +22,15 @@
 
 #include <MutexOwner.hxx>
 #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/drawing/framework/XControllerManager.hpp>
-#include <com/sun/star/drawing/framework/XTabBar.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <memory>
 #include <set>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XControllerManager; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XTabBar; } } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+
 namespace sd { namespace framework {
 
 typedef ::cppu::WeakComponentImplHelper <
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx
index 9e811dd807af..b8df4f1084fc 100644
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -22,14 +22,14 @@
 
 #include <ToolBarManager.hxx>
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
-#include <com/sun/star/drawing/framework/XTabBar.hpp>
-#include <com/sun/star/frame/XController.hpp>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <o3tl/deleter.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 {
 class ViewShellBase;
 }
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx
index 61e319d0dd58..88333b0d9d71 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.hxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx
@@ -23,11 +23,12 @@
 #include <MutexOwner.hxx>
 
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
-#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
-#include <com/sun/star/drawing/framework/XTabBar.hpp>
-#include <com/sun/star/frame/XController.hpp>
 #include <cppuhelper/compbase.hxx>
 
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
+namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XTabBar; } } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
+
 namespace sd { namespace framework {
 
 typedef ::cppu::WeakComponentImplHelper <
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx
index e5013c5436b1..c8ff74cd5166 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx
@@ -20,6 +20,7 @@
 #include "CanvasUpdateRequester.hxx"
 #include <vcl/svapp.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <vector>
 
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
index 471b9ab53b72..653e991f8fc1 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
@@ -20,11 +20,12 @@
 #ifndef INCLUDED_SD_SOURCE_UI_PRESENTER_CANVASUPDATEREQUESTER_HXX
 #define INCLUDED_SD_SOURCE_UI_PRESENTER_CANVASUPDATEREQUESTER_HXX
 
-#include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <sal/types.h>
+#include <com/sun/star/uno/Reference.hxx>
 #include <tools/link.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace rendering { class XSpriteCanvas; } } } }
+
 struct ImplSVEvent;
 
 namespace sd { namespace presenter {
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 220418706256..5a9908026519 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "PresenterCanvas.hxx"
+#include "CanvasUpdateRequester.hxx"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
@@ -25,6 +26,7 @@
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/utils/canvastools.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <canvas/canvastools.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx
index 071a234bdbdb..557d65cbe6f0 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -20,22 +20,19 @@
 #ifndef INCLUDED_SD_SOURCE_UI_PRESENTER_PRESENTERCANVAS_HXX
 #define INCLUDED_SD_SOURCE_UI_PRESENTER_PRESENTERCANVAS_HXX
 
-#include "CanvasUpdateRequester.hxx"
 #include <basegfx/range/b2drectangle.hxx>
 #include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XWindowListener.hpp>
-#include <com/sun/star/geometry/AffineMatrix2D.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <com/sun/star/rendering/XBitmapCanvas.hpp>
-#include <com/sun/star/rendering/VolatileContentDestroyedException.hpp>
+#include <com/sun/star/rendering/XBitmap.hpp>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <memory>
 
+namespace sd { namespace presenter { class CanvasUpdateRequester; } }
+namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
+namespace com { namespace sun { namespace star { namespace geometry { struct AffineMatrix2D; } } } }
+
 namespace sd { namespace presenter {
 
 typedef ::cppu::WeakComponentImplHelper <
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 45c4e6aaa65e..a10934f5f5c4 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/awt/WindowAttribute.hpp>
 #include <com/sun/star/awt/WindowClass.hpp>
 #include <com/sun/star/awt/WindowDescriptor.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx
index cad98b4b15f4..837c04abdb42 100644
--- a/sd/source/ui/presenter/PresenterHelper.hxx
+++ b/sd/source/ui/presenter/PresenterHelper.hxx
@@ -22,10 +22,11 @@
 
 #include <com/sun/star/drawing/XPresenterHelper.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 namespace sd { namespace presenter {
 
 typedef ::cppu::WeakComponentImplHelper<
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index b0de97d6997d..fafe1d9408b9 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -20,6 +20,7 @@
 #include "PresenterPreviewCache.hxx"
 #include <facreg.hxx>
 
+#include <cache/SlsPageCache.hxx>
 #include <cache/SlsCacheContext.hxx>
 #include <tools/IdleDetection.hxx>
 #include <vcl/bitmapex.hxx>
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx
index 78032b7d0b7e..3388d4ac3382 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.hxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx
@@ -22,11 +22,13 @@
 
 #include <com/sun/star/drawing/XSlidePreviewCache.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <cache/SlsPageCache.hxx>
+#include <tools/gen.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <memory>
 
+namespace sd { namespace slidesorter { namespace cache { class PageCache; } } }
+
 namespace sd { namespace presenter {
 
 typedef ::cppu::WeakComponentImplHelper<
diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx
index a34d878d611e..9773807c829f 100644
--- a/sd/source/ui/presenter/PresenterTextView.hxx
+++ b/sd/source/ui/presenter/PresenterTextView.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_SD_SOURCE_UI_PRESENTER_PRESENTERTEXTVIEW_HXX
 
 #include <tools/PropertySet.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <memory>
 
diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx
index c186282bde33..fcb42fd8f166 100644
--- a/sd/source/ui/presenter/SlideRenderer.hxx
+++ b/sd/source/ui/presenter/SlideRenderer.hxx
@@ -21,15 +21,15 @@
 #define INCLUDED_SD_SOURCE_UI_PRESENTER_SLIDERENDERER_HXX
 
 #include <PreviewRenderer.hxx>
-#include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XSlideRenderer.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/rendering/XSpriteCanvas.hpp>
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+
 namespace sd { namespace presenter {
 
 typedef ::cppu::WeakComponentImplHelper <
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 589b43f2bb9c..f614af007e78 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -15,6 +15,7 @@
 #include <new>
 
 #include <sal/log.hxx>
+#include <osl/socket.hxx>
 
 #ifdef LINUX_BLUETOOTH
   #include <glib.h>
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index 37d5e68c4d1a..7d1f9c5a0562 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -9,6 +9,7 @@
 
 #include "BufferedStreamSocket.hxx"
 
+#include <osl/socket.hxx>
 #include <sal/log.hxx>
 #include <algorithm>
 
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
index 3acdaf3fbc8e..9144ebfcdc4a 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
@@ -10,7 +10,7 @@
 #define INCLUDED_SD_SOURCE_UI_REMOTECONTROL_BUFFEREDSTREAMSOCKET_HXX
 
 #include "IBluetoothSocket.hxx"
-#include <osl/socket.hxx>
+#include <osl/socket_decl.hxx>
 #include <vector>
 
 #define CHARSET RTL_TEXTENCODING_UTF8
diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx
index 9ff90b6e7e3f..cf5540078e89 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -20,8 +20,10 @@
 #include <sal/log.hxx>
 
 #include "Communicator.hxx"
+#include "IBluetoothSocket.hxx"
 #include "Listener.hxx"
 #include "Receiver.hxx"
+#include "Transmitter.hxx"
 #include <RemoteServer.hxx>
 
 using namespace sd;
diff --git a/sd/source/ui/remotecontrol/Communicator.hxx b/sd/source/ui/remotecontrol/Communicator.hxx
index f32ae480808b..e32598912899 100644
--- a/sd/source/ui/remotecontrol/Communicator.hxx
+++ b/sd/source/ui/remotecontrol/Communicator.hxx
@@ -9,20 +9,14 @@
 #ifndef INCLUDED_SD_SOURCE_UI_REMOTECONTROL_COMMUNICATOR_HXX
 #define INCLUDED_SD_SOURCE_UI_REMOTECONTROL_COMMUNICATOR_HXX
 
-#include <stdlib.h>
-#ifndef _WIN32
-#include <unistd.h>
-#endif
-#include <sys/types.h>
 #include <memory>
-#include <vector>
 
 #include <rtl/ref.hxx>
 #include <salhelper/thread.hxx>
 
-#include <com/sun/star/presentation/XSlideShowController.hpp>
-
-#include "IBluetoothSocket.hxx"
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace presentation { class XSlideShowController; } } } }
+namespace sd { struct IBluetoothSocket; }
 
 #define CHARSET RTL_TEXTENCODING_UTF8
 namespace sd
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 389589be854d..a23df8fade0e 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -15,10 +15,12 @@
 #include <iostream>
 
 #include <rtl/strbuf.hxx>
+#include <osl/socket.hxx>
 #include <config_features.h>
 #include <sal/log.hxx>
 
 #include "DiscoveryService.hxx"
+#include "ZeroconfService.hxx"
 
 #ifdef _WIN32
   // LO vs WinAPI conflict
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.hxx b/sd/source/ui/remotecontrol/DiscoveryService.hxx
index d78e2f9abfbd..c1dc6e208ab3 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.hxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.hxx
@@ -9,15 +9,9 @@
 #ifndef INCLUDED_SD_SOURCE_UI_REMOTECONTROL_DISCOVERYSERVICE_HXX
 #define INCLUDED_SD_SOURCE_UI_REMOTECONTROL_DISCOVERYSERVICE_HXX
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <osl/socket.hxx>
 #include <osl/thread.hxx>
 
-#include "ZeroconfService.hxx"
-
-struct sockaddr_in;
+namespace sd { class ZeroconfService; }
 
 namespace sd
 {
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 095a7d7d9265..e1526aeac622 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "ImagePreparer.hxx"
+#include "Transmitter.hxx"
 
 #include <comphelper/base64.hxx>
 #include <comphelper/processfactory.hxx>
@@ -38,6 +39,7 @@
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
+#include <com/sun/star/presentation/XSlideShowController.hpp>
 #include <com/sun/star/presentation/XPresentationPage.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
 
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx
index 8deb50300494..4b2e9ff51a8a 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.hxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx
@@ -9,11 +9,11 @@
 #ifndef INCLUDED_SD_SOURCE_UI_REMOTECONTROL_IMAGEPREPARER_HXX
 #define INCLUDED_SD_SOURCE_UI_REMOTECONTROL_IMAGEPREPARER_HXX
 
-#include <osl/thread.hxx>
 #include <vcl/timer.hxx>
-#include <com/sun/star/presentation/XSlideShowController.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
-#include "Transmitter.hxx"
+namespace com { namespace sun { namespace star { namespace presentation { class XSlideShowController; } } } }
+namespace sd { class Transmitter; }
 
 namespace sd
 {
diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx
index f6c026f87e18..290d35cb897f 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -11,8 +11,12 @@
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 
+#include "Communicator.hxx"
 #include "Listener.hxx"
 #include "ImagePreparer.hxx"
+#include "Transmitter.hxx"
+
+#include <com/sun/star/presentation/XSlideShowController.hpp>
 
 using namespace sd;
 using namespace ::com::sun::star::presentation;
diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx
index 08ee3349a64f..ad75d6e1cd18 100644
--- a/sd/source/ui/remotecontrol/Listener.hxx
+++ b/sd/source/ui/remotecontrol/Listener.hxx
@@ -11,14 +11,15 @@
 
 #include <sal/config.h>
 #include <com/sun/star/presentation/XSlideShowListener.hpp>
-#include <com/sun/star/presentation/XSlideShowController.hpp>
 
+#include <rtl/ref.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <osl/socket.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 
-#include "Communicator.hxx"
-#include "Transmitter.hxx"
+namespace com { namespace sun { namespace star { namespace presentation { class XSlideShowController; } } } }
+namespace sd { class Communicator; }
+namespace sd { class Transmitter; }
 
 namespace sd {
 /**
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx
index 042a63006f78..483ff88e9389 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -22,6 +22,7 @@
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <vcl/svapp.hxx>
 
 using namespace sd;
 using namespace ::osl;
diff --git a/sd/source/ui/remotecontrol/Receiver.hxx b/sd/source/ui/remotecontrol/Receiver.hxx
index 9d7652da3119..586c1fe29534 100644
--- a/sd/source/ui/remotecontrol/Receiver.hxx
+++ b/sd/source/ui/remotecontrol/Receiver.hxx
@@ -9,14 +9,13 @@
 #ifndef INCLUDED_SD_SOURCE_UI_REMOTECONTROL_RECEIVER_HXX
 #define INCLUDED_SD_SOURCE_UI_REMOTECONTROL_RECEIVER_HXX
 
-#include <osl/socket.hxx>
-#include <stdlib.h>
+#include <rtl/string.hxx>
 #include <vcl/timer.hxx>
-#include <vcl/svapp.hxx>
 
 #include <vector>
+#include <deque>
 
-#include "Transmitter.hxx"
+namespace sd { class Transmitter; }
 
 namespace sd
 {
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 57adc01cc127..704558ab7366 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -21,6 +21,8 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/configuration.hxx>
 #include <sal/log.hxx>
+#include <vcl/svapp.hxx>
+#include <osl/socket.hxx>
 
 #include <sddll.hxx>
 
diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx b/sd/source/ui/remotecontrol/Transmitter.cxx
index fdfe8b1477fa..8f3b7d24c184 100644
--- a/sd/source/ui/remotecontrol/Transmitter.cxx
+++ b/sd/source/ui/remotecontrol/Transmitter.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 #include "Transmitter.hxx"
+#include "IBluetoothSocket.hxx"
 #include <sal/log.hxx>
 
 using namespace std;
diff --git a/sd/source/ui/remotecontrol/Transmitter.hxx b/sd/source/ui/remotecontrol/Transmitter.hxx
index 607ab59c5975..7044d8f1c852 100644
--- a/sd/source/ui/remotecontrol/Transmitter.hxx
+++ b/sd/source/ui/remotecontrol/Transmitter.hxx
@@ -12,12 +12,13 @@
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
-#include "IBluetoothSocket.hxx"
 #include <osl/thread.hxx>
 #include <rtl/string.hxx>
 
 #include <queue>
 
+namespace sd { struct IBluetoothSocket; }
+
 namespace sd
 {