tdf#42949 Fix IWYU warnings in include/sfx2/[a-D]*

Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I444cb71bc3d045072a4b1f9eed279ed7e425a0d4 Reviewed-on: https://gerrit.libreoffice.org/69481 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

tdf#42949 Fix IWYU warnings in include/sfx2/[a-D]*
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I444cb71bc3d045072a4b1f9eed279ed7e425a0d4 Reviewed-on: https://gerrit.libreoffice.org/69481 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
4304226d · Gabor Kelemen · Miklos Vajna · bbe8bc3c · 4304226d · 4304226d
Kaydet (Commit) 4304226d authored Mar 17, 2019 tarafından Gabor Kelemen Kaydeden (comit) Miklos Vajna Mar 25, 2019
222 changed files
--- a/basctl/source/basicide/IDEComboBox.cxx
+++ b/basctl/source/basicide/IDEComboBox.cxx
@@ -25,6 +25,8 @@
 #include <managelang.hxx>

 #include <sfx2/dispatch.hxx>
+#include <sfx2/frame.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <svtools/langtab.hxx>

 namespace basctl

--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -24,6 +24,7 @@
 #include <svx/ifaceids.hxx>
 #include <vcl/vclptr.hxx>
 #include <sfx2/printer.hxx>
+#include <sfx2/objsh.hxx>
 #include <memory>

 namespace basctl

--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -44,6 +44,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <sot/exchange.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/srchitem.hxx>

--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -37,6 +37,7 @@
 #include <comphelper/string.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <vcl/weld.hxx>
 #include <svl/urihelper.hxx>
 #include <svx/svxids.hrc>

--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -43,6 +43,7 @@
 #include <comphelper/processfactory.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/visitem.hxx>
 #include <svl/whiter.hxx>

--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -44,6 +44,7 @@
 #include <sfx2/minfitem.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <svx/svxids.hrc>
 #include <svl/aeitem.hxx>
 #include <svl/intitem.hxx>

--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -30,6 +30,7 @@
 #include <vcl/textview.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/signaturestate.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <com/sun/star/container/XNamed.hpp>

 namespace basctl

--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -25,6 +25,7 @@
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>

--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -37,6 +37,7 @@
 #include <sfx2/infobar.hxx>
 #include <sfx2/minfitem.hxx>
 #include <sfx2/objface.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/srchitem.hxx>


--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -33,7 +33,9 @@
 #include <dlged.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <sfx2/request.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <sal/log.hxx>
 #include <svtools/ehdl.hxx>


--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -32,7 +32,9 @@
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>

 #include <initializer_list>
 #include <memory>

--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -30,6 +30,7 @@
 #include <sal/log.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/passwd.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/srchdefs.hxx>

--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -24,6 +24,7 @@
 #include <basidesh.hxx>

 #include <sfx2/dispatch.hxx>
+#include <sfx2/sfxsids.hrc>

 namespace basctl
 {

--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/resource/MissingResourceException.hpp>
 #include <com/sun/star/resource/XStringResourceSupplier.hpp>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <tools/debug.hxx>

 namespace basctl

--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -31,9 +31,12 @@
 #include <basic/sbmod.hxx>
 #include <com/sun/star/script/XLibraryContainer2.hpp>

+#include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/frame.hxx>
 #include <sfx2/minfitem.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <vcl/weld.hxx>

 #include <map>

--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -31,6 +31,8 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/sfxsids.hrc>
+#include <sfx2/viewfrm.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/svlbitm.hxx>

--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -32,7 +32,9 @@
 #include <comphelper/processfactory.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/frame.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <svl/stritem.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/weld.hxx>

--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
@@ -39,6 +40,7 @@
 #include <com/sun/star/script/ModuleInfo.hpp>
 #include <com/sun/star/script/ModuleType.hpp>

+#include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/docfile.hxx>

--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/sequence.hxx>
 #include <editeng/unolingu.hxx>
 #include <sfx2/bindings.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <svtools/langtab.hxx>
 #include <svx/langbox.hxx>
 #include <vcl/unohelp.hxx>

--- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
@@ -23,6 +23,7 @@

 namespace weld { class Window; }
 class SfxItemSet;
+class SfxItemPool;

 namespace chart
 {

--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -27,6 +27,7 @@
 #include "SpellAttrib.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <svl/undo.hxx>
 #include <unotools/lingucfg.hxx>
 #include <vcl/textdata.hxx>

--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -86,6 +86,7 @@
 #include <sfx2/shell.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/viewsh.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <svl/languageoptions.hxx>
 #include <svtools/helpopt.hxx>
 #include <svtools/miscopt.hxx>

--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
 #include <svl/intitem.hxx>
+#include <vcl/svapp.hxx>

 #include <basic/sbxdef.hxx>


--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
 #include <svl/intitem.hxx>
+#include <vcl/svapp.hxx>

 #include <basic/sbxdef.hxx>


--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
 #include <svl/intitem.hxx>
+#include <vcl/svapp.hxx>

 #include <basic/sbxdef.hxx>


--- a/dbaccess/source/core/inc/ModelImpl.hxx
+++ b/dbaccess/source/core/inc/ModelImpl.hxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/lang/NotInitializedException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
 #include <com/sun/star/sdb/XBookmarksSupplier.hpp>
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>

--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -20,6 +20,7 @@
 #include "dbfindex.hxx"
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
+#include <osl/thread.hxx>
 #include <tools/config.hxx>
 #include <sfx2/app.hxx>
 #include <dbu_dlg.hxx>

--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -17,6 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/flditem.hxx>

--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -22,6 +22,7 @@
 #include <svl/zforlist.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/builderfactory.hxx>
+#include <vcl/event.hxx>
 #include <formula/IFunctionDescription.hxx>

 #include "funcpage.hxx"

--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -677,3 +677,21 @@ blacklist:
    include/drawinglayer/primitive3d/baseprimitive3d.hxx:
    # base class has to be a complete type
    - com/sun/star/graphic/XPrimitive3D.hpp
+    include/sfx2/asyncfunc.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XUnoTunnel.hpp
+    include/sfx2/charwin.hxx:
+    # Needed for implicit dtor
+    - vcl/virdev.hxx
+    include/sfx2/dinfdlg.hxx:
+    # Needed for implicit dtor
+    - com/sun/star/document/CmisProperty.hpp
+    include/sfx2/docfile.hxx:
+    # Full type needed for template
+    - tools/link.hxx
+    include/sfx2/docstoragemodifylistener.hxx:
+    # base class has to be a complete type
+    - com/sun/star/util/XModifyListener.hpp
+    include/sfx2/DocumentMetadataAccess.hxx:
+    # base class has to be a complete type
+    - com/sun/star/rdf/XDocumentMetadataAccess.hpp
--- a/include/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
@@ -24,9 +24,7 @@

 #include <sfx2/dllapi.h>

-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
-#include <com/sun/star/rdf/XRepositorySupplier.hpp>

 #include <cppuhelper/implbase.hxx>

@@ -47,6 +45,9 @@ namespace com { namespace sun { namespace star { namespace embed {
 namespace com { namespace sun { namespace star { namespace frame {
    class XModel;
 } } } }
+
+namespace com::sun::star::uno { class XComponentContext; }
+
 class SfxObjectShell;

 namespace sfx2 {

--- a/include/sfx2/DocumentSigner.hxx
+++ b/include/sfx2/DocumentSigner.hxx
@@ -13,10 +13,16 @@

 #include <sal/config.h>
 #include <sfx2/dllapi.h>
+#include <rtl/ustring.hxx>

-#include <memory>
-
-#include <com/sun/star/security/XCertificate.hpp>
+namespace com::sun::star::security
+{
+class XCertificate;
+}
+namespace com::sun::star::uno
+{
+template <typename> class Reference;
+}

 namespace sfx2
 {

--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -25,37 +25,23 @@
 #include <sal/types.h>
 #include <vcl/errcode.hxx>
 #include <svl/poolitem.hxx>
-#include <vcl/image.hxx>
-#include <com/sun/star/script/XLibraryContainer.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
-
-// too many files including sfx2/app.hxx use VCL Application class but don't include the
-// header file because in former times SfxApplication was derived from it
-#include <vcl/svapp.hxx>
+#include <vcl/bitmapex.hxx>
+#include <tools/link.hxx>

 #include <sfx2/shell.hxx>

-class Timer;
-class WorkWindow;
-class ISfxTemplateCommon;
+namespace com::sun::star::script { class XLibraryContainer; }
+
+namespace weld { class Window; }
+
 class BasicManager;
 class DdeService;
-class PrinterDialog;
-class Point;
-namespace tools { class Rectangle; }
-class AppSettings;
 struct SfxChildWinContextFactory;
 class SfxAppData_Impl;
-class SfxBindings;
 class SfxChildWinFactArr_Impl;
-class SfxChildWindow;
 class SfxDispatcher;
-class SfxEventConfiguration;
 class SfxEventHint;
 class SfxItemSet;
-class SfxMedium;
-class SfxMenuCtrlFactArr_Impl;
-class SfxNewFileDialog;
 class SfxObjectShell;
 class SfxObjectShellArr_Impl;
 class SfxObjectShellLock;
@@ -65,7 +51,6 @@ class SfxStbCtrlFactArr_Impl;
 class SfxTbxCtrlFactArr_Impl;
 class SfxViewFrame;
 class SfxViewFrameArr_Impl;
-class SfxViewShell;
 class SfxViewShellArr_Impl;
 class StarBASIC;
 class SfxWorkWindow;
@@ -75,13 +60,11 @@ namespace vcl { class Window; }
 struct SfxChildWinFactory;
 struct SfxStbCtrlFactory;
 struct SfxTbxCtrlFactory;
-class ModalDialog;
 class SbxArray;
 class SbxValue;

 namespace sfx2
 {
-    class SvLinkSource;
    namespace sidebar {
        class Theme;
    }

--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -23,23 +23,20 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <vcl/builder.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/floatwin.hxx>
-#include <vcl/timer.hxx>
 #include <vcl/weld.hxx>

-class TabPage;
 class SfxTabPage;
 class SfxBindings;
 class SfxChildWindow;
 struct SfxChildWinInfo;
 class SfxItemSet;
-class SfxItemPool;
 class OKButton;
 class CancelButton;
 class HelpButton;
 class Button;
+class Timer;

 // class SfxModalDialog --------------------------------------------------


--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -27,22 +27,24 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <rtl/strbuf.hxx>
 #include <tools/link.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XDispatchRecorder.hpp>
 #include <com/sun/star/uno/Reference.h>
-#include <sfx2/viewfrm.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/SfxBroadcaster.hxx>
+#include <sfx2/shell.hxx>
+
+namespace com::sun::star::frame { class XDispatch; }
+namespace com::sun::star::frame { class XDispatchProvider; }
+namespace com::sun::star::frame { class XDispatchRecorder; }
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::util { struct URL; }

-class SystemWindow;
 class SfxSlot;
 class SfxSlotServer;
 class SfxControllerItem;
 class SfxStateCache;
 class SfxItemSet;
 class SfxDispatcher;
-class SfxBindings;
 class SfxBindings_Impl;
 class Timer;
 class SfxWorkWindow;

--- a/include/sfx2/brokenpackageint.hxx
+++ b/include/sfx2/brokenpackageint.hxx
@@ -23,9 +23,10 @@
 #include <sal/config.h>
 #include <rtl/ref.hxx>
 #include <sfx2/dllapi.h>
-#include <com/sun/star/document/BrokenPackageRequest.hpp>
-#include <com/sun/star/task/XInteractionApprove.hpp>
-#include <com/sun/star/task/XInteractionDisapprove.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com::sun::star::task { class XInteractionRequest; }

 class RequestPackageReparation_Impl;
 class SFX2_DLLPUBLIC RequestPackageReparation

--- a/include/sfx2/charmapcontrol.hxx
+++ b/include/sfx2/charmapcontrol.hxx
@@ -23,12 +23,11 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sfx2/tbxctrl.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <sfx2/charwin.hxx>
 #include <vcl/button.hxx>
 #include <deque>

-class SvxCharViewControl;
+namespace com::sun::star::frame { class XFrame; }

 class SFX2_DLLPUBLIC SfxCharmapCtrl : public SfxPopupWindow
 {

--- a/include/sfx2/charmappopup.hxx
+++ b/include/sfx2/charmappopup.hxx
@@ -23,8 +23,6 @@
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/dllapi.h>

-#include <functional>
-
 class SFX2_DLLPUBLIC CharmapPopup : public SfxToolBoxControl
 {
 public:

--- a/include/sfx2/charwin.hxx
+++ b/include/sfx2/charwin.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SFX2_INC_CHARWIN_HXX
 #define INCLUDED_SFX2_INC_CHARWIN_HXX

-#include <sfx2/tbxctrl.hxx>
 #include <sfx2/dllapi.h>
+#include <vcl/ctrl.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>

--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -26,20 +26,17 @@
 #include <sal/types.h>
 #include <o3tl/typed_flags_set.hxx>
 #include <vcl/window.hxx>
-#include <com/sun/star/frame/XFrame.hpp>

-#include <sfx2/shell.hxx>
 #include <sfx2/chalign.hxx>

-#include <sfx2/bindings.hxx>
-    // complete SfxBindings for complete SfxChildWinCtor, SfxChildWinContextCtor
-    // under -fsanitize=function
+namespace com::sun::star::frame { class XFrame; }

 class SfxWorkWindow;
 class SfxModule;
-class SfxShell;
 class SfxChildWindow;
 class SfxChildWindowContext;
+class SfxBindings;
+class SfxModelessDialogController;

 enum class SfxChildWindowFlags
 {

--- a/include/sfx2/classificationhelper.hxx
+++ b/include/sfx2/classificationhelper.hxx
@@ -13,18 +13,14 @@
 #include <memory>
 #include <vector>

-#include <com/sun/star/document/XDocumentProperties.hpp>
-
 #include <rtl/ustring.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/infobar.hxx>

-class SfxObjectShell;
+namespace com::sun::star::beans { class XPropertyContainer; }
+namespace com::sun::star::document { class XDocumentProperties; }
+
 class SfxViewFrame;
-namespace basegfx
-{
-class BColor;
-}

 /// Return code of SfxClassificationHelper::CheckPaste().
 enum class SfxClassificationCheckPasteResult

--- a/include/sfx2/ctrlitem.hxx
+++ b/include/sfx2/ctrlitem.hxx
@@ -24,13 +24,8 @@
 #include <sal/types.h>
 #include <svl/poolitem.hxx>
 #include <tools/debug.hxx>
-#if defined( DBG_UTIL )
-#include <sfx2/msg.hxx>
-#endif

-class SfxPoolItem;
 class SfxBindings;
-class SvStream;

 class SFX2_DLLPUBLIC SfxControllerItem
 {

--- a/include/sfx2/dialoghelper.hxx
+++ b/include/sfx2/dialoghelper.hxx
@@ -18,7 +18,6 @@ class DateTime;
 class LocaleDataWrapper;
 namespace vcl { class Window; }
 class OutputDevice;
-class VclBuilderContainer;

 //when two tab pages both have the same basic layout with a preview on the
 //right, get both of their non-preview areas to request the same size so that

--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -30,9 +30,6 @@
 #include <svl/zforlist.hxx>

 #include <vcl/headbar.hxx>
-#include <svtools/svmedit.hxx>
-
-#include <unotools/syslocale.hxx>

 #include <vcl/edit.hxx>
 #include <vcl/field.hxx>

--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -26,39 +26,19 @@
 #include <sal/types.h>

 #include <sfx2/bindings.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <vcl/menu.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/span.hxx>

 #include <initializer_list>

 class SfxSlotServer;
-class SfxShell;
 class SfxRequest;
-class SfxHintPoster;
 class SfxViewFrame;
-class SfxBindings;
 class SfxItemSet;
-class SfxPopupMenuManager;
 class SfxModule;
+class Point;
 struct SfxDispatcher_Impl;

-namespace com
-{
-    namespace sun
-    {
-        namespace star
-        {
-            namespace frame
-            {
-                class XDispatch;
-            }
-        }
-    }
-}
-
-
 enum class SfxDispatcherPopFlags
 {
    NONE          = 0,

--- a/include/sfx2/docfac.hxx
+++ b/include/sfx2/docfac.hxx
@@ -23,19 +23,14 @@
 #include <sfx2/dllapi.h>
 #include <sal/types.h>

-// SFX_IMPL_MODULE_LIB
-#include <osl/module.hxx>
 #include <rtl/ustring.hxx>
-
-#include <sfx2/objsh.hxx>
+#include <sfx2/shell.hxx>
 #include <memory>

-class SfxMedium;
 class SfxFilter;
 class SfxViewFactory;
 struct SfxObjectFactory_Impl;