cppu/IwyuFilter_cppu.yaml | 5 +++++
cppu/qa/test_recursion.cxx | 2 --
cppu/source/threadpool/current.cxx | 1 -
cppu/source/typelib/typelib.cxx | 1 -
cppuhelper/IwyuFilter_cppuhelper.yaml | 2 ++
cppuhelper/inc/compbase2.hxx | 1 -
cppuhelper/source/bootstrap.cxx | 2 --
cppuhelper/source/compbase.cxx | 1 +
cppuhelper/source/component.cxx | 1 -
cppuhelper/source/component_context.cxx | 3 ---
cppuhelper/source/factory.cxx | 1 -
cppuhelper/source/servicemanager.cxx | 1 -
cppuhelper/source/shlib.cxx | 1 -
cppuhelper/source/typemanager.cxx | 1 -
cppuhelper/source/typemanager.hxx | 2 --
cpputools/source/unoexe/unoexe.cxx | 1 -
16 files changed, 8 insertions(+), 18 deletions(-)
New commits:
commit 953a4159ba48b2901e6b1660fc89960fcaa87b0c
Author: Gabor Kelemen <gabor.kele...@collabora.com>
AuthorDate: Thu Aug 7 12:05:58 2025 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Tue Aug 19 09:47:37 2025 +0200
tdf#146619 Run IWYU on cppu/ cppuhelper/ cpputools/
Change-Id: Ib3eadf94a382d9eee4fd08c1a914ea27bc75814e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189790
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Tested-by: Jenkins
diff --git a/cppu/IwyuFilter_cppu.yaml b/cppu/IwyuFilter_cppu.yaml
index 8e9a368b0215..3eb4a1ab900a 100644
--- a/cppu/IwyuFilter_cppu.yaml
+++ b/cppu/IwyuFilter_cppu.yaml
@@ -10,6 +10,11 @@ excludelist:
- Interface2a.hpp
- Interface2b.hpp
- Interface3.hpp
+ # Required in C++20 mode.
+ - o3tl/cppunittraitshelper.hxx
+ cppu/qa/cppumaker/test_cppumaker.cxx:
+ # Required in C++20 mode.
+ - o3tl/cppunittraitshelper.hxx
cppu/source/cppu/cppu_opt.cxx:
# Unit test fails without uno/Any.hxx
- com/sun/star/uno/Any.hxx
diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx
index 40aee4c30e6f..402071f9c35e 100644
--- a/cppu/qa/test_recursion.cxx
+++ b/cppu/qa/test_recursion.cxx
@@ -19,9 +19,7 @@
#include <sal/types.h>
-#include <cppunit/TestSuite.h>
#include <cppunit/TestFixture.h>
-#include <cppunit/TestCase.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <cppunit/extensions/HelperMacros.h>
diff --git a/cppu/source/threadpool/current.cxx
b/cppu/source/threadpool/current.cxx
index efb66e3166ba..cd02b4b3f8d6 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <rtl/byteseq.h>
-#include <osl/mutex.hxx>
#include <uno/current_context.h>
#include <uno/environment.hxx>
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 38119d9ee371..d96ab5c5b5ac 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -18,7 +18,6 @@
*/
-#include <algorithm>
#include <unordered_map>
#include <cassert>
#include <list>
diff --git a/cppuhelper/IwyuFilter_cppuhelper.yaml
b/cppuhelper/IwyuFilter_cppuhelper.yaml
index cbae100fb19d..e42f1aa8601c 100644
--- a/cppuhelper/IwyuFilter_cppuhelper.yaml
+++ b/cppuhelper/IwyuFilter_cppuhelper.yaml
@@ -16,6 +16,8 @@ excludelist:
cppuhelper/source/bootstrap.cxx:
# Needed on win32
- o3tl/char16_t2wchar_t.hxx
+ # Don't replace hxx -> h in URE API
+ - osl/thread.hxx
cppuhelper/source/defaultbootstrap.cxx:
# Needed for template specialization
- com/sun/star/lang/XSingleComponentFactory.hpp
diff --git a/cppuhelper/inc/compbase2.hxx b/cppuhelper/inc/compbase2.hxx
index 6e1486d9fabe..cac7df38224e 100644
--- a/cppuhelper/inc/compbase2.hxx
+++ b/cppuhelper/inc/compbase2.hxx
@@ -15,7 +15,6 @@
#include "interfacecontainer4.hxx"
#include "unoimplbase.hxx"
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index e3a47c6154ba..3bb6a43f3203 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -41,8 +41,6 @@
#include "macro_expander.hxx"
-namespace com :: sun :: star :: uno { class XComponentContext; }
-
using namespace ::osl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/cppuhelper/source/compbase.cxx b/cppuhelper/source/compbase.cxx
index 3444c516dc0a..8c0a28525c6b 100644
--- a/cppuhelper/source/compbase.cxx
+++ b/cppuhelper/source/compbase.cxx
@@ -8,6 +8,7 @@
*/
#include <compbase2.hxx>
+#include <cppuhelper/queryinterface.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 3861f35f03bd..f0f24addeb6b 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -21,7 +21,6 @@
#include <sal/log.hxx>
#include <cppuhelper/component.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
diff --git a/cppuhelper/source/component_context.cxx
b/cppuhelper/source/component_context.cxx
index c7e5476594d6..558e75ec7970 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -20,15 +20,12 @@
#include <unordered_map>
#include <osl/diagnose.h>
-#include <osl/mutex.hxx>
#include <sal/log.hxx>
#include <uno/lbnames.h>
#include <uno/mapping.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
#include <cppuhelper/component_context.hxx>
#include <cppuhelper/implbase.hxx>
#include <compbase2.hxx>
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 7f1255a5bb88..63ac35f589ca 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -25,7 +25,6 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/unload.h>
diff --git a/cppuhelper/source/servicemanager.cxx
b/cppuhelper/source/servicemanager.cxx
index 8e4984228c54..09273863097b 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -43,7 +43,6 @@
#include <o3tl/safeint.hxx>
#include <osl/file.hxx>
#include <osl/module.hxx>
-#include <osl/process.h>
#include <rtl/ref.hxx>
#include <rtl/uri.hxx>
#include <rtl/ustring.hxx>
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index c991ac4d75cf..5bbefd436833 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -37,7 +37,6 @@
#include <o3tl/environment.hxx>
#include <o3tl/string_view.hxx>
#include <osl/module.hxx>
-#include <osl/process.h>
#include <sal/log.hxx>
#include <uno/environment.hxx>
#include <uno/mapping.hxx>
diff --git a/cppuhelper/source/typemanager.cxx
b/cppuhelper/source/typemanager.cxx
index 2d48326e540b..0874e9d2395c 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -52,7 +52,6 @@
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
-#include <sal/macros.h>
#include <sal/types.h>
#include <o3tl/string_view.hxx>
diff --git a/cppuhelper/source/typemanager.hxx
b/cppuhelper/source/typemanager.hxx
index ab1dc4fdbe71..7e2aa4c2f337 100644
--- a/cppuhelper/source/typemanager.hxx
+++ b/cppuhelper/source/typemanager.hxx
@@ -16,10 +16,8 @@
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/container/XSet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/reflection/TypeDescriptionSearchDepth.hpp>
#include <com/sun/star/reflection/XTypeDescriptionEnumerationAccess.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
#include <compbase2.hxx>
#include <rtl/ref.hxx>
#include <sal/types.h>
diff --git a/cpputools/source/unoexe/unoexe.cxx
b/cpputools/source/unoexe/unoexe.cxx
index d4bedbf7f471..0ed543ba0335 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -25,7 +25,6 @@
#include <sal/log.hxx>
#include <o3tl/string_view.hxx>
#include <osl/diagnose.h>
-#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
#include <rtl/process.h>
