diff --git a/scripts/parse_registries.py b/scripts/parse_registries.py
index 8ee9fc9..3c38764 100755
--- a/scripts/parse_registries.py
+++ b/scripts/parse_registries.py
@@ -532,10 +532,6 @@
         headers.append("<array>")
         headers.append("<cstddef>")
         headers.append("<span>")
-
-        if registry_name not in ("ResourceEvent", "HeartbeatEvent"):
-            headers.append("<cstdint>")
-            headers.append("<string>")
         headers.append("<string_view>")
 
         for header in headers:
@@ -546,6 +542,10 @@
 // Clang can't seem to decide whether this header needs to be included or not,
 // and is inconsistent.  Include it for now
 // NOLINTNEXTLINE(misc-include-cleaner)
+#include <cstdint>
+// NOLINTNEXTLINE(misc-include-cleaner)
+#include <string>
+// NOLINTNEXTLINE(misc-include-cleaner)
 #include <utility>
 
 namespace redfish