15 files changed, 14 insertions, 10 deletions
diff --git a/basic/IwyuFilter_basic.yaml b/basic/IwyuFilter_basic.yaml
index f422d724c9ca..b3a926c37315 100644
--- a/basic/IwyuFilter_basic.yaml
+++ b/basic/IwyuFilter_basic.yaml
@@ -1,6 +1,12 @@
 ---
 assumeFilename: basic/source/classes/global.cxx
 excludelist:
+    basic/source/runtime/dllmgr.hxx:
+    # Needed on WIN
+    - memory
+    basic/qa/cppunit/test_compiler_checks.cxx:
+    # Keep for system-cppunit; see also commit 456d61ec526e250fd1af894e109d5914ac9c9e6e
+    - unotest/bootstrapfixturebase.hxx
     basic/source/runtime/methods.cxx:
     # Needed on WIN
     - o3tl/char16_t2wchar_t.hxx
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index 788be5fe43dd..7cfa0cd81f9b 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/script/ModuleInfo.hpp>
 #include <com/sun/star/awt/XDialog.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <basic/basicdllapi.h>
 
 // Basic-Module for excel object.
 
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index 93e9abf6887e..001e332ae245 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -22,7 +22,6 @@
 #include <basic/sbxobj.hxx>
 #include <vcl/graph.hxx>
 #include "sbxfac.hxx"
-#include <basic/basicdllapi.h>
 
 class SbStdFactory final : public SbxFactory
 {
diff --git a/basic/inc/sbxfac.hxx b/basic/inc/sbxfac.hxx
index e9b130eec192..7e92f895adaf 100644
--- a/basic/inc/sbxfac.hxx
+++ b/basic/inc/sbxfac.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <rtl/ustring.hxx>
-#include <basic/basicdllapi.h>
 
 class SbxBase;
 class SbxObject;
diff --git a/basic/qa/cppunit/test_language_conditionals.cxx b/basic/qa/cppunit/test_language_conditionals.cxx
index 190a34ead874..c35d5571e9db 100644
--- a/basic/qa/cppunit/test_language_conditionals.cxx
+++ b/basic/qa/cppunit/test_language_conditionals.cxx
@@ -8,7 +8,6 @@
  */
 
 #include "basictest.hxx"
-#include <rtl/ustring.hxx>
 
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index a2c1e165c8db..6ae3692cc833 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sb.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
 #include <vcl/errinf.hxx>
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 018362e2d544..db7859bf181b 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -33,6 +33,7 @@
 #include <cppuhelper/weakref.hxx>
 
 #include <rtl/instance.hxx>
+#include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/script/ArrayWrapper.hpp>
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 3b0bbc4ceaec..02f8801f1aea 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -18,10 +18,9 @@
  */
 
 
-#include <math.h>
+#include <cmath>
 
 #include <o3tl/temporary.hxx>
-#include <rtl/math.hxx>
 #include <parser.hxx>
 #include <expr.hxx>
 #include <tools/long.hxx>
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 030b9c2041db..b98d986debce 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -27,9 +27,9 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/file.hxx>
-#include <rtl/math.hxx>
 #include <i18nlangtag/lang.h>
 
+#include <cmath>
 #include <vector>
 #include <memory>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index a79cbb59dd1e..ea119593340e 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <basic/basicdllapi.h>
 #include <basic/sbstar.hxx>
 #include <sbxfac.hxx>
 #include <unotools/transliterationwrapper.hxx>
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 44f080544408..c847df8d26e6 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -25,6 +25,7 @@
 #include <cstddef>
 
 #include <stdlib.h>
+#include <rtl/math.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 20268bfbf44b..a5ace17b4941 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -20,7 +20,6 @@
 #include <basic/sberrors.hxx>
 #include <basic/sbstar.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/svapp.hxx>
 #include <sbstdobj.hxx>
 
 #define ATTR_IMP_TYPE           1
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index ebfbda55aa02..07947bffe313 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <rtl/math.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svl/zforlist.hxx>
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 922d892df367..d2f5c91e3483 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -44,7 +44,7 @@
 #include <strings.hrc>
 
 #include <rtl/character.hxx>
-#include <sal/log.hxx>
+#include <rtl/math.hxx>
 #include <svl/zforlist.hxx>
 
 
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 5134ff751aaa..8e5b80ef1e08 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -28,6 +28,7 @@
 #include "sbxconv.hxx"
 #include <sbunoobj.hxx>
 #include <rtl/character.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
 #include <com/sun/star/uno/XInterface.hpp>