diff --git a/src/dmd/dtoh.d b/src/dmd/dtoh.d
index 28cb3ded7963..78cc9c5a0de5 100644
--- a/src/dmd/dtoh.d
+++ b/src/dmd/dtoh.d
@@ -242,7 +242,11 @@ extern(C++) void genCppHdrFiles(ref Modules ms)
     foreach (m; ms)
         m.accept(v);
 
-    buf.printf("// Automatically generated by %s Compiler v%d", global.vendor.ptr, global.versionNumber());
+    if (global.params.doCxxHdrGeneration == CxxHeaderMode.verbose)
+        buf.printf("// Automatically generated by %s Compiler v%d", global.vendor.ptr, global.versionNumber());
+    else
+        buf.printf("// Automatically generated by %s Compiler", global.vendor.ptr);
+
     buf.writenl();
     buf.writenl();
     buf.writestringln("#pragma once");
diff --git a/src/dmd/frontend.h b/src/dmd/frontend.h
index d641a8d8c6af..b0fc1adf0ae7 100644
--- a/src/dmd/frontend.h
+++ b/src/dmd/frontend.h
@@ -1,4 +1,4 @@
-// Automatically generated by Digital Mars D Compiler v2093
+// Automatically generated by Digital Mars D Compiler
 
 #pragma once
 
diff --git a/test/compilable/dtoh_AliasDeclaration.d b/test/compilable/dtoh_AliasDeclaration.d
index 4fc15f2f2046..273b3f1b6598 100644
--- a/test/compilable/dtoh_AliasDeclaration.d
+++ b/test/compilable/dtoh_AliasDeclaration.d
@@ -3,7 +3,7 @@ REQUIRED_ARGS: -HC=silent -c -o-
 PERMUTE_ARGS:
 TEST_OUTPUT:
 ---
-// Automatically generated by Digital Mars D Compiler v$n$
+// Automatically generated by Digital Mars D Compiler
 
 #pragma once
 
diff --git a/test/compilable/dtoh_AnonDeclaration.d b/test/compilable/dtoh_AnonDeclaration.d
index 154160fc58a5..85c09b2cb175 100644
--- a/test/compilable/dtoh_AnonDeclaration.d
+++ b/test/compilable/dtoh_AnonDeclaration.d
@@ -3,7 +3,7 @@ REQUIRED_ARGS: -HC -c -o-
 PERMUTE_ARGS:
 TEST_OUTPUT:
 ---
-// Automatically generated by Digital Mars D Compiler v$n$
+// Automatically generated by Digital Mars D Compiler
 
 #pragma once
 
diff --git a/test/compilable/dtoh_CPPNamespaceDeclaration.d b/test/compilable/dtoh_CPPNamespaceDeclaration.d
index b35d4504b6bb..58aee39a12ba 100644
--- a/test/compilable/dtoh_CPPNamespaceDeclaration.d
+++ b/test/compilable/dtoh_CPPNamespaceDeclaration.d
@@ -3,7 +3,7 @@ REQUIRED_ARGS: -HC -c -o-
 PERMUTE_ARGS:
 TEST_OUTPUT:
 ---
-// Automatically generated by Digital Mars D Compiler v$n$
+// Automatically generated by Digital Mars D Compiler
 
 #pragma once
 
diff --git a/test/compilable/dtoh_ClassDeclaration.d b/test/compilable/dtoh_ClassDeclaration.d
index 770d79a6a636..7ed998848fb6 100644
--- a/test/compilable/dtoh_ClassDeclaration.d
+++ b/test/compilable/dtoh_ClassDeclaration.d
@@ -3,7 +3,7 @@ REQUIRED_ARGS: -HC -c -o-
 PERMUTE_ARGS:
 TEST_OUTPUT:
 ---
-// Automatically generated by Digital Mars D Compiler v$n$
+// Automatically generated by Digital Mars D Compiler
 
 #pragma once
 
diff --git a/test/compilable/dtoh_StructDeclaration.d b/test/compilable/dtoh_StructDeclaration.d
index e52ee30735a3..7021fe419ddf 100644
--- a/test/compilable/dtoh_StructDeclaration.d
+++ b/test/compilable/dtoh_StructDeclaration.d
@@ -3,7 +3,7 @@ REQUIRED_ARGS: -HC -c -o-
 PERMUTE_ARGS:
 TEST_OUTPUT:
 ---
-// Automatically generated by Digital Mars D Compiler v$n$
+// Automatically generated by Digital Mars D Compiler
 
 #pragma once
 
diff --git a/test/compilable/dtoh_TemplateDeclaration.d b/test/compilable/dtoh_TemplateDeclaration.d
index 045da0bd3322..a22265fb85d7 100644
--- a/test/compilable/dtoh_TemplateDeclaration.d
+++ b/test/compilable/dtoh_TemplateDeclaration.d
@@ -3,7 +3,7 @@ REQUIRED_ARGS: -HC -c -o-
 PERMUTE_ARGS:
 TEST_OUTPUT:
 ---
-// Automatically generated by Digital Mars D Compiler v$n$
+// Automatically generated by Digital Mars D Compiler
 
 #pragma once
 
diff --git a/test/compilable/dtoh_VarDeclaration.d b/test/compilable/dtoh_VarDeclaration.d
index ae6b574d0d47..41d80cb1b503 100644
--- a/test/compilable/dtoh_VarDeclaration.d
+++ b/test/compilable/dtoh_VarDeclaration.d
@@ -3,7 +3,7 @@ REQUIRED_ARGS: -HC -c -o-
 PERMUTE_ARGS:
 TEST_OUTPUT:
 ---
-// Automatically generated by Digital Mars D Compiler v$n$
+// Automatically generated by Digital Mars D Compiler
 
 #pragma once
 
diff --git a/test/compilable/dtoh_enum.d b/test/compilable/dtoh_enum.d
index c33e11319ec4..19b86c397aaf 100644
--- a/test/compilable/dtoh_enum.d
+++ b/test/compilable/dtoh_enum.d
@@ -3,7 +3,7 @@ REQUIRED_ARGS: -HC -c -o-
 PERMUTE_ARGS:
 TEST_OUTPUT:
 ---
-// Automatically generated by Digital Mars D Compiler v$n$
+// Automatically generated by Digital Mars D Compiler
 
 #pragma once
 
diff --git a/test/compilable/dtoh_functions.d b/test/compilable/dtoh_functions.d
index 95d7e10f4a40..8263d0cf32bb 100644
--- a/test/compilable/dtoh_functions.d
+++ b/test/compilable/dtoh_functions.d
@@ -3,7 +3,7 @@ REQUIRED_ARGS: -HC -c -o-
 PERMUTE_ARGS:
 TEST_OUTPUT:
 ---
-// Automatically generated by Digital Mars D Compiler v$n$
+// Automatically generated by Digital Mars D Compiler
 
 #pragma once
 
diff --git a/test/compilable/dtoh_unittest_block.d b/test/compilable/dtoh_unittest_block.d
index 7c88cd2eecb9..5860ad0586e9 100644
--- a/test/compilable/dtoh_unittest_block.d
+++ b/test/compilable/dtoh_unittest_block.d
@@ -3,7 +3,7 @@ REQUIRED_ARGS: -HC -c -o-
 PERMUTE_ARGS:
 TEST_OUTPUT:
 ---
-// Automatically generated by Digital Mars D Compiler v$n$
+// Automatically generated by Digital Mars D Compiler
 
 #pragma once