diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf
index 20e7abc14a..382391ca70 100644
--- a/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf
+++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf
@@ -9,9 +9,11 @@ Include=%D/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf
 [Content]
 PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare
 Packages=
-        base-devel
+        base
+        clang-tools-extra
         github-cli
         lcov
         mypy
+        pkgconf
         ruff
         shellcheck
diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf
index 268539f1ff..1d61fd71ee 100644
--- a/mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf
+++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf
@@ -10,5 +10,6 @@ Include=%D/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf
 [Content]
 PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare
 Packages=
+        clang-tools-extra
         python3-mypy
         rpm-build
diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf
index 6bbfab78d6..747b2b2000 100644
--- a/mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf
+++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf
@@ -10,7 +10,9 @@ Include=%D/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
 [Content]
 PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare
 Packages=
+        clang-tools
         gh
+        iwyu
         lcov
         mypy
         shellcheck
diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf
index e32cf27e98..6931423b19 100644
--- a/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf
+++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf
@@ -5,6 +5,7 @@ Distribution=fedora
 
 [Content]
 Packages=
+        iwyu
         lcov
         gh
         ruff
diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf
index 77d54130f7..745476d171 100644
--- a/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf
+++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf
@@ -9,7 +9,9 @@ Include=%D/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
 [Content]
 PrepareScripts=%D/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
 Packages=
+        clang-tools
         gh
+        include-what-you-use
         lcov
         mypy
         python3-ruff