tdf#42949 Fix new IWYU warnings in directories s*

Except recently checked sc, sd, svx, sw

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

Change-Id: Ice1b86628e4f22a39f307b9c5fa567b6ab9d5acb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106917
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

48 files changed, 45 insertions, 117 deletions

diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml
index 87396e719fc4..493d9aa47929 100644
--- a/sfx2/IwyuFilter_sfx2.yaml
+++ b/sfx2/IwyuFilter_sfx2.yaml
@@ -52,15 +52,6 @@ excludelist:
     - 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
@@ -85,9 +76,24 @@ excludelist:
     sfx2/source/bastyp/fltfnc.cxx:
     # Needed for UnoType to work
     - com/sun/star/task/XInteractionHandler.hpp
+    sfx2/source/control/dispatch.cxx:
+    # Needed for DENTERREGISTRATIONS DLEAVEREGISTRATIONS macros from sfx2/bindings.hxx in DBG_UTIL mode
+    - rtl/strbuf.hxx
+    sfx2/source/control/listview.cxx:
+    # Needed for MOREBUTTON in sfx2/inc/bitmaps.hlst to not fail, until a bit of cleanup there.
+    - tools/wintypes.hxx
     sfx2/source/control/sfxstatuslistener.cxx:
     # Actually used
     - com/sun/star/frame/XDispatchProvider.hpp
+    sfx2/source/control/statcach.cxx:
+    # Needed for template
+    - com/sun/star/frame/XFrame.hpp
+    sfx2/source/dialog/documentfontsdialog.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
+    sfx2/source/dialog/versdlg.cxx:
+    # Needed for template
+    - com/sun/star/frame/XModel.hpp
     sfx2/source/doc/docinf.cxx:
     # Actually used
     - com/sun/star/document/XDocumentProperties.hpp
@@ -100,6 +106,9 @@ excludelist:
     sfx2/source/doc/guisaveas.cxx:
     # Needed on WIN32
     - o3tl/char16_t2wchar_t.hxx
+    sfx2/source/doc/iframe.cxx:
+    # Needed for template
+    - com/sun/star/awt/XWindowPeer.hpp
     sfx2/source/doc/objstor.cxx:
     # Actually used
     - com/sun/star/frame/XModel.hpp
@@ -115,6 +124,9 @@ excludelist:
     sfx2/source/doc/sfxbasemodel.cxx:
     # Don't propose hxx -> h change in URE libs
     - cppuhelper/interfacecontainer.hxx
+    sfx2/source/doc/signaturestate.cxx:
+    # Actually used
+    - com/sun/star/security/DocumentSignatureInformation.hpp
     sfx2/source/inc/asyncfunc.hxx:
     # base class has to be a complete type
     - com/sun/star/lang/XUnoTunnel.hpp
@@ -126,6 +138,9 @@ excludelist:
     sfx2/source/sidebar/Panel.cxx:
     # Actually used
     - com/sun/star/ui/XUIElement.hpp
+    sfx2/source/sidebar/ResourceManager.cxx:
+    # Needed for template
+    - com/sun/star/ui/XSidebarPanel.hpp
     sfx2/source/sidebar/SidebarToolBox.cxx:
     # Actually used
     - com/sun/star/frame/XFrame.hpp
@@ -135,6 +150,18 @@ excludelist:
     - com/sun/star/awt/XWindowPeer.hpp
     - com/sun/star/frame/XDispatch.hpp
     - com/sun/star/ui/ContextChangeEventObject.hpp
+    sfx2/source/sidebar/SidebarDockingWindow.cxx:
+    # Needed for json_parser_error
+    - boost/property_tree/json_parser.hpp
+    sfx2/source/sidebar/SidebarPanelBase.cxx:
+    # Needed for template
+    - com/sun/star/awt/XWindowPeer.hpp
+    sfx2/source/view/ipclient.cxx:
+    # Needed for template
+    - com/sun/star/awt/XWindowPeer.hpp
+    sfx2/source/view/sfxbasecontroller.cxx:
+    # Needed for template
+    - com/sun/star/awt/XWindowPeer.hpp
     sfx2/source/view/viewfrm2.cxx:
     # Needed for direct member access
     - com/sun/star/embed/VerbDescriptor.hpp
@@ -146,6 +173,8 @@ excludelist:
     # Actually used
     - com/sun/star/awt/XKeyHandler.hpp
     - com/sun/star/awt/XMouseClickHandler.hpp
+    # Needed for template
+    - com/sun/star/awt/XWindowPeer.hpp
     sfx2/source/view/viewsh.cxx:
     # Needed for TypedWhichId define
     - svl/eitem.hxx
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index f3138419f4a3..9f9909ff6bfa 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -24,7 +24,6 @@
 #include <sfx2/app.hxx>
 #include <sfx2/frame.hxx>
 #include <basic/sberrors.hxx>
-#include <tools/svlibrary.h>
 
 #include <svl/svdde.hxx>
 #include <unotools/configmgr.hxx>
@@ -50,7 +49,6 @@
 #include <sfx2/stbitem.hxx>
 #include <sfx2/dockwin.hxx>
 #include <shellimpl.hxx>
-#include <comphelper/lok.hxx>
 
 #include <svtools/helpopt.hxx>
 #include <unotools/viewoptions.hxx>
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index c9495eea5d16..d41136789ce7 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -43,7 +43,6 @@
 #include <unotools/pathoptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/imgdef.hxx>
-#include <vcl/toolbox.hxx>
 #include <sal/log.hxx>
 #include <vcl/idle.hxx>
 
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 864e2aaaf1a3..f7ddfb297d6a 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -21,8 +21,7 @@
 #include <ucbhelper/content.hxx>
 
 #include <vcl/canvastools.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/graphicfilter.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/graphic/Primitive2DTools.hpp>
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 1fafb81ceb42..d4a7fc134c66 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -20,12 +20,10 @@
 #include <config_features.h>
 
 #include <basic/sbstar.hxx>
-#include <tools/solar.h>
 #include <tools/debug.hxx>
 
 #include <sfx2/app.hxx>
 #include <appdata.hxx>
-#include <sfx2/viewsh.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index d6190e604c78..ab441f70b7f5 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <config_features.h>
-#include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/drawing/ModuleDispatcher.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/DispatchResultEvent.hpp>
@@ -28,8 +27,6 @@
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
 #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/text/ModuleDispatcher.hpp>
 #include <com/sun/star/task/OfficeRestartManager.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -54,7 +51,6 @@
 #include <svl/visitem.hxx>
 
 #include <unotools/configmgr.hxx>
-#include <tools/svlibrary.h>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
@@ -105,7 +101,6 @@
 #include <comphelper/types.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <unotools/confignode.hxx>
-#include <officecfg/Setup.hxx>
 #include <memory>
 
 #include <openuriexternally.hxx>
@@ -118,10 +113,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::script;
-using namespace ::com::sun::star::system;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::ui;
 
 namespace
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 75755ecbe640..ccab2578e750 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -23,7 +23,6 @@
 #include "newhelp.hxx"
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
-#include <limits.h>
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 9f83906fbd65..6170c5db01f0 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -38,7 +38,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -71,7 +70,6 @@
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
 #include <unotools/historyoptions.hxx>
-#include <svtools/menuoptions.hxx>
 #include <unotools/viewoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/imagemgr.hxx>
@@ -80,7 +78,6 @@
 #include <vcl/event.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/taskpanelist.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/unohelp.hxx>
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 82775fd9a328..070d762b00dc 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -25,7 +25,6 @@
 #include <tools/datetime.hxx>
 #include <tools/urlobj.hxx>
 #include <svl/inethist.hxx>
-#include <vcl/gdimtf.hxx>
 #include <vcl/pngwrite.hxx>
 #include <vcl/svapp.hxx>
 #include <officecfg/Office/Common.hxx>
diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx
index f62cb1c368f4..99f5c5796d08 100644
--- a/sfx2/source/control/charwin.cxx
+++ b/sfx2/source/control/charwin.cxx
@@ -23,7 +23,6 @@
 #include <vcl/svapp.hxx>
 #include <sfx2/charwin.hxx>
 #include <comphelper/dispatchcommand.hxx>
-#include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 
diff --git a/sfx2/source/control/listview.cxx b/sfx2/source/control/listview.cxx
index 7b239d172739..d4b8769447cc 100644
--- a/sfx2/source/control/listview.cxx
+++ b/sfx2/source/control/listview.cxx
@@ -7,22 +7,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <vcl/headbar.hxx>
 #include <sfx2/listview.hxx>
 
-#include <sfx2/doctempl.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <tools/urlobj.hxx>
-#include <vcl/svapp.hxx>
-
-#include <vcl/commandevent.hxx>
-#include <vcl/event.hxx>
 
 #include <sfx2/strings.hrc>
 #include <osl/file.hxx>
 #include <osl/time.h>
 #include <comphelper/fileurl.hxx>
-#include <string>
 
 #include <svtools/svtresid.hxx>
 #include <svtools/strings.hrc>
@@ -30,6 +23,7 @@
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/intlwrapper.hxx>
+#include <tools/wintypes.hxx>
 
 #include <bitmaps.hlst>
 #include <rtl/math.hxx>
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index 8a047b20ee8d..dbec7dac90db 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -17,7 +17,6 @@
 #include <sfx2/templatelocalview.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/historyoptions.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
 #include <vcl/ptrstyle.hxx>
 
diff --git a/sfx2/source/control/templatedlglocalview.cxx b/sfx2/source/control/templatedlglocalview.cxx
index 3e60830e5bd9..a1419ab5c8d6 100644
--- a/sfx2/source/control/templatedlglocalview.cxx
+++ b/sfx2/source/control/templatedlglocalview.cxx
@@ -12,7 +12,6 @@
 #include <comphelper/string.hxx>
 #include <sfx2/inputdlg.hxx>
 #include <templateviewitem.hxx>
-#include <sfx2/doctempl.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <templatecontaineritem.hxx>
 #include <sfx2/strings.hrc>
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index d077b46a2f33..6c1597bea1ca 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -18,7 +18,6 @@
 #include <sfx2/docfac.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <vcl/help.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 76bd2b9cefd5..c3ebe3bfe903 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -29,7 +29,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/pngread.hxx>
 
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index 3e6a083a98ee..fce9d20a8bee 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -27,7 +27,6 @@
 #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonSelectionPrimitive2D.hxx>
-#include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 9185458f62af..e27b8bf7bbba 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -25,7 +25,6 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
-#include <vcl/virdev.hxx>
 
 #include <unotools/historyoptions.hxx>
 #include <unotools/moduleoptions.hxx>
@@ -51,8 +50,6 @@
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 
-#include <officecfg/Office/Common.hxx>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index d0cafa6926e2..c777ebed9c76 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -29,7 +29,6 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/viewsh.hxx>
 #include <workwin.hxx>
-#include <sfx2/lokhelper.hxx>
 #include <comphelper/lok.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index 915f33660e1d..c37c563567e7 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -9,7 +9,6 @@
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <comphelper/dispatchcommand.hxx>
-#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
 #include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
@@ -22,7 +21,6 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
-#include <vcl/decoview.hxx>
 #include <vcl/image.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 22acd6791b25..954db248f417 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -25,12 +25,12 @@
 #include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxdlg.hxx>
+#include <sfx2/viewsh.hxx>
 #include <unotools/viewoptions.hxx>
 #include <vcl/virdev.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/lok.hxx>
-#include <sfx2/lokhelper.hxx>
 
 #include <sfx2/strings.hrc>
 #include <helpids.h>
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 4247bc272717..c76f06b14bbe 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -25,8 +25,6 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/event.hxx>
-#include <vcl/help.hxx>
-#include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weldutils.hxx>
@@ -35,8 +33,6 @@
 #include <svl/style.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <unotools/intlwrapper.hxx>
-#include <unotools/collatorwrapper.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/frame/UnknownModuleException.hpp>
@@ -63,7 +59,6 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/module.hxx>
 #include <helpids.h>
-#include <bitmaps.hlst>
 #include <sfx2/viewfrm.hxx>
 
 #include <comphelper/string.hxx>
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 256b328e4978..3239fc185f8b 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -33,7 +33,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <tools/datetime.hxx>
-#include <svtools/miscopt.hxx>
 
 #include <versdlg.hxx>
 #include <sfx2/strings.hrc>
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 578322556b60..fb0e0eacaa51 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
-#include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
 #include <com/sun/star/xml/dom/DOMException.hpp>
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index cb1cd95663de..1253eb75e593 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-
 #include <sfx2/objsh.hxx>
 #include <sfx2/app.hxx>
 #include <objshimp.hxx>
diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx
index 911ec9a33303..7165a475e291 100644
--- a/sfx2/source/doc/objitem.cxx
+++ b/sfx2/source/doc/objitem.cxx
@@ -20,7 +20,6 @@
 
 #include <sfx2/objsh.hxx>
 #include <sfx2/objitem.hxx>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
 
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 0733ccc72752..f94b66df540f 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -85,7 +85,6 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/docfilt.hxx>
 #include <sfx2/objsh.hxx>
 #include <objshimp.hxx>
 #include <sfx2/event.hxx>
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index ef9925549149..226321744a26 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <com/sun/star/security/CertificateValidity.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
 
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index 7e1048da06b4..7e317cc29ea4 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/frame/DoubleInitializationException.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 09d1c506522c..47c379a3a8f6 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/view/DuplexMode.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx
index dab70f396006..a14ff68b1a73 100644
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
@@ -19,16 +19,10 @@
 
 #include <sfx2/sfxmodelfactory.hxx>
 
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <comphelper/namedvaluecollection.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/supportsservice.hxx>
 
 #include <osl/diagnose.h>
 
@@ -43,10 +37,7 @@ namespace sfx2
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::uno::Any;
-    using ::com::sun::star::lang::XMultiServiceFactory;
     using ::com::sun::star::uno::Sequence;
-    using ::com::sun::star::lang::XSingleServiceFactory;
-    using ::com::sun::star::lang::XServiceInfo;
     using ::com::sun::star::beans::NamedValue;
     using ::com::sun::star::beans::PropertyValue;
     using ::com::sun::star::lang::XInitialization;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index dcacebb95446..0bfbe7ba2484 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -14,7 +14,6 @@
 #include <templatesearchviewitem.hxx>
 
 #include <comphelper/processfactory.hxx>
-#include <comphelper/propertysequence.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <sfx2/app.hxx>
@@ -30,7 +29,6 @@
 #include <sfx2/thumbnailviewitem.hxx>
 #include <sot/storage.hxx>
 #include <svtools/imagemgr.hxx>
-#include <svtools/langhelp.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/pathoptions.hxx>
@@ -41,24 +39,19 @@
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/document/UpdateDocMode.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/XStorable.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
-#include <com/sun/star/system/SystemShellExecute.hpp>
-#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <comphelper/dispatchcommand.hxx>
 
 #include <sfx2/strings.hrc>
-#include <bitmaps.hlst>
 
 const char TM_SETTING_MANAGER[] = "TemplateManager";
 const char TM_SETTING_LASTFOLDER[] = "LastFolder";
@@ -1499,4 +1492,4 @@ IMPL_LINK_NOARG(SfxTemplateSelectionDlg, OkClickHdl, weld::Button&, void)
    m_xDialog->response(RET_OK);
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index 33f219e3247e..ad4bd234389a 100644
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <tools/solar.h>
 #include <svl/itempool.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index cff228473371..c87c37118755 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -18,8 +18,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/lok.hxx>
 #include <com/sun/star/frame/UnknownModuleException.hpp>
-#include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp>
-#include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <officecfg/Office/UI/ToolbarMode.hxx>
 #include <com/sun/star/frame/XModuleManager.hpp>
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 65a50da3ef75..57c8ebe31751 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -19,15 +19,11 @@
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-#include <com/sun/star/document/XEmbeddedScripts.hpp>
-#include <com/sun/star/document/XScriptInvocationContext.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <tools/urlobj.hxx>
-#include <tools/diagnose_ex.h>
 #include <svl/macitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/evntconf.hxx>
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index a362e3d8d5cf..a2953e807e61 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -21,8 +21,6 @@
 
 #include <sfx2/bindings.hxx>
 
-#include <com/sun/star/lang/XComponent.hpp>
-
 using namespace css;
 using namespace css::uno;
 
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index c1d5974179a4..4a05db81f000 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -25,7 +25,7 @@
 #include <sidebar/PanelTitleBar.hxx>
 #include <sfx2/sidebar/Panel.hxx>
 #include <sfx2/sidebar/Theme.hxx>
-#include <sfx2/lokhelper.hxx>
+#include <sfx2/viewsh.hxx>
 
 #include <vcl/event.hxx>
 #include <comphelper/lok.hxx>
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index d1ce0ef700e0..79ac22826ea5 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -23,13 +23,7 @@
 #include <sfx2/sidebar/Panel.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sidebar/ControllerFactory.hxx>
-#include <sidebar/Tools.hxx>
 #include <vcl/event.hxx>
-#include <vcl/image.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
-
-#include <com/sun/star/frame/XDispatch.hpp>
 
 using namespace css;
 using namespace css::uno;
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 5b8b64fcae24..35fbdf41254d 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -29,11 +29,9 @@
 #include <sidebar/Tools.hxx>
 #include <sfx2/sidebar/SidebarDockingWindow.hxx>
 #include <sfx2/sidebar/Context.hxx>
+#include <sfx2/viewsh.hxx>
 
 
-#include <sfx2/lokhelper.hxx>
-#include <sfx2/sfxresid.hxx>
-#include <sfx2/strings.hrc>
 #include <framework/ContextChangeEventMultiplexerTunnel.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 3c187f117ba4..46b62f51ad93 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -23,10 +23,10 @@
 
 #include <comphelper/dispatchcommand.hxx>
 #include <comphelper/processfactory.hxx>
-#include <sfx2/lokhelper.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <sfx2/viewsh.hxx>
 #include <svtools/acceleratorexecute.hxx>
 #include <tools/gen.hxx>
 #include <tools/json_writer.hxx>
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index b4cd8907d96b..0ac834b1318e 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -23,16 +23,12 @@
 #include <sidebar/Tools.hxx>
 #include <sfx2/sidebar/FocusManager.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
-#include <sfx2/strings.hrc>
-
-#include <sfx2/sfxresid.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <o3tl/safeint.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
-#include <tools/svborder.hxx>
 #include <svtools/acceleratorexecute.hxx>
 
 using namespace css;
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index bd64a87b7907..140d203a495a 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -25,8 +25,6 @@
 #include <vcl/settings.hxx>
 #include <tools/diagnose_ex.h>
 
-#include <com/sun/star/awt/Rectangle.hpp>
-
 using namespace css;
 using namespace css::uno;
 
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index de2ebdd0ae1b..3c6886630439 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -24,7 +24,6 @@
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/commandinfoprovider.hxx>
-#include <vcl/gradient.hxx>
 
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 1240100e9daa..88b04852b95d 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -42,10 +42,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 
-#include <svtools/framestatuslistener.hxx>
 #include <comphelper/processfactory.hxx>
-#include <vcl/taskpanelist.hxx>
-#include <vcl/event.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <vcl/InterimItemWindow.hxx>
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index cdfa36ff82ed..24224233b964 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/CloseVetoException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 
diff --git a/sfx2/source/view/lokcharthelper.cxx b/sfx2/source/view/lokcharthelper.cxx
index d5995e33ba8d..a03816b6052e 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -15,7 +15,6 @@
 #include <sfx2/lokhelper.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/fract.hxx>
-#include <tools/mapunit.hxx>
 #include <tools/UnitConversion.hxx>
 #include <vcl/virdev.hxx>
 
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 59fd331aa7da..38bd2445e747 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -13,7 +13,6 @@
 
 #include <comphelper/processfactory.hxx>
 #include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <vcl/lok.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 8beeeab61f17..70894ffc5439 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/frame/XLoadable.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/Setup.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 2da4bc1e81bd..919b736a6b8c 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -54,7 +54,6 @@
 
 #include <framework/actiontriggerhelper.hxx>
 #include <comphelper/lok.hxx>
-#include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -62,7 +61,6 @@
 #include <vcl/commandinfoprovider.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
-#include <officecfg/Office/Common.hxx>
 #include <officecfg/Setup.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/flatpak.hxx>