cleanup unused css/script/ includes

but keep exception includes in headers for now

Change-Id: I826828675a2d14b906e57068cbced2e790e12bce
Reviewed-on: https://gerrit.libreoffice.org/37846Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

basctl/source/basicide/bastypes.cxx

@@ -26,7 +26,6 @@
 #include "iderdll2.hxx"
 
 #include <basic/basmgr.hxx>
-#include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/passwd.hxx>

basctl/source/inc/baside3.hxx

@@ -30,8 +30,6 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
 
-#include <com/sun/star/script/XLibraryContainer.hpp>
-
 #include <memory>
 
 class Printer;

basic/source/classes/eventatt.cxx

@@ -35,11 +35,6 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/resource/XStringResourceSupplier.hpp>
 #include <com/sun/star/resource/XStringResourceManager.hpp>
-#include <com/sun/star/script/XEventAttacher.hpp>
-#include <com/sun/star/script/XAllListener.hpp>
-#include <com/sun/star/script/XScriptEventsSupplier.hpp>
-#include <com/sun/star/script/XScriptEventsAttacher.hpp>
-#include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp>
 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>

basic/source/classes/sbunoobj.cxx

@@ -57,7 +57,6 @@
 #include <com/sun/star/script/XInvocationAdapterFactory.hpp>
 #include <com/sun/star/script/Converter.hpp>
 #include <com/sun/star/script/XDefaultProperty.hpp>
-#include <com/sun/star/script/XDefaultMethod.hpp>
 #include <com/sun/star/script/XDirectInvocation.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>

basic/source/classes/sbxmod.cxx

@@ -62,7 +62,6 @@
 #include <com/sun/star/uno/XAggregation.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
 
-#include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/awt/DialogProvider.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/awt/XWindow.hpp>

basic/source/uno/scriptcont.cxx

@@ -57,7 +57,6 @@
 #include <xmlscript/xmlmod_imexp.hxx>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/util/VetoException.hpp>
-#include <com/sun/star/script/XLibraryQueryExecutable.hpp>
 #include <memory>
 
 namespace basic

comphelper/source/eventattachermgr/eventattachermgr.cxx

@@ -39,7 +39,6 @@
 #include <com/sun/star/reflection/XIdlMethod.hpp>
 #include <com/sun/star/script/CannotConvertException.hpp>
 #include <com/sun/star/script/Converter.hpp>
-#include <com/sun/star/script/XEngineListener.hpp>
 #include <com/sun/star/script/XEventAttacher2.hpp>
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/script/XScriptListener.hpp>

cui/source/customize/cfgutil.cxx

@@ -31,8 +31,6 @@
 #include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #include <com/sun/star/script/browse/theBrowseNodeFactory.hpp>
 #include <com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp>
-#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
-#include <com/sun/star/script/provider/XScriptProvider.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/ui/theUICategoryDescription.hpp>

cui/source/inc/acccfg.hxx

@@ -28,7 +28,6 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <com/sun/star/script/browse/XBrowseNode.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 

dbaccess/source/core/inc/querycomposer.hxx

@@ -25,7 +25,6 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/script/XTypeConverter.hpp>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <connectivity/sqliterator.hxx>

desktop/source/deployment/registry/help/dp_help.cxx

@@ -44,7 +44,6 @@
 #include <com/sun/star/util/XMacroExpander.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XVndSunStarExpandUrl.hpp>
-#include <com/sun/star/script/XInvocation.hpp>
 #include <boost/optional.hpp>
 
 using namespace ::dp_misc;

extensions/source/ole/ole2uno.hxx

@@ -29,7 +29,6 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/script/XInvocation.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/bridge/XBridgeSupplier2.hpp>
 #include <com/sun/star/bridge/ModelDependent.hpp>
@@ -48,7 +47,6 @@
 #define UNO_2_OLE_EXCEPTIONCODE 1001
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
-using namespace com::sun::star::script;
 using namespace com::sun::star::registry;
 using namespace com::sun::star::reflection;
 using namespace com::sun::star::beans;

extensions/source/ole/oleobjw.cxx

@@ -29,17 +29,7 @@
 #include <com/sun/star/script/CannotConvertException.hpp>
 #include <com/sun/star/script/FailReason.hpp>
 #include <com/sun/star/beans/XMaterialHolder.hpp>
-#include <com/sun/star/script/XTypeConverter.hpp>
-#include <com/sun/star/script/FinishEngineEvent.hpp>
-#include <com/sun/star/script/InterruptReason.hpp>
-#include <com/sun/star/script/XEngineListener.hpp>
-#include <com/sun/star/script/XDebugging.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
-#include <com/sun/star/script/ContextInformation.hpp>
-#include <com/sun/star/script/FinishReason.hpp>
-#include <com/sun/star/script/XEngine.hpp>
-#include <com/sun/star/script/InterruptEngineEvent.hpp>
-#include <com/sun/star/script/XLibraryAccess.hpp>
 #include <com/sun/star/bridge/ModelDependent.hpp>
 
 #include "com/sun/star/bridge/oleautomation/NamedArgument.hpp"

extensions/source/propctrlr/propcontroller.hxx

@@ -36,7 +36,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/form/XForm.hpp>
-#include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/frame/XController.hpp>

extensions/test/ole/cppToUno/testcppuno.cxx

@@ -28,7 +28,6 @@
 #include <com/sun/star/bridge/ModelDependent.hpp>
 #include <com/sun/star/bridge/XBridgeSupplier2.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/script/XInvocation.hpp>
 #include <oletest/XCallback.hpp>
 #include <rtl/process.h>
 #include <cppuhelper/servicefactory.hxx>
@@ -37,7 +36,6 @@
 
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
-using namespace com::sun::star::script;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::bridge::ModelDependent;
 using namespace cppu;

forms/source/component/DatabaseForm.hxx

@@ -45,7 +45,6 @@
 #include <com/sun/star/form/XLoadListener.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/awt/XTabControllerModel.hpp>
-#include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/sdbc/XRowSetListener.hpp>
 #include <com/sun/star/sdb/XResultSetAccess.hpp>
 #include <com/sun/star/sdbc/XCloseable.hpp>

include/basic/basmgr.hxx

@@ -22,7 +22,7 @@
 #include <vcl/errinf.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <basic/sbstar.hxx>
-#include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
+#include <com/sun/star/script/XPersistentLibraryContainer.hpp>
 #include <com/sun/star/script/XStarBasicAccess.hpp>
 #include <basic/basicdllapi.h>
 #include <memory>

include/sfx2/objsh.hxx

@@ -28,7 +28,6 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/script/XLibraryContainer.hpp>
-#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>

include/svx/fmtools.hxx

@@ -44,7 +44,6 @@
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>

include/vbahelper/vbaapplicationbase.hxx

@@ -22,7 +22,6 @@
 #include <exception>
 #include <memory>
 
-#include <com/sun/star/script/BasicErrorException.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>

include/vbahelper/vbacollectionimpl.hxx

@@ -27,7 +27,6 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/WrappedTargetException.hpp>
-#include <com/sun/star/script/BasicErrorException.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>

include/vbahelper/vbahelperinterface.hxx

@@ -20,7 +20,6 @@
 #define INCLUDED_VBAHELPER_VBAHELPERINTERFACE_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/script/BasicErrorException.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>

include/vbahelper/vbashapes.hxx

@@ -22,7 +22,6 @@
 #include <exception>
 
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/script/BasicErrorException.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>

reportdesign/inc/UndoActions.hxx

@@ -26,9 +26,6 @@
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/script/ScriptEvent.hpp>
-#include <com/sun/star/script/XScriptListener.hpp>
-#include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/ContainerEvent.hpp>
 #include <com/sun/star/report/XReportComponent.hpp>

reportdesign/source/core/sdr/RptObject.cxx

@@ -50,7 +50,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/embed/XComponentSupplier.hpp>
-#include <com/sun/star/script/XScriptEventsSupplier.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/report/XShape.hpp>

reportdesign/source/core/sdr/UndoActions.cxx

@@ -30,7 +30,6 @@
 #include "RptResId.hrc"
 #include "RptModel.hxx"
 
-#include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>

reportdesign/source/core/sdr/UndoEnv.cxx

@@ -29,7 +29,6 @@
 #include "RptResId.hrc"
 #include "RptModel.hxx"
 
-#include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/theIntrospection.hpp>

reportdesign/source/ui/misc/RptUndo.cxx

@@ -39,7 +39,6 @@ namespace rptui
     using namespace ::com::sun::star;
     using namespace uno;
     using namespace lang;
-    using namespace script;
     using namespace beans;
     using namespace awt;
     using namespace util;

sc/source/filter/excel/excimp8.cxx

@@ -95,7 +95,6 @@
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <com/sun/star/script/ModuleInfo.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/implbase.hxx>

sc/source/ui/unoobj/servuno.cxx

@@ -52,7 +52,6 @@
 #include <svx/xmlgrhlp.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
-#include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
 #include <com/sun/star/document/XCodeNameQuery.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>

sc/source/ui/unoobj/viewuno.cxx

@@ -20,7 +20,6 @@
 #include <com/sun/star/awt/MouseButton.hpp>
 #include <com/sun/star/drawing/ShapeCollection.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/script/vba/VBAEventId.hpp>
 #include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
 #include <com/sun/star/util/VetoException.hpp>
 #include <com/sun/star/view/DocumentZoomType.hpp>

sc/source/ui/vba/vbainterior.hxx

@@ -25,7 +25,6 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 
-#include <com/sun/star/script/XInvocation.hpp>
 #include <vbahelper/vbahelperinterface.hxx>
 
 #include <tools/color.hxx>

sc/source/ui/vba/vbapagebreak.hxx

@@ -24,7 +24,6 @@
 #include <ooo/vba/excel/XVPageBreak.hpp>
 #include <ooo/vba/excel/XRange.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/script/BasicErrorException.hpp>
 #include <com/sun/star/sheet/TablePageBreakData.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <vbahelper/vbahelperinterface.hxx>

sc/source/ui/vba/vbapagebreaks.hxx

@@ -25,7 +25,6 @@
 #include <ooo/vba/excel/XVPageBreak.hpp>
 #include <ooo/vba/excel/XRange.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/script/BasicErrorException.hpp>
 #include <com/sun/star/sheet/XSheetPageBreak.hpp>
 #include <com/sun/star/sheet/TablePageBreakData.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>

sc/source/ui/vba/vbarange.hxx

@@ -34,8 +34,6 @@
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/script/XDefaultMethod.hpp>
-#include <com/sun/star/script/XDefaultProperty.hpp>
 #include <com/sun/star/sheet/FillDateMode.hpp>
 #include <com/sun/star/sheet/FillMode.hpp>
 #include <com/sun/star/sheet/FillDirection.hpp>

sc/source/ui/vba/vbaworkbooks.cxx

@@ -35,12 +35,6 @@
 #include <com/sun/star/document/XTypeDetection.hpp>
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
-#include <com/sun/star/script/vba/VBAEventId.hpp>
-#include <com/sun/star/script/vba/XVBACompatibility.hpp>
-#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
-#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
-#include <com/sun/star/script/ModuleInfo.hpp>
-#include <com/sun/star/script/ModuleType.hpp>
 
 #include <sfx2/objsh.hxx>
 #include <tools/urlobj.hxx>

sc/source/ui/vba/vbaworksheet.cxx

@@ -64,13 +64,6 @@
 #include <comphelper/servicehelper.hxx>
 #include <vbahelper/vbashapes.hxx>
 
-#include <com/sun/star/script/vba/VBAEventId.hpp>
-#include <com/sun/star/script/vba/XVBACompatibility.hpp>
-#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
-#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
-#include <com/sun/star/script/ModuleInfo.hpp>
-#include <com/sun/star/script/ModuleType.hpp>
-
 //zhangyun showdataform
 #include <sfx2/sfxdlg.hxx>
 #include "scabstdlg.hxx"

sc/source/ui/vba/vbaworksheet.hxx

@@ -22,7 +22,6 @@
 #include <comphelper/unwrapargs.hxx>
 
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/script/XInvocation.hpp>
 #include <ooo/vba/excel/XWorksheet.hpp>
 #include <ooo/vba/excel/XComments.hpp>
 #include <ooo/vba/excel/XRange.hpp>

sc/source/ui/view/viewfun2.cxx

@@ -40,7 +40,6 @@
 
 #include <basic/sbstar.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/script/XLibraryContainer.hpp>
 
 #include "viewfunc.hxx"
 

scripting/source/dlgprov/dlgprov.hxx

@@ -32,7 +32,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/resource/XStringResourceManager.hpp>
-#include <com/sun/star/script/XScriptEventsAttacher.hpp>
+#include <com/sun/star/script/XScriptListener.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <cppuhelper/implbase.hxx>

scripting/source/provider/ActiveMSPList.cxx

@@ -26,8 +26,6 @@
 #include <com/sun/star/util/XMacroExpander.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 
-#include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
-
 #include "MasterScriptProvider.hxx"
 #include "ActiveMSPList.hxx"
 

scripting/source/provider/ActiveMSPList.hxx

@@ -28,7 +28,6 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 
 #include <com/sun/star/script/provider/XScriptProvider.hpp>
-#include <com/sun/star/script/browse/XBrowseNode.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 
 #include <comphelper/stl_types.hxx>

scripting/source/provider/BrowseNodeFactoryImpl.cxx

@@ -32,6 +32,7 @@
 
 #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>

scripting/source/provider/BrowseNodeFactoryImpl.hxx

@@ -29,7 +29,6 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
 #include <com/sun/star/script/browse/XBrowseNode.hpp>
-#include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #include <com/sun/star/script/browse/XBrowseNodeFactory.hpp>
 
 namespace browsenodefactory

scripting/source/vbaevents/eventhelper.cxx

@@ -39,7 +39,6 @@
 
 #include <com/sun/star/frame/XModel.hpp>
 
-#include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>

sdext/source/minimizer/informationdialog.cxx

@@ -46,7 +46,6 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::script;
 using namespace ::com::sun::star::container;
 
 

sdext/source/minimizer/optimizerdialog.cxx

@@ -41,7 +41,6 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::script;
 using namespace ::com::sun::star::container;
 
 

sdext/source/minimizer/optimizerdialogcontrols.cxx

@@ -38,7 +38,6 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::script;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::presentation;

sdext/source/minimizer/unodialog.cxx

@@ -38,7 +38,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::script;
 
 UnoDialog::UnoDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame ) :
     mxContext( rxContext ),

sdext/source/minimizer/unodialog.hxx

@@ -26,7 +26,6 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/script/XInvocation.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/awt/XControl.hpp>

sfx2/source/appl/appserv.cxx

@@ -86,7 +86,6 @@
 #include <rtl/bootstrap.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 
-#include <com/sun/star/script/provider/XScriptProviderFactory.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 

sfx2/source/doc/objmisc.cxx

@@ -37,17 +37,6 @@
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/XEmbedPersist.hpp>
-#include <com/sun/star/script/XTypeConverter.hpp>
-#include <com/sun/star/script/FinishEngineEvent.hpp>
-#include <com/sun/star/script/InterruptReason.hpp>
-#include <com/sun/star/script/XEngineListener.hpp>
-#include <com/sun/star/script/XDebugging.hpp>
-#include <com/sun/star/script/XInvocation.hpp>
-#include <com/sun/star/script/ContextInformation.hpp>
-#include <com/sun/star/script/FinishReason.hpp>
-#include <com/sun/star/script/XEngine.hpp>
-#include <com/sun/star/script/InterruptEngineEvent.hpp>
-#include <com/sun/star/script/XLibraryAccess.hpp>
 #include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp>
 #include <com/sun/star/script/provider/XScript.hpp>
 #include <com/sun/star/script/provider/XScriptProvider.hpp>

stoc/source/invocation/invocation.cxx

@@ -27,7 +27,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/script/CannotConvertException.hpp>
-#include <com/sun/star/script/FailReason.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
 #include <com/sun/star/script/XInvocation2.hpp>

svx/source/form/fmexpl.cxx

@@ -54,7 +54,6 @@
 #include "fmshimp.hxx"
 #include <svx/fmpage.hxx>
 #include <com/sun/star/io/XPersistObject.hpp>
-#include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <comphelper/property.hxx>

sw/source/core/unocore/unocoll.cxx

@@ -76,7 +76,6 @@
 #include <com/sun/star/form/XFormsSupplier.hpp>
 #include <com/sun/star/script/ModuleInfo.hpp>
 #include <com/sun/star/script/ModuleType.hpp>
-#include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
 #include <vbahelper/vbaaccesshelper.hxx>
 #include <basic/basmgr.hxx>

sw/source/core/unocore/unomap1.cxx

@@ -30,6 +30,7 @@
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/drawing/ColorMode.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
@@ -75,7 +76,6 @@
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 #include <swtypes.hxx>
 #include <unomap.hxx>

vbahelper/source/msforms/vbalistbox.cxx

@@ -20,7 +20,6 @@
 #include "vbalistbox.hxx"
 #include "vbanewfont.hxx"
 #include <comphelper/anytostring.hxx>
-#include <com/sun/star/script/ArrayWrapper.hpp>
 #include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
 #include <ooo/vba/msforms/fmMultiSelect.hpp>
 

xmlhelp/source/cxxhelp/provider/databases.cxx

@@ -52,7 +52,6 @@
 #include <com/sun/star/util/theMacroExpander.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <com/sun/star/uri/XVndSunStarExpandUrl.hpp>
-#include <com/sun/star/script/XInvocation.hpp>
 #include <i18nlangtag/languagetag.hxx>
 
 #include <com/sun/star/awt/XToolkit.hpp>

xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx

@@ -25,7 +25,6 @@
 #include <com/sun/star/i18n/Transliteration.hpp>
 #include <com/sun/star/ucb/XCommandProcessor.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/script/XInvocation.hpp>
 
 #include <helpcompiler/HelpSearch.hxx>
 

xmloff/source/forms/elementimport.hxx

@@ -35,7 +35,6 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
-#include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <osl/diagnose.h>
 
 class XMLTextStyleContext;

xmlscript/source/xmldlg_imexp/imp_share.hxx

@@ -39,7 +39,6 @@
 #include <com/sun/star/awt/FontRelief.hpp>
 #include <com/sun/star/xml/input/XRoot.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
-#include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/container/ElementExistException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <osl/diagnose.h>

xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx

@@ -28,7 +28,6 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/document/XGraphicObjectResolver.hpp>
-#include <com/sun/star/script/vba/XVBACompatibility.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
 
 #include <sal/log.hxx>

xmlscript/source/xmldlg_imexp/xmldlg_import.cxx

@@ -55,8 +55,6 @@
 #include <com/sun/star/table/CellRangeAddress.hpp>
 #include <com/sun/star/document/XGraphicObjectResolver.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
-#include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
-#include <com/sun/star/script/vba/XVBACompatibility.hpp>
 #include <com/sun/star/util/NumberFormatsSupplier.hpp>
 
 using namespace ::com::sun::star;

xmlscript/source/xmlflat_imexp/xmlbas_import.cxx

@@ -26,7 +26,6 @@
 #include <xmlscript/xml_helper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
 #include <cppuhelper/implementationentry.hxx>