diff --git a/BUILD.gn b/BUILD.gn
index 2d9875f2d7..1d67866d90 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -879,7 +879,7 @@ if (v8_use_external_startup_data) {
 
 # This is split out to be a non-code containing target that the Chromium browser
 # DLL can depend upon to get only a version string.
-v8_source_set("v8_version") {
+v8_header_set("v8_version") {
   configs = [ ":internal_config" ]
 
   sources = [
diff --git a/gni/v8.gni b/gni/v8.gni
index a4a3656306..ea628e0000 100644
--- a/gni/v8.gni
+++ b/gni/v8.gni
@@ -112,6 +112,15 @@ template("v8_source_set") {
   }
 }
 
+template("v8_header_set") {
+  source_set(target_name) {
+    forward_variables_from(invoker, "*", [ "configs" ])
+    configs += invoker.configs
+    configs -= v8_remove_configs
+    configs += v8_add_configs
+  }
+}
+
 template("v8_executable") {
   executable(target_name) {
     forward_variables_from(invoker,