diff --git a/common.gypi b/common.gypi
index 93c3f6b8879c93..9da5c37fb67324 100644
--- a/common.gypi
+++ b/common.gypi
@@ -66,10 +66,6 @@
     'v8_enable_pointer_compression%': 0,
     'v8_enable_31bit_smis_on_64bit_arch%': 0,
 
-    # Disable V8 untrusted code mitigations.
-    # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations
-    'v8_untrusted_code_mitigations': 0,
-
     # This is more of a V8 dev setting
     # https://github.com/nodejs/node/pull/22920/files#r222779926
     'v8_enable_fast_mksnapshot': 0,
diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi
index 272f3580b20009..3097e41fd65dfe 100644
--- a/tools/v8_gypfiles/features.gypi
+++ b/tools/v8_gypfiles/features.gypi
@@ -169,9 +169,6 @@
     # Controls the threshold for on-heap/off-heap Typed Arrays.
     'v8_typed_array_max_size_in_heap%': 64,
 
-    # Enable mitigations for executing untrusted code.
-    'v8_untrusted_code_mitigations%': 1,
-
     # Enable minor mark compact.
     'v8_enable_minor_mc%': 1,
 
@@ -358,9 +355,6 @@
       ['v8_enable_verify_csa==1', {
         'defines': ['ENABLE_VERIFY_CSA',],
       }],
-      ['v8_untrusted_code_mitigations==0', {
-        'defines': ['DISABLE_UNTRUSTED_CODE_MITIGATIONS',],
-      }],
       ['v8_use_perfetto==1', {
         'defines': ['V8_USE_PERFETTO',],
       }],
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 1190e38b601a1a..35b4bcfeb0d735 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -509,12 +509,7 @@
       ],
       'direct_dependent_settings': {
         'sources': [
-          '<(V8_ROOT)/include/v8-cppgc.h',
-          '<(V8_ROOT)/include/v8-fast-api-calls.h',
-          '<(V8_ROOT)/include/v8-internal.h',
-          '<(V8_ROOT)/include/v8-profiler.h',
-          '<(V8_ROOT)/include/v8-util.h',
-          '<(V8_ROOT)/include/v8.h',
+          '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "v8_header_set.\\"v8_headers\\".*?sources = ")',
 
           '<(V8_ROOT)/include/v8-wasm-trap-handler-posix.h',
           '<(V8_ROOT)/include/v8-wasm-trap-handler-win.h',