diff --git a/.devcontainer/cpp/Dockerfile b/.devcontainer/cpp/Dockerfile
index bd7614c3..14a2dfae 100644
--- a/.devcontainer/cpp/Dockerfile
+++ b/.devcontainer/cpp/Dockerfile
@@ -2,11 +2,11 @@ FROM ubuntu:24.04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea9
 
 ARG BATS_VERSION=1.11.0
 ARG CCACHE_VERSION=4.10.1
-ARG CLANG_VERSION=17
+ARG CLANG_VERSION=18
 ARG CPM_VERSION=0.40.2
 ARG DOCKER_VERSION=27.3.1
-ARG MULL_VERSION=0.22.0
-ARG INCLUDE_WHAT_YOU_USE_VERSION=0.21
+ARG MULL_VERSION=0.24.0
+ARG INCLUDE_WHAT_YOU_USE_VERSION=0.22
 ARG XWIN_VERSION=0.6.5
 
 ARG DEBIAN_FRONTEND=noninteractive
diff --git a/.devcontainer/cpp/apt-requirements-clang.json b/.devcontainer/cpp/apt-requirements-clang.json
index 1ba45122..ea1af604 100644
--- a/.devcontainer/cpp/apt-requirements-clang.json
+++ b/.devcontainer/cpp/apt-requirements-clang.json
@@ -1,10 +1,10 @@
 {
-  "clang-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
-  "clangd-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
-  "clang-format-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
-  "clang-tidy-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
-  "clang-tools-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
-  "libclang-rt-17-dev": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
-  "lld-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8",
-  "llvm-17": "1:17.0.6~++20240501091250+6009708b4367-1~exp1~20240501211359.8"
+  "clang-18": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92",
+  "clangd-18": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92",
+  "clang-format-18": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92",
+  "clang-tidy-18": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92",
+  "clang-tools-18": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92",
+  "libclang-rt-18-dev": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92",
+  "lld-18": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92",
+  "llvm-18": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92"
 }