diff --git a/xml/cl.xml b/xml/cl.xml
index b0783a34c..e45313995 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -4394,6 +4394,7 @@ server's OpenCL/api-docs repository.
             <type name="cl_ulong"/>
             <type name="cl_float"/>
             <type name="cl_half"/>
+            <type name="cl_double"/>
         </require>
         <require comment="Constants">
             <enum name="CL_CHAR_BIT"/>
@@ -4986,7 +4987,6 @@ server's OpenCL/api-docs repository.
             <type name="cl_kernel_arg_access_qualifier"/>
             <type name="cl_kernel_arg_type_qualifier"/>
             <type name="cl_image_desc"/>
-            <type name="cl_double"/>
         </require>
         <require comment="Constants">
             <enum name="CL_DBL_DIG"/>
@@ -5617,7 +5617,6 @@ server's OpenCL/api-docs repository.
         <extension name="cl_khr_fp64" revision="1.0.0" supported="opencl" promotedto="CL_VERSION_1_2" ratified="opencl">
             <require>
                 <type name="CL/cl.h"/>
-                <type name="cl_double"/>
             </require>
             <require condition="!defined(CL_VERSION_1_2)" comment="cl_device_info - defined in CL.h for OpenCL 1.2 and newer">
                 <enum name="CL_DEVICE_DOUBLE_FP_CONFIG"/>
@@ -5664,7 +5663,6 @@ server's OpenCL/api-docs repository.
         <extension name="cl_khr_icd" revision="1.0.0" supported="opencl" ratified="opencl">
             <require>
                 <type name="CL/cl.h"/>
-                <type name="cl_icd_dispatch"/>
             </require>
             <require comment="cl_platform_info">
                 <enum name="CL_PLATFORM_ICD_SUFFIX_KHR"/>
@@ -5679,6 +5677,7 @@ server's OpenCL/api-docs repository.
         <extension name="cl_loader_layers" revision="1.0.0" supported="opencl">
             <require>
                 <type name="CL/cl_icd.h"/>
+                <type name="cl_icd_dispatch"/>
             </require>
             <require>
                 <type name="cl_layer_info"/>
@@ -6598,9 +6597,6 @@ server's OpenCL/api-docs repository.
         <extension name="cl_khr_gl_depth_images" revision="1.0.0" depends="cl_khr_gl_sharing" comment="no API - reuses tokens from core API" supported="opencl" ratified="opencl">
             <require>
                 <type name="CL/cl.h"/>
-                <type name="cl_GLint"/>
-                <type name="cl_GLenum"/>
-                <type name="cl_GLuint"/>
             </require>
             <require comment="cl_channel_order">
                 <enum name="CL_DEPTH_STENCIL"/>
@@ -6622,6 +6618,9 @@ server's OpenCL/api-docs repository.
         <extension name="cl_khr_gl_sharing" revision="1.0.0" supported="opencl" ratified="opencl">
             <require>
                 <type name="CL/cl.h"/>
+                <type name="cl_GLint"/>
+                <type name="cl_GLenum"/>
+                <type name="cl_GLuint"/>
             </require>
             <require>
                 <type name="cl_gl_context_info"/>