vcl/IwyuFilter_vcl.yaml | 6 ++++++
vcl/qa/cppunit/BitmapTest.cxx | 4 ----
vcl/qa/cppunit/BmpFilterTest.cxx | 1 -
vcl/qa/cppunit/FontFeatureTest.cxx | 1 -
vcl/qa/cppunit/GraphicDescriptorTest.cxx | 1 -
vcl/qa/cppunit/GraphicMemoryTest.cxx | 2 --
vcl/qa/cppunit/GraphicTest.cxx | 5 -----
vcl/qa/cppunit/TypeSerializerTest.cxx | 1 -
vcl/qa/cppunit/VectorGraphicSearchTest.cxx | 2 --
vcl/qa/cppunit/XpmFilterTest.cxx | 1 -
vcl/qa/cppunit/blocklistparsertest.cxx | 1 -
vcl/qa/cppunit/cjktext.cxx | 4 ----
vcl/qa/cppunit/complextext.cxx | 5 -----
vcl/qa/cppunit/drawmode.cxx | 1 -
vcl/qa/cppunit/filter/ipdf/ipdf.cxx | 1 -
vcl/qa/cppunit/font/TTFStructureTest.cxx | 1 -
vcl/qa/cppunit/fontmocks.hxx | 1 -
vcl/qa/cppunit/gradient.cxx | 17 -----------------
vcl/qa/cppunit/graphicfilter/filters-dxf-test.cxx | 1 -
vcl/qa/cppunit/graphicfilter/filters-eps-test.cxx | 1 -
vcl/qa/cppunit/graphicfilter/filters-met-test.cxx | 1 -
vcl/qa/cppunit/graphicfilter/filters-pcd-test.cxx | 1 -
vcl/qa/cppunit/graphicfilter/filters-pcx-test.cxx | 1 -
vcl/qa/cppunit/graphicfilter/filters-pict-test.cxx | 1 -
vcl/qa/cppunit/graphicfilter/filters-ppm-test.cxx | 1 -
vcl/qa/cppunit/graphicfilter/filters-psd-test.cxx | 1 -
vcl/qa/cppunit/graphicfilter/filters-ras-test.cxx | 1 -
vcl/qa/cppunit/graphicfilter/filters-tga-test.cxx | 1 -
vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx | 1 -
vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx | 1 -
vcl/qa/cppunit/lifecycle.cxx | 2 --
vcl/qa/cppunit/logicalfontinstance.cxx | 2 --
vcl/qa/cppunit/outdev.cxx | 1 -
vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx | 5 -----
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 1 -
vcl/qa/cppunit/physicalfontcollection.cxx | 2 --
vcl/qa/cppunit/physicalfontfacecollection.cxx | 6 +-----
vcl/qa/cppunit/physicalfontfamily.cxx | 3 ---
vcl/qa/cppunit/skia/skia.cxx | 2 --
vcl/qa/cppunit/svm/svmtest.cxx | 2 --
vcl/qa/cppunit/text.cxx | 3 ---
vcl/qa/cppunit/textlayout.cxx | 1 -
42 files changed, 7 insertions(+), 90 deletions(-)
New commits:
commit 4511e8b9c9715f7edcb5e101ec09f309378d993e
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Thu May 29 20:30:34 2025 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Mon Jun 2 13:01:58 2025 +0200
tdf#146619 Remove unused headers from vcl/qa
Change-Id: I029761651a247efdaa9a41fb1ba0f0089846664a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186070
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Tested-by: Jenkins
diff --git a/vcl/IwyuFilter_vcl.yaml b/vcl/IwyuFilter_vcl.yaml
index c9811f0759c7..28f96567caf8 100644
--- a/vcl/IwyuFilter_vcl.yaml
+++ b/vcl/IwyuFilter_vcl.yaml
@@ -21,6 +21,12 @@ excludelist:
vcl/inc/svsys.h:
# Needed for nice system abstraction
- unx/svsys.h
+ vcl/qa/cppunit/lifecycle.cxx:
+ # Needed for template
+ - com/sun/star/awt/XVclWindowPeer.hpp
+ vcl/qa/cppunit/mnemonic.cxx:
+ # Required in C++20 mode.
+ - o3tl/cppunittraitshelper.hxx
vcl/qa/cppunit/outdev.cxx:
# Needed for direct member access
- basegfx/matrix/b2dhommatrix.hxx
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index 2a1249f40b10..0534718ed14b 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -11,10 +11,6 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
-#include <config_features.h>
-
-#include <rtl/strbuf.hxx>
-
#include <vcl/BitmapTools.hxx>
#include <vcl/BitmapWriteAccess.hxx>
#include <vcl/bitmap/BitmapMonochromeFilter.hxx>
diff --git a/vcl/qa/cppunit/BmpFilterTest.cxx b/vcl/qa/cppunit/BmpFilterTest.cxx
index 3669f99071e3..f591c39d93a9 100644
--- a/vcl/qa/cppunit/BmpFilterTest.cxx
+++ b/vcl/qa/cppunit/BmpFilterTest.cxx
@@ -12,7 +12,6 @@
#include <vcl/bitmapex.hxx>
#include <tools/stream.hxx>
#include <filter/BmpReader.hxx>
-#include <unotools/tempfile.hxx>
class BmpFilterTest : public test::BootstrapFixture
{
diff --git a/vcl/qa/cppunit/FontFeatureTest.cxx
b/vcl/qa/cppunit/FontFeatureTest.cxx
index 51fc9e24b114..f7a2321ab47c 100644
--- a/vcl/qa/cppunit/FontFeatureTest.cxx
+++ b/vcl/qa/cppunit/FontFeatureTest.cxx
@@ -8,7 +8,6 @@
*/
#include <test/bootstrapfixture.hxx>
-#include <config_features.h>
#include <config_fonts.h>
#include <cppunit/TestAssert.h>
diff --git a/vcl/qa/cppunit/GraphicDescriptorTest.cxx
b/vcl/qa/cppunit/GraphicDescriptorTest.cxx
index a0bbd027160b..db8cfb22ca84 100644
--- a/vcl/qa/cppunit/GraphicDescriptorTest.cxx
+++ b/vcl/qa/cppunit/GraphicDescriptorTest.cxx
@@ -10,7 +10,6 @@
#include <unotest/bootstrapfixturebase.hxx>
#include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/vcl/qa/cppunit/GraphicMemoryTest.cxx
b/vcl/qa/cppunit/GraphicMemoryTest.cxx
index 80c8619508fe..b80cc4dd30e0 100644
--- a/vcl/qa/cppunit/GraphicMemoryTest.cxx
+++ b/vcl/qa/cppunit/GraphicMemoryTest.cxx
@@ -11,13 +11,11 @@
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <vcl/BitmapReadAccess.hxx>
#include <vcl/graph.hxx>
#include <vcl/graphicfilter.hxx>
#include <tools/stream.hxx>
#include <impgraph.hxx>
-#include <graphic/GraphicFormatDetector.hxx>
#include <graphic/MemoryManaged.hxx>
using namespace css;
diff --git a/vcl/qa/cppunit/GraphicTest.cxx b/vcl/qa/cppunit/GraphicTest.cxx
index 51c619ee4765..0c25c5030367 100644
--- a/vcl/qa/cppunit/GraphicTest.cxx
+++ b/vcl/qa/cppunit/GraphicTest.cxx
@@ -9,10 +9,8 @@
#include <sal/config.h>
#include <config_oox.h>
-#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/graphic/XGraphicTransformer.hpp>
#include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <test/bootstrapfixture.hxx>
@@ -24,11 +22,8 @@
#include <vcl/graphicfilter.hxx>
#include <tools/stream.hxx>
#include <unotest/directories.hxx>
-#include <comphelper/DirectoryHelper.hxx>
#include <comphelper/hash.hxx>
-#include <unotools/ucbstreamhelper.hxx>
#include <unotools/tempfile.hxx>
-#include <vcl/cvtgrf.hxx>
#include <vcl/metaact.hxx>
#include <vcl/wmf.hxx>
diff --git a/vcl/qa/cppunit/TypeSerializerTest.cxx
b/vcl/qa/cppunit/TypeSerializerTest.cxx
index b27f1c3c822a..878e5069ac25 100644
--- a/vcl/qa/cppunit/TypeSerializerTest.cxx
+++ b/vcl/qa/cppunit/TypeSerializerTest.cxx
@@ -9,7 +9,6 @@
#include <sal/config.h>
#include <config_oox.h>
-#include <config_features.h>
#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
diff --git a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
index 7b72d5e273d2..53954a778b43 100644
--- a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
+++ b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
@@ -7,8 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <config_features.h>
-
#include <string_view>
#include <cppunit/TestAssert.h>
diff --git a/vcl/qa/cppunit/XpmFilterTest.cxx b/vcl/qa/cppunit/XpmFilterTest.cxx
index 273dda165248..75ad118a1808 100644
--- a/vcl/qa/cppunit/XpmFilterTest.cxx
+++ b/vcl/qa/cppunit/XpmFilterTest.cxx
@@ -13,7 +13,6 @@
#include <vcl/filter/ImportOutput.hxx>
#include <tools/stream.hxx>
#include <filter/XpmReader.hxx>
-#include <unotools/tempfile.hxx>
class XpmFilterTest : public test::BootstrapFixture
{
diff --git a/vcl/qa/cppunit/blocklistparsertest.cxx
b/vcl/qa/cppunit/blocklistparsertest.cxx
index d0592f33c975..8533db4bd85c 100644
--- a/vcl/qa/cppunit/blocklistparsertest.cxx
+++ b/vcl/qa/cppunit/blocklistparsertest.cxx
@@ -10,7 +10,6 @@
#include <sal/types.h>
#include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
diff --git a/vcl/qa/cppunit/cjktext.cxx b/vcl/qa/cppunit/cjktext.cxx
index 0a326de5a068..847928c0d8e0 100644
--- a/vcl/qa/cppunit/cjktext.cxx
+++ b/vcl/qa/cppunit/cjktext.cxx
@@ -16,12 +16,8 @@
#include <vcl/BitmapReadAccess.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/graphicfilter.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
-#include <ImplLayoutArgs.hxx>
-#include <TextLayoutCache.hxx>
#include <salgdi.hxx>
class VclCjkTextTest : public test::BootstrapFixture
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index c8a9e6e7c3cd..e344c7720bcf 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <config_features.h>
#include <config_fonts.h>
#include <ostream>
@@ -22,15 +21,11 @@ static std::ostream& operator<<(std::ostream& rStream,
const std::vector<double>
#endif
#include <test/bootstrapfixture.hxx>
-#include <vcl/wrkwin.hxx>
#include <vcl/virdev.hxx>
// workaround MSVC2015 issue with std::unique_ptr
#include <sallayout.hxx>
-#include <salgdi.hxx>
-#include <ImplLayoutArgs.hxx>
-
#if HAVE_MORE_FONTS
static std::ostream& operator<<(std::ostream& rStream, const
std::vector<sal_Int32>& rVec)
{
diff --git a/vcl/qa/cppunit/drawmode.cxx b/vcl/qa/cppunit/drawmode.cxx
index 762816f7e801..905a9fca2c06 100644
--- a/vcl/qa/cppunit/drawmode.cxx
+++ b/vcl/qa/cppunit/drawmode.cxx
@@ -13,7 +13,6 @@
#include <tools/color.hxx>
#include <vcl/font.hxx>
-#include <vcl/metric.hxx>
#include <vcl/settings.hxx>
#include <vcl/BitmapWriteAccess.hxx>
diff --git a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
index 243687dad00b..fdd3e75a3dcf 100644
--- a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
+++ b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx
@@ -17,7 +17,6 @@
#include <comphelper/propertyvalue.hxx>
#include <unotools/tempfile.hxx>
#include <sfx2/sfxbasemodel.hxx>
-#include <svx/svdview.hxx>
#include <sfx2/viewsh.hxx>
#include <svx/signaturelinehelper.hxx>
#include <sfx2/objsh.hxx>
diff --git a/vcl/qa/cppunit/font/TTFStructureTest.cxx
b/vcl/qa/cppunit/font/TTFStructureTest.cxx
index c644614244e8..a41e5b2b3551 100644
--- a/vcl/qa/cppunit/font/TTFStructureTest.cxx
+++ b/vcl/qa/cppunit/font/TTFStructureTest.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/bootstrapfixture.hxx>
#include <test/unoapi_test.hxx>
#include <font/TTFStructure.hxx>
diff --git a/vcl/qa/cppunit/fontmocks.hxx b/vcl/qa/cppunit/fontmocks.hxx
index 8eac463c143f..162f66971cee 100644
--- a/vcl/qa/cppunit/fontmocks.hxx
+++ b/vcl/qa/cppunit/fontmocks.hxx
@@ -13,7 +13,6 @@
#include <font/FontSelectPattern.hxx>
#include <font/PhysicalFontFace.hxx>
-#include <font/PhysicalFontFaceCollection.hxx>
#include <fontattributes.hxx>
#include <font/LogicalFontInstance.hxx>
diff --git a/vcl/qa/cppunit/gradient.cxx b/vcl/qa/cppunit/gradient.cxx
index 4af26d0be5d1..989037b081a4 100644
--- a/vcl/qa/cppunit/gradient.cxx
+++ b/vcl/qa/cppunit/gradient.cxx
@@ -8,28 +8,11 @@
*/
#include <test/bootstrapfixture.hxx>
-#include <test/outputdevice.hxx>
-
-#include <sal/log.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/numeric/ftools.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/vector/b2enums.hxx>
#include <vcl/gradient.hxx>
-#include <vcl/lineinfo.hxx>
-#include <vcl/print.hxx>
-#include <vcl/rendercontext/RasterOp.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/window.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
-#include <vcl/BitmapWriteAccess.hxx>
-#include <bufferdevice.hxx>
-#include <window.h>
-
class VclGradientTest : public test::BootstrapFixture
{
public:
diff --git a/vcl/qa/cppunit/graphicfilter/filters-dxf-test.cxx
b/vcl/qa/cppunit/graphicfilter/filters-dxf-test.cxx
index 7cccf1f41294..9da6c7ef6111 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-dxf-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-dxf-test.cxx
@@ -9,7 +9,6 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/filter/ImportOutput.hxx>
#include <filter/DxfReader.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-eps-test.cxx
b/vcl/qa/cppunit/graphicfilter/filters-eps-test.cxx
index 34d7bab5d43d..f00a844a904c 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-eps-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-eps-test.cxx
@@ -9,7 +9,6 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
#include <filter/EpsReader.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-met-test.cxx
b/vcl/qa/cppunit/graphicfilter/filters-met-test.cxx
index f4336c659c64..82045f8cd14b 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-met-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-met-test.cxx
@@ -9,7 +9,6 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/filter/ImportOutput.hxx>
#include <filter/MetReader.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-pcd-test.cxx
b/vcl/qa/cppunit/graphicfilter/filters-pcd-test.cxx
index 5aa55604207a..bbd367b92990 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-pcd-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-pcd-test.cxx
@@ -9,7 +9,6 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/filter/ImportOutput.hxx>
#include <filter/PcdReader.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-pcx-test.cxx
b/vcl/qa/cppunit/graphicfilter/filters-pcx-test.cxx
index 901ba1839ed6..39feeb1f76b0 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-pcx-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-pcx-test.cxx
@@ -9,7 +9,6 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/filter/ImportOutput.hxx>
#include <filter/PcxReader.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-pict-test.cxx
b/vcl/qa/cppunit/graphicfilter/filters-pict-test.cxx
index a17232389639..8ac8adbadee2 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-pict-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-pict-test.cxx
@@ -9,7 +9,6 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
#include <test/xmltesttools.hxx>
#include <tools/stream.hxx>
#include <vcl/gdimtf.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-ppm-test.cxx
b/vcl/qa/cppunit/graphicfilter/filters-ppm-test.cxx
index 1d5c3751049f..2d7ddcd0b01f 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-ppm-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-ppm-test.cxx
@@ -9,7 +9,6 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/filter/ImportOutput.hxx>
#include <filter/PbmReader.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-psd-test.cxx
b/vcl/qa/cppunit/graphicfilter/filters-psd-test.cxx
index bf181f811e76..c33efd79a9ef 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-psd-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-psd-test.cxx
@@ -9,7 +9,6 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-ras-test.cxx
b/vcl/qa/cppunit/graphicfilter/filters-ras-test.cxx
index d986c7d0dbf1..f44a03efea3b 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-ras-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-ras-test.cxx
@@ -9,7 +9,6 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
#include <filter/RasReader.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-tga-test.cxx
b/vcl/qa/cppunit/graphicfilter/filters-tga-test.cxx
index 9b00ab314e01..e5547d70682d 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-tga-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-tga-test.cxx
@@ -9,7 +9,6 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/filter/ImportOutput.hxx>
#include <filter/TgaReader.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
index 0f96717c7a1c..982889e1d03b 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
@@ -9,7 +9,6 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
index 0bdf908ad059..8889442b8502 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
@@ -9,7 +9,6 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <vcl/FilterConfigItem.hxx>
#include <vcl/BitmapWriteAccess.hxx>
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index 72aa8aadc5df..de5aeb64d65e 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -16,9 +16,7 @@
#include <vcl/toolkit/dialog.hxx>
#include <vcl/toolkit/field.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/tabctrl.hxx>
#include <vcl/layout.hxx>
-#include <vcl/scheduler.hxx>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <com/sun/star/lang/XComponent.hpp>
diff --git a/vcl/qa/cppunit/logicalfontinstance.cxx
b/vcl/qa/cppunit/logicalfontinstance.cxx
index a25bbfc174dd..9aa0d9269141 100644
--- a/vcl/qa/cppunit/logicalfontinstance.cxx
+++ b/vcl/qa/cppunit/logicalfontinstance.cxx
@@ -17,8 +17,6 @@
#include <font/LogicalFontInstance.hxx>
-#include <memory>
-
class VclLogicalFontInstanceTest : public test::BootstrapFixture
{
public:
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 678189f1912e..4925209ba2a3 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -11,7 +11,6 @@
#include <test/bootstrapfixture.hxx>
#include <test/outputdevice.hxx>
-#include <sal/log.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx
b/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx
index 1ef7e156ccd5..fbdb3b7a21b1 100644
--- a/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx
+++ b/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx
@@ -11,25 +11,20 @@
#include <config_oox.h>
#include <test/unoapi_test.hxx>
-#include <o3tl/string_view.hxx>
#include <o3tl/numeric.hxx>
#include <unotools/mediadescriptor.hxx>
#include <comphelper/crypto/Crypto.hxx>
#include <comphelper/hash.hxx>
-#include <comphelper/random.hxx>
#include <comphelper/propertysequence.hxx>
-#include <comphelper/propertyvalue.hxx>
#include <vcl/filter/PDFiumLibrary.hxx>
-#include <vcl/pdfread.hxx>
#include <com/sun/star/frame/XStorable.hpp>
#include <algorithm>
#include <memory>
#include <string_view>
-#include <cmath>
#include <pdf/PDFEncryptorR6.hxx>
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 975b3ae743f4..07f42e6b03c7 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -23,7 +23,6 @@
#include <vcl/filter/pdfdocument.hxx>
#include <tools/zcodec.hxx>
#include <o3tl/string_view.hxx>
-#include <officecfg/Office/Common.hxx>
#include <vcl/filter/PDFiumLibrary.hxx>
diff --git a/vcl/qa/cppunit/physicalfontcollection.cxx
b/vcl/qa/cppunit/physicalfontcollection.cxx
index 01c0e4f1086f..cd685cdda85d 100644
--- a/vcl/qa/cppunit/physicalfontcollection.cxx
+++ b/vcl/qa/cppunit/physicalfontcollection.cxx
@@ -17,8 +17,6 @@
#include "fontmocks.hxx"
-#include <memory>
-
constexpr int FONTID = 1;
class VclPhysicalFontCollectionTest : public test::BootstrapFixture
diff --git a/vcl/qa/cppunit/physicalfontfacecollection.cxx
b/vcl/qa/cppunit/physicalfontfacecollection.cxx
index 358a5b99436b..b83f9c18a29f 100644
--- a/vcl/qa/cppunit/physicalfontfacecollection.cxx
+++ b/vcl/qa/cppunit/physicalfontfacecollection.cxx
@@ -13,12 +13,8 @@
#include <cppunit/TestAssert.h>
#include <rtl/ref.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-
-#include <vcl/fontcapabilities.hxx>
-#include <vcl/fontcharmap.hxx>
-#include <vcl/virdev.hxx>
+#include <font/PhysicalFontFaceCollection.hxx>
#include "fontmocks.hxx"
class VclPhysicalFontFaceCollectionTest : public test::BootstrapFixture
diff --git a/vcl/qa/cppunit/physicalfontfamily.cxx
b/vcl/qa/cppunit/physicalfontfamily.cxx
index b6763d7226e8..15f024527ce8 100644
--- a/vcl/qa/cppunit/physicalfontfamily.cxx
+++ b/vcl/qa/cppunit/physicalfontfamily.cxx
@@ -14,9 +14,6 @@
#include <tools/fontenum.hxx>
#include <unotools/fontcfg.hxx>
-#include <o3tl/sorted_vector.hxx>
-
-#include <vcl/virdev.hxx>
#include <font/PhysicalFontFamily.hxx>
diff --git a/vcl/qa/cppunit/skia/skia.cxx b/vcl/qa/cppunit/skia/skia.cxx
index 66999e740055..fbe3899cb4f8 100644
--- a/vcl/qa/cppunit/skia/skia.cxx
+++ b/vcl/qa/cppunit/skia/skia.cxx
@@ -9,10 +9,8 @@
#include <test/bootstrapfixture.hxx>
-#include <tools/stream.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <vcl/graphicfilter.hxx>
#include <vcl/virdev.hxx>
#include <vcl/skia/SkiaHelper.hxx>
diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index 1d630d73d4f9..672ec07c7aac 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -25,14 +25,12 @@
#include <vcl/metaact.hxx>
#include <vcl/filter/SvmReader.hxx>
#include <vcl/filter/SvmWriter.hxx>
-#include <salhelper/simplereferenceobject.hxx>
#include <sal/log.hxx>
#include <vcl/BitmapWriteAccess.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <config_features.h>
#include <config_cairo_rgba.h>
#include <config_fonts.h>
#include <vcl/skia/SkiaHelper.hxx>
diff --git a/vcl/qa/cppunit/text.cxx b/vcl/qa/cppunit/text.cxx
index f417b574fee8..89b9a4a1b1d3 100644
--- a/vcl/qa/cppunit/text.cxx
+++ b/vcl/qa/cppunit/text.cxx
@@ -10,14 +10,11 @@
#include <osl/file.hxx>
#include <osl/process.h>
#include <test/bootstrapfixture.hxx>
-#include <sal/log.hxx>
#include <tools/stream.hxx>
#include <vcl/BitmapReadAccess.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/graphicfilter.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
#include <ImplLayoutArgs.hxx>
diff --git a/vcl/qa/cppunit/textlayout.cxx b/vcl/qa/cppunit/textlayout.cxx
index 1274eb24a181..589fd6feaa77 100644
--- a/vcl/qa/cppunit/textlayout.cxx
+++ b/vcl/qa/cppunit/textlayout.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <config_features.h>
#include <config_fonts.h>
#include <test/bootstrapfixture.hxx>
