diff --git a/CL/cl_ext.h b/CL/cl_ext.h
index 20571b02..c3717830 100644
--- a/CL/cl_ext.h
+++ b/CL/cl_ext.h
@@ -858,6 +858,7 @@ clLogMessagesToStderrAPPLE(
 
 /* cl_platform_info */
 #define CL_PLATFORM_ICD_SUFFIX_KHR                          0x0920
+#define CL_PLATFORM_UNLOADABLE_KHR                          0x0921
 
 /* Error codes */
 #define CL_PLATFORM_NOT_FOUND_KHR                           -1001
diff --git a/CL/cl_layer.h b/CL/cl_layer.h
index 245f7b53..e59d50da 100644
--- a/CL/cl_layer.h
+++ b/CL/cl_layer.h
@@ -54,7 +54,7 @@ extern "C" {
     "cl_loader_layers"
 
 
-#define CL_LOADER_LAYERS_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)
+#define CL_LOADER_LAYERS_EXTENSION_VERSION CL_MAKE_VERSION(2, 0, 0)
 
 typedef cl_uint             cl_layer_info;
 typedef cl_uint             cl_layer_api_version;
@@ -65,6 +65,7 @@ typedef cl_uint             cl_layer_api_version;
 
 /* Misc API enums */
 #define CL_LAYER_API_VERSION_100                            100
+#define CL_LAYER_API_VERSION_200                            200
 
 
 typedef cl_int CL_API_CALL
@@ -87,6 +88,13 @@ clInitLayer_t(
 typedef clInitLayer_t *
 clInitLayer_fn ;
 
+typedef cl_int CL_API_CALL
+clDeinitLayer_t(
+    void );
+
+typedef clDeinitLayer_t *
+clDeinitLayer_fn ;
+
 /*
 ** The function pointer typedefs prefixed with "pfn_" are provided for
 ** compatibility with earlier versions of the headers.  New code is
@@ -100,6 +108,9 @@ pfn_clGetLayerInfo ;
 typedef clInitLayer_t *
 pfn_clInitLayer ;
 
+typedef clDeinitLayer_t *
+pfn_clDeinitLayer ;
+
 #if !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES)
 
 extern CL_API_ENTRY cl_int CL_API_CALL
@@ -116,6 +127,10 @@ clInitLayer(
     cl_uint* num_entries_ret,
     const cl_icd_dispatch** layer_dispatch_ret) ;
 
+extern CL_API_ENTRY cl_int CL_API_CALL
+clDeinitLayer(
+    void ) ;
+
 #endif /* !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
 
 #ifdef __cplusplus