diff --git a/xml/cl.xml b/xml/cl.xml
index 629a2842..9e8fcac0 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -256,12 +256,6 @@ server's OpenCL/api-docs repository.
         <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>
-        <type category="define">typedef <type>cl_uint</type>          <name>cl_host_cache_policy</name>;</type>
-        <type category="define">typedef <type>cl_uint</type>          <name>cl_allocation_type</name>;</type>
-        <type category="define">typedef <type>cl_uint</type>          <name>cl_mb_block_type</name>;</type>
-        <type category="define">typedef <type>cl_uint</type>          <name>cl_subpixel_mode</name>;</type>
-        <type category="define">typedef <type>cl_uint</type>          <name>cl_sad_adjust_mode</name>;</type>
-        <type category="define">typedef <type>cl_uint</type>          <name>cl_search_path_type</name>;</type>
         <type category="define">typedef <type>cl_uint</type>          <name>cl_device_me_version</name>;</type>
         <type category="define">typedef <type>cl_uint</type>          <name>cl_device_avc_me_version</name>;</type>
         <type category="define">typedef <type>cl_int</type>           <name>cl_command_execution_status</name>;</type>
@@ -273,14 +267,14 @@ server's OpenCL/api-docs repository.
             <member><type>HANDLE</type>              <name>shared_handle</name></member>
         </type>
         <type category="struct" name="cl_motion_estimation_desc_intel">
-            <member><type>cl_mb_block_type</type>    <name>mb_block_type</name></member>
-            <member><type>cl_subpixel_mode</type>    <name>subpixel_mode</name></member>
-            <member><type>cl_sad_adjust_mode</type>  <name>sad_adjust_mode</name></member>
-            <member><type>cl_search_path_type</type> <name>search_path_type</name></member>
+            <member><type>cl_uint</type>             <name>mb_block_type</name></member>
+            <member><type>cl_uint</type>             <name>subpixel_mode</name></member>
+            <member><type>cl_uint</type>             <name>sad_adjust_mode</name></member>
+            <member><type>cl_uint</type>             <name>search_path_type</name></member>
         </type>
         <type category="struct" name="cl_mem_ext_host_ptr">
-            <member><type>cl_allocation_type</type>  <name>allocation_type</name></member>
-            <member><type>cl_host_cache_policy</type><name>host_cache_policy</name></member>
+            <member><type>cl_uint</type>             <name>allocation_type</name></member>
+            <member><type>cl_uint</type>             <name>host_cache_policy</name></member>
         </type>
         <type category="struct" name="cl_mem_ion_host_ptr">
             <member><type>cl_mem_ext_host_ptr</type> <name>ext_host_ptr</name></member>
@@ -5895,7 +5889,6 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_image_pitch_info_qcom"/>
                 <type name="cl_mem_ext_host_ptr"/>
-                <type name="cl_host_cache_policy"/>
             </require>
             <require group="cl_mem_flags" etype="bitfield">
                 <enum name="CL_MEM_EXT_HOST_PTR_QCOM"/>
@@ -5910,7 +5903,7 @@ server's OpenCL/api-docs repository.
                 <enum name="CL_IMAGE_SLICE_PITCH"/>
                 <enum name="CL_IMAGE_SLICE_ALIGNMENT_QCOM"/>
             </require>
-            <require group="cl_host_cache_policy">
+            <require comment="cl_uint host_cache_policy">
                 <enum name="CL_MEM_HOST_UNCACHED_QCOM"/>
                 <enum name="CL_MEM_HOST_WRITEBACK_QCOM"/>
                 <enum name="CL_MEM_HOST_WRITETHROUGH_QCOM"/>
@@ -5924,10 +5917,7 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require>
-                <type name="cl_host_cache_policy"/>
-            </require>
-            <require group="cl_host_cache_policy">
+            <require comment="cl_uint host_cache_policy">
                 <enum name="CL_MEM_HOST_IOCOHERENT_QCOM"/>
             </require>
         </extension>
@@ -5935,14 +5925,11 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="CL/cl.h"/>
             </require>
-            <require>
-                <type name="cl_allocation_type"/>
-            </require>
             <require>
                 <type name="cl_mem_ext_host_ptr"/>
                 <type name="cl_mem_ion_host_ptr"/>
             </require>
-            <require group="cl_allocation_type">
+            <require comment="cl_uint allocation_type">
                 <enum name="CL_MEM_ION_HOST_PTR_QCOM"/>
             </require>
         </extension>
@@ -5953,9 +5940,8 @@ server's OpenCL/api-docs repository.
             <require>
                 <type name="cl_mem_ext_host_ptr"/>
                 <type name="cl_mem_android_native_buffer_host_ptr"/>
-                <type name="cl_allocation_type"/>
             </require>
-            <require group="cl_allocation_type">
+            <require comment="cl_uint allocation_type">
                 <enum name="CL_MEM_ANDROID_NATIVE_BUFFER_HOST_PTR_QCOM"/>
             </require>
         </extension>
@@ -6201,29 +6187,25 @@ server's OpenCL/api-docs repository.
         <extension name="cl_intel_motion_estimation" revision="0.0.0" supported="opencl">
             <require>
                 <type name="cl_motion_estimation_desc_intel"/>
-                <type name="cl_mb_block_type"/>
-                <type name="cl_subpixel_mode"/>
-                <type name="cl_sad_adjust_mode"/>
-                <type name="cl_search_path_type"/>
             </require>
             <require group="cl_accelerator_type_intel">
                 <enum name="CL_ACCELERATOR_TYPE_MOTION_ESTIMATION_INTEL"/>
             </require>
-            <require group="cl_mb_block_type">
+            <require comment="cl_uint mb_block_type">
                 <enum name="CL_ME_MB_TYPE_16x16_INTEL"/>
                 <enum name="CL_ME_MB_TYPE_8x8_INTEL"/>
                 <enum name="CL_ME_MB_TYPE_4x4_INTEL"/>
             </require>
-            <require group="cl_subpixel_mode">
+            <require comment="cl_uint subpixel_mode">
                 <enum name="CL_ME_SUBPIXEL_MODE_INTEGER_INTEL"/>
                 <enum name="CL_ME_SUBPIXEL_MODE_HPEL_INTEL"/>
                 <enum name="CL_ME_SUBPIXEL_MODE_QPEL_INTEL"/>
             </require>
-            <require group="cl_sad_adjust_mode">
+            <require comment="cl_uint sad_adjust_mode">
                 <enum name="CL_ME_SAD_ADJUST_MODE_NONE_INTEL"/>
                 <enum name="CL_ME_SAD_ADJUST_MODE_HAAR_INTEL"/>
             </require>
-            <require group="cl_search_path_type">
+            <require comment="cl_uint search_path_type">
                 <enum name="CL_ME_SEARCH_PATH_RADIUS_2_2_INTEL"/>
                 <enum name="CL_ME_SEARCH_PATH_RADIUS_4_4_INTEL"/>
                 <enum name="CL_ME_SEARCH_PATH_RADIUS_16_12_INTEL"/>