diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -84,11 +84,12 @@
 RUN apt-get update && apt-get install -y clang-tidy-$(($LLVM_HEAD_VERSION - 1)) clang-tidy-$LLVM_HEAD_VERSION clang-tidy-14
 RUN ln -s /usr/bin/clang-tidy-14 /usr/bin/clang-tidy && [ -e $(readlink /usr/bin/clang-tidy) ]
 
-# Install llvm-dev to compile custom clang-tidy checks
-RUN apt-get update && apt-get install llvm-$(($LLVM_HEAD_VERSION - 1))-dev llvm-$(($LLVM_HEAD_VERSION - 2))-dev
+# Install llvm-dev and libclang-dev to compile custom clang-tidy checks
+RUN apt-get update && apt-get install -y llvm-$(($LLVM_HEAD_VERSION - 1))-dev     llvm-$(($LLVM_HEAD_VERSION - 2))-dev \
+                                     libclang-$(($LLVM_HEAD_VERSION - 1))-dev libclang-$(($LLVM_HEAD_VERSION - 2))-dev
 
 # TODO LLVM16 Don't install llvm-16-dev explicitly
-RUN apt-get update && apt-get install llvm-16-dev
+RUN apt-get update && apt-get install -y llvm-16-dev libclang-16-dev
 
 # Install clang-tools
 RUN apt-get update && apt-get install -y clang-tools-$(($LLVM_HEAD_VERSION - 1)) clang-tools-$LLVM_HEAD_VERSION