basic/IwyuFilter_basic.yaml | 18 ------------------
basic/qa/cppunit/basic_coverage.cxx | 1 +
basic/qa/cppunit/basictest.cxx | 2 ++
basic/qa/cppunit/basictest.hxx | 6 ------
basic/qa/cppunit/test_append.cxx | 1 +
basic/qa/cppunit/test_nested_struct.cxx | 1 +
basic/qa/cppunit/test_vba.cxx | 3 +++
basic/source/basmgr/basmgr.cxx | 2 --
basic/source/classes/codecompletecache.cxx | 1 -
basic/source/classes/eventatt.cxx | 1 -
basic/source/classes/image.cxx | 1 +
basic/source/classes/sb.cxx | 1 -
basic/source/classes/sbxmod.cxx | 1 +
basic/source/comp/token.cxx | 1 -
basic/source/inc/dlgcont.hxx | 3 ---
basic/source/inc/image.hxx | 1 -
basic/source/inc/namecont.hxx | 5 -----
basic/source/inc/runtime.hxx | 1 -
basic/source/inc/scriptcont.hxx | 3 ---
basic/source/runtime/methods.cxx | 2 --
basic/source/runtime/methods1.cxx | 3 ---
basic/source/runtime/runtime.cxx | 3 ---
basic/source/sbx/sbxcurr.cxx | 1 -
basic/source/sbx/sbxform.cxx | 1 -
basic/source/sbx/sbxint.cxx | 3 ---
basic/source/sbx/sbxobj.cxx | 1 -
basic/source/sbx/sbxvalue.cxx | 1 -
basic/source/uno/namecont.cxx | 4 ----
basic/source/uno/scriptcont.cxx | 1 +
binaryurp/IwyuFilter_binaryurp.yaml | 12 ++----------
binaryurp/source/bridge.cxx | 3 ---
binaryurp/source/bridge.hxx | 1 -
binaryurp/source/bridgefactory.cxx | 1 -
binaryurp/source/proxy.cxx | 1 -
binaryurp/source/writer.cxx | 1 -
35 files changed, 13 insertions(+), 79 deletions(-)
New commits:
commit 9ae1e924649ded90488e923a0f57d922bc33233b
Author: Gabor Kelemen <gabor.kele...@collabora.com>
AuthorDate: Tue Jul 29 18:01:28 2025 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Mon Aug 18 20:19:18 2025 +0200
tdf#146619 Run IWYU on binaryurp/
Change-Id: Ie3bcad1a6653350ae10ed69371138d3d413a51e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188750
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
diff --git a/binaryurp/IwyuFilter_binaryurp.yaml
b/binaryurp/IwyuFilter_binaryurp.yaml
index 49e10617cc57..0889976d65a5 100644
--- a/binaryurp/IwyuFilter_binaryurp.yaml
+++ b/binaryurp/IwyuFilter_binaryurp.yaml
@@ -10,25 +10,17 @@ excludelist:
binaryurp/source/incomingrequest.hxx:
# Don't propose hxx -> h change in URE libs
- rtl/byteseq.hxx
- binaryurp/source/lessoperators.cxx:
+ binaryurp/source/writerstate.hxx:
# Don't propose hxx -> h change in URE libs
- rtl/byteseq.hxx
- binaryurp/source/outgoingrequests.cxx:
+ binaryurp/source/lessoperators.cxx:
# Don't propose hxx -> h change in URE libs
- rtl/byteseq.hxx
- # Actually needed
- - lessoperators.hxx
binaryurp/source/bridgefactory.cxx:
# Actually needed
- com/sun/star/connection/XConnection.hpp
- - com/sun/star/uno/XComponentContext.hpp
- - com/sun/star/uno/XInterface.hpp
binaryurp/source/bridge.cxx:
# Actually needed
- com/sun/star/bridge/XInstanceProvider.hpp
- com/sun/star/connection/XConnection.hpp
- com/sun/star/lang/XEventListener.hpp
- - com/sun/star/uno/XInterface.hpp
- binaryurp/source/unmarshal.cxx:
- # Actually used
- - vector
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 9d086946aa81..dffc60ed0f0c 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -28,7 +28,6 @@
#include <vector>
#include <com/sun/star/bridge/InvalidProtocolChangeException.hpp>
-#include <com/sun/star/bridge/XBridge.hpp>
#include <com/sun/star/bridge/XInstanceProvider.hpp>
#include <com/sun/star/bridge/XProtocolProperties.hpp>
#include <com/sun/star/connection/XConnection.hpp>
@@ -41,8 +40,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XInterface.hpp>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
#include <osl/thread.hxx>
#include <rtl/byteseq.hxx>
#include <rtl/random.h>
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index b9c3e4b99d57..62fccbbe0808 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -31,7 +31,6 @@
#include <com/sun/star/uno/Reference.hxx>
#include <cppuhelper/implbase.hxx>
#include <osl/conditn.hxx>
-#include <osl/mutex.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
diff --git a/binaryurp/source/bridgefactory.cxx
b/binaryurp/source/bridgefactory.cxx
index 86b279cd8154..2ba6bc5096dd 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <algorithm>
#include <cassert>
#include <com/sun/star/bridge/BridgeExistsException.hpp>
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index 49705e06aa89..078fc090aae4 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -32,7 +32,6 @@
#include <typelib/typedescription.h>
#include <typelib/typedescription.hxx>
#include <uno/any2.h>
-#include <uno/dispatcher.h>
#include <uno/dispatcher.hxx>
#include "binaryany.hxx"
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index 9b8bf07ea6b4..d9a131c578ef 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <cassert>
-#include <cstddef>
#include <cstring>
#include <exception>
#include <limits>
commit c309a5785dd890f2ab573efe7d2db17501f65cbf
Author: Gabor Kelemen <gabor.kele...@collabora.com>
AuthorDate: Tue Jul 29 12:47:54 2025 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Mon Aug 18 20:19:07 2025 +0200
tdf#146619 Run IWYU on basic/
Change-Id: I58883f0223a28f3ea887c37e2a86a3c31ff88546
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188749
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
diff --git a/basic/IwyuFilter_basic.yaml b/basic/IwyuFilter_basic.yaml
index ca2bb51a38fd..11c95fec1f72 100644
--- a/basic/IwyuFilter_basic.yaml
+++ b/basic/IwyuFilter_basic.yaml
@@ -4,15 +4,9 @@ excludelist:
basic/source/runtime/dllmgr.hxx:
# Needed on WIN
- memory
- basic/source/sbx/sbxconv.hxx:
- # math::round is used
- - rtl/math.hxx
basic/qa/cppunit/test_compiler_checks.cxx:
# Keep for system-cppunit; see also commit
456d61ec526e250fd1af894e109d5914ac9c9e6e
- unotest/bootstrapfixturebase.hxx
- basic/source/comp/exprnode.cxx:
- # math::round is used
- - rtl/math.hxx
basic/source/runtime/methods.cxx:
# Needed on WIN
- o3tl/char16_t2wchar_t.hxx
@@ -20,15 +14,3 @@ excludelist:
basic/source/sbx/sbxdec.cxx:
# Needed on WIN
- o3tl/char16_t2wchar_t.hxx
- basic/source/sbx/sbxbyte.cxx:
- # math::round is used
- - rtl/math.hxx
- basic/source/sbx/sbxchar.cxx:
- # math::round is used
- - rtl/math.hxx
- basic/source/sbx/sbxint.cxx:
- # math::round is used
- - rtl/math.hxx
- basic/source/sbx/sbxlng.cxx:
- # math::round is used
- - rtl/math.hxx
diff --git a/basic/qa/cppunit/basic_coverage.cxx
b/basic/qa/cppunit/basic_coverage.cxx
index 6f68e19dac4b..d839726773bc 100644
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@@ -10,6 +10,7 @@
#include "basictest.hxx"
#include <osl/file.hxx>
#include <i18nlangtag/languagetag.hxx>
+#include <test/bootstrapfixture.hxx>
#include <unotools/syslocaleoptions.hxx>
namespace
diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx
index f93961deab8a..5c3602d0e004 100644
--- a/basic/qa/cppunit/basictest.cxx
+++ b/basic/qa/cppunit/basictest.cxx
@@ -8,7 +8,9 @@
*/
#include "basictest.hxx"
+#include <cppunit/TestAssert.h>
#include <cppunit/plugin/TestPlugIn.h>
+#include <com/sun/star/uno/Sequence.hxx>
#include <basic/sbstar.hxx>
#include <basic/sbmod.hxx>
#include <basic/sbmeth.hxx>
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index 46af3542b82b..f2fe34e9224c 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -9,15 +9,9 @@
#pragma once
#include <sal/types.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-#include <test/bootstrapfixture.hxx>
#include <basic/sbstar.hxx>
#include <basic/basrdll.hxx>
#include <basic/sbmod.hxx>
-#include <basic/sbmeth.hxx>
-#include <basic/sbuno.hxx>
class MacroSnippet
{
diff --git a/basic/qa/cppunit/test_append.cxx b/basic/qa/cppunit/test_append.cxx
index d2de74167a70..70abf4817ef1 100644
--- a/basic/qa/cppunit/test_append.cxx
+++ b/basic/qa/cppunit/test_append.cxx
@@ -8,6 +8,7 @@
*/
#include "basictest.hxx"
+#include <test/bootstrapfixture.hxx>
namespace
{
diff --git a/basic/qa/cppunit/test_nested_struct.cxx
b/basic/qa/cppunit/test_nested_struct.cxx
index c7b9127592e2..f5f7116e3cb1 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -11,6 +11,7 @@
#include <com/sun/star/awt/WindowDescriptor.hpp>
#include <com/sun/star/table/TableBorder.hpp>
#include <basic/sbuno.hxx>
+#include <test/bootstrapfixture.hxx>
namespace
{
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index df0ceffefe81..187fda0249de 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -8,6 +8,7 @@
*/
#include "basictest.hxx"
#include <unotools/syslocaleoptions.hxx>
+#include <test/bootstrapfixture.hxx>
#ifdef _WIN32
#include <string.h>
@@ -17,7 +18,9 @@
#include <systools/win32/odbccp32.hxx>
#endif
+#ifdef _WIN64
using namespace ::com::sun::star;
+#endif
namespace
{
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index bb11ec1963bc..264c8e70ef4e 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -18,7 +18,6 @@
*/
#include <utility>
-#include <vcl/errinf.hxx>
#include <tools/stream.hxx>
#include <sot/storage.hxx>
#include <tools/urlobj.hxx>
@@ -39,7 +38,6 @@
#include <basic/basmgr.hxx>
#include <global.hxx>
#include <com/sun/star/script/XLibraryContainer.hpp>
-#include <com/sun/star/script/XPersistentLibraryContainer.hpp>
#include <scriptcont.hxx>
diff --git a/basic/source/classes/codecompletecache.cxx
b/basic/source/classes/codecompletecache.cxx
index 77c82712ddd9..c38d7673d142 100644
--- a/basic/source/classes/codecompletecache.cxx
+++ b/basic/source/classes/codecompletecache.cxx
@@ -20,7 +20,6 @@
#include <basic/codecompletecache.hxx>
#include <iostream>
#include <officecfg/Office/BasicIDE.hxx>
-#include <officecfg/Office/Common.hxx>
namespace
{
diff --git a/basic/source/classes/eventatt.cxx
b/basic/source/classes/eventatt.cxx
index 2e5142b21fc7..be9d2ae2683c 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -21,7 +21,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
-#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/awt/DialogProvider.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 1e12cf725a79..6f036e5c4c7a 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -23,6 +23,7 @@
#include <o3tl/safeint.hxx>
#include <sal/log.hxx>
#include <basic/sbx.hxx>
+#include <filefmt.hxx>
#include <sb.hxx>
#include <sbxprop.hxx>
#include <string.h>
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index ae9f4d0adeed..4babf05641c8 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -23,7 +23,6 @@
#include <rtl/ustrbuf.hxx>
#include <tools/stream.hxx>
#include <tools/debug.hxx>
-#include <vcl/errinf.hxx>
#include <comphelper/solarmutex.hxx>
#include <basic/sbx.hxx>
#include <vcl/svapp.hxx>
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 6558050e1325..c3c3963f78df 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -30,6 +30,7 @@
#include <sbjsmod.hxx>
#include <sbintern.hxx>
#include <sbprop.hxx>
+#include <filefmt.hxx>
#include <image.hxx>
#include <opcodes.hxx>
#include <runtime.hxx>
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 864402c73aa7..ec5f7df16eb0 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -21,7 +21,6 @@
#include <array>
#include <basic/sberrors.hxx>
-#include <sal/macros.h>
#include <o3tl/string_view.hxx>
#include <basiccharclass.hxx>
#include <token.hxx>
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index 81d14d72bec2..bddbdd1ad659 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -24,9 +24,6 @@
#include <com/sun/star/resource/XStringResourceSupplier.hpp>
#include <com/sun/star/resource/XStringResourcePersistence.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <comphelper/uno3.hxx>
-
namespace basic
{
diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx
index 5a4522bd91bf..36f5ab5a0bc8 100644
--- a/basic/source/inc/image.hxx
+++ b/basic/source/inc/image.hxx
@@ -21,7 +21,6 @@
#include <basic/sbx.hxx>
#include <rtl/ustring.hxx>
-#include "filefmt.hxx"
#include <o3tl/typed_flags_set.hxx>
#include <cstddef>
#include <vector>
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 45246c8447f3..4f628aa03650 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -42,15 +42,10 @@
#include <com/sun/star/script/vba/XVBAScriptListener.hpp>
#include <com/sun/star/util/XChangesNotifier.hpp>
-#include <osl/mutex.hxx>
#include <unotools/eventlisteneradapter.hxx>
#include <comphelper/compbase.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/compbase.hxx>
#include <cppuhelper/weakref.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <rtl/ref.hxx>
-#include <comphelper/interfacecontainer3.hxx>
#include <comphelper/interfacecontainer4.hxx>
#include <xmlscript/xmllib_imexp.hxx>
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index e2b1a4a331a0..eaf9966b197d 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -38,7 +38,6 @@
#include <com/sun/star/container/XIndexAccess.hpp>
#include <unotools/localedatawrapper.hxx>
#include <o3tl/deleter.hxx>
-#include <o3tl/typed_flags_set.hxx>
#include <tools/wldcrd.hxx>
class SbiRuntime; // active StarBASIC procedure instance
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 38e62b3bfedc..018c2ad52143 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -20,10 +20,7 @@
#pragma once
#include "namecont.hxx"
-#include <basic/basmgr.hxx>
#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
-#include <comphelper/uno3.hxx>
-#include <cppuhelper/implbase1.hxx>
namespace basic
{
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 679414e10a14..1082c2e7be6e 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -85,9 +85,7 @@
#include <basic/vbahelper.hxx>
#include <vector>
-#include <math.h>
#include <stdio.h>
-#include <stdlib.h>
#include <errno.h>
#include <sbobjmod.hxx>
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 0775f6c75bb8..7e2b8cf28ec8 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -22,8 +22,6 @@
#include <sal/config.h>
#include <config_version.h>
-#include <cstddef>
-
#include <rtl/math.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mapmod.hxx>
@@ -38,7 +36,6 @@
#include <o3tl/environment.hxx>
#include <o3tl/temporary.hxx>
#include <osl/file.hxx>
-#include <osl/process.h>
#include <sbobjmod.hxx>
#include <basic/sbuno.hxx>
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 669ba20d3544..bf0cefbc0e16 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -23,12 +23,10 @@
#include <string_view>
#include <unordered_map>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/script/XDefaultMethod.hpp>
#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/util/SearchAlgorithms2.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
@@ -44,7 +42,6 @@
#include <rtl/math.hxx>
#include <rtl/ustrbuf.hxx>
-#include <rtl/character.hxx>
#include <svl/numformat.hxx>
#include <svl/zforlist.hxx>
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 5b452686de24..39b8746846da 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -21,7 +21,6 @@
#include <basic/sberrors.hxx>
#include <basic/sbxvar.hxx>
-#include <o3tl/string_view.hxx>
#include <svl/numformat.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index d0640e71a7d6..56cd937b80aa 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -42,7 +42,6 @@ COMMENT: Visual-Basic treats the following (invalid)
format-strings
(this class behaves the same way)
*/
-#include <stdio.h>
#include <float.h>
#include <math.h>
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index a0693635a302..396de01037ed 100644
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -21,14 +21,11 @@
#include <config_features.h>
-#include <o3tl/safeint.hxx>
#include <comphelper/errcode.hxx>
#include <basic/sberrors.hxx>
#include "sbxconv.hxx"
#include <runtime.hxx>
-#include <rtl/math.hxx>
-
namespace
{
template <class T>
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 241143313c8c..2dcdcee263f4 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -31,7 +31,6 @@
#include <svl/SfxBroadcaster.hxx>
#include "sbxdec.hxx"
#include "sbxres.hxx"
-#include <filefmt.hxx>
static OUString pNameProp; // Name-Property
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 8fac8fd867ef..cd0ce40ddf5e 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -23,7 +23,6 @@
#include <string_view>
#include <osl/diagnose.h>
-#include <o3tl/float_int_conversion.hxx>
#include <o3tl/safeint.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index db97fe8794b3..5c20f637b476 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -21,7 +21,6 @@
#include <config_folders.h>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/io/IOException.hpp>
@@ -34,7 +33,6 @@
#include <vcl/svapp.hxx>
#include <o3tl/string_view.hxx>
#include <o3tl/temporary.hxx>
-#include <osl/mutex.hxx>
#include <vcl/errinf.hxx>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
@@ -66,9 +64,7 @@
#include <com/sun/star/deployment/ExtensionManager.hpp>
#include <comphelper/storagehelper.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
#include <memory>
#include <string_view>
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 2fbed6ae9253..45018e23ea5d 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -32,6 +32,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/storagehelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
+#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <sot/storage.hxx>
