Remove obsolete fw declarations from sd/

found with bin/find-unneeded-includes --fwdecl Change-Id: Icca48a80a17fad6765d0e871ec2a6f12e0317d60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183901 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
2025-04-08 16:18:22 +02:00 · 2025-04-08 16:18:22 +02:00 · 1c99fa6372
commit 1c99fa6372
parent 90ce84a5dd
64 changed files with 8 additions and 181 deletions
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@ -72,9 +72,6 @@ excludelist:
    - com/sun/star/lang/XServiceInfo.hpp
    - com/sun/star/style/XStyle.hpp
    - com/sun/star/util/XModifyBroadcaster.hpp
-    sd/inc/textapi.hxx:
-    # base class has to be a complete type
-    - editeng/outliner.hxx
    sd/inc/TransitionPreset.hxx:
    # base class has to be a complete type
    - com/sun/star/lang/XMultiServiceFactory.hpp
@ -91,6 +88,9 @@ excludelist:
    sd/source/filter/eppt/eppt.hxx:
    # base class has to be a complete type
    - escherex.hxx
+    sd/source/filter/html/htmlex.hxx:
+    # Needed in --fwdecl mode, to silence "externally available entity 'HtmlState' is not previously declared in an included file"
+    - class HtmlState
    sd/source/ui/annotations/annotationmanagerimpl.hxx:
    # base class has to be a complete type
    - annotationtag.hxx
@ -122,16 +122,16 @@ excludelist:
    # 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:
+    sd/source/ui/inc/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:
+    sd/source/ui/inc/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:
+    sd/source/ui/inc/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
@ -259,9 +259,6 @@ excludelist:
    - com/sun/star/drawing/framework/XView.hpp
    - com/sun/star/lang/XUnoTunnel.hpp
    - com/sun/star/view/XSelectionSupplier.hpp
-    sd/source/ui/inc/tools/PropertySet.hxx:
-    # base class has to be a complete type
-    - com/sun/star/beans/XPropertySet.hpp
    sd/source/ui/inc/tools/SlotStateListener.hxx:
    # base class has to be a complete type
    - com/sun/star/frame/XStatusListener.hpp
@ -308,11 +305,6 @@ excludelist:
    - com/sun/star/beans/XPropertyChangeListener.hpp
    - com/sun/star/accessibility/XAccessibleEventListener.hpp
    - com/sun/star/frame/XFrameActionListener.hpp
-    sd/source/ui/slidesorter/shell/SlideSorterService.hxx:
-    # base class has to be a complete type
-    - com/sun/star/awt/XWindowListener.hpp
-    - com/sun/star/drawing/XSlideSorterBase.hpp
-    - com/sun/star/lang/XInitialization.hpp
    sd/source/ui/unoidl/sddetect.hxx:
    # base class has to be a complete type
    - com/sun/star/document/XExtendedFilterDetection.hpp
@ -332,9 +324,6 @@ excludelist:
    - com/sun/star/beans/XPropertyState.hpp
    - com/sun/star/lang/XServiceInfo.hpp
    - com/sun/star/lang/XUnoTunnel.hpp
-    sd/source/core/annotations/AnnotationEnumeration.cxx:
-    # Avoid loplugin:unreffun error
-    - AnnotationEnumeration.hxx
    sd/source/core/CustomAnimationCloner.cxx:
    # Avoid loplugin:unreffun error
    - CustomAnimationCloner.hxx
@ -423,9 +412,6 @@ excludelist:
    sd/source/core/drawdoc.cxx:
    # Needed for template
    - com/sun/star/frame/XModel.hpp
-    sd/source/core/text/textapi.cxx:
-    # Needed for macro defines
-    - editeng/unoprnms.hxx
    sd/source/filter/eppt/epptso.cxx:
    # Needed for direct member access
    - com/sun/star/table/XTable.hpp
@ -457,9 +443,6 @@ excludelist:
    sd/source/filter/xml/sdtransform.cxx:
    # Needed for implicit dtor
    - editeng/outlobj.hxx
-    sd/source/ui/annotations/annotationtag.cxx:
-    # Needed for template
-    - com/sun/star/office/XAnnotation.hpp
    sd/source/ui/animations/CustomAnimationList.cxx:
    # Actually used
    - comphelper/scopeguard.hxx
--- a/sd/inc/Annotation.hxx
+++ b/sd/inc/Annotation.hxx
@ -36,12 +36,8 @@

 class SdrUndoAction;

-namespace com::sun::star::office { class XAnnotation; }
-
 namespace com::sun::star::uno { template <typename > class Reference; }

-class SfxViewShell;
-
 namespace sd
 {

--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@ -38,7 +38,6 @@
 #include "stlpool.hxx"

 namespace com::sun::star::xml::dom { class XNode; }
-namespace com::sun::star::uno { class XInterface; }
 namespace editeng { class SvxFieldItemUpdater; }
 namespace vcl { class Font; }
 namespace com::sun::star::presentation { class XPresentation2; }
@ -58,9 +57,7 @@ class SdCustomShowList;
 class SdUndoGroup;
 class SdrObject;
 class Idle;
-class ImageMap;
 class Outliner;
-class SdrModel;
 class SdrOutliner;
 class SdrPage;
 class SdrTextObj;
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@ -56,7 +56,6 @@ class Graphic;
 namespace sd
 {
    class MainSequence;
-    class Annotation;
 }

 namespace sd {
--- a/sd/source/console/PresenterController.hxx
+++ b/sd/source/console/PresenterController.hxx
@ -48,11 +48,9 @@ namespace sdext::presenter {

 class PresenterCanvasHelper;
 class PresenterPaintManager;
-class PresenterPaneAnimator;
 class PresenterPaneContainer;
 class PresenterPaneBorderPainter;
 class PresenterScreen;
-class PresenterTheme;
 class PresenterWindowManager;

 typedef ::cppu::WeakComponentImplHelper <
--- a/sd/source/console/PresenterPaintManager.hxx
+++ b/sd/source/console/PresenterPaintManager.hxx
@ -32,8 +32,6 @@

 namespace sdext::presenter {

-class PresenterPaneContainer;
-
 /** Synchronize painting of windows and canvases.  At the moment there is
    just some processing of invalidate calls.
    This could be extended to process incoming windowPaint() calls.
--- a/sd/source/console/PresenterPaneBorderPainter.hxx
+++ b/sd/source/console/PresenterPaneBorderPainter.hxx
@ -30,7 +30,6 @@

 namespace sdext::presenter {

-class PresenterPane;
 class PresenterTheme;

 typedef ::cppu::WeakComponentImplHelper<
--- a/sd/source/console/PresenterPaneContainer.hxx
+++ b/sd/source/console/PresenterPaneContainer.hxx
@ -36,9 +36,6 @@

 namespace sdext::presenter {

-class PresenterPaneBase;
-class PresenterSprite;
-
 typedef ::cppu::WeakComponentImplHelper <
    css::lang::XEventListener
 > PresenterPaneContainerInterfaceBase;
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@ -36,7 +36,6 @@

 namespace com::sun::star::awt { class XControlModel; }
 namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::drawing { class XShape; }
 namespace com::sun::star::frame { class XModel; }
 namespace com::sun::star::task { class XStatusIndicator; }
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@ -28,7 +28,6 @@
 #include <memory>

 namespace com::sun::star {
-    namespace awt { struct FontDescriptor; }
    namespace beans { class XPropertyState; }
    namespace text { class XTextRange; class XTextContent; class XSimpleText; }
    namespace style { struct TabStop; }
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@ -32,16 +32,9 @@

 namespace sd { class DrawDocShell; }

-class OutlinerParaObject;
-class SfxItemSet;
 class SfxProgress;
-class SdrOutliner;
 class SdPage;
 class HtmlState;
-class SdrTextObj;
-class SdrObjGroup;
-namespace sdr::table { class SdrTableObj; }
-class SdrPage;
 class SdDrawDocument;

 /// this class exports an Impress Document as a HTML Presentation.
--- a/sd/source/ui/annotations/AnnotationPopup.hxx
+++ b/sd/source/ui/annotations/AnnotationPopup.hxx
@ -12,10 +12,6 @@
 #include <svx/annotation/IAnnotationPopup.hxx>
 #include <vcl/weld.hxx>

-namespace com::sun::star::office
-{
-class XAnnotation;
-}
 namespace sdr::annotation
 {
 class Annotation;
@ -23,7 +19,6 @@ class Annotation;

 namespace sd
 {
-class View;
 class AnnotationWindow;

 class AnnotationPopup final : public sdr::annotation::IAnnotationPopup
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@ -35,7 +35,6 @@ namespace sdr::annotation { class TextApiObject; }
 namespace sd
 {

-class AnnotationManagerImpl;
 class DrawDocShell;
 class AnnotationWindow;

--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@ -31,10 +31,6 @@ class XConfiguration;
 }
 namespace com::sun::star::drawing::framework
 {
-class XControllerManager;
-}
-namespace com::sun::star::drawing::framework
-{
 class XResourceId;
 }
 namespace sd
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
@ -23,7 +23,6 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <comphelper/compbase.hxx>

-namespace com::sun::star::drawing::framework { class XConfiguration; }
 namespace com::sun::star::drawing::framework { class XResourceId; }

 namespace sd::framework {
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
@ -30,7 +30,6 @@
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>

-namespace com::sun::star::drawing::framework { class XControllerManager; }
 namespace com::sun::star::drawing::framework { class XResourceFactory; }
 namespace com::sun::star::util { class XURLTransformer; }
 namespace sd { class DrawController; }
--- a/sd/source/ui/framework/configuration/UpdateRequest.hxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx
@ -23,8 +23,6 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <comphelper/compbase.hxx>

-namespace com::sun::star::drawing::framework { class XConfiguration; }
-
 namespace sd::framework {

 typedef comphelper::WeakComponentImplHelper <
--- a/sd/source/ui/framework/factories/ChildWindowPane.hxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx
@ -29,7 +29,6 @@
 class SfxShell;

 namespace sd { class ViewShellBase; }
-namespace com::sun::star::awt { class XWindow; }
 namespace com::sun::star::drawing::framework { class XResourceId; }

 namespace sd::framework {
--- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
@ -27,10 +27,6 @@ namespace com::sun::star::drawing::framework
 {
 class XConfigurationController;
 }
-namespace com::sun::star::frame
-{
-class XController;
-}

 namespace sd
 {
--- a/sd/source/ui/framework/module/NotesPaneModule.hxx
+++ b/sd/source/ui/framework/module/NotesPaneModule.hxx
@ -19,10 +19,6 @@ namespace com::sun::star::drawing::framework
 class XConfigurationController;
 class XView;
 }
-namespace com::sun::star::frame
-{
-class XController;
-}
 namespace sd
 {
 class DrawController;
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@ -32,10 +32,6 @@ namespace com::sun::star::drawing::framework
 {
 class XConfigurationController;
 }
-namespace com::sun::star::frame
-{
-class XController;
-}

 namespace sd
 {
--- a/sd/source/ui/framework/module/SlideSorterModule.hxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.hxx
@ -26,9 +26,7 @@
 #include <set>

 namespace com::sun::star::drawing::framework { class XConfigurationController; }
-namespace com::sun::star::drawing::framework { class XControllerManager; }
 namespace com::sun::star::drawing::framework { class XTabBar; }
-namespace com::sun::star::frame { class XController; }
 namespace sd { class DrawController; }

 namespace sd::framework {
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@ -33,10 +33,6 @@ namespace com::sun::star::drawing::framework
 class XConfigurationController;
 class XResourceId;
 }
-namespace com::sun::star::frame
-{
-class XController;
-}

 namespace sd {
 class DrawController;
--- a/sd/source/ui/framework/module/ViewTabBarModule.hxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx
@ -25,7 +25,6 @@

 namespace com::sun::star::drawing::framework { class XConfigurationController; }
 namespace com::sun::star::drawing::framework { class XTabBar; }
-namespace com::sun::star::frame { class XController; }
 namespace sd { class DrawController; }

 namespace sd::framework {
--- a/sd/source/ui/inc/BulletAndPositionDlg.hxx
+++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx
@ -32,11 +32,7 @@
 #define MN_GALLERY_ENTRY 100

 class ColorListBox;
-class SvxNumValueSet;
 class SvxNumRule;
-class SvxBmpNumValueSet;
-class SvxBrushItem;
-class SdDrawDocument;

 namespace sd
 {
--- a/sd/source/ui/inc/CustomAnimationPane.hxx
+++ b/sd/source/ui/inc/CustomAnimationPane.hxx
@ -28,7 +28,6 @@
 #include <vector>

 namespace com::sun::star::drawing { class XDrawPage; }
-namespace com::sun::star::drawing { class XDrawView; }
 namespace weld { class ComboBox; }
 namespace com::sun::star::animations { class XAnimationNode; }
 namespace sd::tools { class EventMultiplexerEvent; }
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@ -36,8 +36,6 @@
 #include <vector>

 namespace com::sun::star::drawing { class XDrawSubController; }
-namespace com::sun::star::drawing::framework { class XConfigurationController; }
-namespace com::sun::star::drawing::framework { class XModuleController; }
 namespace com::sun::star::drawing { class XLayer; }
 namespace osl { class Mutex; }
 namespace sd::framework { class ConfigurationController; }
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@ -25,11 +25,6 @@
 #include <memory>
 #include <set>

-namespace osl
-{
-class Mutex;
-}
-
 class SdDrawDocument;

 namespace sd
--- a/sd/source/ui/inc/NotesPanelViewShell.hxx
+++ b/sd/source/ui/inc/NotesPanelViewShell.hxx
@ -13,8 +13,6 @@
 #include "fuoltext.hxx"
 #include <glob.hxx>

-class SdPage;
-
 namespace sd
 {
 class NotesPanelView;
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@ -30,7 +30,6 @@ class SdPage;
 class SdrPage;
 class SdrTextObj;
 class SfxProgress;
-struct PasteOrDropInfos;
 class EditView;

 namespace sd::tools {
--- a/sd/source/ui/inc/SdUnoSlideView.hxx
+++ b/sd/source/ui/inc/SdUnoSlideView.hxx
@ -22,7 +22,6 @@
 #include "DrawSubController.hxx"

 namespace sd::slidesorter { class SlideSorter; }
-namespace com::sun::star::drawing { class XDrawPage; }

 namespace sd {

--- a/sd/source/ui/inc/SlideTransitionPane.hxx
+++ b/sd/source/ui/inc/SlideTransitionPane.hxx
@ -31,7 +31,6 @@
 class SdDrawDocument;
 class SdXImpressDocument;
 namespace com::sun::star::drawing { class XDrawView; }
-namespace com::sun::star::frame { class XModel; }
 namespace sd::tools { class EventMultiplexerEvent; }

 namespace sd
--- a/sd/source/ui/inc/SlideshowLayerRenderer.hxx
+++ b/sd/source/ui/inc/SlideshowLayerRenderer.hxx
@ -33,12 +33,6 @@
 class SdrPage;
 class SdrModel;
 class SdrObject;
-class Size;
-
-namespace com::sun::star::animations
-{
-class XAnimate;
-}

 namespace sdr::contact
 {
--- a/sd/source/ui/inc/TableDesignPane.hxx
+++ b/sd/source/ui/inc/TableDesignPane.hxx
@ -26,7 +26,6 @@

 namespace com::sun::star::beans { class XPropertySet; }
 namespace com::sun::star::container { class XIndexAccess; class XNameContainer; }
-namespace com::sun::star::drawing { class XDrawView; }

 namespace sd
 {
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@ -32,7 +32,6 @@

 class SdDrawDocument;
 class SdPage;
-class SdrOle2Obj;
 class SdrGrafObj;
 class SdrMediaObj;
 class OutputDevice;
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@ -30,8 +30,6 @@

 namespace com::sun::star::drawing::framework { class XConfigurationController; }
 namespace com::sun::star::drawing::framework { class XResourceId; }
-namespace com::sun::star::drawing::framework { struct ConfigurationChangeEvent; }
-namespace com::sun::star::frame { class XController; }
 namespace vcl { class Window; }

 namespace sd {
--- a/sd/source/ui/inc/dlgpage.hxx
+++ b/sd/source/ui/inc/dlgpage.hxx
@ -23,7 +23,6 @@
 #include <svx/xtable.hxx>

 class SfxObjectShell;
-enum class ChangeType;

 /**
 * Page configuration-tab-dialog
--- a/sd/source/ui/inc/framework/Configuration.hxx
+++ b/sd/source/ui/inc/framework/Configuration.hxx
@ -26,7 +26,6 @@

 #include <memory>

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

 namespace sd::framework {
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@ -29,12 +29,6 @@

 #include <memory>

-
-namespace com::sun::star::drawing::framework { class XConfiguration; }
-namespace com::sun::star::drawing::framework { class XConfigurationChangeRequest; }
-namespace com::sun::star::drawing::framework { class XResourceId; }
-namespace com::sun::star::drawing::framework { struct ConfigurationChangeEvent; }
-namespace com::sun::star::frame { class XController; }
 namespace sd { class DrawController; }

 namespace sd::framework {
--- a/sd/source/ui/inc/framework/DrawModule.hxx
+++ b/sd/source/ui/inc/framework/DrawModule.hxx
@ -22,14 +22,6 @@
 #include <sal/types.h>
 #include <rtl/ref.hxx>

-namespace com::sun::star::frame
-{
-class XController;
-}
-namespace com::sun::star::uno
-{
-template <typename> class Reference;
-}
 namespace sd
 {
 class DrawController;
--- a/sd/source/ui/inc/framework/ImpressModule.hxx
+++ b/sd/source/ui/inc/framework/ImpressModule.hxx
@ -22,14 +22,6 @@
 #include <sal/types.h>
 #include <rtl/ref.hxx>

-namespace com::sun::star::frame
-{
-class XController;
-}
-namespace com::sun::star::uno
-{
-template <class interface_type> class Reference;
-}
 namespace sd
 {
 class DrawController;
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@ -27,8 +27,6 @@

 #include <unordered_map>

-namespace com::sun::star::frame { class XController; }
-namespace com::sun::star::uno { class XComponentContext; }
 namespace sd { class DrawController; }

 namespace sd::framework {
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@ -24,7 +24,6 @@
 #include <comphelper/compbase.hxx>
 #include <rtl/ref.hxx>

-namespace com::sun::star::frame { class XController; }
 namespace sd { class DrawController; }

 namespace sd::framework {
--- a/sd/source/ui/inc/framework/PresentationModule.hxx
+++ b/sd/source/ui/inc/framework/PresentationModule.hxx
@ -22,14 +22,6 @@
 #include <sal/types.h>
 #include <rtl/ref.hxx>

-namespace com::sun::star::frame
-{
-class XController;
-}
-namespace com::sun::star::uno
-{
-template <class interface_type> class Reference;
-}
 namespace sd
 {
 class DrawController;
--- a/sd/source/ui/inc/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/inc/framework/factories/BasicPaneFactory.hxx
@ -28,7 +28,6 @@

 #include <memory>

-namespace com::sun::star::drawing::framework { class XConfigurationController; }
 namespace com::sun::star::uno { class XComponentContext; }

 namespace sd {
--- a/sd/source/ui/inc/framework/factories/BasicToolBarFactory.hxx
+++ b/sd/source/ui/inc/framework/factories/BasicToolBarFactory.hxx
@ -24,8 +24,6 @@
 #include <comphelper/compbase.hxx>
 #include <rtl/ref.hxx>

-namespace com::sun::star::frame { class XController; }
-namespace com::sun::star::drawing::framework { class XResourceId; }
 namespace com::sun::star::drawing::framework { class XConfigurationController; }
 namespace sd { class DrawController; }

--- a/sd/source/ui/inc/fuolbull.hxx
+++ b/sd/source/ui/inc/fuolbull.hxx
@ -24,7 +24,6 @@
 class SdDrawDocument;
 class SfxRequest;
 class SfxItemSet;
-class SfxPoolItem;
 class SvxNumBulletItem;

 namespace sd {
--- a/sd/source/ui/inc/fusel.hxx
+++ b/sd/source/ui/inc/fusel.hxx
@ -21,8 +21,6 @@

 #include "fudraw.hxx"

-namespace com::sun::star::media { class XPlayer; }
-
 class SdrHdl;
 class SdrObject;

--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@ -33,9 +33,7 @@ namespace vcl { class Window; }

 namespace sd {
 class DrawDocShell;
-class SdNavigatorFloat;
 }
-class Menu;
 class SdNavigatorControllerItem;
 class SdPageNameControllerItem;

--- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx
+++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
@ -26,9 +26,7 @@
 #include <functional>

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

 namespace sd::tools {

--- a/sd/source/ui/inc/tools/SlotStateListener.hxx
+++ b/sd/source/ui/inc/tools/SlotStateListener.hxx
@ -27,7 +27,6 @@
 namespace com::sun::star::frame { class XDispatch; }
 namespace com::sun::star::frame { class XDispatchProvider; }
 namespace com::sun::star::frame { class XStatusListener; }
-namespace com::sun::star::frame { struct FeatureStateEvent; }

 namespace sd::tools {

--- a/sd/source/ui/inc/unchss.hxx
+++ b/sd/source/ui/inc/unchss.hxx
@ -25,7 +25,6 @@

 #include <sdundo.hxx>

-class SfxItemSet;
 class SfxStyleSheet;
 class SdDrawDocument;

--- a/sd/source/ui/inc/undoback.hxx
+++ b/sd/source/ui/inc/undoback.hxx
@ -27,8 +27,6 @@

 class SdDrawDocument;
 class SdPage;
-class SfxItemSet;
-class SfxPoolItem;

 class SdBackgroundObjUndoAction final : public SdUndoAction
 {
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@ -47,9 +47,7 @@
 #include <cppuhelper/weakref.hxx>
 #include <sddllapi.h>

-namespace com::sun::star::container { class XNameContainer; }
 namespace com::sun::star::i18n { class XForbiddenCharacters; }
-namespace com::sun::star::presentation { class XPresentation; }

 class SdDrawDocument;
 class SdPage;
--- a/sd/source/ui/inc/unosrch.hxx
+++ b/sd/source/ui/inc/unosrch.hxx
@ -30,7 +30,6 @@
 namespace com::sun::star::drawing { class XDrawPage; }
 namespace com::sun::star::drawing { class XShape; }
 namespace com::sun::star::text { class XTextRange; }
-namespace com::sun::star::util { class XSearchDescriptor; }

 class SvxItemPropertySet;
 class SdUnoSearchReplaceDescriptor;
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@ -18,6 +18,8 @@
 #include "DiscoveryService.hxx"
 #include "ZeroconfService.hxx"

+struct sockaddr_in;
+
 #ifdef _WIN32
  // LO vs WinAPI conflict
  #undef WB_LEFT
--- a/sd/source/ui/remotecontrol/ZeroconfService.hxx
+++ b/sd/source/ui/remotecontrol/ZeroconfService.hxx
@ -20,8 +20,6 @@

 #define kREG_TYPE "_impressremote._tcp"

-struct sockaddr_in;
-
 typedef unsigned int uint;

 namespace sd{
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@ -26,10 +26,6 @@
 #include <sfx2/request.hxx>
 #include <xmloff/autolayout.hxx>

-namespace com::sun::star::frame
-{
-class XStatusListener;
-}
 namespace com::sun::star::ui
 {
 class XSidebar;
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@ -35,7 +35,6 @@

 #include <slideshow.hxx>

-namespace com::sun::star::frame { class XModel; }
 namespace com::sun::star::media { class XPlayer; }
 namespace sd { class DrawDocShell; }
 namespace sd { class ViewShell; }
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@ -33,8 +33,6 @@
 namespace com::sun::star::awt { class XPointer; }
 namespace com::sun::star::awt { class XWindow; }
 namespace com::sun::star::awt { class XWindowPeer; }
-namespace com::sun::star::awt { struct WindowEvent; }
-namespace com::sun::star::rendering { class XSpriteCanvas; }
 class SdDrawDocument;

 namespace sd
--- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
@ -24,11 +24,6 @@
 #include <memory>
 #include <vector>

-namespace com::sun::star::uno
-{
-class XInterface;
-}
-
 class SdrPage;
 class SdXImpressDocument;

--- a/sd/source/ui/unoidl/sddetect.hxx
+++ b/sd/source/ui/unoidl/sddetect.hxx
@ -26,8 +26,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>


-namespace com::sun::star::beans { struct PropertyValue; }
-
 class SdFilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
 {
 public:
--- a/sd/source/ui/unoidl/unomodule.hxx
+++ b/sd/source/ui/unoidl/unomodule.hxx
@ -27,9 +27,6 @@

 #include <com/sun/star/lang/XServiceInfo.hpp>

-namespace com::sun::star::beans { struct PropertyValue; }
-namespace com::sun::star::frame { struct DispatchDescriptor; }
-
 class SdUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >
 {
 public:
--- a/sd/source/ui/unoidl/unopback.hxx
+++ b/sd/source/ui/unoidl/unopback.hxx
@ -35,7 +35,6 @@
 class SdDrawDocument;
 class SdrModel;
 class SfxItemSet;
-class SvxItemPropertySet;
 struct SfxItemPropertyMapEntry;

 const SvxItemPropertySet* ImplGetPageBackgroundPropertySet();