From 2c0906bceef2889830cf9bd152b9e06b15f989a8 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Sat, 6 Jun 2020 16:01:24 +0200
Subject: [PATCH] tdf#42949 Fix IWYU warnings in scripting/

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

Change-Id: I014631ec79242d9a5f735d7401fe0f5e323c69a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95649
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 scripting/IwyuFilter_scripting.yaml                       | 6 ++++++
 scripting/source/basprov/baslibnode.hxx                   | 1 -
 scripting/source/basprov/basmethnode.cxx                  | 1 -
 scripting/source/basprov/basmethnode.hxx                  | 2 +-
 scripting/source/basprov/basmodnode.cxx                   | 1 -
 scripting/source/basprov/basmodnode.hxx                   | 1 -
 scripting/source/basprov/basprov.cxx                      | 4 ----
 scripting/source/basprov/basprov.hxx                      | 1 -
 scripting/source/basprov/basscript.cxx                    | 2 --
 scripting/source/dlgprov/dlgevtatt.cxx                    | 2 --
 scripting/source/dlgprov/dlgprov.cxx                      | 1 -
 scripting/source/inc/util/MiscUtils.hxx                   | 8 +-------
 scripting/source/protocolhandler/scripthandler.cxx        | 2 --
 scripting/source/protocolhandler/scripthandler.hxx        | 1 -
 scripting/source/provider/ActiveMSPList.cxx               | 5 -----
 scripting/source/provider/ActiveMSPList.hxx               | 3 +--
 scripting/source/provider/BrowseNodeFactoryImpl.cxx       | 8 --------
 scripting/source/provider/BrowseNodeFactoryImpl.hxx       | 2 --
 scripting/source/provider/MasterScriptProvider.cxx        | 5 +----
 scripting/source/provider/MasterScriptProvider.hxx        | 1 -
 scripting/source/provider/MasterScriptProviderFactory.cxx | 4 ----
 scripting/source/provider/MasterScriptProviderFactory.hxx | 2 --
 scripting/source/provider/ProviderCache.cxx               | 3 +--
 scripting/source/provider/ProviderCache.hxx               | 3 ---
 scripting/source/provider/URIHelper.cxx                   | 1 +
 scripting/source/provider/URIHelper.hxx                   | 3 +--
 scripting/source/stringresource/stringresource.cxx        | 5 -----
 scripting/source/vbaevents/eventhelper.cxx                | 6 ------
 28 files changed, 13 insertions(+), 71 deletions(-)
 create mode 100644 scripting/IwyuFilter_scripting.yaml

diff --git a/scripting/IwyuFilter_scripting.yaml b/scripting/IwyuFilter_scripting.yaml
new file mode 100644
index 000000000000..2f3f8c37ae20
--- /dev/null
+++ b/scripting/IwyuFilter_scripting.yaml
@@ -0,0 +1,6 @@
+---
+assumeFilename: scripting/source/stringresource/stringresource.cxx
+blacklist:
+    scripting/source/protocolhandler/scripthandler.cxx:
+    # Actually used
+    - com/sun/star/lang/XSingleServiceFactory.hpp
diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx
index 1124974644cc..1e21c496fe4a 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SCRIPTING_SOURCE_BASPROV_BASLIBNODE_HXX
 #define INCLUDED_SCRIPTING_SOURCE_BASPROV_BASLIBNODE_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/browse/XBrowseNode.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index 2b950556c9e8..26ed5f08ed80 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/frame/DispatchHelper.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #include <vcl/svapp.hxx>
 #include <basic/sbstar.hxx>
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index ce112afbf148..8910a8c6f728 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SCRIPTING_SOURCE_BASPROV_BASMETHNODE_HXX
 
 #include <bcholder.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
 #include <com/sun/star/script/browse/XBrowseNode.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx
index 485b66bd0fa7..b5c3cf1a08e4 100644
--- a/scripting/source/basprov/basmodnode.cxx
+++ b/scripting/source/basprov/basmodnode.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #include <vcl/svapp.hxx>
 #include <basic/sbx.hxx>
-#include <basic/sbstar.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/sbmeth.hxx>
 
diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx
index fa2010a5fc46..d537a92a3026 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SCRIPTING_SOURCE_BASPROV_BASMODNODE_HXX
 #define INCLUDED_SCRIPTING_SOURCE_BASPROV_BASMODNODE_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/script/browse/XBrowseNode.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 0d247130ff9f..6c7ede60649f 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -31,18 +31,14 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/uri.hxx>
 #include <sal/log.hxx>
-#include <osl/process.h>
 #include <osl/file.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <basic/sbx.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/basicmanagerrepository.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/sbmeth.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/objsh.hxx>
 
 #include <com/sun/star/util/theMacroExpander.hpp>
 #include <com/sun/star/script/XLibraryContainer2.hpp>
diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx
index 2e6dc93b4d22..6b57c3f4a2a7 100644
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SCRIPTING_SOURCE_BASPROV_BASPROV_HXX
 #define INCLUDED_SCRIPTING_SOURCE_BASPROV_BASPROV_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index 0f7a5ec6cc2a..216e2fa99bd6 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -20,7 +20,6 @@
 #include "basscript.hxx"
 #include <vcl/svapp.hxx>
 #include <basic/sbx.hxx>
-#include <basic/sbstar.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbuno.hxx>
@@ -28,7 +27,6 @@
 #include <com/sun/star/script/provider/ScriptFrameworkErrorException.hpp>
 #include <com/sun/star/script/provider/ScriptFrameworkErrorType.hpp>
 #include <bcholder.hxx>
-#include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <map>
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index b1a3fceee7ec..4f5970a49bee 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -22,7 +22,6 @@
 #include "dlgprov.hxx"
 
 #include <sfx2/strings.hrc>
-#include <sfx2/app.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
@@ -39,7 +38,6 @@
 #include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp>
 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
-#include <com/sun/star/lang/NoSuchMethodException.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/reflection/XIdlMethod.hpp>
 #include <com/sun/star/beans/MethodConcept.hpp>
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 1ed0b899d609..2f120497cf28 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -45,7 +45,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/objsh.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/namedvaluecollection.hxx>
diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx
index e7b5bd920a58..40d6479ace63 100644
--- a/scripting/source/inc/util/MiscUtils.hxx
+++ b/scripting/source/inc/util/MiscUtils.hxx
@@ -22,20 +22,14 @@
 
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
-#include <tools/urlobj.hxx>
 
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/ucb/XContentAccess.hpp>
-#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <comphelper/processfactory.hxx>
 
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index e55926952f70..a759ef63070c 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -39,7 +39,6 @@
 #include <sfx2/sfxdlg.hxx>
 #include <vcl/abstdlg.hxx>
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/factory.hxx>
@@ -48,7 +47,6 @@
 #include <framework/documentundoguard.hxx>
 #include <officecfg/Office/Common.hxx>
 
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/uri/XVndSunStarScriptUrlReference.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index f23531a53fe4..1a40356463af 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SCRIPTING_SOURCE_PROTOCOLHANDLER_SCRIPTHANDLER_HXX
 #define INCLUDED_SCRIPTING_SOURCE_PROTOCOLHANDLER_SCRIPTHANDLER_HXX
 
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx
index 8233a69be6b8..35d50dea1b67 100644
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -17,16 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <util/MiscUtils.hxx>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/util/XMacroExpander.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 
-#include "MasterScriptProvider.hxx"
 #include "ActiveMSPList.hxx"
 
 #include <tools/diagnose_ex.h>
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 8a6e53cf891d..a17286439e2f 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -22,13 +22,12 @@
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <com/sun/star/lang/XEventListener.hpp>
 
 #include <com/sun/star/script/provider/XScriptProvider.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <map>
 #include <unordered_map>
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 8f41a34e11d5..20574bf70c6f 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -18,29 +18,21 @@
  */
 
 
-#include <cppuhelper/weakref.hxx>
-#include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <unotools/mediadescriptor.hxx>
 
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/reflection/ProxyFactory.hpp>
 
 #include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp>
 #include <com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp>
 #include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
-#include <com/sun/star/document/XScriptInvocationContext.hpp>
 
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
 
 #include "BrowseNodeFactoryImpl.hxx"
 #include "MasterScriptProvider.hxx"
-#include "ActiveMSPList.hxx"
 #include <util/MiscUtils.hxx>
 
 #include <vector>
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index deef03d35d56..6f79e4fb8466 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -25,8 +25,6 @@
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 
 #include <com/sun/star/script/browse/XBrowseNode.hpp>
 #include <com/sun/star/script/browse/XBrowseNodeFactory.hpp>
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index d6e64eb92da8..0ed11a20348f 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -26,11 +26,9 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/urlobj.hxx>
 
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/container/XContentEnumerationAccess.hpp>
-#include <com/sun/star/document/XScriptInvocationContext.hpp>
 #include <com/sun/star/script/provider/ScriptFrameworkErrorException.hpp>
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
@@ -44,7 +42,6 @@
 #include <util/MiscUtils.hxx>
 #include <sal/log.hxx>
 
-#include "ActiveMSPList.hxx"
 #include "MasterScriptProvider.hxx"
 #include "URIHelper.hxx"
 
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index c0bd17674eca..4cc4def03329 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -26,7 +26,6 @@
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx
index 6ca32cd43955..66de3a5cbb79 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -17,11 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/weakref.hxx>
 
 #include "MasterScriptProvider.hxx"
 #include "MasterScriptProviderFactory.hxx"
diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx
index f4532af8d6f8..aea06278aacd 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
@@ -26,8 +26,6 @@
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 
 #include <com/sun/star/script/provider/XScriptProviderFactory.hpp>
 #include <com/sun/star/script/provider/XScriptProvider.hpp>
diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx
index 4bcbd67f9260..9f35e1187ca0 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -18,13 +18,12 @@
  */
 
 #include <comphelper/sequence.hxx>
-#include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/factory.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include "ProviderCache.hxx"
 
 using namespace com::sun::star;
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index 9234d5bd6e6b..0aaedc4d4077 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -22,9 +22,6 @@
 
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index 1d7ec0ce5bb1..1497df6b92a8 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -19,6 +19,7 @@
 
 #include <config_folders.h>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx
index b1d26b572cd8..7cf91e686b8d 100644
--- a/scripting/source/provider/URIHelper.hxx
+++ b/scripting/source/provider/URIHelper.hxx
@@ -24,8 +24,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/ucb/SimpleFileAccess.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 
 #include <rtl/ustring.hxx>
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 4e721517c8b0..4d4bcb1c045e 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -22,25 +22,20 @@
 #include <com/sun/star/io/TempFile.hpp>
 #include <com/sun/star/io/TextInputStream.hpp>
 #include <com/sun/star/io/TextOutputStream.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/resource/MissingResourceException.hpp>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/ElementExistException.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 
 #include <osl/diagnose.h>
 #include <rtl/tencinfo.h>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
 #include <tools/urlobj.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 6e72d1c43315..408f45689898 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 
@@ -43,7 +42,6 @@
 
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
-#include <com/sun/star/script/vba/XVBACompatibility.hpp>
 
 #include <com/sun/star/container/XNamed.hpp>
 
@@ -60,11 +58,7 @@
 #include <com/sun/star/awt/XListBox.hpp>
 
 #include <sfx2/objsh.hxx>
-#include <basic/sbstar.hxx>
 #include <basic/basmgr.hxx>
-#include <basic/sbmeth.hxx>
-#include <basic/sbmod.hxx>
-#include <basic/sbx.hxx>
 #include <filter/msfilter/msvbahelper.hxx>
 #include <vbahelper/vbareturntypes.hxx>