3 files changed, 14 insertions, 17 deletions
diff --git a/vcl/qa/cppunit/BitmapFilterTest.cxx b/vcl/qa/cppunit/BitmapFilterTest.cxx
index c34b121e4959..9a7c00a1d0fa 100644
--- a/vcl/qa/cppunit/BitmapFilterTest.cxx
+++ b/vcl/qa/cppunit/BitmapFilterTest.cxx
@@ -9,21 +9,20 @@
 
 #include <test/bootstrapfixture.hxx>
 
-#include <vcl/bitmap.hxx>
-#include <vcl/BitmapWriteAccess.hxx>
-
 #include <tools/stream.hxx>
+
+#include <vcl/BitmapWriteAccess.hxx>
+#include <vcl/bitmap/BitmapAlphaClampFilter.hxx>
+#include <vcl/bitmap/BitmapArithmeticBlendFilter.hxx>
+#include <vcl/bitmap/BitmapDarkenBlendFilter.hxx>
+#include <vcl/bitmap/BitmapLightenBlendFilter.hxx>
+#include <vcl/bitmap/BitmapMultiplyBlendFilter.hxx>
+#include <vcl/bitmap/BitmapNormalBlendFilter.hxx>
+#include <vcl/bitmap/BitmapScreenBlendFilter.hxx>
+#include <vcl/bitmap/BitmapBasicMorphologyFilter.hxx>
+#include <vcl/bitmap/BitmapFilterStackBlur.hxx>
 #include <vcl/graphicfilter.hxx>
 
-#include <vcl/BitmapAlphaClampFilter.hxx>
-#include <vcl/BitmapArithmeticBlendFilter.hxx>
-#include <vcl/BitmapDarkenBlendFilter.hxx>
-#include <vcl/BitmapLightenBlendFilter.hxx>
-#include <vcl/BitmapMultiplyBlendFilter.hxx>
-#include <vcl/BitmapNormalBlendFilter.hxx>
-#include <vcl/BitmapScreenBlendFilter.hxx>
-#include <vcl/BitmapBasicMorphologyFilter.hxx>
-#include <vcl/BitmapFilterStackBlur.hxx>
 #include <BitmapSymmetryCheck.hxx>
 
 #include <chrono>
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index e00f2e0dc873..2a1249f40b10 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -16,12 +16,11 @@
 #include <rtl/strbuf.hxx>
 
 #include <vcl/BitmapTools.hxx>
-#include <vcl/bitmap.hxx>
+#include <vcl/BitmapWriteAccess.hxx>
+#include <vcl/bitmap/BitmapMonochromeFilter.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
-#include <vcl/BitmapMonochromeFilter.hxx>
 
-#include <vcl/BitmapWriteAccess.hxx>
 #include <bitmap/Octree.hxx>
 #include <salinst.hxx>
 #include <svdata.hxx>
diff --git a/vcl/qa/cppunit/png/PngFilterTest.cxx b/vcl/qa/cppunit/png/PngFilterTest.cxx
index b9160d1602f7..8d979d393c91 100644
--- a/vcl/qa/cppunit/png/PngFilterTest.cxx
+++ b/vcl/qa/cppunit/png/PngFilterTest.cxx
@@ -25,8 +25,7 @@
 #include <tools/stream.hxx>
 #include <vcl/filter/PngImageReader.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
-#include <vcl/BitmapReadAccess.hxx>
-#include <vcl/BitmapMonochromeFilter.hxx>
+#include <vcl/bitmap/BitmapMonochromeFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/graphicfilter.hxx>