tdf#42949 Fix IWYU warnings in stoc/

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

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

stoc/IwyuFilter_stoc.yaml

+---
+assumeFilename: stoc/source/javavm/javavm.cxx
+blacklist:
+    stoc/source/implementationregistration/mergekeys.hxx:
+    # Needed for css shortcut
+    - sal/types.h
+    stoc/source/javavm/interact.hxx:
+    # Base class needs complete type
+    -  com/sun/star/task/XInteractionRequest.hpp
+    stoc/source/javavm/javavm.hxx:
+    # Base class needs complete type
+    - com/sun/star/container/XContainerListener.hpp
+    - com/sun/star/lang/XInitialization.hpp
+    - com/sun/star/java/XJavaThreadRegister_11.hpp
+    - com/sun/star/java/XJavaVM.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    stoc/source/corereflection/crefl.cxx:
+    # Safer to keep for use in cppu::UnoType template
+    - com/sun/star/reflection/XTypeDescription.hpp
+    stoc/source/corereflection/criface.cxx:
+    # Keep for platform-independent alloca.h abstraction
+    - sal/alloca.h
+    # Safer to keep for use in cppu::UnoType template
+    - com/sun/star/uno/RuntimeException.hpp
+    stoc/source/invocation_adapterfactory/iafactory.cxx:
+    # Safer to keep for use in cppu::UnoType template
+    - com/sun/star/script/XInvocation.hpp
+    stoc/source/loader/dllcomponentloader.cxx:
+    # Needed for direct member access
+    - com/sun/star/lang/XMultiServiceFactory.hpp
+    stoc/source/security/permissions.cxx:
+    # Safer to keep for use in cppu::UnoType template
+    - com/sun/star/security/AllPermission.hpp
+    # Needed for __DIAGNOSE mode
+    - vector
+    - rtl/string.hxx
+    stoc/source/security/access_controller.cxx:
+    # Needed for __DIAGNOSE mode
+    - rtl/ustrbuf.hxx
+    - sal/log.hxx

stoc/source/corereflection/base.hxx

@@ -24,15 +24,11 @@
 #include <sal/config.h>
 
 #include <o3tl/any.hxx>
-#include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <uno/mapping.hxx>
 #include <uno/dispatcher.h>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/component.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ref.hxx>
 
@@ -45,15 +41,15 @@
 #include <unordered_map>
 #include <memory>
 
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 
-#include <com/sun/star/reflection/XIdlClass.hpp>
 #include <com/sun/star/reflection/XIdlReflection.hpp>
-#include <com/sun/star/reflection/XIdlField.hpp>
-#include <com/sun/star/reflection/XIdlField2.hpp>
-#include <com/sun/star/reflection/XIdlMethod.hpp>
+
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::reflection { class XIdlClass; }
+namespace com::sun::star::reflection { class XIdlField; }
+namespace com::sun::star::reflection { class XIdlMethod; }
 
 namespace stoc_corefl
 {

stoc/source/corereflection/crarray.cxx

@@ -20,6 +20,7 @@
 #include <typelib/typedescription.h>
 #include <uno/data.h>
 #include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/typeprovider.hxx>
 
 #include "base.hxx"
 

stoc/source/corereflection/crbase.cxx

@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/queryinterface.hxx>
 #include <uno/any2.h>
 
 #include "base.hxx"

stoc/source/corereflection/crcomp.cxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/strbuf.hxx>
 #include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/typeprovider.hxx>
 
 #include <com/sun/star/reflection/XIdlField.hpp>
 #include <com/sun/star/reflection/XIdlField2.hpp>

stoc/source/corereflection/crefl.cxx

@@ -18,14 +18,14 @@
  */
 
 #include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <cppuhelper/typeprovider.hxx>
 #include <sal/log.hxx>
 
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/reflection/XConstantTypeDescription.hpp>
 #include <com/sun/star/reflection/XTypeDescription.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <o3tl/any.hxx>
 #include <uno/lbnames.h>
 
@@ -33,7 +33,6 @@ using namespace css;
 using namespace css::uno;
 using namespace css::lang;
 using namespace css::reflection;
-using namespace css::registry;
 using namespace cppu;
 using namespace osl;
 

stoc/source/corereflection/crenum.cxx

@@ -20,6 +20,9 @@
 #include "base.hxx"
 
 #include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/typeprovider.hxx>
+
+#include <com/sun/star/reflection/XIdlField2.hpp>
 
 using namespace css::lang;
 using namespace css::reflection;

stoc/source/corereflection/criface.cxx

@@ -26,20 +26,18 @@
 #ifdef SAL_UNX
 #include <sal/alloca.h>
 #endif
-#if !(defined(MACOSX) || defined(IOS) || defined(FREEBSD))
-#include <malloc.h>
-#endif
 #include <o3tl/any.hxx>
-#include <rtl/alloc.h>
 #include <typelib/typedescription.hxx>
 #include <uno/data.h>
 
 #include "base.hxx"
 
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/reflection/XIdlField2.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/typeprovider.hxx>
 
 using namespace css::lang;
 using namespace css::reflection;

stoc/source/corereflection/lrucache.hxx

@@ -24,11 +24,12 @@
 
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <sal/log.hxx>
 
 #include <memory>
 #include <unordered_map>
 
+namespace com::sun::star::uno { class Any; }
+
 /** Implementation of a least recently used (lru) cache.
     <br>
 */

stoc/source/defaultregistry/defaultregistry.cxx

@@ -18,23 +18,19 @@
  */
 
 #include <osl/mutex.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <registry/registry.hxx>
 #include <rtl/ref.hxx>
 
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 using namespace css::uno;
 using namespace css::registry;
 using namespace css::lang;
@@ -44,8 +40,6 @@ using namespace osl;
 
 namespace {
 
-class NestedKeyImpl;
-
 class NestedRegistryImpl    : public WeakAggImplHelper4 < XSimpleRegistry, XInitialization, XServiceInfo, XEnumerationAccess >
 {
 public:

stoc/source/implementationregistration/implreg.cxx

@@ -17,25 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdlib.h>
 #include <string.h>
 #include <vector>
 
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/sequence.hxx>
-
-#include <uno/mapping.hxx>
-#include <osl/thread.h>
-
-#include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/process.h>
 
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -52,8 +42,6 @@
 
 #if defined(_WIN32)
 #include <io.h>
-#else
-#include <unistd.h>
 #endif
 
 

stoc/source/implementationregistration/mergekeys.cxx

@@ -23,7 +23,6 @@
 #include <osl/diagnose.h>
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/registry/MergeConflictException.hpp>
 
 #include "mergekeys.hxx"
 

stoc/source/implementationregistration/mergekeys.hxx

@@ -21,12 +21,12 @@
 #define INCLUDED_STOC_SOURCE_IMPLEMENTATIONREGISTRATION_MERGEKEYS_HXX
 
 #include <sal/config.h>
-
-#include <com/sun/star/uno/Reference.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star { namespace registry {
     class XRegistryKey;
 } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 namespace stoc_impreg {
 

stoc/source/inspect/introspection.cxx

@@ -29,25 +29,18 @@
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
-#include <osl/thread.h>
 #include <sal/log.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/component.hxx>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
-#include <com/sun/star/uno/DeploymentException.hpp>
 #include <com/sun/star/lang/NoSuchMethodException.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/reflection/XIdlReflection.hpp>
 #include <com/sun/star/reflection/XIdlClass.hpp>
@@ -70,14 +63,12 @@
 
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
 #include <unordered_map>
 
 using namespace css::uno;
 using namespace css::lang;
 using namespace css::reflection;
 using namespace css::container;
-using namespace css::registry;
 using namespace css::beans;
 using namespace css::beans::PropertyAttribute;
 using namespace css::beans::PropertyConcept;
@@ -158,7 +149,6 @@ typedef std::unordered_map
 LowerToExactNameMap;
 
 
-class ImplIntrospectionAccess;
 class IntrospectionAccessStatic_Impl: public salhelper::SimpleReferenceObject
 {
     friend class Implementation;

stoc/source/invocation/invocation.cxx

@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/mutex.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/exc_hlp.hxx>
@@ -25,7 +24,6 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/script/CannotConvertException.hpp>
@@ -45,15 +43,11 @@
 #include <com/sun/star/beans/MethodConcept.hpp>
 #include <com/sun/star/beans/PropertyConcept.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 
 #include <memory>
 #include <vector>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
 
 #define SERVICENAME "com.sun.star.script.Invocation"
 #define IMPLNAME     "com.sun.star.comp.stoc.Invocation"

stoc/source/invocation_adapterfactory/iafactory.cxx

@@ -34,15 +34,11 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <com/sun/star/uno/XAggregation.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/script/XInvocationAdapterFactory.hpp>
 #include <com/sun/star/script/XInvocationAdapterFactory2.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/reflection/InvocationTargetException.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>

stoc/source/javaloader/javaloader.cxx

@@ -17,12 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cstdarg>
-
-#include <osl/process.h>
-
 #include <rtl/process.h>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
 #include <uno/environment.h>
@@ -39,8 +34,6 @@
 
 #include <com/sun/star/java/XJavaVM.hpp>
 
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-
 #include <jni.h>
 
 #include <cppuhelper/factory.hxx>
@@ -50,14 +43,15 @@
 #include <cppuhelper/supportsservice.hxx>
 
 #include <com/sun/star/loader/XImplementationLoader.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <jvmaccess/unovirtualmachine.hxx>
 #include <jvmaccess/virtualmachine.hxx>
 
+namespace com::sun::star::registry { class XRegistryKey; }
+
 using namespace css::java;
 using namespace css::lang;
 using namespace css::loader;

stoc/source/javavm/interact.cxx

@@ -20,14 +20,13 @@
 
 #include "interact.hxx"
 
-#include <com/sun/star/java/JavaDisabledException.hpp>
-#include <com/sun/star/java/JavaVMCreationFailureException.hpp>
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionRetry.hpp>
-#include <com/sun/star/task/XInteractionContinuation.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 
+namespace com::sun::star::task { class XInteractionContinuation; }
+
 using stoc_javavm::InteractionRequest;
 
 namespace {

stoc/source/javavm/interact.hxx

@@ -22,7 +22,6 @@
 
 #include <com/sun/star/task/XInteractionRequest.hpp>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>

stoc/source/javavm/javavm.cxx

@@ -24,8 +24,6 @@
 #include "jvmargs.hxx"
 
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/java/JavaNotFoundException.hpp>
 #include <com/sun/star/java/InvalidJavaSettingsException.hpp>
@@ -36,7 +34,6 @@
 #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/XSingleComponentFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
@@ -50,7 +47,6 @@
 #include <com/sun/star/uno/XCurrentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/util/theMacroExpander.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
@@ -60,19 +56,11 @@
 #include <jvmaccess/classpath.hxx>
 #include <jvmaccess/unovirtualmachine.hxx>
 #include <jvmaccess/virtualmachine.hxx>
-#include <osl/file.hxx>
-#include <osl/thread.h>
-#include <rtl/bootstrap.hxx>
 #include <rtl/process.h>
-#include <rtl/string.h>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
-#include <rtl/uri.hxx>
 #include <sal/types.h>
 #include <sal/log.hxx>
 #include <uno/current_context.hxx>
-#include <uno/environment.h>
 #include <jvmfwk/framework.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <jni.h>

stoc/source/javavm/javavm.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_STOC_SOURCE_JAVAVM_JAVAVM_HXX
 #define INCLUDED_STOC_SOURCE_JAVAVM_JAVAVM_HXX
 
-#include "jvmargs.hxx"
+#include <jni.h>
 
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>

stoc/source/loader/dllcomponentloader.cxx

@@ -18,20 +18,11 @@
  */
 
 
-#include <stdlib.h>
-#include <osl/file.h>
-#include <vector>
 #include <osl/diagnose.h>
-#include <osl/module.h>
-#include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
-#include <uno/environment.h>
-#include <uno/mapping.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/shlib.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/bootstrap.hxx>
 
@@ -39,9 +30,10 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
+namespace com::sun::star::registry { class XRegistryKey; }
+
 using namespace com::sun::star;
 using namespace css::uno;
 using namespace css::loader;

stoc/source/namingservice/namingservice.cxx

@@ -19,12 +19,7 @@
 
 
 #include <osl/mutex.hxx>
-#include <uno/dispatcher.h>
-#include <uno/mapping.hxx>
-#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/weak.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/component.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>

stoc/source/proxy_factory/proxyfac.cxx

@@ -20,7 +20,6 @@
 
 #include <osl/diagnose.h>
 #include <osl/interlck.h>
-#include <osl/doublecheckedlocking.h>
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 #include <uno/dispatcher.hxx>
@@ -36,7 +35,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weakagg.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/reflection/XProxyFactory.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 

stoc/source/security/access_controller.cxx

@@ -24,7 +24,6 @@
 #include <osl/mutex.hxx>
 #include <osl/thread.hxx>
 
-#include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
@@ -33,14 +32,12 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <com/sun/star/uno/XCurrentContext.hpp>
 #include <com/sun/star/uno/DeploymentException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/security/XAccessController.hpp>

stoc/source/security/file_policy.cxx

@@ -21,16 +21,13 @@
 #include <osl/diagnose.h>
 #include <osl/file.h>
 #include <rtl/byteseq.hxx>
-#include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <cppuhelper/access_control.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/security/XAccessController.hpp>
 #include <com/sun/star/security/XPolicy.hpp>
 #include <com/sun/star/security/AllPermission.hpp>
 #include <com/sun/star/security/RuntimePermission.hpp>

stoc/source/security/permissions.cxx

@@ -26,7 +26,6 @@
 
 #include <rtl/string.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <osl/diagnose.h>
 #include <sal/log.hxx>
 
 #include <com/sun/star/security/RuntimePermission.hpp>
@@ -34,10 +33,10 @@
 #include <com/sun/star/io/FilePermission.hpp>
 #include <com/sun/star/connection/SocketPermission.hpp>
 #include <com/sun/star/security/AccessControlException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
 
 #include "permissions.h"
 
-
 using namespace ::std;
 using namespace ::osl;
 using namespace ::com::sun::star;

stoc/source/security/permissions.h

@@ -23,9 +23,8 @@
 #include <rtl/ustring.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 namespace stoc_sec
 {

stoc/source/servicemanager/servicemanager.cxx

@@ -22,19 +22,12 @@
 #include <o3tl/any.hxx>
 #include <osl/mutex.hxx>
 #include <osl/diagnose.h>
-#include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
-#include <uno/mapping.hxx>
-#include <uno/dispatcher.h>
-#include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/factory.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <cppuhelper/component.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/component_context.hxx>
-#include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/sequence.hxx>
@@ -55,9 +48,7 @@
 #include <com/sun/star/container/XElementAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/uno/XUnloadingPreference.hpp>
 
 #include <unordered_map>
 #include <unordered_set>

stoc/source/simpleregistry/simpleregistry.cxx

@@ -31,7 +31,6 @@
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/implbase.hxx>
@@ -49,6 +48,8 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 namespace {
 
 class SimpleRegistry:

stoc/source/typeconv/convert.cxx

@@ -21,8 +21,6 @@
 
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -36,19 +34,17 @@
 #endif
 #include <float.h>
 
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/script/CannotConvertException.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/script/FailReason.hpp>
-#include <com/sun/star/container/XSet.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 using namespace css::uno;
 using namespace css::lang;
 using namespace css::script;
-using namespace css::registry;
 using namespace cppu;
 using namespace osl;
 

stoc/source/uriproc/ExternalUriReferenceTranslator.cxx

@@ -22,12 +22,7 @@
 #include <string_view>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uri/XExternalUriReferenceTranslator.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -41,6 +36,9 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
+namespace com::sun::star::uno { class XInterface; }
+namespace com::sun::star::uno { class XComponentContext; }
+
 namespace {
 
 class Translator:

stoc/source/uriproc/UriReference.cxx

@@ -22,7 +22,6 @@
 
 #include <osl/diagnose.h>