12 files changed, 10 insertions, 31 deletions
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index af5b7a2403aa..a3145f404979 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -19,14 +19,11 @@
 
 #include <memory>
 #include <vcl/svapp.hxx>
-#include <svl/solar.hrc>
 #include <tools/debug.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/settings.hxx>
 
 #include <basic/sbstar.hxx>
 #include <basic/basrdll.hxx>
-#include <unotools/resmgr.hxx>
 #include <strings.hrc>
 #include <sbxbase.hxx>
 #include <config_features.h>
diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx
index ea4557d4d02e..dc172d1143f0 100644
--- a/basic/source/runtime/ddectrl.hxx
+++ b/basic/source/runtime/ddectrl.hxx
@@ -21,7 +21,10 @@
 #define INCLUDED_BASIC_SOURCE_RUNTIME_DDECTRL_HXX
 
 #include <tools/link.hxx>
-#include <basic/sberrors.hxx>
+#include <vcl/errcode.hxx>
+
+#include <memory>
+#include <vector>
 
 class DdeConnection;
 class DdeData;
diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx
index c299a4dcdfd0..5b4c24003b3b 100644
--- a/basic/source/runtime/dllmgr-none.cxx
+++ b/basic/source/runtime/dllmgr-none.cxx
@@ -24,12 +24,10 @@
 #include <postwin.h>
 #endif
 
+#include <basic/sberrors.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbxvar.hxx>
-#include <rtl/ref.hxx>
-#include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
-#include <salhelper/simplereferenceobject.hxx>
 #include <osl/time.h>
 
 #include "dllmgr.hxx"
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 9bd2e9c95424..461375467ad1 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_BASIC_SOURCE_RUNTIME_DLLMGR_HXX
 
 #include <sal/config.h>
-#include <basic/sberrors.hxx>
+#include <vcl/errcode.hxx>
 #include <memory>
 
 class SbxArray;
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index d38ca3670836..24a71850607b 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -17,12 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <basic/sberrors.hxx>
 #include <tools/lineend.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/window.hxx>
-#include <runtime.hxx>
-#include <stdobj.hxx>
 #include <rtlproto.hxx>
 #include <memory>
 
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 6797b41f7758..e58c0a060df2 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -22,27 +22,18 @@
 #include <vcl/weld.hxx>
 #include <vcl/window.hxx>
 #include <osl/file.hxx>
-#include <tools/urlobj.hxx>
 
 #include <runtime.hxx>
 
-#include <rtl/byteseq.hxx>
-#include <rtl/textenc.h>
 #include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 
-#include <com/sun/star/bridge/BridgeFactory.hpp>
-#include <com/sun/star/bridge/XBridge.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/ucb/UniversalContentBroker.hpp>
-#include <com/sun/star/ucb/XContentProvider.hpp>
-#include <com/sun/star/ucb/XContentProviderManager.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XStream.hpp>
@@ -55,7 +46,6 @@ using namespace com::sun::star::io;
 using namespace com::sun::star::bridge;
 
 #include <iosys.hxx>
-#include <sbintern.hxx>
 
 
 class SbiInputDialog : public weld::GenericDialogController
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 8cb2b33436d1..95057cb854c5 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -42,7 +42,6 @@
 #include <tools/wldcrd.hxx>
 #include <i18nlangtag/lang.h>
 #include <rtl/string.hxx>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 
 #include <runtime.hxx>
@@ -52,16 +51,13 @@
 
 #include <comphelper/string.hxx>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/string.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/script/XErrorQuery.hpp>
-#include <ooo/vba/XHelperInterface.hpp>
 #include <ooo/vba/VbTriState.hpp>
 #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
 #include <memory>
@@ -75,7 +71,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 
 #include <date.hxx>
-#include <stdobj.hxx>
 #include <sbstdobj.hxx>
 #include <rtlproto.hxx>
 #include <image.hxx>
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 281b23ec3243..19f0acaa8c0a 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -37,14 +37,12 @@
 #include <tools/fract.hxx>
 #include <o3tl/temporary.hxx>
 #include <osl/file.hxx>
-#include <vcl/jobset.hxx>
 #include <sbobjmod.hxx>
 #include <basic/sbuno.hxx>
 
 #include <date.hxx>
 #include <sbintern.hxx>
 #include <runtime.hxx>
-#include <stdobj.hxx>
 #include <rtlproto.hxx>
 #include "dllmgr.hxx"
 #include <iosys.hxx>
diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx
index 8822aefba8f3..28bd71a31bd6 100644
--- a/basic/source/runtime/props.cxx
+++ b/basic/source/runtime/props.cxx
@@ -19,7 +19,6 @@
 
 
 #include <runtime.hxx>
-#include <stdobj.hxx>
 #include <rtlproto.hxx>
 #include <errobject.hxx>
 #include <basegfx/numeric/ftools.hxx>
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 52f7c645c640..033285d8f7fe 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -65,6 +65,7 @@
 #include <runtime.hxx>
 #include <sb.hxx>
 #include <sbintern.hxx>
+#include <sbprop.hxx>
 #include <sbunoobj.hxx>
 #include <basic/codecompletecache.hxx>
 #include <memory>
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index a2f3be73b308..234deed57ea0 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -21,7 +21,6 @@
 #include <runtime.hxx>
 #include <stdobj.hxx>
 #include <sbstdobj.hxx>
-#include <sal/macros.h>
 #include <rtlproto.hxx>
 #include <sbintern.hxx>
 // The nArgs-field of a table entry is encrypted as follows:
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 039be508aef9..d6ae5d5dc35a 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <basic/sberrors.hxx>
+#include <basic/sbstar.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/transfer.hxx>
-#include <runtime.hxx>
 #include <sbstdobj.hxx>
 
 #define ATTR_IMP_TYPE           1