tdf#42949 Fix IWYU warnings in sfx2/source/[b-c]*/*cxx

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

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

36 files changed, 17 insertions, 189 deletions

diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml
index d2f56b4e8c91..fb36b9001a3c 100644
--- a/sfx2/IwyuFilter_sfx2.yaml
+++ b/sfx2/IwyuFilter_sfx2.yaml
@@ -62,3 +62,9 @@ blacklist:
     - sfx2/strings.hrc
     # Don't propose hxx -> h change in URE libs
     - osl/module.hxx
+    sfx2/source/bastyp/fltfnc.cxx:
+    # Needed for UnoType to work
+    - com/sun/star/task/XInteractionHandler.hpp
+    sfx2/source/control/sfxstatuslistener.cxx:
+    # Actually used
+    - com/sun/star/frame/XDispatchProvider.hpp
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index c1919954af87..e83edf00f776 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/datatransfer/DataFlavor.hpp>
 #include <com/sun/star/document/XTypeDetection.hpp>
 #include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -33,66 +32,39 @@
 #include <comphelper/sequenceashashmap.hxx>
 
 #include <sot/exchange.hxx>
-#include <basic/sbmeth.hxx>
-#include <basic/basmgr.hxx>
-#include <basic/sbstar.hxx>
-#include <basic/sbxobj.hxx>
-#include <basic/sbxmeth.hxx>
-#include <basic/sbxcore.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
-#include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
-#include <svl/lckbitem.hxx>
-#include <svl/inettype.hxx>
-#include <svl/rectitem.hxx>
 
-#include <sot/storage.hxx>
-#include <com/sun/star/loader/XImplementationLoader.hpp>
 #include <comphelper/processfactory.hxx>
 
 #include <sal/types.h>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/ucb/XContent.hpp>
-#include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <tools/urlobj.hxx>
 
 #include <rtl/instance.hxx>
 
-#include <svtools/sfxecode.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/charclass.hxx>
 
-#include <sfx2/sfxhelp.hxx>
 #include <sfx2/docfilt.hxx>
-#include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfxtypes.hxx>
-#include <sfx2/sfxuno.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/progress.hxx>
-#include <openflag.hxx>
 #include <sfx2/strings.hrc>
 #include <sfx2/sfxresid.hxx>
-#include <sfx2/doctempl.hxx>
-#include <sfx2/frame.hxx>
-#include <sfx2/dispatch.hxx>
+#include <sfx2/objsh.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <sfx2/viewfrm.hxx>
-#include <helper.hxx>
 #include "fltlst.hxx"
-#include <sfx2/request.hxx>
 #include <arrdecl.hxx>
 
 #include <vector>
 #include <memory>
-#include <functional>
 
 #if defined(DBG_UTIL)
 unsigned SfxStack::nLevel = 0;
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index c570e7c062a0..ac7f7df39fa4 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -24,8 +24,6 @@
 #include <comphelper/processfactory.hxx>
 
 #include <sfx2/fcontnr.hxx>
-#include <sfx2/sfxuno.hxx>
-#include <sfx2/docfac.hxx>
 
 #include <vcl/svapp.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 850dd0badc88..a86a88c70320 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -19,16 +19,9 @@
 
 
 #include <svtools/htmltokn.h>
-#include <svtools/asynclink.hxx>
 
 #include <sfx2/frmdescr.hxx>
 #include <sfx2/frmhtml.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/evntconf.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/fcontnr.hxx>
-#include <sfxtypes.hxx>
 
 static char const sHTML_SC_yes[] =  "YES";
 static char const sHTML_SC_no[] =       "NO";
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 3c7db9c95232..007a9c89af55 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -22,9 +22,7 @@
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
 
-#include <unotools/configmgr.hxx>
 #include <svl/urihelper.hxx>
-#include <tools/datetime.hxx>
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
 #include <unotools/resmgr.hxx>
@@ -32,12 +30,6 @@
 
 #include <sfx2/frmdescr.hxx>
 #include <sfx2/frmhtmlw.hxx>
-#include <sfx2/evntconf.hxx>
-#include <sfx2/frame.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/objsh.hxx>
 #include <strings.hxx>
 
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 691baa157d75..a6bb0d05206b 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -19,35 +19,20 @@
 
 
 #include <helper.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <com/sun/star/ucb/IllegalIdentifierException.hpp>
-#include <com/sun/star/ucb/NameClash.hpp>
-#include <com/sun/star/ucb/NumberedSortingInfo.hpp>
-#include <com/sun/star/ucb/TransferInfo.hpp>
-#include <com/sun/star/ucb/XAnyCompareFactory.hpp>
-#include <com/sun/star/ucb/XCommandInfo.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
-#include <com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp>
-#include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <unotools/localedatawrapper.hxx>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/datetime.hxx>
-#include <vcl/svapp.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <comphelper/processfactory.hxx>
-#include <osl/file.hxx>
-#include <vector>
 
 using namespace com::sun::star;
 using namespace comphelper;
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index e6271de164e9..ecd2ebba936f 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -19,11 +19,7 @@
 
 #include <tools/stream.hxx>
 
-#include <sot/storage.hxx>
-#include <sot/formats.hxx>
-
 #include <sfx2/mieclip.hxx>
-#include <sfx2/sfxuno.hxx>
 
 MSE40HTMLClipFormatObj::~MSE40HTMLClipFormatObj()
 {
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 9cf183c67ffe..d7603926bc0b 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -22,27 +22,20 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 
-#include <basic/sbx.hxx>
-
 #include <svl/eitem.hxx>
-#include <tools/time.hxx>
 #include <tools/debug.hxx>
 #include <sal/log.hxx>
 
 #include <appdata.hxx>
-#include <sfx2/request.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/viewsh.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfxtypes.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <workwin.hxx>
-#include <sfx2/msg.hxx>
-#include <sfxslots.hxx>
 #include <sfxbasecontroller_internal.hxx>
 #include <time.h>
 
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 53f25cb95423..334a62c26d09 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -21,7 +21,6 @@
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 
-#include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/event.hxx>
 #include <openflag.hxx>
@@ -34,12 +33,9 @@
 #include <vcl/imappoly.hxx>
 #include <vcl/imaprect.hxx>
 #include <svl/zforlist.hxx>
-#include <rtl/tencinfo.h>
-#include <tools/tenccvt.hxx>
 
 #include <sfx2/sfxhtml.hxx>
 
-#include <com/sun/star/beans/XPropertyContainer.hpp>
 #include <comphelper/string.hxx>
 
 #include <vector>
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 4f953e3a63e4..df3803126a94 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -20,24 +20,13 @@
 
 #include <memory>
 
-#include <svl/lstner.hxx>
-#include <basic/basmgr.hxx>
-#include <basic/sbmod.hxx>
-#include <basic/sbx.hxx>
-#include <sot/storage.hxx>
-#include <unotools/securityoptions.hxx>
-
-#include <rtl/ustring.h>
 #include <sal/log.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/evntconf.hxx>
 #include <svl/macitem.hxx>
 
-#include <sfx2/docfile.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/dispatch.hxx>
 #include <eventsupplier.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sfx2/source/control/asyncfunc.cxx b/sfx2/source/control/asyncfunc.cxx
index b64d9f88d78d..fe25e3749132 100644
--- a/sfx2/source/control/asyncfunc.cxx
+++ b/sfx2/source/control/asyncfunc.cxx
@@ -9,8 +9,6 @@
 
 #include <sfx2/asyncfunc.hxx>
 
-#include <com/sun/star/uno/Reference.hxx>
-
 AsyncFunc::AsyncFunc(const std::function<void()>& rAsyncFunc)
     : m_pAsyncFunc(rAsyncFunc)
 {
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 13d511fddec3..e29d51ac294f 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -25,21 +25,16 @@
 #include <svl/itempool.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/eitem.hxx>
-#include <svl/aeitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
-#include <svl/visitem.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
-#include <com/sun/star/util/URLTransformer.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <itemdel.hxx>
 
 //Includes below due to nInReschedule
-#include <appdata.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/msg.hxx>
 #include <statcach.hxx>
@@ -48,11 +43,8 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/objface.hxx>
-#include <sfxtypes.hxx>
 #include <workwin.hxx>
 #include <sfx2/unoctitm.hxx>
-#include <sfx2/sfxuno.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/msgpool.hxx>
diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx
index 437f48bb4ddd..e13032d7be08 100644
--- a/sfx2/source/control/charwin.cxx
+++ b/sfx2/source/control/charwin.cxx
@@ -26,7 +26,6 @@
 #include <sfx2/charwin.hxx>
 #include <comphelper/dispatchcommand.hxx>
 #include <comphelper/processfactory.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/strings.hrc>
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 5775a9a4f04e..82ec1b671f72 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -23,7 +23,6 @@
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/msgpool.hxx>
 #include <statcach.hxx>
 #include <sfx2/viewfrm.hxx>
 
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 9b6519ca1814..e06ea3b4e15b 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -24,7 +24,6 @@
 #include <deque>
 #include <vector>
 
-#include <stdarg.h>
 #include <stdlib.h>
 
 #include <boost/property_tree/json_parser.hpp>
@@ -40,13 +39,11 @@
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/docfac.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/hintpost.hxx>
 #include <sfx2/ipclient.hxx>
@@ -55,24 +52,17 @@
 #include <sfx2/msgpool.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/sfxhelp.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <sfx2/sfxuno.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 #include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/itempool.hxx>
-#include <svl/undo.hxx>
-#include <svl/whiter.hxx>
-#include <svtools/helpopt.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <vcl/wrkwin.hxx>
+#include <tools/debug.hxx>
 #include <vcl/idle.hxx>
 
-#include <appdata.hxx>
 #include <sfxtypes.hxx>
 #include <slotserv.hxx>
 #include <workwin.hxx>
diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx
index 7deab4abb0d5..68299bc72019 100644
--- a/sfx2/source/control/emojicontrol.cxx
+++ b/sfx2/source/control/emojicontrol.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <sfx2/emojiview.hxx>
-#include <sfx2/emojiviewitem.hxx>
 #include <sfx2/emojicontrol.hxx>
+#include <sfx2/thumbnailviewitem.hxx>
 #include <vcl/tabpage.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/dispatchcommand.hxx>
diff --git a/sfx2/source/control/emojipopup.cxx b/sfx2/source/control/emojipopup.cxx
index 1cc35d02b12d..85f5a350ac64 100644
--- a/sfx2/source/control/emojipopup.cxx
+++ b/sfx2/source/control/emojipopup.cxx
@@ -18,7 +18,6 @@
  */
 #include <sfx2/emojipopup.hxx>
 #include <sfx2/emojicontrol.hxx>
-#include <unotools/viewoptions.hxx>
 #include <vcl/toolbox.hxx>
 
 SFX_IMPL_TOOLBOX_CONTROL(EmojiPopup, SfxVoidItem);
diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx
index 65d9c5d415d5..571681474335 100644
--- a/sfx2/source/control/emojiview.cxx
+++ b/sfx2/source/control/emojiview.cxx
@@ -9,21 +9,18 @@
 
 #include <sfx2/emojiview.hxx>
 #include <sfx2/emojiviewitem.hxx>
-#include <sfx2/templatelocalview.hxx>
-#include <tools/urlobj.hxx>
-#include <vcl/layout.hxx>
 #include <rtl/bootstrap.hxx>
 #include <sal/log.hxx>
 #include <config_folders.h>
 #include <officecfg/Office/Common.hxx>
 #include <comphelper/processfactory.hxx>
+#include <vcl/event.hxx>
 
 #include <orcus/json_document_tree.hpp>
 #include <orcus/config.hpp>
 #include <orcus/pstring.hpp>
 #include <string>
 #include <fstream>
-#include <streambuf>
 
 #include <vcl/builderfactory.hxx>
 using namespace ::com::sun::star;
diff --git a/sfx2/source/control/emojiviewitem.cxx b/sfx2/source/control/emojiviewitem.cxx
index 52bbf1d0f2e0..8a5115a95331 100644
--- a/sfx2/source/control/emojiviewitem.cxx
+++ b/sfx2/source/control/emojiviewitem.cxx
@@ -10,17 +10,11 @@
 #include <sfx2/emojiviewitem.hxx>
 
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <drawinglayer/attribute/fillgraphicattribute.hxx>
-#include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
-#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
-#include <drawinglayer/primitive2d/discretebitmapprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
-#include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
-#include <vcl/button.hxx>
-#include <vcl/graph.hxx>
+#include <com/sun/star/lang/Locale.hpp>
+#include <tools/poly.hxx>
 
 using namespace basegfx;
 using namespace basegfx::utils;
diff --git a/sfx2/source/control/itemdel.cxx b/sfx2/source/control/itemdel.cxx
index 1b44681fbb01..756133c47382 100644
--- a/sfx2/source/control/itemdel.cxx
+++ b/sfx2/source/control/itemdel.cxx
@@ -20,9 +20,9 @@
 #include <sal/config.h>
 
 #include <itemdel.hxx>
+#include <svl/poolitem.hxx>
 #include <vcl/idle.hxx>
 
-#include <svl/itempool.hxx>
 #include <tools/debug.hxx>
 
 class SfxItemDisruptor_Impl
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index 6ffa3c7408a2..852501c34af5 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <svl/itempool.hxx>
-#include <svl/eitem.hxx>
 #include <sfx2/msg.hxx>
 
 #include <climits>
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 9555a128e41f..28a1c8ba885b 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
-#include <tools/stream.hxx>
-#include <svl/style.hxx>
 
 // due to pSlotPool
 #include <appdata.hxx>
@@ -28,9 +26,7 @@
 #include <sfx2/msg.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
-#include <sfxtypes.hxx>
 #include <sfx2/sfxresid.hxx>
-#include <arrdecl.hxx>
 #include <sfx2/module.hxx>
 
 #include <sfx2/strings.hrc>
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 3a459dd5551e..7c48f81c98ef 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -22,15 +22,11 @@
 
 #include <sal/log.hxx>
 
-#include <tools/stream.hxx>
-
 #include <sfx2/module.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/msgpool.hxx>
-#include <sfx2/objsh.hxx>
-#include <rtl/strbuf.hxx>
 
 extern "C" {
 
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index 414f1236ce9f..4eaa6ae4de64 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -19,11 +19,8 @@
 
 #include <sal/log.hxx>
 #include <comphelper/base64.hxx>
-#include <sax/tools/converter.hxx>
 #include <sfx2/recentdocsview.hxx>
 #include <sfx2/recentdocsviewitem.hxx>
-#include <sfx2/templatelocalview.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/historyoptions.hxx>
@@ -34,14 +31,11 @@
 #include <vcl/svapp.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
-#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/embed/StorageFactory.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/util/URLTransformer.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
 #include <sfx2/strings.hrc>
 #include <bitmaps.hlst>
 #include <vcl/virdev.hxx>
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 81247b4395ad..277c5745b50c 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -44,7 +44,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/sfxuno.hxx>
-#include <rtl/strbuf.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index a16841ba81a8..58c6aa522d03 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -22,8 +22,6 @@
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
-#include <svl/itemset.hxx>
-#include <itemdel.hxx>
 #include <svl/visitem.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
@@ -32,7 +30,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
-#include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 285420a6381b..353dde1a8d07 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -19,7 +19,6 @@
 
 #include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <com/sun/star/embed/VerbAttributes.hpp>
-#include <basic/sbstar.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
@@ -28,10 +27,8 @@
 #include <svl/undo.hxx>
 #include <itemdel.hxx>
 #include <svtools/asynclink.hxx>
-#include <basic/sbx.hxx>
 #include <unotools/configmgr.hxx>
 #include <comphelper/lok.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/shell.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
@@ -39,11 +36,9 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
-#include <sfxtypes.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <statcach.hxx>
-#include <sfx2/msgpool.hxx>
 #include <sidebar/ContextChangeBroadcaster.hxx>
 #include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
 #include <tools/debug.hxx>
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index 79f8ddc221f5..6f23e3fcf33f 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -21,7 +21,6 @@
 #include <sfx2/sfxsids.hrc>
 #include <sorgitm.hxx>
 #include <osl/diagnose.h>
-#include <typeinfo>
 
 SfxPoolItem* SfxScriptOrganizerItem::CreateDefault() { return new SfxScriptOrganizerItem; }
 
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 080d5275a107..af28bec53a2a 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -22,8 +22,6 @@
 #include <ctime>
 #endif
 
-#include <string>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <framework/dispatchhelper.hxx>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -38,7 +36,6 @@
 #include <sfx2/msg.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfxtypes.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/msgpool.hxx>
diff --git a/sfx2/source/control/templatecontaineritem.cxx b/sfx2/source/control/templatecontaineritem.cxx
index 2d5cbb25a6e1..41f1b6b93719 100644
--- a/sfx2/source/control/templatecontaineritem.cxx
+++ b/sfx2/source/control/templatecontaineritem.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <sfx2/templatecontaineritem.hxx>
-#include <sfx2/templateviewitem.hxx>
 
 TemplateContainerItem::TemplateContainerItem (sal_uInt16 nId)
     : mnId(nId)
diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx
index 0af006cbc1c5..1d170cfef538 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -14,7 +14,6 @@
 #include <vcl/builderfactory.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
-#include <sfx2/app.hxx>
 
 #include <sfx2/strings.hrc>
 
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 2242170cb1f0..f033aaf53747 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -16,7 +16,6 @@
 #include <sfx2/templatecontaineritem.hxx>
 #include <sfx2/templateviewitem.hxx>
 #include <sfx2/docfac.hxx>
-#include <svl/inettype.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <vcl/help.hxx>
@@ -25,12 +24,6 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
 #include <sfx2/strings.hrc>
 #include <bitmaps.hlst>
 
diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx
index b6918de9445b..f77ba6448054 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -16,10 +16,8 @@
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/discretebitmapprimitive2d.hxx>
-#include <drawinglayer/primitive2d/textlayoutdevice.hxx>
-#include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
-#include <vcl/button.hxx>
+#include <tools/poly.hxx>
 #include <vcl/graph.hxx>
 
 #include <bitmaps.hlst>
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 6f4ca606ea1b..56cf4213b51d 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -15,18 +15,10 @@
 #include "thumbnailviewacc.hxx"
 
 #include <basegfx/color/bcolortools.hxx>
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/vector/b2dsize.hxx>
-#include <basegfx/vector/b2dvector.hxx>
 #include <comphelper/processfactory.hxx>
-#include <drawinglayer/attribute/fillgraphicattribute.hxx>
 #include <drawinglayer/attribute/fontattribute.hxx>
-#include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
-#include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
 #include <rtl/ustring.hxx>
@@ -34,17 +26,14 @@
 #include <svtools/optionsdrawinglayer.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/ucbstreamhelper.hxx>
-#include <vcl/decoview.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/scrbar.hxx>
-#include <vcl/help.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/pngread.hxx>
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/StorageFactory.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index 930debed6a05..54c2a6e4451e 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -23,8 +23,6 @@
 #include "thumbnailviewacc.hxx"
 
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/vector/b2dsize.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <drawinglayer/attribute/fillgraphicattribute.hxx>
 #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
@@ -33,11 +31,8 @@
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
-#include <vcl/button.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/texteng.hxx>
-#include <vcl/textdata.hxx>
 
 using namespace basegfx;
 using namespace basegfx::utils;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 1ae7996f2993..36f6e5d4250b 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -18,11 +18,9 @@
  */
 
 #include <config_java.h>
-#include <config_folders.h>
 
 #include <tools/debug.hxx>
 #include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itemset.hxx>
 #include <svl/visitem.hxx>
@@ -60,18 +58,15 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/request.hxx>
-#include <statcach.hxx>
-#include <sfx2/msgpool.hxx>
 #include <sfx2/msg.hxx>
-#include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
+#include <slotserv.hxx>
 #include <osl/file.hxx>
 #include <rtl/ustring.hxx>
 #include <unotools/pathoptions.hxx>
 #include <osl/time.h>
 #include <sfx2/lokhelper.hxx>
 
-#include <iostream>
 #include <map>
 #include <memory>