diff --git a/xml/cl.xml b/xml/cl.xml
index e71aebc9..0eb49341 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -255,6 +255,7 @@ server's OpenCL/api-docs repository.
         <type category="define">typedef <type>cl_bitfield</type>      <name>cl_platform_command_buffer_capabilities_khr</name>;</type>
         <type category="define">typedef <type>cl_bitfield</type>      <name>cl_mutable_dispatch_asserts_khr</name></type>
         <type category="define">typedef <type>cl_bitfield</type>      <name>cl_device_kernel_clock_capabilities_khr</name>;</type>
+        <type category="define">typedef <type>cl_uint</type>          <name>cl_command_termination_reason_arm</name>;</type>
 
             <comment>Structure types</comment>
         <type category="struct" name="cl_dx9_surface_info_khr">
@@ -977,7 +978,7 @@ server's OpenCL/api-docs repository.
             <unused start="0x8" end="0x80000000"/>
     </enums>
 
-    <enums name="cl_arm_device_svm_capabilities.flags" vendor="Arm" type="bitmask">
+    <enums name="cl_device_svm_capabilities_arm" vendor="Arm" type="bitmask">
         <enum bitpos="0"            name="CL_DEVICE_SVM_COARSE_GRAIN_BUFFER_ARM"/>
         <enum bitpos="1"            name="CL_DEVICE_SVM_FINE_GRAIN_BUFFER_ARM"/>
         <enum bitpos="2"            name="CL_DEVICE_SVM_FINE_GRAIN_SYSTEM_ARM"/>
@@ -1326,7 +1327,7 @@ server's OpenCL/api-docs repository.
             <unused start="3" end="31"/>
     </enums>
 
-    <enums name="cl_device_command_buffer_capabilities_khr " vendor="Khronos" type="bitmask">
+    <enums name="cl_device_command_buffer_capabilities_khr" vendor="Khronos" type="bitmask">
         <enum bitpos="0"            name="CL_COMMAND_BUFFER_CAPABILITY_KERNEL_PRINTF_KHR"/>
         <enum bitpos="1"            name="CL_COMMAND_BUFFER_CAPABILITY_DEVICE_SIDE_ENQUEUE_KHR"/>
         <enum bitpos="2"            name="CL_COMMAND_BUFFER_CAPABILITY_SIMULTANEOUS_USE_KHR"/>
@@ -4388,7 +4389,7 @@ server's OpenCL/api-docs repository.
             <type name="cl_image_format"/>
             <type name="cl_buffer_region"/>
         </require>
-        <require comment="Constants">
+        <require etype="constants">
             <enum name="CL_CHAR_BIT"/>
             <enum name="CL_CHAR_MAX"/>
             <enum name="CL_CHAR_MIN"/>
@@ -4479,25 +4480,25 @@ server's OpenCL/api-docs repository.
             <enum name="CL_INVALID_MIP_LEVEL"/>
             <enum name="CL_INVALID_GLOBAL_WORK_SIZE"/>
         </require>
-        <require comment="cl_bool">
+        <require group="cl_bool">
             <enum name="CL_FALSE"/>
             <enum name="CL_TRUE"/>
         </require>
-        <require comment="cl_platform_info">
+        <require group="cl_platform_info">
             <enum name="CL_PLATFORM_PROFILE"/>
             <enum name="CL_PLATFORM_VERSION"/>
             <enum name="CL_PLATFORM_NAME"/>
             <enum name="CL_PLATFORM_VENDOR"/>
             <enum name="CL_PLATFORM_EXTENSIONS"/>
         </require>
-        <require comment="cl_device_type - bitfield">
+        <require group="cl_device_type" etype="bitfield">
             <enum name="CL_DEVICE_TYPE_DEFAULT"/>
             <enum name="CL_DEVICE_TYPE_CPU"/>
             <enum name="CL_DEVICE_TYPE_GPU"/>
             <enum name="CL_DEVICE_TYPE_ACCELERATOR"/>
             <enum name="CL_DEVICE_TYPE_ALL"/>
         </require>
-        <require comment="cl_device_info">
+        <require group="cl_device_info">
             <enum name="CL_DEVICE_TYPE"/>
             <enum name="CL_DEVICE_VENDOR_ID"/>
             <enum name="CL_DEVICE_MAX_COMPUTE_UNITS"/>
@@ -4547,7 +4548,7 @@ server's OpenCL/api-docs repository.
             <enum name="CL_DEVICE_EXTENSIONS"/>
             <enum name="CL_DEVICE_PLATFORM"/>
         </require>
-        <require comment="cl_device_fp_config - bitfield">
+        <require group="cl_device_fp_config" etype="bitfield">
             <enum name="CL_FP_DENORM"/>
             <enum name="CL_FP_INF_NAN"/>
             <enum name="CL_FP_ROUND_TO_NEAREST"/>
@@ -4555,38 +4556,39 @@ server's OpenCL/api-docs repository.
             <enum name="CL_FP_ROUND_TO_INF"/>
             <enum name="CL_FP_FMA"/>
         </require>
-        <require comment="cl_device_mem_cache_type">
+        <require group="cl_device_mem_cache_type">
             <enum name="CL_NONE"/>
             <enum name="CL_READ_ONLY_CACHE"/>
             <enum name="CL_READ_WRITE_CACHE"/>
         </require>
-        <require comment="cl_device_local_mem_type">
+        <require group="cl_device_local_mem_type">
             <enum name="CL_LOCAL"/>
             <enum name="CL_GLOBAL"/>
         </require>
-        <require comment="cl_device_exec_capabilities - bitfield">
+        <require group="cl_device_exec_capabilities" etype="bitfield">
             <enum name="CL_EXEC_KERNEL"/>
             <enum name="CL_EXEC_NATIVE_KERNEL"/>
         </require>
-        <require comment="cl_command_queue_properties - bitfield">
+        <require group="cl_command_queue_properties" etype="bitfield">
+            <enum name="CL_NONE"/>
             <enum name="CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE"/>
             <enum name="CL_QUEUE_PROFILING_ENABLE"/>
         </require>
-        <require comment="cl_context_info">
+        <require group="cl_context_info" comment="For getting info from existing context">
             <enum name="CL_CONTEXT_REFERENCE_COUNT"/>
             <enum name="CL_CONTEXT_DEVICES"/>
             <enum name="CL_CONTEXT_PROPERTIES"/>
         </require>
-        <require comment="cl_context_properties">
+        <require group="cl_context_properties" comment="For creating context with properties">
             <enum name="CL_CONTEXT_PLATFORM"/>
         </require>
-        <require comment="cl_command_queue_info">
+        <require group="cl_command_queue_info">
             <enum name="CL_QUEUE_CONTEXT"/>
             <enum name="CL_QUEUE_DEVICE"/>
             <enum name="CL_QUEUE_REFERENCE_COUNT"/>
             <enum name="CL_QUEUE_PROPERTIES"/>
         </require>
-        <require comment="cl_mem_flags and cl_svm_mem_flags - bitfield">
+        <require group="cl_mem_flags" etype="bitfield">
             <enum name="CL_MEM_READ_WRITE"/>
             <enum name="CL_MEM_WRITE_ONLY"/>
             <enum name="CL_MEM_READ_ONLY"/>
@@ -4594,13 +4596,21 @@ server's OpenCL/api-docs repository.
             <enum name="CL_MEM_ALLOC_HOST_PTR"/>
             <enum name="CL_MEM_COPY_HOST_PTR"/>
         </require>
-        <require comment="cl_profiling_info">
+        <require group="cl_svm_mem_flags" etype="bitfield">
+            <enum name="CL_MEM_READ_WRITE"/>
+            <enum name="CL_MEM_WRITE_ONLY"/>
+            <enum name="CL_MEM_READ_ONLY"/>
+            <enum name="CL_MEM_USE_HOST_PTR"/>
+            <enum name="CL_MEM_ALLOC_HOST_PTR"/>
+            <enum name="CL_MEM_COPY_HOST_PTR"/>
+        </require>
+        <require group="cl_profiling_info">
             <enum name="CL_PROFILING_COMMAND_QUEUED"/>
             <enum name="CL_PROFILING_COMMAND_SUBMIT"/>
             <enum name="CL_PROFILING_COMMAND_START"/>
             <enum name="CL_PROFILING_COMMAND_END"/>
         </require>
-        <require comment="cl_channel_order">
+        <require group="cl_channel_order">
             <enum name="CL_R"/>
             <enum name="CL_A"/>
             <enum name="CL_RG"/>
@@ -4612,7 +4622,7 @@ server's OpenCL/api-docs repository.
             <enum name="CL_INTENSITY"/>
             <enum name="CL_LUMINANCE"/>
         </require>
-        <require comment="cl_channel_type">
+        <require group="cl_channel_type">
             <enum name="CL_SNORM_INT8"/>
             <enum name="CL_SNORM_INT16"/>
             <enum name="CL_UNORM_INT8"/>
@@ -4629,12 +4639,12 @@ server's OpenCL/api-docs repository.
             <enum name="CL_HALF_FLOAT"/>
             <enum name="CL_FLOAT"/>
         </require>
-        <require comment="cl_mem_object_type">
+        <require group="cl_mem_object_type">
             <enum name="CL_MEM_OBJECT_BUFFER"/>
             <enum name="CL_MEM_OBJECT_IMAGE2D"/>
             <enum name="CL_MEM_OBJECT_IMAGE3D"/>
         </require>
-        <require comment="cl_mem_info">
+        <require group="cl_mem_info">
             <enum name="CL_MEM_TYPE"/>
             <enum name="CL_MEM_FLAGS"/>
             <enum name="CL_MEM_SIZE"/>
@@ -4643,7 +4653,7 @@ server's OpenCL/api-docs repository.
             <enum name="CL_MEM_REFERENCE_COUNT"/>
             <enum name="CL_MEM_CONTEXT"/>
         </require>
-        <require comment="cl_image_info">
+        <require group="cl_image_info">
             <enum name="CL_IMAGE_FORMAT"/>
             <enum name="CL_IMAGE_ELEMENT_SIZE"/>
             <enum name="CL_IMAGE_ROW_PITCH"/>
@@ -4652,28 +4662,28 @@ server's OpenCL/api-docs repository.
             <enum name="CL_IMAGE_HEIGHT"/>
             <enum name="CL_IMAGE_DEPTH"/>
         </require>
-        <require comment="cl_addressing_mode">
+        <require group="cl_addressing_mode">
             <enum name="CL_ADDRESS_NONE"/>
             <enum name="CL_ADDRESS_CLAMP_TO_EDGE"/>
             <enum name="CL_ADDRESS_CLAMP"/>
             <enum name="CL_ADDRESS_REPEAT"/>
         </require>
-        <require comment="cl_filter_mode">
+        <require group="cl_filter_mode">
             <enum name="CL_FILTER_NEAREST"/>
             <enum name="CL_FILTER_LINEAR"/>
         </require>
-        <require comment="cl_sampler_info">
+        <require group="cl_sampler_info">
             <enum name="CL_SAMPLER_REFERENCE_COUNT"/>
             <enum name="CL_SAMPLER_CONTEXT"/>
             <enum name="CL_SAMPLER_NORMALIZED_COORDS"/>
             <enum name="CL_SAMPLER_ADDRESSING_MODE"/>
             <enum name="CL_SAMPLER_FILTER_MODE"/>
         </require>
-        <require comment="cl_map_flags - bitfield">
+        <require group="cl_map_flags" etype="bitfield">
             <enum name="CL_MAP_READ"/>
             <enum name="CL_MAP_WRITE"/>
         </require>
-        <require comment="cl_program_info">
+        <require group="cl_program_info">
             <enum name="CL_PROGRAM_REFERENCE_COUNT"/>
             <enum name="CL_PROGRAM_CONTEXT"/>
             <enum name="CL_PROGRAM_NUM_DEVICES"/>
@@ -4682,38 +4692,38 @@ server's OpenCL/api-docs repository.
             <enum name="CL_PROGRAM_BINARY_SIZES"/>
             <enum name="CL_PROGRAM_BINARIES"/>
         </require>
-        <require comment="cl_program_build_info">
+        <require group="cl_program_build_info">
             <enum name="CL_PROGRAM_BUILD_STATUS"/>
             <enum name="CL_PROGRAM_BUILD_OPTIONS"/>
             <enum name="CL_PROGRAM_BUILD_LOG"/>
         </require>
-        <require comment="cl_build_status">
+        <require group="cl_build_status">
             <enum name="CL_BUILD_SUCCESS"/>
             <enum name="CL_BUILD_NONE"/>
             <enum name="CL_BUILD_ERROR"/>
             <enum name="CL_BUILD_IN_PROGRESS"/>
         </require>
-        <require comment="cl_kernel_info">
+        <require group="cl_kernel_info">
             <enum name="CL_KERNEL_FUNCTION_NAME"/>
             <enum name="CL_KERNEL_NUM_ARGS"/>
             <enum name="CL_KERNEL_REFERENCE_COUNT"/>
             <enum name="CL_KERNEL_CONTEXT"/>
             <enum name="CL_KERNEL_PROGRAM"/>
         </require>
-        <require comment="cl_kernel_work_group_info">
+        <require group="cl_kernel_work_group_info">
             <enum name="CL_KERNEL_WORK_GROUP_SIZE"/>
             <enum name="CL_KERNEL_COMPILE_WORK_GROUP_SIZE"/>
             <enum name="CL_KERNEL_LOCAL_MEM_SIZE"/>
             <enum name="CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE"/>
             <enum name="CL_KERNEL_PRIVATE_MEM_SIZE"/>
         </require>
-        <require comment="cl_event_info">
+        <require group="cl_event_info">
             <enum name="CL_EVENT_COMMAND_QUEUE"/>
             <enum name="CL_EVENT_COMMAND_TYPE"/>
             <enum name="CL_EVENT_REFERENCE_COUNT"/>
             <enum name="CL_EVENT_COMMAND_EXECUTION_STATUS"/>
         </require>
-        <require comment="cl_command_type">
+        <require group="cl_command_type">
             <enum name="CL_COMMAND_NDRANGE_KERNEL"/>
             <enum name="CL_COMMAND_TASK"/>
             <enum name="CL_COMMAND_NATIVE_KERNEL"/>
@@ -4738,7 +4748,7 @@ server's OpenCL/api-docs repository.
             <enum name="CL_SUBMITTED"/>
             <enum name="CL_QUEUED"/>
         </require>
-        <require comment="cl_khronos_vendor_id">
+        <require group="cl_khronos_vendor_id">
             <!-- The cl_khronos_vendor_id type was added in OpenCL 3.0, but the
                  concept of assigned vendor IDs has existed since OpenCL 1.0.
                  These enums can be used in any OpenCL version because the type
@@ -4851,7 +4861,7 @@ server's OpenCL/api-docs repository.
             <command name="clUnloadCompiler"/>
             <command name="clGetExtensionFunctionAddress"/>
         </require>
-        <require comment="OpenCL 1.0 cl_device_info enums that were deprecated in OpenCL 1.2">
+        <require group="cl_device_info" comment="OpenCL 1.0 cl_device_info enums that were deprecated in OpenCL 1.2">
             <enum name="CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE"/>
         </require>
         <require comment="OpenCL 1.0 APIs that were deprecated in OpenCL 2.0">
@@ -4859,7 +4869,7 @@ server's OpenCL/api-docs repository.
             <command name="clCreateSampler"/>
             <command name="clEnqueueTask"/>
         </require>
-        <require comment="OpenCL 1.0 cl_device_info enums that were deprecated in OpenCL 2.0">
+        <require group="cl_device_info" comment="OpenCL 1.0 cl_device_info enums that were deprecated in OpenCL 2.0">
             <enum name="CL_DEVICE_QUEUE_PROPERTIES"/>
         </require>
     </feature>
@@ -4868,7 +4878,7 @@ server's OpenCL/api-docs repository.
         <require>
             <type name="cl_buffer_create_type"/>
         </require>
-        <require comment="Constants">
+        <require etype="constants">
             <enum name="CL_NAN"/>
             <enum name="CL_HUGE_VALF"/>
             <enum name="CL_HUGE_VAL"/>
@@ -4880,7 +4890,7 @@ server's OpenCL/api-docs repository.
             <enum name="CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST"/>
             <enum name="CL_INVALID_PROPERTY"/>
         </require>
-        <require comment="cl_device_info">
+        <require group="cl_device_info">
             <enum name="CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF"/>
             <enum name="CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR"/>
             <enum name="CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT"/>
@@ -4890,34 +4900,34 @@ server's OpenCL/api-docs repository.
             <enum name="CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE"/>
             <enum name="CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF"/>
         </require>
-        <require comment="cl_device_fp_config - bitfield">
+        <require group="cl_device_fp_config" etype="bitfield">
             <enum name="CL_FP_SOFT_FLOAT"/>
         </require>
-        <require comment="cl_context_info">
+        <require group="cl_context_info">
             <enum name="CL_CONTEXT_NUM_DEVICES"/>
         </require>
-        <require comment="cl_channel_order">
+        <require group="cl_channel_order">
             <enum name="CL_Rx"/>
             <enum name="CL_RGx"/>
             <enum name="CL_RGBx"/>
         </require>
-        <require comment="cl_mem_info">
+        <require group="cl_mem_info">
             <enum name="CL_MEM_ASSOCIATED_MEMOBJECT"/>
             <enum name="CL_MEM_OFFSET"/>
         </require>
-        <require comment="cl_addressing_mode">
+        <require group="cl_addressing_mode">
             <enum name="CL_ADDRESS_MIRRORED_REPEAT"/>
         </require>
-        <require comment="cl_event_info">
+        <require group="cl_event_info">
             <enum name="CL_EVENT_CONTEXT"/>
         </require>
-        <require comment="cl_command_type">
+        <require group="cl_command_type">
             <enum name="CL_COMMAND_READ_BUFFER_RECT"/>
             <enum name="CL_COMMAND_WRITE_BUFFER_RECT"/>
             <enum name="CL_COMMAND_COPY_BUFFER_RECT"/>
             <enum name="CL_COMMAND_USER"/>
         </require>
-        <require comment="cl_buffer_create_type">
+        <require group="cl_buffer_create_type">
             <enum name="CL_BUFFER_CREATE_TYPE_REGION"/>
         </require>
         <require comment="Memory Object APIs">
@@ -4934,10 +4944,10 @@ server's OpenCL/api-docs repository.
             <command name="clEnqueueWriteBufferRect"/>
             <command name="clEnqueueCopyBufferRect"/>
         </require>
-        <require comment="OpenCL 1.1 cl_device_info enums that were deprecated in OpenCL 2.0">
+        <require group="cl_device_info" comment="OpenCL 1.1 cl_device_info enums that were deprecated in OpenCL 2.0">
             <enum name="CL_DEVICE_HOST_UNIFIED_MEMORY"/>
         </require>
-        <require comment="OpenCL 1.1 cl_device_info enums that were deprecated in OpenCL 3.0">
+        <require group="cl_device_info" comment="OpenCL 1.1 cl_device_info enums that were deprecated in OpenCL 3.0">
             <enum name="CL_DEVICE_OPENCL_C_VERSION"/>
         </require>
     </feature>
@@ -4954,7 +4964,7 @@ server's OpenCL/api-docs repository.
             <type name="cl_kernel_arg_type_qualifier"/>
             <type name="cl_image_desc"/>
         </require>
-        <require comment="Constants">
+        <require etype="constants">
             <enum name="CL_DBL_DIG"/>
             <enum name="CL_DBL_MANT_DIG"/>
             <enum name="CL_DBL_MAX_10_EXP"/>
@@ -4977,20 +4987,20 @@ server's OpenCL/api-docs repository.
             <enum name="CL_INVALID_LINKER_OPTIONS"/>
             <enum name="CL_INVALID_DEVICE_PARTITION_COUNT"/>
         </require>
-        <require comment="cl_command_type">
+        <require group="cl_command_type">
             <enum name="CL_COMMAND_BARRIER"/>
             <enum name="CL_COMMAND_MIGRATE_MEM_OBJECTS"/>
             <enum name="CL_COMMAND_FILL_BUFFER"/>
             <enum name="CL_COMMAND_FILL_IMAGE"/>
         </require>
-        <require comment="cl_bool">
+        <require group="cl_bool">
             <enum name="CL_BLOCKING"/>
             <enum name="CL_NON_BLOCKING"/>
         </require>
-        <require comment="cl_device_type - bitfield">
+        <require group="cl_device_type" etype="bitfield">
             <enum name="CL_DEVICE_TYPE_CUSTOM"/>
         </require>
-        <require comment="cl_device_info">
+        <require group="cl_device_info">
             <enum name="CL_DEVICE_DOUBLE_FP_CONFIG"/>
             <enum name="CL_DEVICE_LINKER_AVAILABLE"/>
             <enum name="CL_DEVICE_BUILT_IN_KERNELS"/>
@@ -5005,19 +5015,19 @@ server's OpenCL/api-docs repository.
             <enum name="CL_DEVICE_PREFERRED_INTEROP_USER_SYNC"/>
             <enum name="CL_DEVICE_PRINTF_BUFFER_SIZE"/>
         </require>
-        <require comment="cl_device_fp_config - bitfield">
+        <require group="cl_device_fp_config" etype="bitfield">
             <enum name="CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT"/>
         </require>
-        <require comment="cl_context_properties">
+        <require group="cl_context_properties">
             <enum name="CL_CONTEXT_INTEROP_USER_SYNC"/>
         </require>
-        <require comment="cl_device_partition_property">
+        <require group="cl_device_partition_property">
             <enum name="CL_DEVICE_PARTITION_EQUALLY"/>
             <enum name="CL_DEVICE_PARTITION_BY_COUNTS"/>
             <enum name="CL_DEVICE_PARTITION_BY_COUNTS_LIST_END"/>
             <enum name="CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN"/>
         </require>
-        <require comment="cl_device_affinity_domain">
+        <require group="cl_device_affinity_domain" etype="bitfield">
             <enum name="CL_DEVICE_AFFINITY_DOMAIN_NUMA"/>
             <enum name="CL_DEVICE_AFFINITY_DOMAIN_L4_CACHE"/>
             <enum name="CL_DEVICE_AFFINITY_DOMAIN_L3_CACHE"/>
@@ -5025,71 +5035,76 @@ server's OpenCL/api-docs repository.
             <enum name="CL_DEVICE_AFFINITY_DOMAIN_L1_CACHE"/>
             <enum name="CL_DEVICE_AFFINITY_DOMAIN_NEXT_PARTITIONABLE"/>
         </require>
-        <require comment="cl_mem_flags and cl_svm_mem_flags - bitfield">
+        <require group="cl_mem_flags" etype="bitfield">
+            <enum name="CL_MEM_HOST_WRITE_ONLY"/>
+            <enum name="CL_MEM_HOST_READ_ONLY"/>
+            <enum name="CL_MEM_HOST_NO_ACCESS"/>
+        </require>
+        <require group="cl_svm_mem_flags" etype="bitfield">
             <enum name="CL_MEM_HOST_WRITE_ONLY"/>
             <enum name="CL_MEM_HOST_READ_ONLY"/>
             <enum name="CL_MEM_HOST_NO_ACCESS"/>
         </require>
-        <require comment="cl_mem_migration_flags - bitfield">
+        <require group="cl_mem_migration_flags" etype="bitfield">
             <enum name="CL_MIGRATE_MEM_OBJECT_HOST"/>
             <enum name="CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED"/>
         </require>
-        <require comment="cl_mem_object_type">
+        <require group="cl_mem_object_type">
             <enum name="CL_MEM_OBJECT_IMAGE2D_ARRAY"/>
             <enum name="CL_MEM_OBJECT_IMAGE1D"/>
             <enum name="CL_MEM_OBJECT_IMAGE1D_ARRAY"/>
             <enum name="CL_MEM_OBJECT_IMAGE1D_BUFFER"/>
         </require>
-        <require comment="cl_image_info">
+        <require group="cl_image_info">
             <enum name="CL_IMAGE_ARRAY_SIZE"/>
             <enum name="CL_IMAGE_NUM_MIP_LEVELS"/>
             <enum name="CL_IMAGE_NUM_SAMPLES"/>
         </require>
-        <require comment="cl_map_flags - bitfield">
+        <require group="cl_map_flags" etype="bitfield">
             <enum name="CL_MAP_WRITE_INVALIDATE_REGION"/>
         </require>
-        <require comment="cl_program_info">
+        <require group="cl_program_info">
             <enum name="CL_PROGRAM_NUM_KERNELS"/>
             <enum name="CL_PROGRAM_KERNEL_NAMES"/>
         </require>
-        <require comment="cl_program_build_info">
+        <require group="cl_program_build_info">
             <enum name="CL_PROGRAM_BINARY_TYPE"/>
         </require>
-        <require comment="cl_program_binary_type">
+        <require group="cl_program_binary_type">
             <enum name="CL_PROGRAM_BINARY_TYPE_NONE"/>
             <enum name="CL_PROGRAM_BINARY_TYPE_COMPILED_OBJECT"/>
             <enum name="CL_PROGRAM_BINARY_TYPE_LIBRARY"/>
             <enum name="CL_PROGRAM_BINARY_TYPE_EXECUTABLE"/>
         </require>
-        <require comment="cl_kernel_info">
+        <require group="cl_kernel_info">
             <enum name="CL_KERNEL_ATTRIBUTES"/>
         </require>
-        <require comment="cl_kernel_arg_info">
+        <require group="cl_kernel_arg_info">
             <enum name="CL_KERNEL_ARG_ADDRESS_QUALIFIER"/>
             <enum name="CL_KERNEL_ARG_ACCESS_QUALIFIER"/>
             <enum name="CL_KERNEL_ARG_TYPE_NAME"/>
             <enum name="CL_KERNEL_ARG_TYPE_QUALIFIER"/>
             <enum name="CL_KERNEL_ARG_NAME"/>
         </require>
-        <require comment="cl_kernel_arg_address_qualifier">
+        <require group="cl_kernel_arg_address_qualifier">
             <enum name="CL_KERNEL_ARG_ADDRESS_GLOBAL"/>
             <enum name="CL_KERNEL_ARG_ADDRESS_LOCAL"/>
             <enum name="CL_KERNEL_ARG_ADDRESS_CONSTANT"/>
             <enum name="CL_KERNEL_ARG_ADDRESS_PRIVATE"/>
         </require>
-        <require comment="cl_kernel_arg_access_qualifier">
+        <require group="cl_kernel_arg_access_qualifier">
             <enum name="CL_KERNEL_ARG_ACCESS_READ_ONLY"/>
             <enum name="CL_KERNEL_ARG_ACCESS_WRITE_ONLY"/>
             <enum name="CL_KERNEL_ARG_ACCESS_READ_WRITE"/>
             <enum name="CL_KERNEL_ARG_ACCESS_NONE"/>
         </require>
-        <require comment="cl_kernel_arg_type_qualifier">
+        <require group="cl_kernel_arg_type_qualifier" etype="bitfield">
             <enum name="CL_KERNEL_ARG_TYPE_NONE"/>
             <enum name="CL_KERNEL_ARG_TYPE_CONST"/>
             <enum name="CL_KERNEL_ARG_TYPE_RESTRICT"/>
             <enum name="CL_KERNEL_ARG_TYPE_VOLATILE"/>
         </require>
-        <require comment="cl_kernel_work_group_info">
+        <require group="cl_kernel_work_group_info">
             <enum name="CL_KERNEL_GLOBAL_WORK_SIZE"/>
         </require>
         <require comment="Platform APIs">
@@ -5119,7 +5134,7 @@ server's OpenCL/api-docs repository.
         <require comment="Extension function access">
             <command name="clGetExtensionFunctionAddressForPlatform"/>
         </require>
-        <require comment="OpenCL 1.2 cl_image_info enums that were deprecated in OpenCL 2.0">
+        <require group="cl_image_info" comment="OpenCL 1.2 cl_image_info enums that were deprecated in OpenCL 2.0">
             <enum name="CL_IMAGE_BUFFER"/>
         </require>
     </feature>
@@ -5138,7 +5153,7 @@ server's OpenCL/api-docs repository.
             <enum name="CL_INVALID_PIPE_SIZE"/>
             <enum name="CL_INVALID_DEVICE_QUEUE"/>
         </require>
-        <require comment="cl_device_info">
+        <require group="cl_device_info">
             <enum name="CL_DEVICE_QUEUE_ON_HOST_PROPERTIES"/>
             <enum name="CL_DEVICE_IMAGE_PITCH_ALIGNMENT"/>
             <enum name="CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT"/>
@@ -5158,25 +5173,30 @@ server's OpenCL/api-docs repository.
             <enum name="CL_DEVICE_PREFERRED_GLOBAL_ATOMIC_ALIGNMENT"/>
             <enum name="CL_DEVICE_PREFERRED_LOCAL_ATOMIC_ALIGNMENT"/>
         </require>
-        <require comment="cl_command_queue_properties - bitfield">
+        <require group="cl_command_queue_properties" etype="bitfield">
             <enum name="CL_QUEUE_ON_DEVICE"/>
             <enum name="CL_QUEUE_ON_DEVICE_DEFAULT"/>
         </require>
-        <require comment="cl_device_svm_capabilities">
+        <require group="cl_device_svm_capabilities" etype="bitfield">
             <enum name="CL_DEVICE_SVM_COARSE_GRAIN_BUFFER"/>
             <enum name="CL_DEVICE_SVM_FINE_GRAIN_BUFFER"/>
             <enum name="CL_DEVICE_SVM_FINE_GRAIN_SYSTEM"/>
             <enum name="CL_DEVICE_SVM_ATOMICS"/>
         </require>
-        <require comment="cl_command_queue_info">
+        <require group="cl_command_queue_info">
             <enum name="CL_QUEUE_SIZE"/>
         </require>
-        <require comment="cl_mem_flags and cl_svm_mem_flags - bitfield">
+        <require group="cl_mem_flags" etype="bitfield">
+            <enum name="CL_MEM_SVM_FINE_GRAIN_BUFFER"/>
+            <enum name="CL_MEM_SVM_ATOMICS"/>
+            <enum name="CL_MEM_KERNEL_READ_AND_WRITE"/>
+        </require>
+        <require group="cl_svm_mem_flags" etype="bitfield">
             <enum name="CL_MEM_SVM_FINE_GRAIN_BUFFER"/>
             <enum name="CL_MEM_SVM_ATOMICS"/>
             <enum name="CL_MEM_KERNEL_READ_AND_WRITE"/>
         </require>
-        <require comment="cl_channel_order">
+        <require group="cl_channel_order">
             <enum name="CL_DEPTH"/>
             <enum name="CL_sRGB"/>
             <enum name="CL_sRGBx"/>
@@ -5184,39 +5204,39 @@ server's OpenCL/api-docs repository.
             <enum name="CL_sBGRA"/>
             <enum name="CL_ABGR"/>
         </require>
-        <require comment="cl_mem_object_type">
+        <require group="cl_mem_object_type">
             <enum name="CL_MEM_OBJECT_PIPE"/>
         </require>
-        <require comment="cl_mem_info">
+        <require group="cl_mem_info">
             <enum name="CL_MEM_USES_SVM_POINTER"/>
         </require>
-        <require comment="cl_pipe_info">
+        <require group="cl_pipe_info">
             <enum name="CL_PIPE_PACKET_SIZE"/>
             <enum name="CL_PIPE_MAX_PACKETS"/>
         </require>
-        <require comment="cl_sampler_info">
+        <require group="cl_sampler_info">
             <enum name="CL_SAMPLER_MIP_FILTER_MODE"/>
             <enum name="CL_SAMPLER_LOD_MIN"/>
             <enum name="CL_SAMPLER_LOD_MAX"/>
         </require>
-        <require comment="cl_program_build_info">
+        <require group="cl_program_build_info">
             <enum name="CL_PROGRAM_BUILD_GLOBAL_VARIABLE_TOTAL_SIZE"/>
         </require>
-        <require comment="cl_kernel_arg_type_qualifier">
+        <require group="cl_kernel_arg_type_qualifier" etype="bitfield">
             <enum name="CL_KERNEL_ARG_TYPE_PIPE"/>
         </require>
-        <require comment="cl_kernel_exec_info">
+        <require group="cl_kernel_exec_info">
             <enum name="CL_KERNEL_EXEC_INFO_SVM_PTRS"/>
             <enum name="CL_KERNEL_EXEC_INFO_SVM_FINE_GRAIN_SYSTEM"/>
         </require>
-        <require comment="cl_command_type">
+        <require group="cl_command_type">
             <enum name="CL_COMMAND_SVM_FREE"/>
             <enum name="CL_COMMAND_SVM_MEMCPY"/>
             <enum name="CL_COMMAND_SVM_MEMFILL"/>
             <enum name="CL_COMMAND_SVM_MAP"/>
             <enum name="CL_COMMAND_SVM_UNMAP"/>
         </require>
-        <require comment="cl_profiling_info">
+        <require group="cl_profiling_info">
             <enum name="CL_PROFILING_COMMAND_COMPLETE"/>
         </require>
         <require comment="Command-Queue APIs">
@@ -5250,24 +5270,24 @@ server's OpenCL/api-docs repository.
         <require>
             <type name="cl_kernel_sub_group_info"/>
         </require>
-        <require comment="cl_platform_info">
+        <require group="cl_platform_info">
             <enum name="CL_PLATFORM_HOST_TIMER_RESOLUTION"/>
         </require>
-        <require comment="cl_device_info">
+        <require group="cl_device_info">
             <enum name="CL_DEVICE_IL_VERSION"/>
             <enum name="CL_DEVICE_MAX_NUM_SUB_GROUPS"/>
             <enum name="CL_DEVICE_SUB_GROUP_INDEPENDENT_FORWARD_PROGRESS"/>
         </require>
-        <require comment="cl_command_queue_info">
+        <require group="cl_command_queue_info">
             <enum name="CL_QUEUE_DEVICE_DEFAULT"/>
         </require>
-        <require comment="cl_channel_type">
+        <require group="cl_channel_type">
             <enum name="CL_UNORM_INT_101010_2"/>
         </require>
-        <require comment="cl_program_info">
+        <require group="cl_program_info">
             <enum name="CL_PROGRAM_IL"/>
         </require>
-        <require comment="cl_kernel_sub_group_info">
+        <require group="cl_kernel_sub_group_info">
             <enum name="CL_KERNEL_MAX_NUM_SUB_GROUPS"/>
             <enum name="CL_KERNEL_COMPILE_NUM_SUB_GROUPS"/>
             <enum name="CL_KERNEL_MAX_SUB_GROUP_SIZE_FOR_NDRANGE"/>
@@ -5304,7 +5324,7 @@ server's OpenCL/api-docs repository.
         <require comment="OpenCL 2.2 Program Object APIs that were deprecated in OpenCL 3.0">
             <command name="clSetProgramReleaseCallback"/>
         </require>
-        <require comment="OpenCL 2.2 cl_program_info enums that were deprecated in OpenCL 3.0">
+        <require group="cl_program_info" comment="OpenCL 2.2 cl_program_info enums that were deprecated in OpenCL 3.0">
             <enum name="CL_PROGRAM_SCOPE_GLOBAL_CTORS_PRESENT"/>
             <enum name="CL_PROGRAM_SCOPE_GLOBAL_DTORS_PRESENT"/>
         </require>
@@ -5319,7 +5339,7 @@ server's OpenCL/api-docs repository.
             <type name="cl_version"/>
             <type name="cl_name_version"/>
         </require>
-        <require comment="cl_device_atomic_capabilities - bitfield">
+        <require group="cl_device_atomic_capabilities" etype="bitfield">
             <enum name="CL_DEVICE_ATOMIC_ORDER_RELAXED"/>
             <enum name="CL_DEVICE_ATOMIC_ORDER_ACQ_REL"/>
             <enum name="CL_DEVICE_ATOMIC_ORDER_SEQ_CST"/>
@@ -5328,15 +5348,15 @@ server's OpenCL/api-docs repository.
             <enum name="CL_DEVICE_ATOMIC_SCOPE_DEVICE"/>
             <enum name="CL_DEVICE_ATOMIC_SCOPE_ALL_DEVICES"/>
         </require>
-        <require comment="cl_device_device_enqueue_capabilities - bitfield">
+        <require group="cl_device_device_enqueue_capabilities" etype="bitfield">
             <enum name="CL_DEVICE_QUEUE_SUPPORTED"/>
             <enum name="CL_DEVICE_QUEUE_REPLACEABLE_DEFAULT"/>
         </require>
-        <require comment="cl_platform_info">
+        <require group="cl_platform_info">
             <enum name="CL_PLATFORM_NUMERIC_VERSION"/>
             <enum name="CL_PLATFORM_EXTENSIONS_WITH_VERSION"/>
         </require>
-        <require comment="cl_device_info">
+        <require group="cl_device_info">
             <enum name="CL_DEVICE_ATOMIC_MEMORY_CAPABILITIES"/>
             <enum name="CL_DEVICE_ATOMIC_FENCE_CAPABILITIES"/>
             <enum name="CL_DEVICE_NON_UNIFORM_WORK_GROUP_SUPPORT"/>
@@ -5353,22 +5373,22 @@ server's OpenCL/api-docs repository.
             <enum name="CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_MULTIPLE"/>
             <enum name="CL_DEVICE_LATEST_CONFORMANCE_VERSION_PASSED"/>
         </require>
-        <require comment="cl_pipe_info">
+        <require group="cl_pipe_info">
             <enum name="CL_PIPE_PROPERTIES"/>
         </require>
-        <require comment="cl_sampler_info">
+        <require group="cl_sampler_info">
             <enum name="CL_SAMPLER_PROPERTIES"/>
         </require>
-        <require comment="cl_command_queue_info">
+        <require group="cl_command_queue_info">
             <enum name="CL_QUEUE_PROPERTIES_ARRAY"/>
         </require>
-        <require comment="cl_mem_info">
+        <require group="cl_mem_info">
             <enum name="CL_MEM_PROPERTIES"/>
         </require>
-        <require comment="cl_command_type">
+        <require group="cl_command_type">
             <enum name="CL_COMMAND_SVM_MIGRATE_MEM"/>
         </require>
-        <require comment="Misc API enums">
+        <require etype="constants" comment="Misc API enums">
             <enum name="CL_VERSION_MAJOR_BITS"/>
             <enum name="CL_VERSION_MINOR_BITS"/>
             <enum name="CL_VERSION_PATCH_BITS"/>
@@ -5410,25 +5430,27 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_D3D10_RESOURCE_ALREADY_ACQUIRED_KHR"/>
                 <enum name="CL_D3D10_RESOURCE_NOT_ACQUIRED_KHR"/>
             </require>
-            <require comment="cl_d3d10_device_source_khr">
+            <require group="cl_d3d10_device_source_khr">
                 <enum name="CL_D3D10_DEVICE_KHR"/>
                 <enum name="CL_D3D10_DXGI_ADAPTER_KHR"/>
             </require>
-            <require comment="cl_d3d10_device_set_khr">
+            <require group="cl_d3d10_device_set_khr">
                 <enum name="CL_PREFERRED_DEVICES_FOR_D3D10_KHR"/>
                 <enum name="CL_ALL_DEVICES_FOR_D3D10_KHR"/>
             </require>
-            <require comment="cl_context_info">
+            <require group="cl_context_properties">
                 <enum name="CL_CONTEXT_D3D10_DEVICE_KHR"/>
+            </require>
+            <require group="cl_context_info">
                 <enum name="CL_CONTEXT_D3D10_PREFER_SHARED_RESOURCES_KHR"/>
             </require>
-            <require comment="cl_mem_info">
+            <require group="cl_mem_info">
                 <enum name="CL_MEM_D3D10_RESOURCE_KHR"/>
             </require>
-            <require comment="cl_image_info">
+            <require group="cl_image_info">
                 <enum name="CL_IMAGE_D3D10_SUBRESOURCE_KHR"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_ACQUIRE_D3D10_OBJECTS_KHR"/>
                 <enum name="CL_COMMAND_RELEASE_D3D10_OBJECTS_KHR"/>
             </require>
@@ -5457,25 +5479,27 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_D3D11_RESOURCE_ALREADY_ACQUIRED_KHR"/>
                 <enum name="CL_D3D11_RESOURCE_NOT_ACQUIRED_KHR"/>
             </require>
-            <require comment="cl_d3d11_device_source_khr">
+            <require group="cl_d3d11_device_source_khr">
                 <enum name="CL_D3D11_DEVICE_KHR"/>
                 <enum name="CL_D3D11_DXGI_ADAPTER_KHR"/>
             </require>
-            <require comment="cl_d3d11_device_set_khr">
+            <require group="cl_d3d11_device_set_khr">
                 <enum name="CL_PREFERRED_DEVICES_FOR_D3D11_KHR"/>
                 <enum name="CL_ALL_DEVICES_FOR_D3D11_KHR"/>
             </require>
-            <require comment="cl_context_info">
+            <require group="cl_context_properties">
                 <enum name="CL_CONTEXT_D3D11_DEVICE_KHR"/>
+            </require>
+            <require group="cl_context_info">
                 <enum name="CL_CONTEXT_D3D11_PREFER_SHARED_RESOURCES_KHR"/>
             </require>
-            <require comment="cl_mem_info">
+            <require group="cl_mem_info">
                 <enum name="CL_MEM_D3D11_RESOURCE_KHR"/>
             </require>
-            <require comment="cl_image_info">
+            <require group="cl_image_info">
                 <enum name="CL_IMAGE_D3D11_SUBRESOURCE_KHR"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_ACQUIRE_D3D11_OBJECTS_KHR"/>
                 <enum name="CL_COMMAND_RELEASE_D3D11_OBJECTS_KHR"/>
             </require>
@@ -5505,28 +5529,28 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_DX9_MEDIA_SURFACE_ALREADY_ACQUIRED_KHR"/>
                 <enum name="CL_DX9_MEDIA_SURFACE_NOT_ACQUIRED_KHR"/>
             </require>
-            <require comment="cl_media_adapter_type_khr">
+            <require group="cl_dx9_media_adapter_type_khr">
                 <enum name="CL_ADAPTER_D3D9_KHR"/>
                 <enum name="CL_ADAPTER_D3D9EX_KHR"/>
                 <enum name="CL_ADAPTER_DXVA_KHR"/>
             </require>
-            <require comment="cl_media_adapter_set_khr">
+            <require group="cl_dx9_media_adapter_set_khr">
                 <enum name="CL_PREFERRED_DEVICES_FOR_DX9_MEDIA_ADAPTER_KHR"/>
                 <enum name="CL_ALL_DEVICES_FOR_DX9_MEDIA_ADAPTER_KHR"/>
             </require>
-            <require comment="cl_context_info">
+            <require group="cl_context_properties">
                 <enum name="CL_CONTEXT_ADAPTER_D3D9_KHR"/>
                 <enum name="CL_CONTEXT_ADAPTER_D3D9EX_KHR"/>
                 <enum name="CL_CONTEXT_ADAPTER_DXVA_KHR"/>
             </require>
-            <require comment="cl_mem_info">
+            <require group="cl_mem_info">
                 <enum name="CL_MEM_DX9_MEDIA_ADAPTER_TYPE_KHR"/>
                 <enum name="CL_MEM_DX9_MEDIA_SURFACE_INFO_KHR"/>
             </require>
-            <require comment="cl_image_info">
+            <require group="cl_image_info">
                 <enum name="CL_IMAGE_DX9_MEDIA_PLANE_KHR"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_ACQUIRE_DX9_MEDIA_SURFACES_KHR"/>
                 <enum name="CL_COMMAND_RELEASE_DX9_MEDIA_SURFACES_KHR"/>
             </require>
@@ -5541,7 +5565,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="Command type for events created with clEnqueueAcquireEGLObjectsKHR">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_EGL_FENCE_SYNC_OBJECT_KHR"/>
                 <enum name="CL_COMMAND_ACQUIRE_EGL_OBJECTS_KHR"/>
                 <enum name="CL_COMMAND_RELEASE_EGL_OBJECTS_KHR"/>
@@ -5583,7 +5607,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require condition="!defined(CL_VERSION_1_2)" comment="cl_device_info - defined in CL.h for OpenCL 1.2 and newer">
+            <require group="cl_device_info" condition="!defined(CL_VERSION_1_2)" comment="defined in CL.h for OpenCL 1.2 and newer">
                 <enum name="CL_DEVICE_DOUBLE_FP_CONFIG"/>
             </require>
         </extension>
@@ -5591,7 +5615,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_HALF_FP_CONFIG"/>
             </require>
         </extension>
@@ -5617,7 +5641,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_platform_info">
+            <require group="cl_platform_info">
                 <enum name="CL_PLATFORM_ICD_SUFFIX_KHR"/>
             </require>
             <require comment="Error codes">
@@ -5635,11 +5659,11 @@ server's OpenCL/api-docs repository.
                 <type name="cl_layer_info"/>
                 <type name="cl_layer_api_version"/>
             </require>
-            <require comment="cl_layer_info">
+            <require group="cl_layer_info">
                 <enum name="CL_LAYER_API_VERSION"/>
                 <enum name="CL_LAYER_NAME"/>
             </require>
-            <require comment="Misc API enums">
+            <require etype="constants" comment="Misc API enums">
                 <enum name="CL_LAYER_API_VERSION_100"/>
             </require>
             <require>
@@ -5654,7 +5678,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_icdl_info"/>
             </require>
-            <require comment="cl_icdl_info">
+            <require group="cl_icdl_info">
                 <enum name="CL_ICDL_OCL_VERSION"/>
                 <enum name="CL_ICDL_VERSION"/>
                 <enum name="CL_ICDL_NAME"/>
@@ -5668,10 +5692,10 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_IL_VERSION_KHR"/>
             </require>
-            <require comment="cl_program_info">
+            <require group="cl_program_info">
                 <enum name="CL_PROGRAM_IL_KHR"/>
             </require>
             <require>
@@ -5679,7 +5703,7 @@ server's OpenCL/api-docs repository.
             </require>
         </extension>
         <extension name="cl_khr_image2d_from_buffer" revision="1.0.0" supported="opencl" promotedto="CL_VERSION_2_0" ratified="opencl">
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_IMAGE_PITCH_ALIGNMENT_KHR"/>
                 <enum name="CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT_KHR"/>
             </require>
@@ -5691,10 +5715,10 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_context_memory_initialize_khr"/>
             </require>
-            <require comment="cl_context_properties">
+            <require group="cl_context_properties">
                 <enum name="CL_CONTEXT_MEMORY_INITIALIZE_KHR"/>
             </require>
-            <require comment="cl_context_memory_initialize_khr">
+            <require group="cl_context_memory_initialize_khr">
                 <enum name="CL_CONTEXT_MEMORY_INITIALIZE_LOCAL_KHR"/>
                 <enum name="CL_CONTEXT_MEMORY_INITIALIZE_PRIVATE_KHR"/>
             </require>
@@ -5706,13 +5730,13 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_device_terminate_capability_khr"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_TERMINATE_CAPABILITY_KHR"/>
             </require>
-            <require comment="cl_context_properties">
+            <require group="cl_context_properties">
                 <enum name="CL_CONTEXT_TERMINATE_KHR"/>
             </require>
-            <require comment="cl_device_terminate_capability_khr">
+            <require group="cl_device_terminate_capability_khr" etype="bitfield">
                 <enum name="CL_DEVICE_TERMINATE_CAPABILITY_CONTEXT_KHR"/>
             </require>
             <require comment="Error codes">
@@ -5726,10 +5750,10 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_SPIR_VERSIONS"/>
             </require>
-            <require comment="cl_program_binary_type">
+            <require group="cl_program_binary_type">
                 <enum name="CL_PROGRAM_BINARY_TYPE_INTERMEDIATE"/>
             </require>
         </extension>
@@ -5748,7 +5772,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV"/>
                 <enum name="CL_DEVICE_COMPUTE_CAPABILITY_MINOR_NV"/>
                 <enum name="CL_DEVICE_REGISTERS_PER_BLOCK_NV"/>
@@ -5762,7 +5786,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_PROFILING_TIMER_OFFSET_AMD"/>
                 <enum name="CL_DEVICE_TOPOLOGY_AMD"/>
                 <enum name="CL_DEVICE_BOARD_NAME_AMD"/>
@@ -5790,7 +5814,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_context_properties">
+            <require group="cl_context_properties">
                 <enum name="CL_PRINTF_CALLBACK_ARM"/>
                 <enum name="CL_PRINTF_BUFFERSIZE_ARM"/>
             </require>
@@ -5807,20 +5831,21 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_INVALID_PARTITION_COUNT_EXT"/>
                 <enum name="CL_INVALID_PARTITION_NAME_EXT"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_PARENT_DEVICE_EXT"/>
                 <enum name="CL_DEVICE_PARTITION_TYPES_EXT"/>
                 <enum name="CL_DEVICE_AFFINITY_DOMAINS_EXT"/>
                 <enum name="CL_DEVICE_REFERENCE_COUNT_EXT"/>
                 <enum name="CL_DEVICE_PARTITION_STYLE_EXT"/>
             </require>
-            <require comment="cl_device_partition_property_ext">
+            <require group="cl_device_partition_property_ext">
                 <enum name="CL_DEVICE_PARTITION_EQUALLY_EXT"/>
                 <enum name="CL_DEVICE_PARTITION_BY_COUNTS_EXT"/>
+                <enum name="CL_PARTITION_BY_COUNTS_LIST_END_EXT"/>
                 <enum name="CL_DEVICE_PARTITION_BY_NAMES_EXT"/>
+                <enum name="CL_PARTITION_BY_NAMES_LIST_END_EXT"/>
                 <enum name="CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN_EXT"/>
-            </require>
-            <require comment="cl_device_partition_property_ext - affinity domains">
+                <enum name="CL_PROPERTIES_LIST_END_EXT"/>
                 <enum name="CL_AFFINITY_DOMAIN_L1_CACHE_EXT"/>
                 <enum name="CL_AFFINITY_DOMAIN_L2_CACHE_EXT"/>
                 <enum name="CL_AFFINITY_DOMAIN_L3_CACHE_EXT"/>
@@ -5828,11 +5853,6 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_AFFINITY_DOMAIN_NUMA_EXT"/>
                 <enum name="CL_AFFINITY_DOMAIN_NEXT_FISSIONABLE_EXT"/>
             </require>
-            <require comment="cl_device_partition_property_ext - list terminators">
-                <enum name="CL_PROPERTIES_LIST_END_EXT"/>
-                <enum name="CL_PARTITION_BY_COUNTS_LIST_END_EXT"/>
-                <enum name="CL_PARTITION_BY_NAMES_LIST_END_EXT"/>
-            </require>
             <require>
                 <command name="clReleaseDeviceEXT"/>
                 <command name="clRetainDeviceEXT"/>
@@ -5846,10 +5866,10 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_mem_migration_flags_ext"/>
             </require>
-            <require comment="cl_mem_migration_flags_ext">
+            <require group="cl_mem_migration_flags_ext" etype="bitfield">
                 <enum name="CL_MIGRATE_MEM_OBJECT_HOST_EXT"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_MIGRATE_MEM_OBJECT_EXT"/>
             </require>
             <require>
@@ -5864,15 +5884,17 @@ server's OpenCL/api-docs repository.
                 <type name="cl_image_pitch_info_qcom"/>
                 <type name="cl_mem_ext_host_ptr"/>
             </require>
-            <require comment="cl_mem_flags">
+            <require group="cl_mem_flags" etype="bitfield">
                 <enum name="CL_MEM_EXT_HOST_PTR_QCOM"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_EXT_MEM_PADDING_IN_BYTES_QCOM"/>
                 <enum name="CL_DEVICE_PAGE_SIZE_QCOM"/>
             </require>
-            <require comment="cl_image_pitch_info_qcom">
+            <require group="cl_image_pitch_info_qcom">
+                <enum name="CL_IMAGE_ROW_PITCH"/>
                 <enum name="CL_IMAGE_ROW_ALIGNMENT_QCOM"/>
+                <enum name="CL_IMAGE_SLICE_PITCH"/>
                 <enum name="CL_IMAGE_SLICE_ALIGNMENT_QCOM"/>
             </require>
             <require comment="cl_uint host_cache_policy">
@@ -5921,7 +5943,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_channel_order">
+            <require group="cl_channel_order">
                 <enum name="CL_NV21_IMG"/>
                 <enum name="CL_YV12_IMG"/>
             </require>
@@ -5930,7 +5952,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_mem_flags">
+            <require group="cl_mem_flags" etype="bitfield">
                 <enum name="CL_MEM_USE_UNCACHED_CPU_MEMORY_IMG"/>
                 <enum name="CL_MEM_USE_CACHED_CPU_MEMORY_IMG"/>
             </require>
@@ -5939,7 +5961,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_sampler_properties">
+            <require group="cl_sampler_properties">
                 <enum name="CL_SAMPLER_MIP_FILTER_MODE_KHR"/>
                 <enum name="CL_SAMPLER_LOD_MIN_KHR"/>
                 <enum name="CL_SAMPLER_LOD_MAX_KHR"/>
@@ -5953,10 +5975,10 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_GRALLOC_RESOURCE_NOT_ACQUIRED_IMG"/>
                 <enum name="CL_INVALID_GRALLOC_OBJECT_IMG"/>
             </require>
-            <require comment="cl_mem_flags">
+            <require group="cl_mem_flags" etype="bitfield">
                 <enum name="CL_MEM_USE_GRALLOC_PTR_IMG"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_ACQUIRE_GRALLOC_OBJECTS_IMG"/>
                 <enum name="CL_COMMAND_RELEASE_GRALLOC_OBJECTS_IMG"/>
             </require>
@@ -5972,7 +5994,7 @@ server's OpenCL/api-docs repository.
             <require condition="!defined(CL_VERSION_2_1)" comment="defined in CL.h for OpenCL 2.1 and newer">
                 <type name="cl_kernel_sub_group_info"/>
             </require>
-            <require comment="cl_kernel_sub_group_info">
+            <require group="cl_kernel_sub_group_info">
                 <enum name="CL_KERNEL_MAX_SUB_GROUP_SIZE_FOR_NDRANGE_KHR"/>
                 <enum name="CL_KERNEL_SUB_GROUP_COUNT_FOR_NDRANGE_KHR"/>
             </require>
@@ -5987,10 +6009,10 @@ server's OpenCL/api-docs repository.
             <require comment="To be used by clGetEventInfo">
                 <type name="cl_queue_priority_khr"/>
             </require>
-            <require comment="cl_queue_properties">
+            <require group="cl_queue_properties">
                 <enum name="CL_QUEUE_PRIORITY_KHR"/>
             </require>
-            <require comment="cl_queue_priority_khr">
+            <require group="cl_queue_priority_khr">
                 <enum name="CL_QUEUE_PRIORITY_HIGH_KHR"/>
                 <enum name="CL_QUEUE_PRIORITY_MED_KHR"/>
                 <enum name="CL_QUEUE_PRIORITY_LOW_KHR"/>
@@ -6003,10 +6025,10 @@ server's OpenCL/api-docs repository.
             <require comment="To be used by clGetEventInfo">
                 <type name="cl_queue_throttle_khr"/>
             </require>
-            <require comment="cl_queue_properties">
+            <require group="cl_queue_properties">
                 <enum name="CL_QUEUE_THROTTLE_KHR"/>
             </require>
-            <require comment="cl_queue_throttle_khr">
+            <require group="cl_queue_throttle_khr">
                 <enum name="CL_QUEUE_THROTTLE_HIGH_KHR"/>
                 <enum name="CL_QUEUE_THROTTLE_MED_KHR"/>
                 <enum name="CL_QUEUE_THROTTLE_LOW_KHR"/>
@@ -6016,7 +6038,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_MAX_NAMED_BARRIER_COUNT_KHR"/>
             </require>
         </extension>
@@ -6027,17 +6049,19 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_import_properties_arm"/>
             </require>
-            <require comment="cl_import_properties_arm">
+            <require group="cl_import_properties_arm">
                 <enum name="CL_IMPORT_TYPE_ARM"/>
                 <enum name="CL_IMPORT_TYPE_HOST_ARM"/>
                 <enum name="CL_IMPORT_TYPE_DMA_BUF_ARM"/>
                 <enum name="CL_IMPORT_TYPE_PROTECTED_ARM"/>
                 <enum name="CL_IMPORT_TYPE_ANDROID_HARDWARE_BUFFER_ARM"/>
                 <enum name="CL_IMPORT_DMA_BUF_DATA_CONSISTENCY_WITH_HOST_ARM"/>
-                <enum name="CL_IMPORT_MEMORY_WHOLE_ALLOCATION_ARM"/>
                 <enum name="CL_IMPORT_ANDROID_HARDWARE_BUFFER_PLANE_INDEX_ARM"/>
                 <enum name="CL_IMPORT_ANDROID_HARDWARE_BUFFER_LAYER_INDEX_ARM"/>
             </require>
+            <require etype="constants">
+                <enum name="CL_IMPORT_MEMORY_WHOLE_ALLOCATION_ARM"/>
+            </require>
             <require>
                 <comment>
                     Allows for direct memory import into OpenCL via the clImportMemoryARM function.
@@ -6067,30 +6091,30 @@ server's OpenCL/api-docs repository.
                 <type name="cl_kernel_exec_info_arm"/>
                 <type name="cl_device_svm_capabilities_arm"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_SVM_CAPABILITIES_ARM"/>
             </require>
-            <require comment="cl_mem_info">
+            <require group="cl_mem_info">
                 <enum name="CL_MEM_USES_SVM_POINTER_ARM"/>
             </require>
-            <require comment="cl_kernel_exec_info_arm">
+            <require group="cl_kernel_exec_info_arm">
                 <enum name="CL_KERNEL_EXEC_INFO_SVM_PTRS_ARM"/>
                 <enum name="CL_KERNEL_EXEC_INFO_SVM_FINE_GRAIN_SYSTEM_ARM"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_SVM_FREE_ARM"/>
                 <enum name="CL_COMMAND_SVM_MEMCPY_ARM"/>
                 <enum name="CL_COMMAND_SVM_MEMFILL_ARM"/>
                 <enum name="CL_COMMAND_SVM_MAP_ARM"/>
                 <enum name="CL_COMMAND_SVM_UNMAP_ARM"/>
             </require>
-            <require comment="cl_device_svm_capabilities_arm">
+            <require group="cl_device_svm_capabilities_arm" etype="bitfield">
                 <enum name="CL_DEVICE_SVM_COARSE_GRAIN_BUFFER_ARM"/>
                 <enum name="CL_DEVICE_SVM_FINE_GRAIN_BUFFER_ARM"/>
                 <enum name="CL_DEVICE_SVM_FINE_GRAIN_SYSTEM_ARM"/>
                 <enum name="CL_DEVICE_SVM_ATOMICS_ARM"/>
             </require>
-            <require comment="cl_svm_mem_flags_arm">
+            <require group="cl_svm_mem_flags_arm" etype="bitfield">
                 <enum name="CL_MEM_SVM_FINE_GRAIN_BUFFER_ARM"/>
                 <enum name="CL_MEM_SVM_ATOMICS_ARM"/>
             </require>
@@ -6110,7 +6134,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_COMPUTE_UNITS_BITFIELD_ARM"/>
             </require>
         </extension>
@@ -6119,12 +6143,12 @@ server's OpenCL/api-docs repository.
                 <type name="CL/cl.h"/>
                 <type name="CL/cl_platform.h"/>
             </require>
-            <require comment="cl_command_queue_properties - bitfield">
+            <require group="cl_command_queue_properties" etype="bitfield">
                 <enum name="CL_QUEUE_THREAD_LOCAL_EXEC_ENABLE_INTEL"/>
             </require>
         </extension>
         <extension name="cl_intel_device_partition_by_names" revision="0.0.0" supported="opencl">
-            <require>
+            <require group="cl_device_partition_property">
                 <enum name="CL_DEVICE_PARTITION_BY_NAMES_INTEL"/>
                 <enum name="CL_PARTITION_BY_NAMES_LIST_END_INTEL"/>
             </require>
@@ -6135,7 +6159,7 @@ server's OpenCL/api-docs repository.
                 <type name="cl_accelerator_type_intel"/>
                 <type name="cl_accelerator_info_intel"/>
             </require>
-            <require comment="cl_accelerator_info_intel">
+            <require group="cl_accelerator_info_intel">
                 <enum name="CL_ACCELERATOR_DESCRIPTOR_INTEL"/>
                 <enum name="CL_ACCELERATOR_REFERENCE_COUNT_INTEL"/>
                 <enum name="CL_ACCELERATOR_CONTEXT_INTEL"/>
@@ -6158,7 +6182,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_motion_estimation_desc_intel"/>
             </require>
-            <require comment="cl_accelerator_type_intel">
+            <require group="cl_accelerator_type_intel">
                 <enum name="CL_ACCELERATOR_TYPE_MOTION_ESTIMATION_INTEL"/>
             </require>
             <require comment="cl_uint mb_block_type">
@@ -6182,35 +6206,35 @@ server's OpenCL/api-docs repository.
             </require>
         </extension>
         <extension name="cl_intel_advanced_motion_estimation" revision="0.0.0" supported="opencl">
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_ME_VERSION_INTEL"/>
             </require>
-            <require>
-                <enum name="CL_ME_VERSION_LEGACY_INTEL"/>
+            <require comment="returned from clGetDeviceInfo with CL_DEVICE_ME_VERSION_INTEL">
+                <enum name="CL_ME_VERSION_LEGACY_INTEL" comment="Extension text doesn't say anything about this value: #1262"/>
                 <enum name="CL_ME_VERSION_ADVANCED_VER_1_INTEL"/>
                 <enum name="CL_ME_VERSION_ADVANCED_VER_2_INTEL"/>
             </require>
-            <require>
+            <require etype="OpenCL-C only">
                 <enum name="CL_ME_CHROMA_INTRA_PREDICT_ENABLED_INTEL"/>
                 <enum name="CL_ME_LUMA_INTRA_PREDICT_ENABLED_INTEL"/>
             </require>
-            <require>
+            <require etype="OpenCL-C only">
                 <enum name="CL_ME_SKIP_BLOCK_TYPE_16x16_INTEL"/>
                 <enum name="CL_ME_SKIP_BLOCK_TYPE_8x8_INTEL"/>
             </require>
-            <require>
+            <require etype="OpenCL-C only">
                 <enum name="CL_ME_COST_PENALTY_NONE_INTEL"/>
                 <enum name="CL_ME_COST_PENALTY_LOW_INTEL"/>
                 <enum name="CL_ME_COST_PENALTY_NORMAL_INTEL"/>
                 <enum name="CL_ME_COST_PENALTY_HIGH_INTEL"/>
             </require>
-            <require>
+            <require etype="OpenCL-C only">
                 <enum name="CL_ME_COST_PRECISION_QPEL_INTEL"/>
                 <enum name="CL_ME_COST_PRECISION_HPEL_INTEL"/>
                 <enum name="CL_ME_COST_PRECISION_PEL_INTEL"/>
                 <enum name="CL_ME_COST_PRECISION_DPEL_INTEL"/>
             </require>
-            <require>
+            <require etype="OpenCL-C only">
                 <enum name="CL_ME_LUMA_PREDICTOR_MODE_VERTICAL_INTEL"/>
                 <enum name="CL_ME_LUMA_PREDICTOR_MODE_HORIZONTAL_INTEL"/>
                 <enum name="CL_ME_LUMA_PREDICTOR_MODE_DC_INTEL"/>
@@ -6222,18 +6246,18 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_ME_LUMA_PREDICTOR_MODE_VERTICAL_LEFT_INTEL"/>
                 <enum name="CL_ME_LUMA_PREDICTOR_MODE_HORIZONTAL_UP_INTEL"/>
             </require>
-            <require>
+            <require etype="OpenCL-C only">
                 <enum name="CL_ME_CHROMA_PREDICTOR_MODE_DC_INTEL"/>
                 <enum name="CL_ME_CHROMA_PREDICTOR_MODE_HORIZONTAL_INTEL"/>
                 <enum name="CL_ME_CHROMA_PREDICTOR_MODE_VERTICAL_INTEL"/>
                 <enum name="CL_ME_CHROMA_PREDICTOR_MODE_PLANE_INTEL"/>
             </require>
-            <require>
+            <require etype="OpenCL-C only">
                 <enum name="CL_ME_FORWARD_INPUT_MODE_INTEL"/>
                 <enum name="CL_ME_BACKWARD_INPUT_MODE_INTEL"/>
                 <enum name="CL_ME_BIDIRECTION_INPUT_MODE_INTEL"/>
             </require>
-            <require>
+            <require etype="OpenCL-C only">
                 <enum name="CL_ME_BIDIR_WEIGHT_QUARTER_INTEL"/>
                 <enum name="CL_ME_BIDIR_WEIGHT_THIRD_INTEL"/>
                 <enum name="CL_ME_BIDIR_WEIGHT_HALF_INTEL"/>
@@ -6242,18 +6266,21 @@ server's OpenCL/api-docs repository.
             </require>
         </extension>
         <extension name="cl_intel_simultaneous_sharing" revision="0.0.0" supported="opencl">
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_SIMULTANEOUS_INTEROPS_INTEL"/>
                 <enum name="CL_DEVICE_NUM_SIMULTANEOUS_INTEROPS_INTEL"/>
             </require>
         </extension>
         <extension name="cl_intel_egl_image_yuv" revision="0.0.0" supported="opencl">
-            <require comment="cl_egl_image_properties_khr">
+            <require group="cl_egl_image_properties_khr">
+                <enum name="CL_EGL_YUV_PLANE_INTEL"/>
+            </require>
+            <require group="cl_image_info">
                 <enum name="CL_EGL_YUV_PLANE_INTEL"/>
             </require>
         </extension>
         <extension name="cl_intel_packed_yuv" revision="0.0.0" supported="opencl">
-            <require comment="cl_channel_order">
+            <require group="cl_channel_order">
                 <enum name="CL_YUYV_INTEL"/>
                 <enum name="CL_UYVY_INTEL"/>
                 <enum name="CL_YVYU_INTEL"/>
@@ -6261,13 +6288,13 @@ server's OpenCL/api-docs repository.
             </require>
         </extension>
         <extension name="cl_intel_required_subgroup_size" revision="0.0.0" supported="opencl">
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_SUB_GROUP_SIZES_INTEL"/>
             </require>
-            <require comment="cl_kernel_work_group_info">
+            <require group="cl_kernel_work_group_info">
                 <enum name="CL_KERNEL_SPILL_MEM_SIZE_INTEL"/>
             </require>
-            <require comment="cl_kernel_sub_group_info">
+            <require group="cl_kernel_sub_group_info">
                 <enum name="CL_KERNEL_COMPILE_SUB_GROUP_SIZE_INTEL"/>
             </require>
         </extension>
@@ -6275,10 +6302,10 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_diagnostic_verbose_level_intel"/>
             </require>
-            <require comment="cl_context_properties">
+            <require group="cl_context_properties">
                 <enum name="CL_CONTEXT_SHOW_DIAGNOSTICS_INTEL"/>
             </require>
-            <require comment="cl_diagnostic_verbose_level_intel">
+            <require group="cl_diagnostic_verbose_level_intel">
                 <enum name="CL_CONTEXT_DIAGNOSTICS_LEVEL_ALL_INTEL"/>
                 <enum name="CL_CONTEXT_DIAGNOSTICS_LEVEL_GOOD_INTEL"/>
                 <enum name="CL_CONTEXT_DIAGNOSTICS_LEVEL_BAD_INTEL"/>
@@ -6286,46 +6313,46 @@ server's OpenCL/api-docs repository.
             </require>
         </extension>
         <extension name="cl_intel_planar_yuv" revision="0.0.0" supported="opencl">
-            <require comment="cl_channel_order">
+            <require group="cl_channel_order">
                 <enum name="CL_NV12_INTEL"/>
             </require>
-            <require comment="cl_mem_flags">
+            <require group="cl_mem_flags" etype="bitfield">
                 <enum name="CL_MEM_NO_ACCESS_INTEL"/>
                 <enum name="CL_MEM_ACCESS_FLAGS_UNRESTRICTED_INTEL"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_PLANAR_YUV_MAX_WIDTH_INTEL"/>
                 <enum name="CL_DEVICE_PLANAR_YUV_MAX_HEIGHT_INTEL"/>
             </require>
         </extension>
         <extension name="cl_intel_device_side_avc_motion_estimation" revision="0.0.0" supported="opencl">
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_AVC_ME_VERSION_INTEL"/>
                 <enum name="CL_DEVICE_AVC_ME_SUPPORTS_TEXTURE_SAMPLER_USE_INTEL"/>
                 <enum name="CL_DEVICE_AVC_ME_SUPPORTS_PREEMPTION_INTEL"/>
             </require>
-            <require comment="returned by CL_DEVICE_AVC_ME_VERSION_INTEL">
+            <require comment="returned from clGetDeviceInfo with CL_DEVICE_AVC_ME_VERSION_INTEL">
                 <enum name="CL_AVC_ME_VERSION_0_INTEL"/>
                 <enum name="CL_AVC_ME_VERSION_1_INTEL"/>
             </require>
-            <require comment="Inter macro-block major shape values">
+            <require comment="Inter macro-block major shape values" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_MAJOR_16x16_INTEL"/>
                 <enum name="CL_AVC_ME_MAJOR_16x8_INTEL"/>
                 <enum name="CL_AVC_ME_MAJOR_8x16_INTEL"/>
                 <enum name="CL_AVC_ME_MAJOR_8x8_INTEL"/>
             </require>
-            <require comment="Inter macro-block minor shape values">
+            <require comment="Inter macro-block minor shape values" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_MINOR_8x8_INTEL"/>
                 <enum name="CL_AVC_ME_MINOR_8x4_INTEL"/>
                 <enum name="CL_AVC_ME_MINOR_4x8_INTEL"/>
                 <enum name="CL_AVC_ME_MINOR_4x4_INTEL"/>
             </require>
-            <require comment="Inter macro-block major direction values">
+            <require comment="Inter macro-block major direction values" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_MAJOR_FORWARD_INTEL"/>
                 <enum name="CL_AVC_ME_MAJOR_BACKWARD_INTEL"/>
                 <enum name="CL_AVC_ME_MAJOR_BIDIRECTIONAL_INTEL"/>
             </require>
-            <require comment="Inter (IME) partition mask values">
+            <require comment="Inter (IME) partition mask values" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_PARTITION_MASK_ALL_INTEL"/>
                 <enum name="CL_AVC_ME_PARTITION_MASK_16x16_INTEL"/>
                 <enum name="CL_AVC_ME_PARTITION_MASK_16x8_INTEL"/>
@@ -6335,7 +6362,7 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_AVC_ME_PARTITION_MASK_4x8_INTEL"/>
                 <enum name="CL_AVC_ME_PARTITION_MASK_4x4_INTEL"/>
             </require>
-            <require comment="Search window configuration">
+            <require comment="Search window configuration" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_SEARCH_WINDOW_EXHAUSTIVE_INTEL"/>
                 <enum name="CL_AVC_ME_SEARCH_WINDOW_SMALL_INTEL"/>
                 <enum name="CL_AVC_ME_SEARCH_WINDOW_TINY_INTEL"/>
@@ -6349,39 +6376,39 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_AVC_ME_SEARCH_WINDOW_4x4_RADIUS_INTEL"/>
                 <enum name="CL_AVC_ME_SEARCH_WINDOW_2x2_RADIUS_INTEL"/>
             </require>
-            <require comment="SAD adjustment mode">
+            <require comment="SAD adjustment mode" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_SAD_ADJUST_MODE_NONE_INTEL"/>
                 <enum name="CL_AVC_ME_SAD_ADJUST_MODE_HAAR_INTEL"/>
             </require>
-            <require comment="Pixel resolution">
+            <require comment="Pixel resolution" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_SUBPIXEL_MODE_INTEGER_INTEL"/>
                 <enum name="CL_AVC_ME_SUBPIXEL_MODE_HPEL_INTEL"/>
                 <enum name="CL_AVC_ME_SUBPIXEL_MODE_QPEL_INTEL"/>
             </require>
-            <require comment="Cost precision values">
+            <require comment="Cost precision values" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_COST_PRECISION_QPEL_INTEL"/>
                 <enum name="CL_AVC_ME_COST_PRECISION_HPEL_INTEL"/>
                 <enum name="CL_AVC_ME_COST_PRECISION_PEL_INTEL"/>
                 <enum name="CL_AVC_ME_COST_PRECISION_DPEL_INTEL"/>
             </require>
-            <require comment="Inter bidirectional weights">
+            <require comment="Inter bidirectional weights" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_BIDIR_WEIGHT_QUARTER_INTEL"/>
                 <enum name="CL_AVC_ME_BIDIR_WEIGHT_THIRD_INTEL"/>
                 <enum name="CL_AVC_ME_BIDIR_WEIGHT_HALF_INTEL"/>
                 <enum name="CL_AVC_ME_BIDIR_WEIGHT_TWO_THIRD_INTEL"/>
                 <enum name="CL_AVC_ME_BIDIR_WEIGHT_THREE_QUARTER_INTEL"/>
             </require>
-            <require comment="Inter border reached values">
+            <require comment="Inter border reached values" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_BORDER_REACHED_LEFT_INTEL"/>
                 <enum name="CL_AVC_ME_BORDER_REACHED_RIGHT_INTEL"/>
                 <enum name="CL_AVC_ME_BORDER_REACHED_TOP_INTEL"/>
                 <enum name="CL_AVC_ME_BORDER_REACHED_BOTTOM_INTEL"/>
             </require>
-            <require comment="Inter skip block partition type">
+            <require comment="Inter skip block partition type" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_SKIP_BLOCK_PARTITION_16x16_INTEL"/>
                 <enum name="CL_AVC_ME_SKIP_BLOCK_PARTITION_8x8_INTEL"/>
             </require>
-            <require comment="Inter skip motion vector mask">
+            <require comment="Inter skip motion vector mask" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_SKIP_BLOCK_16x16_FORWARD_ENABLE_INTEL"/>
                 <enum name="CL_AVC_ME_SKIP_BLOCK_16x16_BACKWARD_ENABLE_INTEL"/>
                 <enum name="CL_AVC_ME_SKIP_BLOCK_16x16_DUAL_ENABLE_INTEL"/>
@@ -6397,27 +6424,27 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_AVC_ME_SKIP_BLOCK_8x8_3_FORWARD_ENABLE_INTEL"/>
                 <enum name="CL_AVC_ME_SKIP_BLOCK_8x8_3_BACKWARD_ENABLE_INTEL"/>
             </require>
-            <require comment="Block based skip type values">
+            <require comment="Block based skip type values" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_BLOCK_BASED_SKIP_4x4_INTEL"/>
                 <enum name="CL_AVC_ME_BLOCK_BASED_SKIP_8x8_INTEL"/>
             </require>
-            <require comment="cl_intel_device_side_avc_motion_estimation.??">
+            <require comment="cl_intel_device_side_avc_motion_estimation.??" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_INTRA_16x16_INTEL"/>
                 <enum name="CL_AVC_ME_INTRA_8x8_INTEL"/>
                 <enum name="CL_AVC_ME_INTRA_4x4_INTEL"/>
             </require>
-            <require comment="Luma intra partition mask values">
+            <require comment="Luma intra partition mask values" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_INTRA_LUMA_PARTITION_MASK_16x16_INTEL"/>
                 <enum name="CL_AVC_ME_INTRA_LUMA_PARTITION_MASK_8x8_INTEL"/>
                 <enum name="CL_AVC_ME_INTRA_LUMA_PARTITION_MASK_4x4_INTEL"/>
             </require>
-            <require comment="Intra neighbor availability mask values">
+            <require comment="Intra neighbor availability mask values" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_INTRA_NEIGHBOR_LEFT_MASK_ENABLE_INTEL"/>
                 <enum name="CL_AVC_ME_INTRA_NEIGHBOR_UPPER_MASK_ENABLE_INTEL"/>
                 <enum name="CL_AVC_ME_INTRA_NEIGHBOR_UPPER_RIGHT_MASK_ENABLE_INTEL"/>
                 <enum name="CL_AVC_ME_INTRA_NEIGHBOR_UPPER_LEFT_MASK_ENABLE_INTEL"/>
             </require>
-            <require comment="Luma intra modes">
+            <require comment="Luma intra modes" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_LUMA_PREDICTOR_MODE_VERTICAL_INTEL"/>
                 <enum name="CL_AVC_ME_LUMA_PREDICTOR_MODE_HORIZONTAL_INTEL"/>
                 <enum name="CL_AVC_ME_LUMA_PREDICTOR_MODE_DC_INTEL"/>
@@ -6429,23 +6456,23 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_AVC_ME_LUMA_PREDICTOR_MODE_VERTICAL_LEFT_INTEL"/>
                 <enum name="CL_AVC_ME_LUMA_PREDICTOR_MODE_HORIZONTAL_UP_INTEL"/>
             </require>
-            <require comment="Chroma intra modes">
+            <require comment="Chroma intra modes" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_CHROMA_PREDICTOR_MODE_DC_INTEL"/>
                 <enum name="CL_AVC_ME_CHROMA_PREDICTOR_MODE_HORIZONTAL_INTEL"/>
                 <enum name="CL_AVC_ME_CHROMA_PREDICTOR_MODE_VERTICAL_INTEL"/>
                 <enum name="CL_AVC_ME_CHROMA_PREDICTOR_MODE_PLANE_INTEL"/>
             </require>
-            <require comment="Reference image select values">
+            <require comment="Reference image select values" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_FRAME_FORWARD_INTEL"/>
                 <enum name="CL_AVC_ME_FRAME_BACKWARD_INTEL"/>
                 <enum name="CL_AVC_ME_FRAME_DUAL_INTEL"/>
             </require>
-            <require comment="Slice type values">
+            <require comment="Slice type values" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_SLICE_TYPE_PRED_INTEL"/>
                 <enum name="CL_AVC_ME_SLICE_TYPE_BPRED_INTEL"/>
                 <enum name="CL_AVC_ME_SLICE_TYPE_INTRA_INTEL"/>
             </require>
-            <require comment="Interlaced image field polarity values">
+            <require comment="Interlaced image field polarity values" etype="OpenCL-C only">
                 <enum name="CL_AVC_ME_INTERLACED_SCAN_TOP_FIELD_INTEL"/>
                 <enum name="CL_AVC_ME_INTERLACED_SCAN_BOTTOM_FIELD_INTEL"/>
             </require>
@@ -6454,7 +6481,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_GLsync"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR"/>
             </require>
             <require>
@@ -6475,23 +6502,23 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_VA_API_MEDIA_SURFACE_ALREADY_ACQUIRED_INTEL"/>
                 <enum name="CL_VA_API_MEDIA_SURFACE_NOT_ACQUIRED_INTEL"/>
             </require>
-            <require comment="cl_va_api_device_source_intel">
+            <require group="cl_va_api_device_source_intel">
                 <enum name="CL_VA_API_DISPLAY_INTEL"/>
             </require>
-            <require comment="cl_va_api_device_set_intel">
+            <require group="cl_va_api_device_set_intel">
                 <enum name="CL_PREFERRED_DEVICES_FOR_VA_API_INTEL"/>
                 <enum name="CL_ALL_DEVICES_FOR_VA_API_INTEL"/>
             </require>
-            <require comment="cl_context_info">
+            <require group="cl_context_info">
                 <enum name="CL_CONTEXT_VA_API_DISPLAY_INTEL"/>
             </require>
-            <require comment="cl_mem_info">
+            <require group="cl_mem_info">
                 <enum name="CL_MEM_VA_API_MEDIA_SURFACE_INTEL"/>
             </require>
-            <require comment="cl_image_info">
+            <require group="cl_image_info">
                 <enum name="CL_IMAGE_VA_API_PLANE_INTEL"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_ACQUIRE_VA_API_MEDIA_SURFACES_INTEL"/>
                 <enum name="CL_COMMAND_RELEASE_VA_API_MEDIA_SURFACES_INTEL"/>
             </require>
@@ -6516,28 +6543,28 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_DX9_RESOURCE_ALREADY_ACQUIRED_INTEL"/>
                 <enum name="CL_DX9_RESOURCE_NOT_ACQUIRED_INTEL"/>
             </require>
-            <require comment="cl_dx9_device_source_intel">
+            <require group="cl_dx9_device_source_intel">
                 <enum name="CL_D3D9_DEVICE_INTEL"/>
                 <enum name="CL_D3D9EX_DEVICE_INTEL"/>
                 <enum name="CL_DXVA_DEVICE_INTEL"/>
             </require>
-            <require comment="cl_dx9_device_set_intel">
+            <require group="cl_dx9_device_set_intel">
                 <enum name="CL_PREFERRED_DEVICES_FOR_DX9_INTEL"/>
                 <enum name="CL_ALL_DEVICES_FOR_DX9_INTEL"/>
             </require>
-            <require comment="cl_context_info">
+            <require group="cl_context_properties">
                 <enum name="CL_CONTEXT_D3D9_DEVICE_INTEL"/>
                 <enum name="CL_CONTEXT_D3D9EX_DEVICE_INTEL"/>
                 <enum name="CL_CONTEXT_DXVA_DEVICE_INTEL"/>
             </require>
-            <require comment="cl_mem_info">
+            <require group="cl_mem_info">
                 <enum name="CL_MEM_DX9_RESOURCE_INTEL"/>
                 <enum name="CL_MEM_DX9_SHARED_HANDLE_INTEL"/>
             </require>
-            <require comment="cl_image_info">
+            <require group="cl_image_info">
                 <enum name="CL_IMAGE_DX9_PLANE_INTEL"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_ACQUIRE_DX9_OBJECTS_INTEL"/>
                 <enum name="CL_COMMAND_RELEASE_DX9_OBJECTS_INTEL"/>
             </require>
@@ -6552,10 +6579,10 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_channel_order">
+            <require group="cl_channel_order">
                 <enum name="CL_DEPTH_STENCIL"/>
             </require>
-            <require comment="cl_channel_type">
+            <require group="cl_channel_type">
                 <enum name="CL_UNORM_INT24"/>
             </require>
         </extension>
@@ -6563,7 +6590,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_gl_texture_info">
+            <require group="cl_gl_texture_info">
                 <!-- <enum name="GL_TEXTURE_2D_MULTISAMPLE"/> -->
                 <!-- <enum name="GL_TEXTURE_2D_MULTISAMPLE_ARRAY"/> -->
                 <enum name="CL_GL_NUM_SAMPLES"/>
@@ -6584,35 +6611,35 @@ server's OpenCL/api-docs repository.
             <require comment="Error codes">
                 <enum name="CL_INVALID_GL_SHAREGROUP_REFERENCE_KHR"/>
             </require>
-            <require comment="cl_gl_context_info">
+            <require group="cl_gl_context_info">
                 <enum name="CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR"/>
                 <enum name="CL_DEVICES_FOR_GL_CONTEXT_KHR"/>
             </require>
-            <require comment="Additional cl_context_properties">
+            <require group="cl_context_properties">
                 <enum name="CL_GL_CONTEXT_KHR"/>
-                <enum name="CL_EGL_DISPLAY_KHR"/>
-                <enum name="CL_GLX_DISPLAY_KHR"/>
-                <enum name="CL_WGL_HDC_KHR"/>
-                <enum name="CL_CGL_SHAREGROUP_KHR"/>
+                <enum name="CL_EGL_DISPLAY_KHR" comment="For embedded"/>
+                <enum name="CL_GLX_DISPLAY_KHR" comment="For Linux"/>
+                <enum name="CL_WGL_HDC_KHR" comment="For Windows"/>
+                <enum name="CL_CGL_SHAREGROUP_KHR" comment="For macOS"/>
             </require>
             <require>
                 <type name="cl_gl_object_type"/>
                 <type name="cl_gl_texture_info"/>
                 <type name="cl_gl_platform_info" comment="Unused"/>
             </require>
-            <require comment="cl_gl_object_type">
+            <require group="cl_gl_object_type">
                 <enum name="CL_GL_OBJECT_BUFFER"/>
                 <enum name="CL_GL_OBJECT_TEXTURE2D"/>
                 <enum name="CL_GL_OBJECT_TEXTURE3D"/>
                 <enum name="CL_GL_OBJECT_RENDERBUFFER"/>
             </require>
-            <require condition="defined(CL_VERSION_1_2)" comment="cl_gl_object_type">
+            <require group="cl_gl_object_type" condition="defined(CL_VERSION_1_2)">
                 <enum name="CL_GL_OBJECT_TEXTURE2D_ARRAY"/>
                 <enum name="CL_GL_OBJECT_TEXTURE1D"/>
                 <enum name="CL_GL_OBJECT_TEXTURE1D_ARRAY"/>
                 <enum name="CL_GL_OBJECT_TEXTURE_BUFFER"/>
             </require>
-            <require comment="cl_gl_texture_info">
+            <require group="cl_gl_texture_info">
                 <enum name="CL_GL_TEXTURE_TARGET"/>
                 <enum name="CL_GL_MIPMAP_LEVEL"/>
             </require>
@@ -6644,46 +6671,47 @@ server's OpenCL/api-docs repository.
                 <type name="cl_unified_shared_memory_type_intel"/>
                 <type name="cl_mem_advice_intel"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_HOST_MEM_CAPABILITIES_INTEL"/>
                 <enum name="CL_DEVICE_DEVICE_MEM_CAPABILITIES_INTEL"/>
                 <enum name="CL_DEVICE_SINGLE_DEVICE_SHARED_MEM_CAPABILITIES_INTEL"/>
                 <enum name="CL_DEVICE_CROSS_DEVICE_SHARED_MEM_CAPABILITIES_INTEL"/>
                 <enum name="CL_DEVICE_SHARED_SYSTEM_MEM_CAPABILITIES_INTEL"/>
             </require>
-            <require comment="cl_unified_shared_memory_capabilities_intel - bitfield">
+            <require group="cl_device_unified_shared_memory_capabilities_intel" etype="bitfield">
                 <enum name="CL_UNIFIED_SHARED_MEMORY_ACCESS_INTEL"/>
                 <enum name="CL_UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS_INTEL"/>
                 <enum name="CL_UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS_INTEL"/>
                 <enum name="CL_UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS_INTEL"/>
             </require>
-            <require comment="cl_mem_properties_intel">
+            <require group="cl_mem_properties_intel">
                 <enum name="CL_MEM_ALLOC_FLAGS_INTEL"/>
             </require>
-            <require comment="cl_mem_alloc_flags_intel - bitfield">
+            <require group="cl_mem_alloc_flags_intel" etype="bitfield">
                 <enum name="CL_MEM_ALLOC_WRITE_COMBINED_INTEL"/>
                 <enum name="CL_MEM_ALLOC_INITIAL_PLACEMENT_DEVICE_INTEL"/>
                 <enum name="CL_MEM_ALLOC_INITIAL_PLACEMENT_HOST_INTEL"/>
             </require>
-            <require comment="cl_mem_alloc_info_intel">
+            <require group="cl_mem_info_intel">
                 <enum name="CL_MEM_ALLOC_TYPE_INTEL"/>
                 <enum name="CL_MEM_ALLOC_BASE_PTR_INTEL"/>
                 <enum name="CL_MEM_ALLOC_SIZE_INTEL"/>
                 <enum name="CL_MEM_ALLOC_DEVICE_INTEL"/>
+                <enum name="CL_MEM_ALLOC_FLAGS_INTEL"/>
             </require>
-            <require comment="cl_unified_shared_memory_type_intel">
+            <require group="cl_unified_shared_memory_type_intel">
                 <enum name="CL_MEM_TYPE_UNKNOWN_INTEL"/>
                 <enum name="CL_MEM_TYPE_HOST_INTEL"/>
                 <enum name="CL_MEM_TYPE_DEVICE_INTEL"/>
                 <enum name="CL_MEM_TYPE_SHARED_INTEL"/>
             </require>
-            <require comment="cl_kernel_exec_info">
+            <require group="cl_kernel_exec_info">
                 <enum name="CL_KERNEL_EXEC_INFO_INDIRECT_HOST_ACCESS_INTEL"/>
                 <enum name="CL_KERNEL_EXEC_INFO_INDIRECT_DEVICE_ACCESS_INTEL"/>
                 <enum name="CL_KERNEL_EXEC_INFO_INDIRECT_SHARED_ACCESS_INTEL"/>
                 <enum name="CL_KERNEL_EXEC_INFO_USM_PTRS_INTEL"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_MEMFILL_INTEL"/>
                 <enum name="CL_COMMAND_MEMCPY_INTEL"/>
                 <enum name="CL_COMMAND_MIGRATEMEM_INTEL"/>
@@ -6709,11 +6737,11 @@ server's OpenCL/api-docs repository.
             </require>
         </extension>
         <extension name="cl_khr_device_uuid" revision="1.0.0" supported="opencl" ratified="opencl">
-            <require comment="Size Constants">
+            <require etype="constants">
                 <enum name="CL_UUID_SIZE_KHR"/>
                 <enum name="CL_LUID_SIZE_KHR"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_UUID_KHR"/>
                 <enum name="CL_DRIVER_UUID_KHR"/>
                 <enum name="CL_DEVICE_LUID_VALID_KHR"/>
@@ -6730,7 +6758,7 @@ server's OpenCL/api-docs repository.
             </require>
         </extension>
         <extension name="cl_intel_mem_channel_property" revision="0.0.0" supported="opencl">
-            <require comment="cl_mem_properties_intel">
+            <require group="cl_mem_properties_intel">
                 <enum name="CL_MEM_CHANNEL_INTEL"/>
             </require>
         </extension>
@@ -6738,10 +6766,10 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_mem_properties_intel">
+            <require group="cl_mem_properties_intel">
                 <enum name="CL_MEM_ALLOC_BUFFER_LOCATION_INTEL"/>
             </require>
-            <require comment="cl_mem_alloc_info_intel">
+            <require group="cl_mem_info_intel">
                 <enum name="CL_MEM_ALLOC_BUFFER_LOCATION_INTEL"/>
             </require>
         </extension>
@@ -6749,7 +6777,7 @@ server's OpenCL/api-docs repository.
             <require comment="Types">
                 <type name="cl_device_scheduling_controls_capabilities_arm"/>
             </require>
-            <require comment="cl_device_scheduling_controls_capabilities_arm">
+            <require group="cl_device_scheduling_controls_capabilities_arm" etype="bitfield">
                 <enum name="CL_DEVICE_SCHEDULING_KERNEL_BATCHING_ARM"/>
                 <enum name="CL_DEVICE_SCHEDULING_WORKGROUP_BATCH_SIZE_ARM"/>
                 <enum name="CL_DEVICE_SCHEDULING_WORKGROUP_BATCH_SIZE_MODIFIER_ARM"/>
@@ -6759,33 +6787,33 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_DEVICE_SCHEDULING_COMPUTE_UNIT_BATCH_QUEUE_SIZE_ARM"/>
                 <enum name="CL_DEVICE_SCHEDULING_COMPUTE_UNIT_LIMIT_ARM"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_SCHEDULING_CONTROLS_CAPABILITIES_ARM"/>
                 <enum name="CL_DEVICE_SUPPORTED_REGISTER_ALLOCATIONS_ARM"/>
                 <enum name="CL_DEVICE_MAX_WARP_COUNT_ARM"/>
             </require>
-            <require comment="cl_kernel_exec_info">
+            <require group="cl_kernel_exec_info">
                 <enum name="CL_KERNEL_EXEC_INFO_WORKGROUP_BATCH_SIZE_ARM"/>
                 <enum name="CL_KERNEL_EXEC_INFO_WORKGROUP_BATCH_SIZE_MODIFIER_ARM"/>
                 <enum name="CL_KERNEL_EXEC_INFO_WARP_COUNT_LIMIT_ARM"/>
                 <enum name="CL_KERNEL_EXEC_INFO_COMPUTE_UNIT_MAX_QUEUED_BATCHES_ARM"/>
             </require>
-            <require comment="cl_kernel_info">
+            <require group="cl_kernel_info">
                 <enum name="CL_KERNEL_MAX_WARP_COUNT_ARM"/>
             </require>
-            <require comment="cl_queue_properties">
+            <require group="cl_queue_properties">
                 <enum name="CL_QUEUE_KERNEL_BATCHING_ARM"/>
                 <enum name="CL_QUEUE_DEFERRED_FLUSH_ARM"/>
                 <enum name="CL_QUEUE_COMPUTE_UNIT_LIMIT_ARM"/>
             </require>
         </extension>
         <extension name="cl_ext_cxx_for_opencl" revision="1.0.0" depends="CL_VERSION_3_0,CL_VERSION_2_0+cl_khr_extended_versioning" supported="opencl">
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_CXX_FOR_OPENCL_NUMERIC_VERSION_EXT"/>
             </require>
         </extension>
         <extension name="cl_intel_mem_force_host_memory" revision="0.0.0" supported="opencl">
-            <require comment="cl_mem_flags">
+            <require group="cl_mem_flags" etype="bitfield">
                 <enum name="CL_MEM_FORCE_HOST_MEMORY_INTEL"/>
             </require>
         </extension>
@@ -6793,12 +6821,12 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require condition="!defined(CL_VERSION_2_0)" comment="cl_channel_order - defined in CL.h for OpenCL 2.0 and newer">
+            <require group="cl_channel_order" condition="!defined(CL_VERSION_2_0)">
                 <enum name="CL_DEPTH"/>
             </require>
         </extension>
         <extension name="cl_khr_extended_versioning" revision="1.0.0" supported="opencl" promotedto="CL_VERSION_3_0" ratified="opencl">
-            <require>
+            <require etype="constants">
                 <enum name="CL_VERSION_MAJOR_BITS_KHR"/>
                 <enum name="CL_VERSION_MINOR_BITS_KHR"/>
                 <enum name="CL_VERSION_PATCH_BITS_KHR"/>
@@ -6816,18 +6844,18 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL_MAKE_VERSION_KHR"/>
             </require>
-            <require>
+            <require etype="constants">
                 <enum name="CL_NAME_VERSION_MAX_NAME_SIZE_KHR"/>
             </require>
             <require>
                 <type name="cl_version_khr"/>
                 <type name="cl_name_version_khr"/>
             </require>
-            <require comment="cl_platform_info">
+            <require group="cl_platform_info">
                 <enum name="CL_PLATFORM_NUMERIC_VERSION_KHR"/>
                 <enum name="CL_PLATFORM_EXTENSIONS_WITH_VERSION_KHR"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_NUMERIC_VERSION_KHR"/>
                 <enum name="CL_DEVICE_OPENCL_C_NUMERIC_VERSION_KHR"/>
                 <enum name="CL_DEVICE_EXTENSIONS_WITH_VERSION_KHR"/>
@@ -6839,11 +6867,11 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_mipmap_filter_mode_img"/>
             </require>
-            <require comment="cl_mipmap_filter_mode_img">
+            <require group="cl_mipmap_filter_mode_img">
                 <enum name="CL_MIPMAP_FILTER_ANY_IMG"/>
                 <enum name="CL_MIPMAP_FILTER_BOX_IMG"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_GENERATE_MIPMAP_IMG"/>
             </require>
             <require>
@@ -6854,10 +6882,10 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_mem_properties">
+            <require group="cl_mem_properties">
                 <enum name="CL_MEM_ALLOC_FLAGS_IMG"/>
             </require>
-            <require comment="cl_mem_alloc_flags_img">
+            <require group="cl_mem_alloc_flags_img" etype="bitfield">
                 <enum name="CL_MEM_ALLOC_RELAX_REQUIREMENTS_IMG"/>
                 <enum name="CL_MEM_ALLOC_GPU_WRITE_COMBINE_IMG"/>
                 <enum name="CL_MEM_ALLOC_GPU_CACHED_IMG"/>
@@ -6865,29 +6893,30 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_MEM_ALLOC_GPU_LOCAL_IMG"/>
                 <enum name="CL_MEM_ALLOC_GPU_PRIVATE_IMG"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_MEMORY_CAPABILITIES_IMG"/>
             </require>
         </extension>
         <extension name="cl_arm_controlled_kernel_termination" revision="0.0.0" supported="opencl">
             <require comment="Types">
                 <type name="cl_device_controlled_termination_capabilities_arm"/>
+                <type name="cl_command_termination_reason_arm"/>
             </require>
             <require comment="Error codes">
                 <enum name="CL_COMMAND_TERMINATED_ITSELF_WITH_FAILURE_ARM"/>
             </require>
-            <require comment="cl_device_controlled_termination_capabilities_arm">
+            <require group="cl_device_controlled_termination_capabilities_arm" etype="bitfield">
                 <enum name="CL_DEVICE_CONTROLLED_TERMINATION_SUCCESS_ARM"/>
                 <enum name="CL_DEVICE_CONTROLLED_TERMINATION_FAILURE_ARM"/>
                 <enum name="CL_DEVICE_CONTROLLED_TERMINATION_QUERY_ARM"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_CONTROLLED_TERMINATION_CAPABILITIES_ARM"/>
             </require>
-            <require comment="cl_event_info">
+            <require group="cl_event_info">
                 <enum name="CL_EVENT_COMMAND_TERMINATION_REASON_ARM"/>
             </require>
-            <require comment="cl_command_termination_reason_arm">
+            <require group="cl_command_termination_reason_arm">
                 <enum name="CL_COMMAND_TERMINATION_COMPLETION_ARM"/>
                 <enum name="CL_COMMAND_TERMINATION_CONTROLLED_SUCCESS_ARM"/>
                 <enum name="CL_COMMAND_TERMINATION_CONTROLLED_FAILURE_ARM"/>
@@ -6901,20 +6930,24 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_command_queue_capabilities_intel"/>
             </require>
-            <require>
+            <require etype="constants">
                 <enum name="CL_QUEUE_FAMILY_MAX_NAME_SIZE_INTEL"/>
             </require>
             <require>
                 <type name="cl_queue_family_properties_intel"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_QUEUE_FAMILY_PROPERTIES_INTEL"/>
             </require>
-            <require comment="cl_queue_properties">
+            <require group="cl_queue_properties">
                 <enum name="CL_QUEUE_FAMILY_INTEL"/>
                 <enum name="CL_QUEUE_INDEX_INTEL"/>
             </require>
-            <require comment="cl_command_queue_capabilities_intel">
+            <require group="cl_command_queue_info">
+                <enum name="CL_QUEUE_FAMILY_INTEL"/>
+                <enum name="CL_QUEUE_INDEX_INTEL"/>
+            </require>
+            <require group="cl_command_queue_capabilities_intel" etype="bitfield">
                 <enum name="CL_QUEUE_DEFAULT_CAPABILITIES_INTEL"/>
                 <enum name="CL_QUEUE_CAPABILITY_CREATE_SINGLE_QUEUE_EVENTS_INTEL"/>
                 <enum name="CL_QUEUE_CAPABILITY_CREATE_CROSS_QUEUE_EVENTS_INTEL"/>
@@ -6941,7 +6974,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_device_pci_bus_info_khr"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_PCI_BUS_INFO_KHR"/>
             </require>
         </extension>
@@ -6960,11 +6993,11 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_device_feature_capabilities_intel"/>
             </require>
-            <require comment="cl_device_feature_capabilities_intel">
+            <require group="cl_device_feature_capabilities_intel" etype="bitfield">
                 <enum name="CL_DEVICE_FEATURE_FLAG_DP4A_INTEL"/>
                 <enum name="CL_DEVICE_FEATURE_FLAG_DPAS_INTEL"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_IP_VERSION_INTEL"/>
                 <enum name="CL_DEVICE_ID_INTEL"/>
                 <enum name="CL_DEVICE_NUM_SLICES_INTEL"/>
@@ -6982,11 +7015,11 @@ server's OpenCL/api-docs repository.
                 <type name="cl_device_integer_dot_product_capabilities_khr"/>
                 <type name="cl_device_integer_dot_product_acceleration_properties_khr"/>
             </require>
-            <require comment="cl_device_integer_dot_product_capabilities_khr">
+            <require group="cl_device_integer_dot_product_capabilities_khr" etype="bitfield">
                 <enum name="CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR"/>
                 <enum name="CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED_KHR"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_INTEGER_DOT_PRODUCT_CAPABILITIES_KHR"/>
                 <enum name="CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_8BIT_KHR"/>
                 <enum name="CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_4x8BIT_PACKED_KHR"/>
@@ -7003,27 +7036,29 @@ server's OpenCL/api-docs repository.
                 <type name="cl_semaphore_type_khr"/>
                 <type name="cl_semaphore_payload_khr"/>
             </require>
-            <require comment="cl_semaphore_type">
+            <require group="cl_semaphore_type_khr">
                 <enum name="CL_SEMAPHORE_TYPE_BINARY_KHR"/>
             </require>
-            <require comment="cl_platform_info">
+            <require group="cl_platform_info">
                 <enum name="CL_PLATFORM_SEMAPHORE_TYPES_KHR"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_SEMAPHORE_TYPES_KHR"/>
             </require>
-            <require comment="cl_semaphore_info_khr">
+            <require group="cl_semaphore_info_khr">
                 <enum name="CL_SEMAPHORE_CONTEXT_KHR"/>
                 <enum name="CL_SEMAPHORE_REFERENCE_COUNT_KHR"/>
                 <enum name="CL_SEMAPHORE_PROPERTIES_KHR"/>
                 <enum name="CL_SEMAPHORE_PAYLOAD_KHR"/>
+                <enum name="CL_SEMAPHORE_TYPE_KHR"/>
+                <enum name="CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR"/>
             </require>
-            <require comment="cl_semaphore_info_khr or cl_semaphore_properties_khr">
+            <require group="cl_semaphore_properties_khr">
                 <enum name="CL_SEMAPHORE_TYPE_KHR"/>
                 <enum name="CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR"/>
                 <enum name="CL_SEMAPHORE_DEVICE_HANDLE_LIST_END_KHR"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_SEMAPHORE_WAIT_KHR"/>
                 <enum name="CL_COMMAND_SEMAPHORE_SIGNAL_KHR"/>
             </require>
@@ -7047,19 +7082,19 @@ server's OpenCL/api-docs repository.
                 <type name="cl_semaphore_khr"/>
                 <type name="cl_external_semaphore_handle_type_khr"/>
             </require>
-            <require comment="cl_platform_info">
+            <require group="cl_platform_info">
                 <enum name="CL_PLATFORM_SEMAPHORE_IMPORT_HANDLE_TYPES_KHR"/>
                 <enum name="CL_PLATFORM_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_SEMAPHORE_IMPORT_HANDLE_TYPES_KHR"/>
                 <enum name="CL_DEVICE_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR"/>
             </require>
-            <require comment="cl_semaphore_properties_khr">
+            <require group="cl_semaphore_properties_khr">
                 <enum name="CL_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR"/>
                 <enum name="CL_SEMAPHORE_EXPORT_HANDLE_TYPES_LIST_END_KHR"/>
             </require>
-            <require comment="cl_semaphore_info_khr">
+            <require group="cl_semaphore_info_khr">
                 <enum name="CL_SEMAPHORE_EXPORTABLE_KHR"/>
             </require>
             <require>
@@ -7070,7 +7105,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_external_semaphore_handle_type_khr">
+            <require group="cl_external_semaphore_handle_type_khr">
                 <enum name="CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR"/>
             </require>
         </extension>
@@ -7081,7 +7116,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_semaphore_reimport_properties_khr"/>
             </require>
-            <require comment="cl_external_semaphore_handle_type_khr">
+            <require group="cl_external_semaphore_handle_type_khr">
                 <enum name="CL_SEMAPHORE_HANDLE_SYNC_FD_KHR"/>
             </require>
             <require>
@@ -7092,7 +7127,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_external_semaphore_handle_type_khr">
+            <require group="cl_external_semaphore_handle_type_khr">
                 <enum name="CL_SEMAPHORE_HANDLE_OPAQUE_WIN32_KHR"/>
                 <enum name="CL_SEMAPHORE_HANDLE_OPAQUE_WIN32_KMT_KHR"/>
                 <enum name="CL_SEMAPHORE_HANDLE_OPAQUE_WIN32_NAME_KHR"/>
@@ -7105,18 +7140,18 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_external_memory_handle_type_khr"/>
             </require>
-            <require comment="cl_platform_info">
+            <require group="cl_platform_info">
                 <enum name="CL_PLATFORM_EXTERNAL_MEMORY_IMPORT_HANDLE_TYPES_KHR"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_EXTERNAL_MEMORY_IMPORT_HANDLE_TYPES_KHR"/>
                 <enum name="CL_DEVICE_EXTERNAL_MEMORY_IMPORT_ASSUME_LINEAR_IMAGES_HANDLE_TYPES_KHR"/>
             </require>
-            <require comment="cl_mem_properties">
+            <require group="cl_mem_properties">
                 <enum name="CL_MEM_DEVICE_HANDLE_LIST_KHR"/>
                 <enum name="CL_MEM_DEVICE_HANDLE_LIST_END_KHR"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_ACQUIRE_EXTERNAL_MEM_OBJECTS_KHR"/>
                 <enum name="CL_COMMAND_RELEASE_EXTERNAL_MEM_OBJECTS_KHR"/>
             </require>
@@ -7129,7 +7164,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_external_memory_handle_type_khr">
+            <require group="cl_external_memory_handle_type_khr">
                 <enum name="CL_EXTERNAL_MEMORY_HANDLE_DMA_BUF_KHR"/>
             </require>
         </extension>
@@ -7137,7 +7172,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_external_memory_handle_type_khr">
+            <require group="cl_external_memory_handle_type_khr">
                 <enum name="CL_EXTERNAL_MEMORY_HANDLE_OPAQUE_FD_KHR"/>
             </require>
         </extension>
@@ -7145,7 +7180,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_external_memory_handle_type_khr">
+            <require group="cl_external_memory_handle_type_khr">
                 <enum name="CL_EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_KHR"/>
                 <enum name="CL_EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_KMT_KHR"/>
                 <enum name="CL_EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_NAME_KHR"/>
@@ -7201,20 +7236,20 @@ server's OpenCL/api-docs repository.
                 <type name="cl_command_properties_khr"/>
                 <type name="cl_mutable_command_khr"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_COMMAND_BUFFER_CAPABILITIES_KHR"/>
                 <enum name="CL_DEVICE_COMMAND_BUFFER_REQUIRED_QUEUE_PROPERTIES_KHR"/>
             </require>
-            <require comment="cl_device_command_buffer_capabilities_khr - bitfield">
+            <require group="cl_device_command_buffer_capabilities_khr" etype="bitfield">
                 <enum name="CL_COMMAND_BUFFER_CAPABILITY_KERNEL_PRINTF_KHR"/>
                 <enum name="CL_COMMAND_BUFFER_CAPABILITY_DEVICE_SIDE_ENQUEUE_KHR"/>
                 <enum name="CL_COMMAND_BUFFER_CAPABILITY_SIMULTANEOUS_USE_KHR"/>
                 <enum name="CL_COMMAND_BUFFER_CAPABILITY_OUT_OF_ORDER_KHR"/>
             </require>
-            <require comment="cl_command_buffer_properties_khr">
+            <require group="cl_command_buffer_properties_khr">
                <enum name="CL_COMMAND_BUFFER_FLAGS_KHR"/>
             </require>
-            <require comment="cl_command_buffer_flags_khr - bitfield">
+            <require group="cl_command_buffer_flags_khr" etype="bitfield">
                <enum name="CL_COMMAND_BUFFER_SIMULTANEOUS_USE_KHR"/>
             </require>
             <require comment="Error codes">
@@ -7222,7 +7257,7 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_INVALID_SYNC_POINT_WAIT_LIST_KHR"/>
                 <enum name="CL_INCOMPATIBLE_COMMAND_QUEUE_KHR"/>
             </require>
-            <require comment="cl_command_buffer_info_khr">
+            <require group="cl_command_buffer_info_khr">
                <enum name="CL_COMMAND_BUFFER_QUEUES_KHR"/>
                <enum name="CL_COMMAND_BUFFER_NUM_QUEUES_KHR"/>
                <enum name="CL_COMMAND_BUFFER_REFERENCE_COUNT_KHR"/>
@@ -7230,12 +7265,12 @@ server's OpenCL/api-docs repository.
                <enum name="CL_COMMAND_BUFFER_PROPERTIES_ARRAY_KHR"/>
                <enum name="CL_COMMAND_BUFFER_CONTEXT_KHR"/>
             </require>
-            <require comment="cl_command_buffer_state_khr">
+            <require group="cl_command_buffer_state_khr">
                <enum name="CL_COMMAND_BUFFER_STATE_RECORDING_KHR"/>
                <enum name="CL_COMMAND_BUFFER_STATE_EXECUTABLE_KHR"/>
                <enum name="CL_COMMAND_BUFFER_STATE_PENDING_KHR"/>
             </require>
-            <require comment="cl_command_type">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_COMMAND_BUFFER_KHR"/>
             </require>
             <require>
@@ -7261,7 +7296,7 @@ server's OpenCL/api-docs repository.
             </require>
         </extension>
         <extension name="cl_arm_protected_memory_allocation" revision="0.0.0" supported="opencl">
-            <require>
+            <require group="cl_mem_flags" etype="bitfield">
                 <enum name="CL_MEM_PROTECTED_ALLOC_ARM"/>
             </require>
         </extension>
@@ -7272,7 +7307,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_device_fp_atomic_capabilities_ext"/>
             </require>
-            <require comment="cl_device_fp_atomic_capabilities_ext">
+            <require group="cl_device_fp_atomic_capabilities_ext" etype="bitfield">
                 <enum name="CL_DEVICE_GLOBAL_FP_ATOMIC_LOAD_STORE_EXT"/>
                 <enum name="CL_DEVICE_GLOBAL_FP_ATOMIC_ADD_EXT"/>
                 <enum name="CL_DEVICE_GLOBAL_FP_ATOMIC_MIN_MAX_EXT"/>
@@ -7280,7 +7315,7 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_DEVICE_LOCAL_FP_ATOMIC_ADD_EXT"/>
                 <enum name="CL_DEVICE_LOCAL_FP_ATOMIC_MIN_MAX_EXT"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_SINGLE_FP_ATOMIC_CAPABILITIES_EXT"/>
                 <enum name="CL_DEVICE_DOUBLE_FP_ATOMIC_CAPABILITIES_EXT"/>
                 <enum name="CL_DEVICE_HALF_FP_ATOMIC_CAPABILITIES_EXT"/>
@@ -7290,11 +7325,11 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="clGetEventInfo response when param_name is CL_EVENT_COMMAND_TYPE">
+            <require group="cl_command_type">
                 <enum name="CL_COMMAND_READ_HOST_PIPE_INTEL"/>
                 <enum name="CL_COMMAND_WRITE_HOST_PIPE_INTEL"/>
             </require>
-            <require comment="clGetProgramInfo param_name">
+            <require group="cl_program_info">
                 <enum name="CL_PROGRAM_NUM_HOST_PIPES_INTEL"/>
                 <enum name="CL_PROGRAM_HOST_PIPE_NAMES_INTEL"/>
             </require>
@@ -7307,7 +7342,7 @@ server's OpenCL/api-docs repository.
             <require comment="Types">
                 <type name="cl_image_requirements_info_ext"/>
             </require>
-            <require comment="cl_image_requirements_info_ext">
+            <require group="cl_image_requirements_info_ext">
                 <enum name="CL_IMAGE_REQUIREMENTS_BASE_ADDRESS_ALIGNMENT_EXT"/>
                 <enum name="CL_IMAGE_REQUIREMENTS_ROW_PITCH_ALIGNMENT_EXT"/>
                 <enum name="CL_IMAGE_REQUIREMENTS_SIZE_EXT"/>
@@ -7321,15 +7356,15 @@ server's OpenCL/api-docs repository.
             </require>
         </extension>
         <extension name="cl_intel_queue_no_sync_operations" revision="0.0.0" supported="opencl">
-            <require comment="cl_command_queue_properties">
+            <require group="cl_command_queue_properties" etype="bitfield">
                 <enum name="CL_QUEUE_NO_SYNC_OPERATIONS_INTEL"/>
             </require>
         </extension>
         <extension name="cl_arm_job_slot_selection" revision="0.0.0" supported="opencl">
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_JOB_SLOTS_ARM"/>
             </require>
-            <require comment="cl_queue_properties">
+            <require group="cl_queue_properties">
                 <enum name="CL_QUEUE_JOB_SLOT_ARM"/>
             </require>
         </extension>
@@ -7346,27 +7381,27 @@ server's OpenCL/api-docs repository.
                 <type name="cl_mutable_dispatch_config_khr"/>
                 <type name="cl_mutable_dispatch_asserts_khr"/>
             </require>
-            <require comment="cl_command_buffer_flags_khr - bitfield">
+            <require group="cl_command_buffer_flags_khr" etype="bitfield">
                <enum name="CL_COMMAND_BUFFER_MUTABLE_KHR"/>
             </require>
             <require comment="Error codes">
                 <enum name="CL_INVALID_MUTABLE_COMMAND_KHR"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_MUTABLE_DISPATCH_CAPABILITIES_KHR"/>
             </require>
-            <require comment="cl_command_properties_khr">
+            <require group="cl_command_properties_khr">
                <enum name="CL_MUTABLE_DISPATCH_UPDATABLE_FIELDS_KHR"/>
             </require>
 
-            <require comment="cl_mutable_dispatch_fields_khr - bitfield">
+            <require group="cl_mutable_dispatch_fields_khr" etype="bitfield">
                 <enum name="CL_MUTABLE_DISPATCH_GLOBAL_OFFSET_KHR"/>
                 <enum name="CL_MUTABLE_DISPATCH_GLOBAL_SIZE_KHR"/>
                 <enum name="CL_MUTABLE_DISPATCH_LOCAL_SIZE_KHR"/>
                 <enum name="CL_MUTABLE_DISPATCH_ARGUMENTS_KHR"/>
                 <enum name="CL_MUTABLE_DISPATCH_EXEC_INFO_KHR"/>
             </require>
-            <require comment="cl_mutable_command_info_khr">
+            <require group="cl_mutable_command_info_khr">
                <enum name="CL_MUTABLE_COMMAND_COMMAND_QUEUE_KHR"/>
                <enum name="CL_MUTABLE_COMMAND_COMMAND_BUFFER_KHR"/>
                <enum name="CL_MUTABLE_COMMAND_COMMAND_TYPE_KHR"/>
@@ -7377,16 +7412,16 @@ server's OpenCL/api-docs repository.
                <enum name="CL_MUTABLE_DISPATCH_GLOBAL_WORK_SIZE_KHR"/>
                <enum name="CL_MUTABLE_DISPATCH_LOCAL_WORK_SIZE_KHR"/>
             </require>
-            <require comment="cl_command_buffer_update_type_khr">
+            <require group="cl_command_buffer_update_type_khr">
                 <enum name="CL_STRUCTURE_TYPE_MUTABLE_DISPATCH_CONFIG_KHR"/>
             </require>
-            <require comment="cl_command_buffer_properties_khr">
+            <require group="cl_command_buffer_properties_khr">
                 <enum name="CL_COMMAND_BUFFER_MUTABLE_DISPATCH_ASSERTS_KHR"/>
             </require>
-            <require comment="cl_command_properties_khr">
+            <require group="cl_command_properties_khr">
                 <enum name="CL_MUTABLE_DISPATCH_ASSERTS_KHR"/>
             </require>
-            <require comment="cl_mutable_dispatch_asserts_khr - bitfield">
+            <require group="cl_mutable_dispatch_asserts_khr" etype="bitfield">
                 <enum name="CL_MUTABLE_DISPATCH_ASSERT_NO_ADDITIONAL_WORK_GROUPS_KHR"/>
             </require>
             <require>
@@ -7395,12 +7430,12 @@ server's OpenCL/api-docs repository.
             </require>
         </extension>
         <extension name="cl_ext_image_from_buffer" revision="1.0.0" depends="CL_VERSION_3_0+cl_ext_image_requirements_info" condition="defined(CL_VERSION_3_0)" supported="opencl">
-            <require comment="cl_image_requirements_info_ext">
+            <require group="cl_image_requirements_info_ext">
                 <enum name="CL_IMAGE_REQUIREMENTS_SLICE_PITCH_ALIGNMENT_EXT"/>
             </require>
         </extension>
         <extension name="cl_intel_create_mem_object_properties" revision="0.0.0" supported="opencl">
-            <require comment="cl_mem_properties">
+            <require group="cl_mem_properties">
                 <enum name="CL_MEM_LOCALLY_UNCACHED_RESOURCE_INTEL"/>
                 <enum name="CL_MEM_DEVICE_ID_INTEL"/>
             </require>
@@ -7412,22 +7447,22 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_platform_command_buffer_capabilities_khr"/>
             </require>
-            <require comment="cl_platform_info">
+            <require group="cl_platform_info">
                 <enum name="CL_PLATFORM_COMMAND_BUFFER_CAPABILITIES_KHR"/>
             </require>
-            <require comment="cl_platform_command_buffer_capabilities_khr - bitfield">
+            <require group="cl_platform_command_buffer_capabilities_khr" etype="bitfield">
                 <enum name="CL_COMMAND_BUFFER_PLATFORM_UNIVERSAL_SYNC_KHR"/>
                 <enum name="CL_COMMAND_BUFFER_PLATFORM_REMAP_QUEUES_KHR"/>
                 <enum name="CL_COMMAND_BUFFER_PLATFORM_AUTOMATIC_REMAP_KHR"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_COMMAND_BUFFER_NUM_SYNC_DEVICES_KHR"/>
                 <enum name="CL_DEVICE_COMMAND_BUFFER_SYNC_DEVICES_KHR"/>
             </require>
-            <require comment="cl_device_command_buffer_capabilities_khr - bitfield">
+            <require group="cl_device_command_buffer_capabilities_khr" etype="bitfield">
                 <enum name="CL_COMMAND_BUFFER_CAPABILITY_MULTIPLE_QUEUE_KHR"/>
             </require>
-            <require comment="cl_command_buffer_flags_khr - bitfield">
+            <require group="cl_command_buffer_flags_khr" etype="bitfield">
                <enum name="CL_COMMAND_BUFFER_DEVICE_SIDE_SYNC_KHR"/>
             </require>
             <require>
@@ -7435,7 +7470,7 @@ server's OpenCL/api-docs repository.
             </require>
         </extension>
         <extension name="cl_ext_image_raw10_raw12" revision="1.0.0" depends="CL_VERSION_1_2" supported="opencl">
-            <require comment="cl_channel_type">
+            <require group="cl_channel_type">
                 <enum name="CL_UNSIGNED_INT_RAW10_EXT"/>
                 <enum name="CL_UNSIGNED_INT_RAW12_EXT"/>
             </require>
@@ -7480,22 +7515,22 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require comment="cl_device_info">
+            <require group="cl_device_info">
                 <enum name="CL_DEVICE_KERNEL_CLOCK_CAPABILITIES_KHR"/>
             </require>
             <require>
                 <type name="cl_device_kernel_clock_capabilities_khr"/>
             </require>
-            <require comment="cl_device_kernel_clock_capabilities_khr">
+            <require group="cl_device_kernel_clock_capabilities_khr" etype="bitfield">
                 <enum name="CL_DEVICE_KERNEL_CLOCK_SCOPE_DEVICE_KHR"/>
                 <enum name="CL_DEVICE_KERNEL_CLOCK_SCOPE_WORK_GROUP_KHR"/>
                 <enum name="CL_DEVICE_KERNEL_CLOCK_SCOPE_SUB_GROUP_KHR"/>
             </require>
         </extension>
         <extension name="cl_ext_image_unorm_int_2_101010" revision="1.0.0" depends="CL_VERSION_1_2" supported="opencl">
-            <require comment="cl_channel_type">
+            <require group="cl_channel_type">
                 <enum name="CL_UNORM_INT_2_101010_EXT"/>
             </require>
         </extension>
     </extensions>
-</registry>
+</registry>
\ No newline at end of file
diff --git a/xml/registry.rnc b/xml/registry.rnc
index ff85c0d1..05aa5cf5 100644
--- a/xml/registry.rnc
+++ b/xml/registry.rnc
@@ -403,6 +403,12 @@ Command = element command {
 #   <require> / <remove> contains features to require or remove in
 #                        this version
 #     profile - only require/remove when generated profile matches
+#     etype - can be "enum", "bitfield", "constants" or "OpenCL-C only"
+#               If omited, etype="enum" is assumed
+#     group - type name, dedicated to a select group of enums
+#               Only exists for "enum" and "bitfield" etype's
+#               Multiple <require> blocks can add enums to the same group
+#               In such cases, the same etype attribute has to be present
 #     comment - descriptive text with no semantic meaning
 Feature = element feature {
     attribute api { text } ,
@@ -415,6 +421,8 @@ Feature = element feature {
         element require {
             ProfileName ? ,
             Depends ? ,
+            GroupName ? ,
+            EType ? ,
             Comment ? ,
             (
                 InterfaceElement |
@@ -474,9 +482,15 @@ Extensions = element extensions {
 #       a special purpose of the extension. Tokens may include 'cadsupport',
 #       'd3demulation', 'devtools', 'debugging', and 'glemulation'. Others
 #       may be added in the future.
-# In addition, <require> / <remove> tags also support an api attribute:
+# In addition, <require> / <remove> tags also support attributes:
 #     api - only require/remove these features for the matching API.
 #       Not a regular expression.
+#     etype - can be "enum", "bitfield", "constants" or "OpenCL-C only"
+#               If omited, etype="enum" is assumed
+#     group - type name, dedicated to a select group of enums
+#               Only exists for "enum" and "bitfield" etype's
+#               Multiple <require> blocks can add enums to the same group
+#               In such cases, the same etype attribute has to be present
 Extension = element extension {
     Name ,
     attribute revision { text },
@@ -503,6 +517,8 @@ Extension = element extension {
             attribute condition { text } ? ,
             ProfileName ? ,
             Depends ? ,
+            GroupName ? ,
+            EType ? ,
             Comment ? ,
             (
                 InterfaceElement |
@@ -561,6 +577,8 @@ ExtensionName = attribute extension { text }
 # Boolean expression of core version and extension names using (),+ operators
 Depends = attribute depends { text }
 Vendor = attribute vendor { text }
+GroupName = attribute group { text }
+EType = attribute etype { text }
 Comment = attribute comment { text }
 Name = attribute name { text }