diff --git a/CODEOWNERS b/CODEOWNERS
index f6575a1dd3..15f76fecf8 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -28,8 +28,8 @@ src/dmd/target.d @ibuclaw @MartinNowak
 src/dmd/transitivevisitor.d @RazvanN7
 src/dmd/vcbuild @rainers
 
-# GitHub's implementation of the CODEOWNERS format is buggy, so this might not work
-src/dmd/*.h @ibuclaw
+# GitHub's implementation of the CODEOWNERS format is buggy, it doesn't allow src/dmd/*.h
+*.h @ibuclaw @kinke @klickverbot
 
 # CI & automation
 posix.mak @MartinNowak @wilzbach