diff --git a/src/vulkan/util/vk_cmd_queue_gen.py b/src/vulkan/util/vk_cmd_queue_gen.py
index 5973f08e43e..ce068bdbb04 100644
--- a/src/vulkan/util/vk_cmd_queue_gen.py
+++ b/src/vulkan/util/vk_cmd_queue_gen.py
@@ -84,6 +84,8 @@ TEMPLATE_H = Template(COPYRIGHT + """\
 #include <vulkan/vulkan_beta.h>
 #endif
 
+#include "vk_internal_exts.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -681,6 +683,16 @@ def get_types_defines(doc):
 
     return types_to_defines
 
+INTERNAL_STRUCT_EXTENSIONS = {
+    "VkRenderingAttachmentInfo": EntrypointType(
+        name="VkRenderingAttachmentInitialLayoutInfoMESA",
+        enum="VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INITIAL_LAYOUT_INFO_MESA",
+        members=[],
+        extended_by=[],
+        guard=None
+    )
+}
+
 def get_types(doc, beta, api, types_to_defines):
     """Extract the types from the registry."""
     types = {}
@@ -732,6 +744,9 @@ def get_types(doc, beta, api, types_to_defines):
                 continue
             types[extended].extended_by.append(types[_type.attrib['name']])
 
+    for extended in INTERNAL_STRUCT_EXTENSIONS:
+        types[extended].extended_by.append(INTERNAL_STRUCT_EXTENSIONS[extended])
+
     return types
 
 def get_types_from_xml(xml_files, beta, api='vulkan'):