diff --git a/rocclr/CMakeLists.txt b/rocclr/CMakeLists.txt
index 7abfedb8f6..56c59cf6f7 100644
--- a/rocclr/CMakeLists.txt
+++ b/rocclr/CMakeLists.txt
@@ -57,7 +57,7 @@ find_package(Threads REQUIRED)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
 
-add_definitions(-DLINUX -D__x86_64__ -D__AMD64__ -DUNIX_OS -DqLittleEndian -DOPENCL_MAJOR=2 -DOPENCL_MINOR=1 -DWITH_AQL -DWITH_ONLINE_COMPILER -DATI_OS_LINUX -DATI_ARCH_X86 -DLITTLEENDIAN_CPU -DATI_BITS_64 -DATI_COMP_GCC -DWITH_TARGET_AMDGCN -DOPENCL_EXPORTS -DCL_USE_DEPRECATED_OPENCL_1_0_APIS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS -DVEGA10_ONLY=false -DWITH_LIGHTNING_COMPILER)
+add_definitions(-DLINUX -D__x86_64__ -D__AMD64__ -DUNIX_OS -DqLittleEndian -DOPENCL_MAJOR=2 -DOPENCL_MINOR=1 -DCL_TARGET_OPENCL_VERSION=220 -DWITH_AQL -DWITH_ONLINE_COMPILER -DATI_OS_LINUX -DATI_ARCH_X86 -DLITTLEENDIAN_CPU -DATI_BITS_64 -DATI_COMP_GCC -DWITH_TARGET_AMDGCN -DOPENCL_EXPORTS -DCL_USE_DEPRECATED_OPENCL_1_0_APIS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS -DVEGA10_ONLY=false -DWITH_LIGHTNING_COMPILER)
 add_definitions(-DOPENCL_C_MAJOR=2 -DOPENCL_C_MINOR=0)
 
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic -Wl,--unresolved-symbols=report-all")
diff --git a/rocclr/include/vdi_common.hpp b/rocclr/include/vdi_common.hpp
index 10f927c9fa..feb73288ef 100644
--- a/rocclr/include/vdi_common.hpp
+++ b/rocclr/include/vdi_common.hpp
@@ -149,7 +149,7 @@ struct ParamInfo<char[N]>
 
 } // namespace detail
 
-struct PlatformIDS { const struct KHRicdVendorDispatchRec* dispatch_; };
+struct PlatformIDS { const cl_icd_dispatch* dispatch_; };
 class PlatformID {
 public:
     static PlatformIDS Platform;
diff --git a/rocclr/platform/object.hpp b/rocclr/platform/object.hpp
index 3078b2bdfb..f55768383d 100644
--- a/rocclr/platform/object.hpp
+++ b/rocclr/platform/object.hpp
@@ -61,11 +61,11 @@ CL_TYPES_DO(DECLARE_CL_TYPES);
 
 #undef DECLARE_CL_TYPES
 
-struct KHRicdVendorDispatchRec;
+typedef struct _cl_icd_dispatch cl_icd_dispatch;
 
 #define DECLARE_CL_TYPES(CL, AMD)                                                                  \
   typedef struct _##CL {                                                                           \
-    struct KHRicdVendorDispatchRec* dispatch;                                                      \
+    cl_icd_dispatch* dispatch;                                                             \
   } * CL;
 
 AMD_CL_TYPES_DO(DECLARE_CL_TYPES);
@@ -108,8 +108,8 @@ CL_TYPES_DO(DEFINE_CL_TRAITS);
 //! \endcond
 
 struct ICDDispatchedObject {
-  static struct KHRicdVendorDispatchRec icdVendorDispatch_[];
-  const struct KHRicdVendorDispatchRec* const dispatch_;
+  static cl_icd_dispatch icdVendorDispatch_[];
+  const cl_icd_dispatch* const dispatch_;
 
  protected:
   ICDDispatchedObject() : dispatch_(icdVendorDispatch_) {}