7 files changed, 9 insertions, 22 deletions
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 457a3d570378..35582a0c25be 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -22,10 +22,7 @@
 #include <comphelper/string.hxx>
 
 #include <com/sun/star/awt/XControlContainer.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/awt/XControl.hpp>
-#include <com/sun/star/awt/XDialog.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/DialogProvider.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -44,8 +41,8 @@
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
-#include <xmlscript/xmldlg_imexp.hxx>
 #include <sbunoobj.hxx>
+#include <basic/sberrors.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbuno.hxx>
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 6d177755b671..90cdaa7b7ed9 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -23,6 +23,7 @@
 #include <sal/log.hxx>
 #include <basic/sbx.hxx>
 #include <sb.hxx>
+#include <basic/sbxprop.hxx>
 #include <string.h>
 #include <image.hxx>
 #include <codegen.hxx>
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index f3e8e88f6446..fbceb81ad7b1 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -30,7 +30,6 @@
 #include <o3tl/any.hxx>
 
 #include <algorithm>
-#include <limits.h>
 
 using com::sun::star::uno::Reference;
 using namespace com::sun::star;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 8cce1979c6ec..3ee34bc7e2fb 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -31,10 +31,11 @@
 #include <sbjsmod.hxx>
 #include <sbintern.hxx>
 #include <runtime.hxx>
+#include <basic/sberrors.hxx>
 #include <basic/sbuno.hxx>
+#include <sbprop.hxx>
 #include <sbobjmod.hxx>
 #include <stdobj.hxx>
-#include <filefmt.hxx>
 #include <basic.hrc>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -47,7 +48,7 @@
 
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/ModuleInfo.hpp>
-#include <svtools/miscopt.hxx>
+
 using namespace ::com::sun::star::script;
 
 
diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx
index 1c4af0f5fa9b..77bfc64e030b 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -19,10 +19,6 @@
 
 #include <sbintern.hxx>
 #include <sbunoobj.hxx>
-#include <token.hxx>
-#include <symtbl.hxx>
-#include <parser.hxx>
-#include <codegen.hxx>
 #include <basic/basmgr.hxx>
 
 SbiGlobals* SbiGlobals::pGlobals = nullptr;
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index af5a3aab3da2..26aedddd3a40 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -27,14 +27,12 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/weakref.hxx>
 
 #include <rtl/instance.hxx>
-#include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/script/ArrayWrapper.hpp>
@@ -55,7 +53,6 @@
 #include <com/sun/star/script/BasicErrorException.hpp>
 #include <com/sun/star/script/InvocationAdapterFactory.hpp>
 #include <com/sun/star/script/XAllListener.hpp>
-#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/XDirectInvocation.hpp>
@@ -64,6 +61,7 @@
 #include <com/sun/star/reflection/XIdlArray.hpp>
 #include <com/sun/star/reflection/XIdlReflection.hpp>
 #include <com/sun/star/reflection/XServiceConstructorDescription.hpp>
+#include <com/sun/star/reflection/XSingletonTypeDescription.hpp>
 #include <com/sun/star/reflection/theCoreReflection.hpp>
 #include <com/sun/star/bridge/oleautomation/NamedArgument.hpp>
 #include <com/sun/star/bridge/oleautomation/Date.hpp>
@@ -71,7 +69,6 @@
 #include <com/sun/star/bridge/oleautomation/Currency.hpp>
 #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
 #include <com/sun/star/script/XAutomationInvocation.hpp>
-#include <basic/codecompletecache.hxx>
 
 #include <rtlproto.hxx>
 
@@ -79,8 +76,6 @@
 #include <basic/sbuno.hxx>
 #include <basic/sberrors.hxx>
 #include <sbunoobj.hxx>
-#include <sbjsmod.hxx>
-#include <basic/basmgr.hxx>
 #include <sbintern.hxx>
 #include <runtime.hxx>
 
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 1df211a3f8b3..3e88a3fb4bff 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -22,12 +22,13 @@
 #include <tools/stream.hxx>
 #include <tools/diagnose_ex.h>
 #include <svl/SfxBroadcaster.hxx>
+#include <basic/codecompletecache.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbuno.hxx>
-#include <sb.hxx>
 #include <sbjsmeth.hxx>
 #include <sbjsmod.hxx>
 #include <sbintern.hxx>
+#include <sbprop.hxx>
 #include <image.hxx>
 #include <opcodes.hxx>
 #include <runtime.hxx>
@@ -36,13 +37,12 @@
 
 #include <sal/log.hxx>
 
-#include <basic/basrdll.hxx>
+#include <basic/sberrors.hxx>
 #include <sbobjmod.hxx>
 #include <basic/vbahelper.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <unotools/eventcfg.hxx>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
@@ -66,9 +66,7 @@
 #include <com/sun/star/awt/DialogProvider.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/awt/XControl.hpp>
 #include <ooo/vba/VbQueryClose.hpp>
-#include <list>
 #include <memory>
 #include <sbxmod.hxx>
 #include <parser.hxx>