diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 98146b1276a..5497e069c37 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -171,54 +171,54 @@ typedef enum {
     VK_STRUCTURE_TYPE_APPLICATION_INFO = 0,
     VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO = 1,
     VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO = 2,
-    VK_STRUCTURE_TYPE_BUFFER_VIEW_ATTACH_INFO = 5,
-    VK_STRUCTURE_TYPE_IMAGE_VIEW_ATTACH_INFO = 6,
-    VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO = 7,
-    VK_STRUCTURE_TYPE_COLOR_ATTACHMENT_VIEW_CREATE_INFO = 8,
-    VK_STRUCTURE_TYPE_DEPTH_STENCIL_VIEW_CREATE_INFO = 9,
-    VK_STRUCTURE_TYPE_SHADER_CREATE_INFO = 10,
-    VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO = 11,
-    VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO = 12,
-    VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO = 13,
-    VK_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO = 14,
-    VK_STRUCTURE_TYPE_DYNAMIC_RS_STATE_CREATE_INFO = 15,
-    VK_STRUCTURE_TYPE_DYNAMIC_CB_STATE_CREATE_INFO = 16,
-    VK_STRUCTURE_TYPE_DYNAMIC_DS_STATE_CREATE_INFO = 17,
-    VK_STRUCTURE_TYPE_CMD_BUFFER_CREATE_INFO = 18,
-    VK_STRUCTURE_TYPE_EVENT_CREATE_INFO = 19,
-    VK_STRUCTURE_TYPE_FENCE_CREATE_INFO = 20,
-    VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO = 21,
-    VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO = 23,
-    VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO = 24,
-    VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO = 25,
-    VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO = 26,
-    VK_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO = 27,
-    VK_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO = 28,
-    VK_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO = 29,
-    VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO = 30,
-    VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO = 31,
-    VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO = 32,
-    VK_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO = 33,
-    VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO = 34,
-    VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO = 35,
-    VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO = 36,
-    VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO = 37,
-    VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO = 38,
-    VK_STRUCTURE_TYPE_CMD_BUFFER_GRAPHICS_BEGIN_INFO = 39,
-    VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO = 40,
-    VK_STRUCTURE_TYPE_LAYER_CREATE_INFO = 41,
-    VK_STRUCTURE_TYPE_MEMORY_BARRIER = 42,
-    VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER = 43,
-    VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER = 44,
-    VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO = 45,
-    VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO = 51,
-    VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO = 52,
-    VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
-    VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET,
-    VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
-    VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO,
-
-    VK_ENUM_RANGE(STRUCTURE_TYPE, APPLICATION_INFO, PIPELINE_LAYOUT_CREATE_INFO)
+    VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO = 3,
+    VK_STRUCTURE_TYPE_COLOR_ATTACHMENT_VIEW_CREATE_INFO = 4,
+    VK_STRUCTURE_TYPE_DEPTH_STENCIL_VIEW_CREATE_INFO = 5,
+    VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO = 6,
+    VK_STRUCTURE_TYPE_SHADER_CREATE_INFO = 7,
+    VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO = 8,
+    VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO = 9,
+    VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO = 10,
+    VK_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO = 11,
+    VK_STRUCTURE_TYPE_DYNAMIC_RS_STATE_CREATE_INFO = 12,
+    VK_STRUCTURE_TYPE_DYNAMIC_CB_STATE_CREATE_INFO = 13,
+    VK_STRUCTURE_TYPE_DYNAMIC_DS_STATE_CREATE_INFO = 14,
+    VK_STRUCTURE_TYPE_CMD_BUFFER_CREATE_INFO = 15,
+    VK_STRUCTURE_TYPE_EVENT_CREATE_INFO = 16,
+    VK_STRUCTURE_TYPE_FENCE_CREATE_INFO = 17,
+    VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO = 18,
+    VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO = 19,
+    VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO = 20,
+    VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO = 21,
+    VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO = 22,
+    VK_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO = 23,
+    VK_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO = 24,
+    VK_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO = 25,
+    VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO = 26,
+    VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO = 27,
+    VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO = 28,
+    VK_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO = 29,
+    VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO = 30,
+    VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO = 31,
+    VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO = 32,
+    VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO = 33,
+    VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO = 34,
+    VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO = 35,
+    VK_STRUCTURE_TYPE_LAYER_CREATE_INFO = 36,
+    VK_STRUCTURE_TYPE_MEMORY_BARRIER = 37,
+    VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER = 38,
+    VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER = 39,
+    VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO = 40,
+    VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET = 41,
+    VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET = 42,
+    VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO = 43,
+    VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO = 44,
+    VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE = 45,
+    VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO = 46,
+    VK_STRUCTURE_TYPE_BEGIN_RANGE = VK_STRUCTURE_TYPE_APPLICATION_INFO,
+    VK_STRUCTURE_TYPE_END_RANGE = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
+    VK_STRUCTURE_TYPE_NUM = (VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO - VK_STRUCTURE_TYPE_APPLICATION_INFO + 1),
+    VK_STRUCTURE_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkStructureType;
 
 typedef enum {