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>

6 files changed, 7 insertions, 9 deletions

diff --git a/stoc/IwyuFilter_stoc.yaml b/stoc/IwyuFilter_stoc.yaml
index 59588c0005f2..5b046e4da1e4 100644
--- a/stoc/IwyuFilter_stoc.yaml
+++ b/stoc/IwyuFilter_stoc.yaml
@@ -14,6 +14,9 @@ excludelist:
     - com/sun/star/java/XJavaThreadRegister_11.hpp
     - com/sun/star/java/XJavaVM.hpp
     - com/sun/star/lang/XServiceInfo.hpp
+    stoc/source/implementationregistration/mergekeys.cxx:
+    # Actually used
+    - com/sun/star/registry/XRegistryKey.hpp
     stoc/source/corereflection/crefl.cxx:
     # Safer to keep for use in cppu::UnoType template
     - com/sun/star/reflection/XTypeDescription.hpp
@@ -25,6 +28,8 @@ excludelist:
     stoc/source/invocation_adapterfactory/iafactory.cxx:
     # Safer to keep for use in cppu::UnoType template
     - com/sun/star/script/XInvocation.hpp
+    # Complete type needed for uno_Interface
+    - uno/dispatcher.h
     stoc/source/loader/dllcomponentloader.cxx:
     # Needed for direct member access
     - com/sun/star/lang/XMultiServiceFactory.hpp
@@ -34,6 +39,8 @@ excludelist:
     # Needed for __DIAGNOSE mode
     - vector
     - rtl/string.hxx
+    # Actually used
+    - com/sun/star/uno/Sequence.hxx
     stoc/source/security/access_controller.cxx:
     # Needed for __DIAGNOSE mode
     - rtl/ustrbuf.hxx
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 126af1f82851..7efacb98fb92 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -43,7 +43,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <unordered_map>
-#include <unordered_set>
 #include <vector>
 
 using namespace ::std;
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 73b0ddf557ff..524988146b4b 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -38,7 +38,6 @@
 #include <jni.h>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
 
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index bbc962c17466..1b7a86e712ec 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/java/JavaVMCreationFailureException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
@@ -50,9 +49,6 @@
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/SetFlagContextHelper.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <jvmaccess/classpath.hxx>
 #include <jvmaccess/unovirtualmachine.hxx>
@@ -60,7 +56,6 @@
 #include <rtl/process.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <uno/current_context.hxx>
 #include <jvmfwk/framework.hxx>
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index 29142064d537..a71b3644f9e4 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -21,7 +21,6 @@
 #include <osl/mutex.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <com/sun/star/uno/XNamingService.hpp>
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 628bdb877b23..3ed0e7c802a7 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -22,7 +22,6 @@
 #include <o3tl/any.hxx>
 #include <osl/mutex.hxx>
 #include <osl/diagnose.h>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>