tdf#42949 Fix IWYU warnings in sfx2/source/appl/*cxx

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

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

34 files changed, 51 insertions, 387 deletions

diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml
index 7f5540100f6c..d2f56b4e8c91 100644
--- a/sfx2/IwyuFilter_sfx2.yaml
+++ b/sfx2/IwyuFilter_sfx2.yaml
@@ -4,6 +4,9 @@ blacklist:
     sfx2/source/doc/syspathw32.hxx:
     # Needed on WIN32
     - sal/types.h
+    sfx2/source/appl/appdata.cxx:
+    # Needed for direct member access
+    - sfx2/module.hxx
     sfx2/source/appl/appdde.cxx:
     # Needed on WIN32
     - config_features.h
@@ -27,3 +30,35 @@ blacklist:
     - sfx2/docfile.hxx
     - ucbhelper/content.hxx
     - comphelper/processfactory.hxx
+    sfx2/source/appl/appquit.cxx:
+    # Needed for DELETEZ to avoid -Wdelete-incomplete warnings
+    - childwinimpl.hxx
+    - ctrlfactoryimpl.hxx
+    - sfx2/doctempl.hxx
+    - sfx2/fcontnr.hxx
+    - sfx2/msgpool.hxx
+    - sfx2/viewsh.hxx
+    - shellimpl.hxx
+    sfx2/source/appl/appmisc.cxx:
+    # Needed for TypedWhichId macro
+    - svl/stritem.hxx
+    sfx2/source/appl/appbas.cxx:
+    # Needed for createSfxPoolItem calls
+    - svl/eitem.hxx
+    - sfx2/dinfdlg.hxx
+    - sfx2/frame.hxx
+    - sfx2/msg.hxx
+    - sorgitm.hxx
+    # Needed for STATIC_LINKING to work
+    - config_options.h
+    sfx2/source/appl/newhelp.cxx:
+    # Actually used
+    - com/sun/star/i18n/XBreakIterator.hpp
+    sfx2/source/appl/shutdownicon.cxx:
+    # Needed on MAC
+    - osl/file.hxx
+    # Needed on WIN32
+    - sfx2/sfxresid.hxx
+    - sfx2/strings.hrc
+    # Don't propose hxx -> h change in URE libs
+    - osl/module.hxx
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 172f6e20ba86..03498e22dd6c 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -25,46 +25,23 @@
 #include <sfx2/app.hxx>
 #include <sfx2/frame.hxx>
 #include <basic/basrdll.hxx>
-#include <basic/sbmeth.hxx>
-#include <basic/sbmod.hxx>
-#include <basic/sberrors.hxx>
 #include <tools/svlibrary.h>
-#include <svtools/asynclink.hxx>
-#include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
-#include <svl/urlbmk.hxx>
-#include <svtools/sfxecode.hxx>
-#include <svtools/ehdl.hxx>
 
 #include <svl/svdde.hxx>
 #include <unotools/configmgr.hxx>
-#include <unotools/tempfile.hxx>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/loader/XImplementationLoader.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp>
 #include <basic/basmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/sfxhelp.hxx>
-#include <sfx2/request.hxx>
-#include <sfxtypes.hxx>
-#include <arrdecl.hxx>
 #include <sfx2/progress.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/docfac.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/new.hxx>
-#include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <appdata.hxx>
-#include <openflag.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/event.hxx>
 #include <workwin.hxx>
@@ -72,25 +49,11 @@
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/stbitem.hxx>
-#include <eventsupplier.hxx>
 #include <sfx2/dockwin.hxx>
 #include <shellimpl.hxx>
 
-#include <unotools/saveopt.hxx>
 #include <svtools/helpopt.hxx>
-#include <unotools/pathoptions.hxx>
 #include <unotools/viewoptions.hxx>
-#include <unotools/moduleoptions.hxx>
-#include <unotools/historyoptions.hxx>
-#include <svtools/menuoptions.hxx>
-#include <svtools/miscopt.hxx>
-#include <unotools/useroptions.hxx>
-#include <unotools/securityoptions.hxx>
-#include <unotools/fontoptions.hxx>
-#include <unotools/syslocaleoptions.hxx>
-#include <unotools/syslocale.hxx>
-#include <framework/addonsoptions.hxx>
-#include <unotools/extendedsecurityoptions.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/strbuf.hxx>
 #include <memory>
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 89063f729b3a..b1fd03e925b1 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -25,52 +25,25 @@
 #include <cassert>
 
 #include <com/sun/star/script/XLibraryContainer.hpp>
-#include <basic/basrdll.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <svl/macitem.hxx>
-#include <basic/sbxfac.hxx>
-#include <basic/sbx.hxx>
-#include <vcl/gradient.hxx>
-#include <svl/rectitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
-#include <basic/sbmod.hxx>
 #include <svl/whiter.hxx>
-#include <basic/sbmeth.hxx>
 #include <basic/sbstar.hxx>
-#include <basic/sbuno.hxx>
-#include <svtools/sfxecode.hxx>
-#include <svtools/ehdl.hxx>
 
+#include <sfx2/frame.hxx>
 #include <sfx2/dinfdlg.hxx>
-#include <sfx2/module.hxx>
-#include <arrdecl.hxx>
 #include <sfx2/app.hxx>
-#include <sfxtypes.hxx>
 #include <sfx2/msg.hxx>
-#include <sfx2/msgpool.hxx>
-#include <sfx2/progress.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/objitem.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/tplpitem.hxx>
-#include <sfx2/minfitem.hxx>
-#include <sfx2/evntconf.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <appdata.hxx>
-#include <sfx2/sfxhelp.hxx>
 #include <basic/basmgr.hxx>
 #include <unotools/configmgr.hxx>
 #include <sorgitm.hxx>
 #include <appbaslib.hxx>
 #include <basic/basicmanagerrepository.hxx>
 
-#include <svl/srchitem.hxx>
-#include <osl/socket.hxx>
-
 #define SFX_TYPEMAP
 #include <sfxslots.hxx>
 
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index 7b3dd295d4ee..f05afecdd20d 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -21,13 +21,10 @@
 
 #include <appbaslib.hxx>
 
-#include <sfx2/sfxuno.hxx>
-#include <sfxtypes.hxx>
 #include <sfx2/app.hxx>
 
 #include <basic/basmgr.hxx>
 #include <tools/diagnose_ex.h>
-#include <cppuhelper/weak.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 44065b512989..ec24c2951f03 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -18,16 +18,12 @@
  */
 
 #include <memory>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/util/XFlushable.hpp>
 #include <comphelper/sequence.hxx>
 #include <osl/file.hxx>
 
-#include <stdlib.h>
 #include <rtl/ustring.hxx>
 #include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/slstitm.hxx>
 #include <svl/stritem.hxx>
@@ -36,14 +32,11 @@
 #include <svl/undo.hxx>
 
 #include <sfx2/sfxsids.hrc>
-#include <sot/exchange.hxx>
 
 #include <svl/isethint.hxx>
 
 #include <officecfg/Inet.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <unotools/configmgr.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/saveopt.hxx>
 #include <svtools/helpopt.hxx>
 #include <unotools/securityoptions.hxx>
@@ -51,25 +44,15 @@
 #include <svtools/miscopt.hxx>
 #include <svtools/imgdef.hxx>
 #include <vcl/toolbox.hxx>
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <vcl/idle.hxx>
 
 #include <sfx2/app.hxx>
-#include <sfx2/docfile.hxx>
+#include <sfx2/event.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/sfxhelp.hxx>
-#include <sfxtypes.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 #include <objshimp.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/evntconf.hxx>
-#include <appdata.hxx>
-#include <workwin.hxx>
-#include <helper.hxx>
 #include "shutdownicon.hxx"
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index 0a2fa0b69526..0aaf722ba700 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -19,8 +19,6 @@
 
 
 #include <osl/diagnose.h>
-#include <svl/whiter.hxx>
-#include <svl/eitem.hxx>
 #include <tools/debug.hxx>
 
 #include <sfx2/app.hxx>
@@ -28,13 +26,7 @@
 #include <workwin.hxx>
 #include <childwinimpl.hxx>
 #include <sfx2/childwin.hxx>
-#include <sfx2/templdlg.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfxtypes.hxx>
 #include <sfx2/module.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
 
 
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 5cd097484940..e37fc0e1e73e 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -19,29 +19,14 @@
 
 #include <config_features.h>
 
-#include <tools/config.hxx>
-#include <svl/stritem.hxx>
-
-#include <vcl/menu.hxx>
-#include <comphelper/processfactory.hxx>
-
-#include <sfx2/viewfrm.hxx>
 #include <appdata.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/event.hxx>
 #include <sfxpicklist.hxx>
-#include <sfxtypes.hxx>
 #include <sfx2/doctempl.hxx>
-#include <arrdecl.hxx>
-#include <sfx2/docfac.hxx>
-#include <sfx2/docfile.hxx>
 #include <sfx2/module.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/sidebar/Theme.hxx>
+#include <sfx2/objsh.hxx>
 #include <sfx2/unoctitm.hxx>
-#include <objshimp.hxx>
 #include <appbaslib.hxx>
-#include <childwinimpl.hxx>
 #include <svl/svdde.hxx>
 
 #include <basic/basicmanagerrepository.hxx>
diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx
index 60d0cbefa21e..d3ec722aaead 100644
--- a/sfx2/source/appl/appdispatchprovider.cxx
+++ b/sfx2/source/appl/appdispatchprovider.cxx
@@ -26,31 +26,17 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/util/URL.hpp>
 
-#include <basic/basmgr.hxx>
-#include <basic/sbuno.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <rtl/ref.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/fcontnr.hxx>
-#include <sfx2/frame.hxx>
-#include <sfx2/module.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/msgpool.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/sfxbasecontroller.hxx>
-#include <sfx2/sfxsids.hrc>
-#include <sfx2/sfxuno.hxx>
 #include <sfx2/unoctitm.hxx>
-#include <svl/intitem.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 68ee31f76b89..5ae244d8e049 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -29,40 +29,22 @@
 #include <basic/sbdef.hxx>
 #include <tools/svlibrary.h>
 #include <svtools/soerr.hxx>
-#include <unotools/resmgr.hxx>
 #include <unotools/configmgr.hxx>
-#include <unotools/saveopt.hxx>
-#include <svl/intitem.hxx>
-#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
 #include <svtools/ehdl.hxx>
 #include <comphelper/processfactory.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <osl/module.hxx>
-#include <osl/security.hxx>
-#include <unotools/pathoptions.hxx>
-#include <unotools/historyoptions.hxx>
-#include <unotools/moduleoptions.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <vcl/edit.hxx>
+#include <vcl/help.hxx>
 #include <vcl/svapp.hxx>
 
 #include <sfx2/unoctitm.hxx>
 #include <appdata.hxx>
-#include <arrdecl.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/docfac.hxx>
-#include <sfx2/evntconf.hxx>
 #include <sfx2/msgpool.hxx>
-#include <sfx2/progress.hxx>
-#include <sfx2/sfxhelp.hxx>
-#include <sfxtypes.hxx>
-#include <sfx2/viewsh.hxx>
 #include <nochaos.hxx>
-#include <sfx2/fcontnr.hxx>
-#include <helper.hxx>
 #include <sfxpicklist.hxx>
 #include <ctrlfactoryimpl.hxx>
 #include <shellimpl.hxx>
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index f00254edba32..31295cd0f5ae 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -17,26 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/ehdl.hxx>
-#include <svl/itempool.hxx>
 #include <svl/urihelper.hxx>
-#include <svtools/helpopt.hxx>
-#include <framework/sfxhelperfunctions.hxx>
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
 
-#include <sfxtypes.hxx>
 #include <appdata.hxx>
-#include <sfx2/docfac.hxx>
 #include <sfx2/app.hxx>
-#include <arrdecl.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/msgpool.hxx>
-#include <sfx2/docfile.hxx>
-#include <workwin.hxx>
 
 
 SfxFilterMatcher& SfxApplication::GetFilterMatcher()
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 7e29627c9b69..f6fcc99bdb18 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -20,51 +20,26 @@
 #include <config_folders.h>
 
 #include <vcl/canvastools.hxx>
-#include <vcl/status.hxx>
 #include <vcl/svapp.hxx>
-#include <svl/whiter.hxx>
-#include <svl/stritem.hxx>
-#include <svl/intitem.hxx>
-#include <svl/eitem.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <unotools/pathoptions.hxx>
-#include <com/sun/star/registry/InvalidRegistryException.hpp>
 #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/graphic/Primitive2DTools.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <unotools/configmgr.hxx>
-#include <framework/menuconfiguration.hxx>
 #include <comphelper/processfactory.hxx>
-#include <unotools/localfilehelper.hxx>
-#include <unotools/bootstrap.hxx>
-#include <unotools/moduleoptions.hxx>
-#include <osl/file.hxx>
-#include <osl/process.h>
 #include <rtl/bootstrap.hxx>
+#include <svl/stritem.hxx>
+#include <tools/urlobj.hxx>
 
 #include <sfx2/app.hxx>
 #include <appdata.hxx>
-#include <sfx2/tbxctrl.hxx>
-#include <sfx2/stbitem.hxx>
-#include <sfx2/docfac.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include <workwin.hxx>
-#include <sfx2/fcontnr.hxx>
-#include <sfx2/templdlg.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
-#include <openflag.hxx>
-#include <sfx2/viewsh.hxx>
 #include <sfx2/objface.hxx>
-#include <helper.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 2ef69751b199..66a3a26fc825 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/util/URL.hpp>
@@ -36,6 +35,7 @@
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include <com/sun/star/uno/Sequence.h>
@@ -55,14 +55,9 @@
 #include <svtools/sfxecode.hxx>
 #include <preventduplicateinteraction.hxx>
 #include <svtools/ehdl.hxx>
-#include <basic/sbxobj.hxx>
-#include <svl/urihelper.hxx>
-#include <unotools/localfilehelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/securityoptions.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <svtools/miscopt.hxx>
-#include <osl/file.hxx>
 #include <unotools/extendedsecurityoptions.hxx>
 #include <comphelper/docpasswordhelper.hxx>
 #include <vcl/svapp.hxx>
@@ -74,14 +69,10 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <sfx2/new.hxx>
 #include <sfx2/objitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/slstitm.hxx>
 #include <appopen.hxx>
-#include <objshimp.hxx>
-#include <openflag.hxx>
-#include <sfx2/passwd.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/viewsh.hxx>
@@ -90,8 +81,6 @@
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <sfx2/docfac.hxx>
-#include <sfx2/event.hxx>
 #include <sfx2/templatedlg.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <openuriexternally.hxx>
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index bf034e9b2b9b..7b17c538c14f 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -19,34 +19,20 @@
 
 #include <config_features.h>
 
-#include <basic/basmgr.hxx>
 #include <basic/sbstar.hxx>
-
-#include <svl/svdde.hxx>
-#include <svl/eitem.hxx>
-
-#include <unotools/saveopt.hxx>
-#include <unotools/misccfg.hxx>
+#include <tools/solar.h>
+#include <tools/debug.hxx>
 
 #include <sfx2/app.hxx>
-#include <sfx2/evntconf.hxx>
-#include <sfx2/unoctitm.hxx>
 #include <appdata.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/printer.hxx>
-#include <arrdecl.hxx>
-#include <sfx2/event.hxx>
-#include <sfx2/templdlg.hxx>
 #include <sfx2/msgpool.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfxtypes.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <nochaos.hxx>
 #include <sfx2/doctempl.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/docfac.hxx>
 #include <appbaslib.hxx>
 #include <childwinimpl.hxx>
 #include <ctrlfactoryimpl.hxx>
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index 614a92ca79fd..4e74737d3aad 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -19,12 +19,9 @@
 
 
 #include <sal/log.hxx>
-#include <vcl/toolbox.hxx>
 
 #include <sfx2/app.hxx>
 #include <appdata.hxx>
-#include <sfx2/sfxhelp.hxx>
-#include <sfx2/templdlg.hxx>
 #include <inettbc.hxx>
 #include <sfx2/stbitem.hxx>
 #include <sfx2/infobar.hxx>
@@ -37,7 +34,6 @@
 #include <ctrlfactoryimpl.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
-#include <sfx2/objface.hxx>
 
 
 void SfxApplication::Registrations_Impl()
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index c73d8d9d39c9..aee61e671f14 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -21,8 +21,6 @@
 
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/drawing/ModuleDispatcher.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/DispatchResultEvent.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
@@ -33,8 +31,6 @@
 #include <com/sun/star/sdbc/DriverManager.hpp>
 #include <com/sun/star/system/SystemShellExecute.hpp>
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <com/sun/star/system/SystemShellExecuteException.hpp>
-#include <com/sun/star/task/XJobExecutor.hpp>
 #include <com/sun/star/text/ModuleDispatcher.hpp>
 #include <com/sun/star/task/OfficeRestartManager.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -56,39 +52,29 @@
 #include <svtools/miscopt.hxx>
 #include <svtools/restartdialog.hxx>
 #include <svl/visitem.hxx>
-#include <unotools/intlwrapper.hxx>
 
 #include <unotools/configmgr.hxx>
 #include <tools/svlibrary.h>
 #include <tools/diagnose_ex.h>
-#include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
 #include <basic/sbstar.hxx>
-#include <basic/basmgr.hxx>
 #include <basic/basrdll.hxx>
 #include <basic/sberrors.hxx>
-#include <svtools/sfxecode.hxx>
-#include <svtools/ehdl.hxx>
 #include <vcl/help.hxx>
-#include <vcl/stdtext.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <osl/file.hxx>
 #include <osl/module.hxx>
 #include <vcl/EnumContext.hxx>
 
-#include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <unotools/viewoptions.hxx>
 #include <svtools/helpopt.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <unotools/bootstrap.hxx>
 #include <rtl/bootstrap.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -99,34 +85,19 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/objface.hxx>
-#include <sfx2/objitem.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/hintpost.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/docfac.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/new.hxx>
-#include <sfxtypes.hxx>
-#include <sfx2/tabdlg.hxx>
-#include <arrdecl.hxx>
 #include <sfx2/strings.hrc>
-#include <sfx2/passwd.hxx>
 #include <sfx2/sfxresid.hxx>
-#include <sfx2/childwin.hxx>
 #include <appdata.hxx>
-#include <sfx2/minfitem.hxx>
-#include <sfx2/event.hxx>
-#include <sfx2/module.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfxpicklist.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sorgitm.hxx>
 #include <sfx2/sfxhelp.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <sfx2/templatedlg.hxx>
-#include <sfx2/sidebar/Sidebar.hxx>
 #include <sfx2/notebookbar/SfxNotebookBar.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
 #include <sfx2/safemode.hxx>
@@ -134,7 +105,6 @@
 
 #include <comphelper/types.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <officecfg/Office/UI/ToolbarMode.hxx>
 #include <unotools/confignode.hxx>
 #include <officecfg/Setup.hxx>
 #include <memory>
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index bfbe90dc896b..466f31e87250 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -18,48 +18,25 @@
  */
 
 #include <fltoptint.hxx>
-#include <objshimp.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/brokenpackageint.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/fcontnr.hxx>
 #include <sfx2/frame.hxx>
-#include <sfx2/module.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/msgpool.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/sfxbasecontroller.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/sfxuno.hxx>
-#include <sfx2/unoctitm.hxx>
 #include <sfxslots.hxx>
-#include <sfxtypes.hxx>
 
 #include <sal/config.h>
 #include <sal/log.hxx>
-#include <basic/basmgr.hxx>
-#include <basic/sberrors.hxx>
-#include <basic/sbmeth.hxx>
-#include <basic/sbuno.hxx>
-#include <basic/sbx.hxx>
-#include <basic/sbxcore.hxx>
-#include <basic/sbxmeth.hxx>
-#include <basic/sbxobj.hxx>
 #include <comphelper/interaction.hxx>
-#include <framework/documentundoguard.hxx>
+#include <osl/diagnose.h>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itempool.hxx>
-#include <svl/lckbitem.hxx>
-#include <svl/ownlist.hxx>
-#include <svl/rectitem.hxx>
 #include <svl/slstitm.hxx>
 #include <svl/stritem.hxx>
-#include <tools/config.hxx>
 #include <tools/debug.hxx>
-#include <tools/urlobj.hxx>
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/document/BrokenPackageRequest.hpp>
@@ -67,7 +44,9 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
 
 #include <memory>
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 89aa5bb43285..9c2ee6687ded 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -18,8 +18,6 @@
  */
 
 #include <memory>
-#include <vcl/toolbox.hxx>
-#include <unotools/moduleoptions.hxx>
 #include <unotools/viewoptions.hxx>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 9c56c944b990..2f20bb84fc87 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -21,11 +21,7 @@
 #include <tools/stream.hxx>
 #include <sot/formats.hxx>
 #include <sal/log.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <sfx2/lnkbase.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/progress.hxx>
-#include <sfx2/docfilt.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sot/exchange.hxx>
 #include <com/sun/star/uno/Any.hxx>
@@ -42,7 +38,6 @@
 #include <sfx2/objsh.hxx>
 #include "fileobj.hxx"
 #include <sfx2/strings.hrc>
-#include <vcl/dibtools.hxx>
 #include <vcl/svapp.hxx>
 
 #define FILETYPE_TEXT       1
diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx
index df66d6e3a72f..6a7eee8fb8b6 100644
--- a/sfx2/source/appl/fwkhelper.cxx
+++ b/sfx2/source/appl/fwkhelper.cxx
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
-#include <framework/sfxhelperfunctions.hxx>
 
 #include <vcl/svapp.hxx>
 
diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx
index a53c5e5ed622..7b2467a34c80 100644
--- a/sfx2/source/appl/helpdispatch.cxx
+++ b/sfx2/source/appl/helpdispatch.cxx
@@ -19,7 +19,6 @@
 
 
 #include "helpdispatch.hxx"
-#include <sfx2/sfxuno.hxx>
 #include "newhelp.hxx"
 #include <tools/debug.hxx>
 
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 90f95151da26..54cf5cf06315 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -21,12 +21,8 @@
 #include "helpinterceptor.hxx"
 #include "helpdispatch.hxx"
 #include "newhelp.hxx"
-#include <sfx2/sfxuno.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <cppuhelper/interfacecontainer.h>
-#include <vcl/window.hxx>
 #include <limits.h>
 
 using namespace ::com::sun::star::beans;
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 39cd6629b12a..fbf452065520 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -25,10 +25,8 @@
 
 #include "impldde.hxx"
 
-#include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <sot/exchange.hxx>
-#include <rtl/strbuf.hxx>
 #include <rtl/ustring.hxx>
 
 #include <sfx2/lnkbase.hxx>
@@ -40,8 +38,6 @@
 #include <svl/svdde.hxx>
 #include <sot/formats.hxx>
 
-#include <unotools/securityoptions.hxx>
-
 using namespace ::com::sun::star::uno;
 
 namespace sfx2
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index fb8746e834fd..03d01eb900af 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -38,7 +38,6 @@
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <sfx2/request.hxx>
 #include <vcl/dibtools.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/securityoptions.hxx>
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx
index 98e036e0a7ea..912b555c829b 100644
--- a/sfx2/source/appl/macroloader.cxx
+++ b/sfx2/source/appl/macroloader.cxx
@@ -21,8 +21,6 @@
 
 #include <macroloader.hxx>
 
-#include <com/sun/star/document/UpdateDocMode.hpp>
-#include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <basic/basmgr.hxx>
 #include <basic/sbuno.hxx>
@@ -31,14 +29,9 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <framework/documentundoguard.hxx>
-#include <rtl/ref.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/docfile.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/sfxsids.hrc>
-#include <svl/intitem.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 9cd0dd0682fa..693f584ac326 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -17,10 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cstdarg>
 #include <sfx2/module.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/styfitem.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/stbitem.hxx>
@@ -32,7 +30,6 @@
 #include <sfx2/sfxsids.hrc>
 #include <svl/intitem.hxx>
 #include <tools/diagnose_ex.h>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 
 #define ShellClass_SfxModule
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index cddd4318cea6..e615a3f88baf 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -19,13 +19,9 @@
 
 
 #include "newhelp.hxx"
-#include <sfx2/sfxuno.hxx>
 #include <sfx2/sfxresid.hxx>
 #include "helpinterceptor.hxx"
 #include <helper.hxx>
-#include <sfx2/msgpool.hxx>
-#include <sfx2/app.hxx>
-#include <sfxtypes.hxx>
 #include "panelist.hxx"
 #include <srchdlg.hxx>
 #include <sfx2/sfxhelp.hxx>
@@ -45,8 +41,6 @@
 #include <comphelper/string.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -60,13 +54,11 @@
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/text/XTextViewCursor.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
@@ -78,16 +70,12 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/CloseVetoException.hpp>
-#include <com/sun/star/ui/XDockingAreaAcceptor.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
-#include <svtools/helpopt.hxx>
 #include <unotools/historyoptions.hxx>
 #include <svtools/menuoptions.hxx>
-#include <unotools/pathoptions.hxx>
 #include <unotools/viewoptions.hxx>
 #include <tools/urlobj.hxx>
-#include <unotools/streamhelper.hxx>
 #include <svtools/imagemgr.hxx>
 #include <svtools/miscopt.hxx>
 #include <vcl/unohelp.hxx>
@@ -100,10 +88,6 @@
 #include <ucbhelper/content.hxx>
 #include <unotools/ucbhelper.hxx>
 
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/docfac.hxx>
-
 #include <unordered_map>
 #include <vector>
 
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index dc0e09231b40..02b44545bf73 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -22,30 +22,17 @@
 #include <tools/urlobj.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp>
-#include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
-#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <o3tl/any.hxx>
-#include <svl/urihelper.hxx>
-#include <vcl/transfer.hxx>
-#include <sot/formats.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfile.hxx>
-#include <unotools/pathoptions.hxx>
 #include <sfx2/opengrf.hxx>
 #include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx
index 45e9ee0861f4..c7db4a701b38 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -15,9 +15,7 @@
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <comphelper/processfactory.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
diff --git a/sfx2/source/appl/preventduplicateinteraction.cxx b/sfx2/source/appl/preventduplicateinteraction.cxx
index 8c9796491b8f..a80b05c44929 100644
--- a/sfx2/source/appl/preventduplicateinteraction.cxx
+++ b/sfx2/source/appl/preventduplicateinteraction.cxx
@@ -24,7 +24,6 @@
 
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionAbort.hpp>
-#include <com/sun/star/task/XInteractionRetry.hpp>
 
 namespace sfx2 {
 
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 36cdd776d64f..511acc50f07f 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -20,7 +20,6 @@
 #include <config_folders.h>
 #include <sfx2/sfxhelp.hxx>
 
-#include <set>
 #include <string_view>
 #include <algorithm>
 #include <cassert>
@@ -37,25 +36,17 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/UnknownModuleException.hpp>
 #include <com/sun/star/frame/XFrame2.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
-#include <com/sun/star/awt/PosSize.hpp>
-#include <com/sun/star/util/URLTransformer.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/frame/ModuleManager.hpp>
-#include <com/sun/star/system/SystemShellExecute.hpp>
-#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <unotools/configmgr.hxx>
-#include <unotools/configitem.hxx>
 #include <svtools/helpopt.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/debug.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/pathoptions.hxx>
 #include <rtl/byteseq.hxx>
@@ -63,9 +54,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <osl/process.h>
 #include <osl/file.hxx>
-#include <unotools/bootstrap.hxx>
 #include <unotools/tempfile.hxx>
-#include <unotools/localedatawrapper.hxx>
 #include <unotools/securityoptions.hxx>
 #include <rtl/uri.hxx>
 #include <vcl/commandinfoprovider.hxx>
@@ -73,8 +62,6 @@
 #include <vcl/settings.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/weld.hxx>
-#include <svtools/ehdl.hxx>
-#include <svtools/sfxecode.hxx>
 #include <openuriexternally.hxx>
 
 #include <comphelper/lok.hxx>
@@ -82,15 +69,11 @@
 #include <sfx2/viewsh.hxx>
 
 #include "newhelp.hxx"
-#include <sfx2/objsh.hxx>
-#include <sfx2/docfac.hxx>
 #include <sfx2/flatpak.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <helper.hxx>
 #include <sfx2/strings.hrc>
-#include <sfx2/sfxuno.hxx>
 #include <vcl/svapp.hxx>
-#include <sfx2/frame.hxx>
 #include <rtl/string.hxx>
 #include <svtools/langtab.hxx>
 #include <tools/diagnose_ex.h>
@@ -100,7 +83,6 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::system;
 
 namespace {
 
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 8ec36aa20c2b..67b5b1765331 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -17,47 +17,32 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
-
 #include <comphelper/lok.hxx>
 #include <comphelper/base64.hxx>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <unotools/historyoptions.hxx>
 #include <unotools/useroptions.hxx>
+#include <tools/datetime.hxx>
 #include <tools/urlobj.hxx>
-#include <framework/menuconfiguration.hxx>
-#include <sax/tools/converter.hxx>
 #include <svl/inethist.hxx>
-#include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/pngwrite.hxx>
 #include <vcl/svapp.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <osl/file.hxx>
-#include <unotools/localfilehelper.hxx>
-#include <cppuhelper/implbase.hxx>
 
 
 #include <sfx2/app.hxx>
 #include <sfxpicklist.hxx>
-#include <sfx2/sfxuno.hxx>
-#include <sfxtypes.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/event.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/bindings.hxx>
 #include <sfx2/docfile.hxx>
-#include <objshimp.hxx>
 #include <openurlhint.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <rtl/instance.hxx>
 
-#include <algorithm>
-
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index f828982f0726..8ec370eddc1c 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -23,7 +23,6 @@
 #include <cassert>
 
 #include <boost/logic/tribool.hpp>
-#include <config_folders.h>
 #include "shutdownicon.hxx"
 #include <sfx2/strings.hrc>
 #include <sfx2/app.hxx>
@@ -41,7 +40,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
@@ -54,21 +52,13 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <sfx2/dispatch.hxx>
 #include <comphelper/extract.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
-#include <osl/security.hxx>
 #include <osl/file.hxx>
 #include <osl/module.hxx>
-#include <rtl/bootstrap.hxx>
 #include <rtl/ref.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
-#ifdef UNX // need symlink
-#include <unistd.h>
-#include <errno.h>
-#endif
 
 #include <sfx2/sfxresid.hxx>
 
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 16c0d1652cdf..c6d1da362a89 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -20,6 +20,7 @@
 #include <config_feature_desktop.h>
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
+#include <osl/diagnose.h>
 
 #include <sfx2/docfile.hxx>
 #include <sfx2/objface.hxx>
@@ -33,20 +34,13 @@
 #include <sfx2/viewsh.hxx>
 #include <splitwin.hxx>
 #include <childwinimpl.hxx>
-#include <sfx2/msgpool.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/toolbarids.hxx>
 #include <vcl/taskpanelist.hxx>
-#include <vcl/toolbox.hxx>
 #include <vcl/svapp.hxx>
-#include <tools/diagnose_ex.h>
-#include <svl/itempool.hxx>
-#include <svl/itemiter.hxx>
-#include <svl/whiter.hxx>
-#include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <tools/svborder.hxx>
+#include <tools/debug.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <com/sun/star/ui/XUIElement.hpp>
 #include <com/sun/star/frame/LayoutManagerEvents.hpp>
@@ -54,7 +48,6 @@
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <type_traits>
 #include <unordered_map>
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 607d4f0993cd..825a334f30ee 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -26,14 +26,12 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <rtl/ref.hxx>
 #include <sot/stg.hxx>
 #include <sot/storage.hxx>
 #include <tools/stream.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <ucbhelper/content.hxx>
-#include <ucbhelper/commandenvironment.hxx>
 
 using namespace css;