diff --git a/compilerplugins/clang/checkunusedparams.cxx b/compilerplugins/clang/checkunusedparams.cxx
index fac2a08d3249..fa930ba959c8 100644
--- a/compilerplugins/clang/checkunusedparams.cxx
+++ b/compilerplugins/clang/checkunusedparams.cxx
@@ -216,7 +216,7 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) {
     if (loplugin::isSamePathname(fn, SRCDIR "/include/vcl/svmain.hxx"))
          return true;
     // passing pointer to function
-    if (loplugin::isSamePathname(fn, SRCDIR "/include/vcl/bitmapaccess.hxx"))
+    if (loplugin::isSamePathname(fn, SRCDIR "/include/vcl/BitmapReadAccess.hxx"))
          return true;
     if (loplugin::isSamePathname(fn, SRCDIR "/vcl/inc/unx/gtk/gtkobject.hxx"))
          return true;
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index 9b477e8bbe3a..92bc161784ad 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -14,7 +14,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <test/unoapi_test.hxx>
-#include <vcl/bitmapaccess.hxx>
+#include <vcl/BitmapReadAccess.hxx>
 #include <vcl/pngwrite.hxx>
 #include <vcl/gdimtf.hxx>
 #include <tools/stream.hxx>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 841d6ba8690e..7ed19033506a 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6402,7 +6402,6 @@ include/vcl/accessibletable.hxx
 include/vcl/accessibletableprovider.hxx
 include/vcl/alpha.hxx
 include/vcl/bitmap.hxx
-include/vcl/bitmapaccess.hxx
 include/vcl/bitmapex.hxx
 include/vcl/builder.hxx
 include/vcl/builderfactory.hxx
diff --git a/vcl/IwyuFilter_vcl.yaml b/vcl/IwyuFilter_vcl.yaml
index 015da8ca9a8e..150dc6519da4 100644
--- a/vcl/IwyuFilter_vcl.yaml
+++ b/vcl/IwyuFilter_vcl.yaml
@@ -49,7 +49,7 @@ excludelist:
     - vector
     vcl/source/filter/jpeg/JpegWriter.hxx:
     # Needed for direct member access
-    - vcl/bitmapaccess.hxx
+    - vcl/BitmapReadAccess.hxx
     vcl/source/filter/png/pngwrite.cxx:
     # Actually these are used
     - com/sun/star/beans/PropertyValue.hpp
diff --git a/vcl/qa/cppunit/gen/gen.cxx b/vcl/qa/cppunit/gen/gen.cxx
index a82a0717ab80..e313ff5d8cdf 100644
--- a/vcl/qa/cppunit/gen/gen.cxx
+++ b/vcl/qa/cppunit/gen/gen.cxx
@@ -14,7 +14,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <test/unoapi_test.hxx>
-#include <vcl/bitmapaccess.hxx>
+#include <vcl/BitmapReadAccess.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/virdev.hxx>