compilerplugins/clang/singlevalfields.results | 3
compilerplugins/clang/unusedvarsglobal.writeonly.results | 4
sal/IwyuFilter_sal.yaml | 21
++++
sal/qa/ByteSequence/ByteSequence.cxx | 1
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 1
sal/qa/osl/condition/osl_Condition.cxx | 10 +-
sal/qa/osl/condition/osl_Condition_Const.h | 47
----------
sal/qa/osl/file/osl_File.cxx | 6 -
sal/qa/osl/file/test_cpy_wrt_file.cxx | 2
sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx | 1
sal/qa/osl/module/osl_Module_DLL.cxx | 5 -
sal/qa/osl/mutex/osl_Mutex.cxx | 1
sal/qa/osl/pipe/osl_Pipe.cxx | 5 -
sal/qa/osl/process/osl_Thread.cxx | 5 -
sal/qa/osl/process/osl_process.cxx | 10 --
sal/qa/osl/process/osl_process_child.cxx | 1
sal/qa/osl/profile/osl_old_testprofile.cxx | 2
sal/qa/osl/security/osl_Security.cxx | 2
sal/qa/osl/setthreadname/test-setthreadname.cxx | 2
sal/qa/rtl/alloc/rtl_alloc.cxx | 2
sal/qa/rtl/bootstrap/expand.cxx | 1
sal/qa/rtl/cipher/rtl_cipher.cxx | 3
sal/qa/rtl/crc32/rtl_crc32.cxx | 1
sal/qa/rtl/digest/rtl_digest.cxx | 3
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 4
sal/qa/rtl/locale/rtl_locale.cxx | 1
sal/qa/rtl/math/test-rtl-math.cxx | 2
sal/qa/rtl/math/test-std-math.cxx | 7 -
sal/qa/rtl/ostring/rtl_str.cxx | 1
sal/qa/rtl/oustring/rtl_OUString2.cxx | 4
sal/qa/rtl/oustring/rtl_ustr.cxx | 1
sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx | 1
sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx | 1
sal/qa/rtl/process/rtl_Process.cxx | 2
sal/qa/rtl/random/rtl_random.cxx | 1
sal/qa/rtl/ref/rtl_ref.cxx | 2
sal/qa/rtl/strings/test_oustring_compare.cxx | 1
sal/qa/rtl/strings/test_oustring_startswith.cxx | 1
sal/qa/rtl/strings/test_oustring_stringliterals.cxx | 2
sal/qa/rtl/strings/test_strings_replace.cxx | 2
sal/qa/rtl/strings/test_strings_valuex.cxx | 1
sal/qa/rtl/textenc/rtl_tencinfo.cxx | 3
sal/qa/rtl/textenc/rtl_textcvt.cxx | 3
sal/qa/rtl/uri/rtl_Uri.cxx | 4
sal/qa/rtl/uri/rtl_testuri.cxx | 4
sal/qa/rtl/uuid/rtl_Uuid.cxx | 8 -
46 files changed, 34 insertions(+), 161 deletions(-)
New commits:
commit b2f7fa71af28c2095d42396306cf7818e9e73175
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Fri Aug 18 01:35:58 2023 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Aug 22 08:06:09 2023 +0200
tdf#146619 Remove unused includes from sal/qa
also drop now-unused osl_Condition_Const.h
Change-Id: I40beb5b1ad49c126a126bb444d5f66703664d56d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155820
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/compilerplugins/clang/singlevalfields.results
b/compilerplugins/clang/singlevalfields.results
index ca2067a31351..f625c11ff833 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -583,9 +583,6 @@ sal/osl/unx/signal.cxx:59
sal/osl/unx/sockimpl.hxx:39
oslSocketImpl m_bIsInShutdown
1
-sal/qa/osl/condition/osl_Condition_Const.h:41
- /home/noel/libo/sal/qa/osl/condition/osl_Condition.cxx aTestCon
- testcondition
sal/qa/osl/file/osl_File_Const.h:118
extern aPreURL
file:///
diff --git a/compilerplugins/clang/unusedvarsglobal.writeonly.results
b/compilerplugins/clang/unusedvarsglobal.writeonly.results
index 3e0bfbfd39f2..cf3e1e27bd0c 100644
--- a/compilerplugins/clang/unusedvarsglobal.writeonly.results
+++ b/compilerplugins/clang/unusedvarsglobal.writeonly.results
@@ -28,10 +28,6 @@ libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:62
gpointer gtv_lok_dialog_parent_class
sal/osl/unx/system.cxx:164
void *[3] dummy
-sal/qa/osl/condition/osl_Condition_Const.h:41
- OUString aTestCon
-sal/qa/osl/condition/osl_Condition_Const.h:43
- char[17] pTestString
sal/qa/osl/file/osl_File_Const.h:63
char[11] pBuffer_Number
sal/qa/osl/file/osl_File_Const.h:64
diff --git a/sal/IwyuFilter_sal.yaml b/sal/IwyuFilter_sal.yaml
index b3b5cfded82e..0bfa0a3d07a4 100644
--- a/sal/IwyuFilter_sal.yaml
+++ b/sal/IwyuFilter_sal.yaml
@@ -13,3 +13,24 @@ excludelist:
sal/android/uthash.h:
# needed for defines to work / somehow on Linux there is a warning about
android-related file
- string.h
+ sal/qa/osl/security/osl_Security.cxx:
+ # Needed on _WIN32
+ - o3tl/char16_t2wchar_t.hxx
+ sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx:
+ # Required in C++20 mode.
+ - o3tl/cppunittraitshelper.hxx
+ sal/qa/rtl/oustring/rtl_ustr.cxx:
+ # Required in C++20 mode.
+ - o3tl/cppunittraitshelper.hxx
+ sal/qa/rtl/oustring/rtl_OUString2.cxx:
+ # Required in C++20 mode.
+ - o3tl/cppunittraitshelper.hxx
+ sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx:
+ # Required in C++20 mode.
+ - o3tl/cppunittraitshelper.hxx
+ sal/qa/rtl/strings/test_oustring_stringliterals.cxx:
+ # Required in C++20 mode.
+ - o3tl/cppunittraitshelper.hxx
+ sal/qa/rtl/textenc/rtl_textcvt.cxx:
+ # Required in C++20 mode.
+ - o3tl/cppunittraitshelper.hxx
diff --git a/sal/qa/ByteSequence/ByteSequence.cxx
b/sal/qa/ByteSequence/ByteSequence.cxx
index f5541a0f3efe..350dd383a542 100644
--- a/sal/qa/ByteSequence/ByteSequence.cxx
+++ b/sal/qa/ByteSequence/ByteSequence.cxx
@@ -21,7 +21,6 @@
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/byteseq.hxx>
namespace {
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index 5b55d8a49936..0543db0112b3 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -25,7 +25,6 @@
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <string.h>
// This file contains cppunit tests for the
diff --git a/sal/qa/osl/condition/osl_Condition.cxx
b/sal/qa/osl/condition/osl_Condition.cxx
index 05b7fc661f6a..9bc15b92b6ef 100644
--- a/sal/qa/osl/condition/osl_Condition.cxx
+++ b/sal/qa/osl/condition/osl_Condition.cxx
@@ -17,8 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "osl_Condition_Const.h"
-#include <stdlib.h>
+#include <sal/types.h>
+#include <osl/thread.hxx>
+#include <osl/conditn.hxx>
+#include <osl/time.h>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
using namespace osl;
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h
b/sal/qa/osl/condition/osl_Condition_Const.h
deleted file mode 100644
index 89b26121ba88..000000000000
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SAL_QA_OSL_CONDITION_OSL_CONDITION_CONST_H
-#define INCLUDED_SAL_QA_OSL_CONDITION_OSL_CONDITION_CONST_H
-
-#include <sal/types.h>
-#include <rtl/ustring.hxx>
-#include <osl/thread.hxx>
-#include <osl/mutex.hxx>
-#include <osl/pipe.hxx>
-#include <osl/conditn.hxx>
-#include <osl/time.h>
-
-#ifdef UNX
-#include <unistd.h>
-#endif
-
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-
-// condition names
-
-OUString aTestCon("testcondition");
-
-const char pTestString[17] = "Sun Microsystems";
-
-#endif // INCLUDED_SAL_QA_OSL_CONDITION_OSL_CONDITION_CONST_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 93199e8bd2fa..cb38fb764cc9 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -20,17 +20,12 @@
#include <sal/types.h>
#include <rtl/byteseq.hxx>
#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/thread.h>
#include <osl/file.hxx>
#include "osl_File_Const.h"
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-
-#include <tools/urlobj.hxx>
#include <memory>
@@ -38,6 +33,7 @@
#include <prewin.h>
#include <postwin.h>
#include <o3tl/char16_t2wchar_t.hxx>
+#include <tools/urlobj.hxx>
#endif
using namespace osl;
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx
b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index 6843d10b362a..8a8b7226fe4e 100644
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
@@ -20,9 +20,7 @@
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <osl/file.hxx>
-#include <osl/thread.h>
#include <rtl/ustring.hxx>
using namespace osl;
diff --git
a/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx
b/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx
index 4fd5d6b16ffb..d4adff6531a5 100644
--- a/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx
+++ b/sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx
@@ -22,7 +22,6 @@
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <osl/file.hxx>
diff --git a/sal/qa/osl/module/osl_Module_DLL.cxx
b/sal/qa/osl/module/osl_Module_DLL.cxx
index 59f30b137a6f..9222e2ec4fbe 100644
--- a/sal/qa/osl/module/osl_Module_DLL.cxx
+++ b/sal/qa/osl/module/osl_Module_DLL.cxx
@@ -17,11 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "osl_Module_Const.h"
-
-#include <stdio.h>
#include <sal/types.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
// This module contains no tests. It is loaded as a dynamic library by
// osl_Module.
// But we instantiate a test plugin to fake the build process.
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index faa3c36b156c..440532d09bb0 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -23,7 +23,6 @@
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <osl/thread.hxx>
#include <osl/mutex.hxx>
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index eef77e998380..39c9e99864f6 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -23,18 +23,13 @@
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/ustring.hxx>
#include <osl/test/uniquepipename.hxx>
#include <osl/thread.hxx>
#include <osl/pipe.hxx>
-#include <osl/time.h>
-#ifdef UNX
-#include <unistd.h>
-#endif
#include <string.h>
using namespace osl;
diff --git a/sal/qa/osl/process/osl_Thread.cxx
b/sal/qa/osl/process/osl_Thread.cxx
index 3f62c6ea3e06..389894bbcd8a 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -23,16 +23,12 @@
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
-#else
-#include <unistd.h>
-#include <time.h>
#endif
// include files
#include <sal/types.h>
#include <rtl/string.hxx>
-#include <rtl/strbuf.hxx>
#include <osl/thread.hxx>
#include <osl/mutex.hxx>
#include <osl/time.h>
@@ -42,7 +38,6 @@
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#define t_print printf
diff --git a/sal/qa/osl/process/osl_process.cxx
b/sal/qa/osl/process/osl_process.cxx
index c396a06b5782..e648d2467984 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -24,16 +24,12 @@
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <osl/process.h>
#include <osl/file.hxx>
#include <osl/thread.h>
#include <rtl/ustring.hxx>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <osl/module.hxx>
#include <sal/macros.h>
@@ -43,15 +39,9 @@
#define RUNNING_ON_VALGRIND false
#endif
-#if !defined(_WIN32) // Windows
-#include <unistd.h>
-#endif
-
#include <iostream>
-#include <fstream>
#include <vector>
#include <algorithm>
-#include <iterator>
#include <string>
#ifdef UNX
diff --git a/sal/qa/osl/process/osl_process_child.cxx
b/sal/qa/osl/process/osl_process_child.cxx
index 17f749bc270c..ee260956b2ef 100644
--- a/sal/qa/osl/process/osl_process_child.cxx
+++ b/sal/qa/osl/process/osl_process_child.cxx
@@ -24,7 +24,6 @@
# include <unistd.h>
#endif
-#include <stdio.h>
#include <stdlib.h>
#include <fstream>
#include <string.h>
diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx
b/sal/qa/osl/profile/osl_old_testprofile.cxx
index d1556bb157ae..6d44ebde4c7f 100644
--- a/sal/qa/osl/profile/osl_old_testprofile.cxx
+++ b/sal/qa/osl/profile/osl_old_testprofile.cxx
@@ -17,11 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sal/types.h>
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <osl/profile.h>
#include <rtl/bootstrap.hxx>
diff --git a/sal/qa/osl/security/osl_Security.cxx
b/sal/qa/osl/security/osl_Security.cxx
index 34417cd146fd..3c0764014b67 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <algorithm>
#ifdef _WIN32
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
@@ -29,7 +28,6 @@
#include "osl_Security_Const.h"
#include <osl/thread.h>
#include <rtl/process.h>
-#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
diff --git a/sal/qa/osl/setthreadname/test-setthreadname.cxx
b/sal/qa/osl/setthreadname/test-setthreadname.cxx
index 9af8793eb1c2..d33a0eddda9d 100644
--- a/sal/qa/osl/setthreadname/test-setthreadname.cxx
+++ b/sal/qa/osl/setthreadname/test-setthreadname.cxx
@@ -22,10 +22,8 @@
#include <limits>
#include <sal/types.h>
-#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <osl/thread.hxx>
namespace {
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index 419a3f3b03ca..39d2b95f030a 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -26,8 +26,6 @@
#include "../../../rtl/strimp.hxx"
-#include <memory.h>
-
namespace rtl_alloc
{
diff --git a/sal/qa/rtl/bootstrap/expand.cxx b/sal/qa/rtl/bootstrap/expand.cxx
index e9799c15f37c..46ea08b331c6 100644
--- a/sal/qa/rtl/bootstrap/expand.cxx
+++ b/sal/qa/rtl/bootstrap/expand.cxx
@@ -12,7 +12,6 @@
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/bootstrap.hxx>
#include <rtl/ustring.hxx>
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index 1f6852184b43..55bbd47b006f 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -22,10 +22,9 @@
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-#include <rtl/strbuf.hxx>
#include <rtl/cipher.h>
+#include <rtl/string.hxx>
namespace rtl_cipher
{
diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx
index 00933b5890bc..34b900f8555b 100644
--- a/sal/qa/rtl/crc32/rtl_crc32.cxx
+++ b/sal/qa/rtl/crc32/rtl_crc32.cxx
@@ -20,7 +20,6 @@
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/crc.h>
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index 4bf0512a0968..f62e951a7295 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -21,15 +21,12 @@
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <memory>
#include <string_view>
#include <rtl/digest.h>
#include <rtl/string.h>
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>
#include <string.h>
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index ef639423d774..0e2dd77cdcc5 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -30,16 +30,12 @@
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#ifdef _WIN32
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
-#else
-#include <unistd.h>
-#include <time.h>
#endif
#define CONST_TEST_STRING "gregorian"
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index f1b4e12ee4b7..4d8e1d63d3e4 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -23,7 +23,6 @@
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
namespace rtl_locale
{
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx
b/sal/qa/rtl/math/test-rtl-math.cxx
index 05879d567760..d6851b76aafa 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -21,9 +21,7 @@
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/math.hxx>
-#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
#include <limits>
diff --git a/sal/qa/rtl/math/test-std-math.cxx
b/sal/qa/rtl/math/test-std-math.cxx
index 214e1c792dbe..b56144c95e21 100644
--- a/sal/qa/rtl/math/test-std-math.cxx
+++ b/sal/qa/rtl/math/test-std-math.cxx
@@ -17,15 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sal/types.h>
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/math.hxx>
-#include <rtl/ustring.h>
-#include <rtl/ustring.hxx>
-#include <limits>
#include <cmath>
/*
@@ -192,4 +187,4 @@ public:
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx
index f7af2200833f..9024fe491f1d 100644
--- a/sal/qa/rtl/ostring/rtl_str.cxx
+++ b/sal/qa/rtl/ostring/rtl_str.cxx
@@ -20,7 +20,6 @@
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/string.hxx>
#include <cstring>
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx
b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 1340b262642b..b633af15626c 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -23,12 +23,8 @@
#include <math.h>
#include <stdio.h>
-#include <algorithm>
-#include <limits>
-
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <config_options.h>
#include <o3tl/cppunittraitshelper.hxx>
diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx
index f5c405dfd948..9ef70516a756 100644
--- a/sal/qa/rtl/oustring/rtl_ustr.cxx
+++ b/sal/qa/rtl/oustring/rtl_ustr.cxx
@@ -24,7 +24,6 @@
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
namespace rtl_ustr
{
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
index d942480d1748..7de2eb54ac43 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/TestAssert.h>
#include <cppunit/extensions/HelperMacros.h>
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
index 764b03d8c220..6134bc20195a 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
@@ -23,7 +23,6 @@
#include <cppunit/extensions/HelperMacros.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
namespace test::oustringbuffer {
diff --git a/sal/qa/rtl/process/rtl_Process.cxx
b/sal/qa/rtl/process/rtl_Process.cxx
index 346e31436dd4..4895035bf185 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -18,14 +18,12 @@
*/
#include <memory>
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx
index 4987b5a0c372..fb4be759a578 100644
--- a/sal/qa/rtl/random/rtl_random.cxx
+++ b/sal/qa/rtl/random/rtl_random.cxx
@@ -24,7 +24,6 @@
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#include <rtl/random.h>
diff --git a/sal/qa/rtl/ref/rtl_ref.cxx b/sal/qa/rtl/ref/rtl_ref.cxx
index 2bf7c9803f3d..388aa1e26ed4 100644
--- a/sal/qa/rtl/ref/rtl_ref.cxx
+++ b/sal/qa/rtl/ref/rtl_ref.cxx
@@ -8,10 +8,8 @@
*/
#include <rtl/ref.hxx>
-#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
namespace rtl_ref
{
diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx
b/sal/qa/rtl/strings/test_oustring_compare.cxx
index 1eaf9dd5eba4..65c29faa6d18 100644
--- a/sal/qa/rtl/strings/test_oustring_compare.cxx
+++ b/sal/qa/rtl/strings/test_oustring_compare.cxx
@@ -20,7 +20,6 @@
#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <rtl/string.h>
#include <rtl/ustring.hxx>
namespace test::oustring {
diff --git a/sal/qa/rtl/strings/test_oustring_startswith.cxx
b/sal/qa/rtl/strings/test_oustring_startswith.cxx
index a74671e6eef1..08bc64bcf5d9 100644
--- a/sal/qa/rtl/strings/test_oustring_startswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_startswith.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <sal/types.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <rtl/ustring.hxx>
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 6c653f118935..d530e2e65a18 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -18,10 +18,8 @@
#include <o3tl/cppunittraitshelper.hxx>
#include <sal/types.h>
-#include <config_global.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <rtl/string.h>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/sal/qa/rtl/strings/test_strings_replace.cxx
b/sal/qa/rtl/strings/test_strings_replace.cxx
index 3be6e176ad41..72e30db34df9 100644
--- a/sal/qa/rtl/strings/test_strings_replace.cxx
+++ b/sal/qa/rtl/strings/test_strings_replace.cxx
@@ -13,9 +13,7 @@
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <rtl/string.h>
#include <rtl/string.hxx>
-#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
namespace {
diff --git a/sal/qa/rtl/strings/test_strings_valuex.cxx
b/sal/qa/rtl/strings/test_strings_valuex.cxx
index 953cf8b68efb..5761c267e7b5 100644
--- a/sal/qa/rtl/strings/test_strings_valuex.cxx
+++ b/sal/qa/rtl/strings/test_strings_valuex.cxx
@@ -11,7 +11,6 @@
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <rtl/ustring.hxx>
-#include <iostream>
namespace test::strings {
diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
index 88da153ae9ed..123b8f12325f 100644
--- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
+++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
@@ -19,13 +19,10 @@
#include <config_locales.h>
-#include <string.h>
-
#include <rtl/tencinfo.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
namespace
{
diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx
b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index e64dbd4c5e03..37ba5e658462 100644
--- a/sal/qa/rtl/textenc/rtl_textcvt.cxx
+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx
@@ -21,9 +21,6 @@
#include <sal/config.h>
-#include <cstddef>
-#include <cstring>
-
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 1084926c65bb..8e91e848e5a7 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -17,15 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <stdlib.h>
-#include <rtl/strbuf.hxx>
#include <rtl/uri.hxx>
#include <osl/thread.h>
-#include <osl/file.hxx>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
namespace Stringtest
{
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index 3b119820aea9..0b529112adea 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -19,15 +19,11 @@
#include <config_locales.h>
-#include <rtl/strbuf.hxx>
#include <rtl/uri.hxx>
-#include <rtl/ustrbuf.hxx>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-#include <cstddef>
#include <stdio.h>
namespace {
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index aae77cfe32a4..e7b524db89fb 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -17,25 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <math.h>
-#include <stdio.h>
#include <string.h>
#include <rtl/uuid.h>
-#include <rtl/ustring.h>
-#include <rtl/ustring.hxx>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
#ifdef _WIN32
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
-#elif defined UNX
-#include <unistd.h>
-#include <time.h>
#endif
