tdf#42949 Fix IWYU warnings in include/sfx2/[sS]*

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

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

18 files changed, 126 insertions, 100 deletions

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index a66056a04972..3595286db9e2 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -698,3 +698,66 @@ blacklist:
     include/sfx2/mieclip.hxx:
     # Needed for implicit dtor
     - tools/stream.hxx
+    include/sfx2/sfxbasecontroller.hxx:
+    # base class has to be a complete type
+    - com/sun/star/frame/XController2.hpp
+    - com/sun/star/frame/XControllerBorder.hpp
+    - com/sun/star/frame/XDispatchProvider.hpp
+    - com/sun/star/task/XStatusIndicatorSupplier.hpp
+    - com/sun/star/ui/XContextMenuInterception.hpp
+    - com/sun/star/awt/XUserInputInterception.hpp
+    - com/sun/star/frame/XDispatchInformationProvider.hpp
+    - com/sun/star/frame/XTitle.hpp
+    - com/sun/star/frame/XTitleChangeBroadcaster.hpp
+    - com/sun/star/lang/XInitialization.hpp
+    include/sfx2/sfxbasemodel.hxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XChild.hpp
+    - com/sun/star/document/XDocumentPropertiesSupplier.hpp
+    - com/sun/star/document/XCmisDocument.hpp
+    - com/sun/star/rdf/XDocumentMetadataAccess.hpp
+    - com/sun/star/document/XDocumentRecovery.hpp
+    - com/sun/star/document/XUndoManagerSupplier.hpp
+    - com/sun/star/document/XEventBroadcaster.hpp
+    - com/sun/star/document/XDocumentEventBroadcaster.hpp
+    - com/sun/star/lang/XEventListener.hpp
+    - com/sun/star/document/XEventsSupplier.hpp
+    - com/sun/star/document/XEmbeddedScripts.hpp
+    - com/sun/star/document/XScriptInvocationContext.hpp
+    - com/sun/star/frame/XModel2.hpp
+    - com/sun/star/util/XModifiable2.hpp
+    - com/sun/star/view/XPrintable.hpp
+    - com/sun/star/view/XPrintJobBroadcaster.hpp
+    - com/sun/star/frame/XStorable2.hpp
+    - com/sun/star/frame/XLoadable.hpp
+    - com/sun/star/script/XStarBasicAccess.hpp
+    - com/sun/star/document/XViewDataSupplier.hpp
+    - com/sun/star/util/XCloseable.hpp
+    - com/sun/star/datatransfer/XTransferable.hpp
+    - com/sun/star/document/XDocumentSubStorageSupplier.hpp
+    - com/sun/star/document/XStorageBasedDocument.hpp
+    - com/sun/star/script/provider/XScriptProviderSupplier.hpp
+    - com/sun/star/ui/XUIConfigurationManagerSupplier.hpp
+    - com/sun/star/embed/XVisualObject.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
+    - com/sun/star/frame/XModule.hpp
+    - com/sun/star/frame/XTitle.hpp
+    - com/sun/star/frame/XTitleChangeBroadcaster.hpp
+    - com/sun/star/frame/XUntitledNumbers.hpp
+    include/sfx2/sfxsids.hrc:
+    # Needed for sfxitems.sdi to build
+    - svl/memberid.h
+    # Needed for TypedWhichId defines
+    - svl/typedwhich.hxx
+    - class SvxZoomItem
+    - class SfxUInt16Item
+    - class SvxHyperlinkItem
+    - class SfxDocumentInfoItem
+    - class SvxSearchItem
+    include/sfx2/shell.hxx:
+    # Used in macro define
+    - class SfxModule
+    include/sfx2/sfxstatuslistener.hxx:
+    # base class has to be a complete type
+    - com/sun/star/frame/XStatusListener.hpp
+    - com/sun/star/lang/XComponent.hpp
diff --git a/include/sfx2/StyleManager.hxx b/include/sfx2/StyleManager.hxx
index 593da26d7f4c..625c9350b03c 100644
--- a/include/sfx2/StyleManager.hxx
+++ b/include/sfx2/StyleManager.hxx
@@ -12,14 +12,14 @@
 
 #include <sfx2/dllapi.h>
 
-#include <vcl/outdev.hxx>
-
-#include <sfx2/StylePreviewRenderer.hxx>
 #include <svl/style.hxx>
 
-#include <sfx2/objsh.hxx>
 #include <memory>
 
+class OutputDevice;
+class SfxObjectShell;
+namespace sfx2 { class StylePreviewRenderer; }
+
 namespace sfx2
 {
 
diff --git a/include/sfx2/StylePreviewRenderer.hxx b/include/sfx2/StylePreviewRenderer.hxx
index 9843cf00e529..0a1c67063776 100644
--- a/include/sfx2/StylePreviewRenderer.hxx
+++ b/include/sfx2/StylePreviewRenderer.hxx
@@ -11,10 +11,11 @@
 #define INCLUDED_SFX2_STYLEPREVIEWRENDERER_HXX
 
 #include <sfx2/dllapi.h>
-#include <vcl/outdev.hxx>
-#include <svl/style.hxx>
 #include <sfx2/objsh.hxx>
 
+class OutputDevice;
+class SfxStyleSheetBase;
+
 namespace sfx2
 {
 
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 14fa0a7aca2d..97f5dae19ecf 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -39,6 +39,8 @@ class SfxModule;
 class Point;
 struct SfxDispatcher_Impl;
 
+namespace vcl { class Window; }
+
 enum class SfxDispatcherPopFlags
 {
     NONE          = 0,
diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx
index 84503fb0768a..38716ea34f7d 100644
--- a/include/sfx2/docfac.hxx
+++ b/include/sfx2/docfac.hxx
@@ -31,6 +31,8 @@ class SfxFilter;
 class SfxViewFactory;
 struct SfxObjectFactory_Impl;
 class SfxFilterContainer;
+class SvGlobalName;
+class SfxModule;
 
 typedef void (*SfxVoidFunc)();
 
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index c44db6f90a58..d16eb2e1c95b 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -62,6 +62,7 @@ class Button;
 class OutputDevice;
 class Color;
 class Fraction;
+class SvGlobalName;
 
 enum class SfxModelFlags;
 enum class SfxEventHintId;
@@ -81,6 +82,7 @@ namespace sfx2
     class StyleManager;
 }
 
+namespace vcl { class Window; }
 namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::document { struct CmisVersion; }
 namespace com::sun::star::embed { class XStorage; }
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index 1f834835602a..e15d53e4ab53 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -24,39 +24,38 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/DispatchDescriptor.hpp>
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
 #include <com/sun/star/frame/XController2.hpp>
 #include <com/sun/star/frame/XControllerBorder.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
 #include <com/sun/star/ui/XContextMenuInterception.hpp>
-#include <com/sun/star/ui/XContextMenuInterceptor.hpp>
-#include <com/sun/star/awt/XMouseClickHandler.hpp>
-#include <com/sun/star/awt/XKeyHandler.hpp>
 #include <com/sun/star/awt/XUserInputInterception.hpp>
 #include <tools/link.hxx>
-#include <vcl/button.hxx>
 
-#include <com/sun/star/ui/XSidebarProvider.hpp>
-
-#include <sfx2/viewsh.hxx>
-#include <sfx2/sfxuno.hxx>
 #include <sfx2/groupid.hxx>
 
+namespace com::sun::star::awt { class XKeyHandler; }
+namespace com::sun::star::awt { class XMouseClickHandler; }
+namespace com::sun::star::frame { class XDispatch; }
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::frame { struct DispatchDescriptor; }
+namespace com::sun::star::ui { class XContextMenuInterceptor; }
+namespace com::sun::star::ui { class XSidebarProvider; }
+namespace com::sun::star::util { struct URL; }
+
 struct  IMPL_SfxBaseController_DataContainer    ;   // impl. struct to hold member of class SfxBaseController
 
+class Button;
+class NotifyEvent;
 class SfxViewFrame;
+class SfxViewShell;
 
 sal_Int16 MapGroupIDToCommandGroup( SfxGroupId nGroupID );
 
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 0f93d8652b6c..9dcba7e68542 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -23,65 +23,44 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/frame/XModule.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
 #include <com/sun/star/frame/XUntitledNumbers.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/frame/XController2.hpp>
 #include <com/sun/star/document/XCmisDocument.hpp>
-#include <com/sun/star/document/CmisVersion.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentRecovery.hpp>
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
 #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
-#include <com/sun/star/document/XEventListener.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
-#include <com/sun/star/document/EventObject.hpp>
 #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/lang/NotInitializedException.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/XModel2.hpp>
-#include <com/sun/star/frame/DoubleInitializationException.hpp>
 #include <com/sun/star/util/XModifiable2.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/util/XCloseBroadcaster.hpp>
-#include <com/sun/star/util/XCloseListener.hpp>
-#include <com/sun/star/util/CloseVetoException.hpp>
 #include <com/sun/star/view/XPrintable.hpp>
 #include <com/sun/star/view/XPrintJobBroadcaster.hpp>
 #include <com/sun/star/frame/XStorable2.hpp>
 #include <com/sun/star/frame/XLoadable.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/document/CmisProperty.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
-#include <com/sun/star/ui/XUIConfigurationManager2.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Any.hxx>
-#include <cppuhelper/weak.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/script/XStarBasicAccess.hpp>
-#include <vcl/svapp.hxx>
 
 #include <com/sun/star/document/XViewDataSupplier.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 
@@ -89,10 +68,7 @@
 
 class ErrCode;
 class SfxMedium;
-class   SfxPrinter;
-class   SfxViewShell;
 class   SfxObjectShell                      ;
-class   SfxEventHint;
 class   SfxViewFrame;
 struct  IMPL_SfxBaseModel_DataContainer     ;   // impl. struct to hold member of class SfxBaseModel
 
@@ -100,6 +76,19 @@ namespace sfx { namespace intern {
     class ViewCreationGuard;
 } }
 
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::container { class XNameContainer; }
+namespace com::sun::star::container { class XNameReplace; }
+namespace com::sun::star::document { class XEventListener; }
+namespace com::sun::star::document { struct CmisProperty; }
+namespace com::sun::star::document { struct CmisVersion; }
+namespace com::sun::star::document { struct EventObject; }
+namespace com::sun::star::frame { class XController2; }
+namespace com::sun::star::task { class XInteractionHandler; }
+namespace com::sun::star::ui { class XUIConfigurationManager2; }
+namespace com::sun::star::util { class XCloseListener; }
+namespace com::sun::star::util { class XModifyListener; }
+
 //  class declarations
 
 
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index 26d978d3b13d..2250bd07bf96 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -23,37 +23,28 @@
 #include <sfx2/dllapi.h>
 
 #include <vcl/abstdlg.hxx>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 
-#include <sot/exchange.hxx>
-#include <sfx2/lnkbase.hxx>
+#include <sot/formats.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.h>
 
-class SfxTabPage;
-class SfxViewFrame;
-class SfxBindings;
 class SfxItemSet;
 namespace vcl { class Window; }
-namespace rtl {
-   class OUString;
-};
 class SfxItemPool;
 class SvObjectServerList;
 class TransferableDataHelper;
-struct TransferableObjectDescriptor;
+class SvGlobalName;
 
 namespace sfx2
 {
     class LinkManager;
+    class SvBaseLink;
 }
 
-namespace com { namespace sun { namespace star { namespace frame {
-    class XModel;
-} } } }
+namespace com::sun::star::embed { class XEmbeddedObject; }
+namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::uno { class Any; }
 
 class SfxAbstractDialog : virtual public VclAbstractDialog
 {
@@ -119,7 +110,7 @@ public:
     virtual void                SetRunLabel() = 0;
 };
 
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com::sun::star::frame { class XFrame; }
 
 class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialogFactory
 {
diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index d7afeb2b9af0..5dd0a81fc1e9 100644
--- a/include/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.hxx
@@ -24,9 +24,6 @@
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
 #include <vcl/help.hxx>
-#include <memory>
-
-class SfxFrame;
 
 class SFX2_DLLPUBLIC SfxHelp : public Help
 {
diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx
index 5a140f59f0cf..ab7070c79af2 100644
--- a/include/sfx2/sfxhtml.hxx
+++ b/include/sfx2/sfxhtml.hxx
@@ -31,7 +31,6 @@
 
 class ImageMap;
 class SfxMedium;
-class SfxObjectShell;
 class SvNumberFormatter;
 
 class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser
diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx
index f7b000b548e4..1010fc0e3453 100644
--- a/include/sfx2/sfxmodelfactory.hxx
+++ b/include/sfx2/sfxmodelfactory.hxx
@@ -22,10 +22,14 @@
 
 #include <sfx2/dllapi.h>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
+namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace com::sun::star::lang { class XSingleServiceFactory; }
+namespace com::sun::star::uno { class XInterface; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
+
 enum class SfxModelFlags
 {
     NONE                       = 0x00,
diff --git a/include/sfx2/sfxresid.hxx b/include/sfx2/sfxresid.hxx
index 5557f652c57b..922c59941738 100644
--- a/include/sfx2/sfxresid.hxx
+++ b/include/sfx2/sfxresid.hxx
@@ -21,7 +21,6 @@
 
 #include <sfx2/dllapi.h>
 #include <rtl/ustring.hxx>
-#include <locale>
 
 SFX2_DLLPUBLIC OUString SfxResId(const char* pId);
 
diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx
index f612da5f4755..56ea2d57b11d 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -23,15 +23,15 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <svl/poolitem.hxx>
-#include <cppuhelper/weak.hxx>
-#include <osl/conditn.hxx>
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 
 #include <cppuhelper/implbase.hxx>
 
+namespace com::sun::star::frame { class XDispatch; }
+namespace com::sun::star::frame { class XDispatchProvider; }
+namespace com::sun::star::frame { struct FeatureStateEvent; }
+
 class SFX2_DLLPUBLIC SfxStatusListener : public cppu::WeakImplHelper<
                           css::frame::XStatusListener,
                           css::lang::XComponent>
diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx
index 9b968dff5d5c..6c6253f37f76 100644
--- a/include/sfx2/sfxuno.hxx
+++ b/include/sfx2/sfxuno.hxx
@@ -22,21 +22,10 @@
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/supportsservice.hxx>
-#include <rtl/ustring.hxx>
 
+namespace com::sun::star::beans { struct NamedValue; }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 class SfxAllItemSet ;
 class SfxItemSet    ;
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 17bbcf3d9229..b4bd938a379d 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -20,41 +20,32 @@
 #define INCLUDED_SFX2_SHELL_HXX
 
 #include <memory>
-#include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
 #include <sal/types.h>
 #include <svl/typedwhich.hxx>
 #include <sfx2/dllapi.h>
-#include <sfx2/sfxuno.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/strong_int.hxx>
 
-namespace vcl { class Window; }
-class ToolBox;
+namespace com::sun::star::embed { struct VerbDescriptor; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
+
 class SfxItemPool;
 class SfxPoolItem;
 class SfxRequest;
 class SfxItemSet;
-struct SfxFormalArgument;
-class StatusBar;
 class SfxInterface;
 class SfxViewShell;
 class SfxObjectShell;
-class SfxSlotPool;
-class SvGlobalName;
 
-class SfxShellObject;
 class SfxShell;
 struct SfxShell_Impl;
-class SfxShellObject;
 class SfxDispatcher;
 class SfxViewFrame;
 class SfxSlot;
 class SfxRepeatTarget;
-class SbxVariable;
-class SbxBase;
 class SfxBindings;
 class SfxModule;
 class SfxUndoManager;
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index 5abab5b9f6b3..4531d0a23b81 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -28,7 +28,6 @@
 
 class SfxModule;
 class SfxStatusBarControl;
-class SfxBindings;
 
 svt::StatusbarController* SfxStatusBarControllerFactory(
     const css::uno::Reference< css::frame::XFrame >& rFrame,
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index 88a69fe40c72..b144c840cd8e 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -22,7 +22,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <vcl/bitmap.hxx>
 #include <vcl/image.hxx>
 #include <svl/style.hxx>
 #include <vector>