diff --git a/opencl/CMakeLists.txt b/opencl/CMakeLists.txt
index 658547f11..523eb2b5c 100644
--- a/opencl/CMakeLists.txt
+++ b/opencl/CMakeLists.txt
@@ -15,7 +15,7 @@ set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory")
 include(GNUInstallDirs)
 
 option(BUILD_TESTS "Enable building OpenCL tests" OFF)
-option(BUILD_ICD "Enable building OpenCL ICD Loader" ON)
+option(BUILD_ICD "Enable building OpenCL ICD Loader" OFF)
 option(EMU_ENV "Enable building for emulation environment" OFF)
 option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorganization backward compatibility" OFF)
 
@@ -26,6 +26,10 @@ if(MSVC)
 endif()
 
 set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
+
+###--- Packaging ------------------------------------------------------------###
+
+# DEV package
 if(BUILD_ICD)
   add_subdirectory(khronos/icd)
 else()
@@ -38,19 +42,6 @@ if(BUILD_TESTS)
   add_subdirectory(tests/ocltst)
 endif()
 
-###--- Packaging ------------------------------------------------------------###
-
-# DEV package
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL"
-        DESTINATION include
-        COMPONENT DEV
-        PATTERN cl_d3d10.h EXCLUDE
-        PATTERN cl_d3d11.h EXCLUDE
-        PATTERN cl_dx9_media_sharing.h EXCLUDE
-        PATTERN cl_egl.h EXCLUDE
-        PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-        )
-
 #############################
 # Packaging steps
 #############################
diff --git a/opencl/packaging/CMakeLists.txt b/opencl/packaging/CMakeLists.txt
index d9329c415..3643f88e7 100644
--- a/opencl/packaging/CMakeLists.txt
+++ b/opencl/packaging/CMakeLists.txt
@@ -22,12 +22,6 @@ install(TARGETS amdocl DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT asan)
 install(FILES ${opencl_SOURCE_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary)
 install(FILES ${opencl_SOURCE_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}-asan COMPONENT asan)
 
-install(DIRECTORY ${opencl_SOURCE_DIR}/khronos/headers/opencl2.2/CL
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev
-        USE_SOURCE_PERMISSIONS
-        PATTERN cl_d3d10.h EXCLUDE
-        PATTERN cl_d3d11.h EXCLUDE
-        PATTERN cl_dx9_media_sharing.h EXCLUDE )
 
 if(BUILD_ICD)
   install(TARGETS OpenCL DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT icd )
diff --git a/opencl/tests/ocltst/env/CMakeLists.txt b/opencl/tests/ocltst/env/CMakeLists.txt
index 308acc7d6..13dec123f 100644
--- a/opencl/tests/ocltst/env/CMakeLists.txt
+++ b/opencl/tests/ocltst/env/CMakeLists.txt
@@ -34,10 +34,11 @@ target_include_directories(ocltst
     PRIVATE
         $<TARGET_PROPERTY:Common,INTERFACE_INCLUDE_DIRECTORIES>)
 
-target_link_libraries(ocltst
-    PRIVATE
-        OpenCL
-        )
+target_link_libraries(ocltst PRIVATE OpenCL::OpenCL ${CMAKE_DL_LIBS})
+
+if(NOT WIN32)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+endif()
 
 set_target_properties(ocltst PROPERTIES INSTALL_RPATH "$ORIGIN")
 
diff --git a/opencl/tests/ocltst/module/gl/CMakeLists.txt b/opencl/tests/ocltst/module/gl/CMakeLists.txt
index 115879cf1..41dffa15b 100644
--- a/opencl/tests/ocltst/module/gl/CMakeLists.txt
+++ b/opencl/tests/ocltst/module/gl/CMakeLists.txt
@@ -45,9 +45,7 @@ target_include_directories(oclgl
     PRIVATE
         $<TARGET_PROPERTY:Common,INTERFACE_INCLUDE_DIRECTORIES>)
 
-target_link_libraries(oclgl
-    PRIVATE
-        OpenCL
+target_link_libraries(oclgl PRIVATE
         ${GLEW_LIBRARIES}
         ${OPENGL_LIBRARIES})
 
diff --git a/opencl/tests/ocltst/module/perf/CMakeLists.txt b/opencl/tests/ocltst/module/perf/CMakeLists.txt
index b9780283c..e0134c922 100644
--- a/opencl/tests/ocltst/module/perf/CMakeLists.txt
+++ b/opencl/tests/ocltst/module/perf/CMakeLists.txt
@@ -95,9 +95,10 @@ target_include_directories(oclperf
     PRIVATE
         $<TARGET_PROPERTY:Common,INTERFACE_INCLUDE_DIRECTORIES>)
 
-target_link_libraries(oclperf
-    PRIVATE
-        OpenCL)
+target_link_libraries(oclperf PRIVATE OpenCL::OpenCL ${CMAKE_DL_LIBS})
+if(NOT WIN32)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+endif()
 
 add_custom_command(
     TARGET oclperf POST_BUILD
diff --git a/opencl/tests/ocltst/module/runtime/CMakeLists.txt b/opencl/tests/ocltst/module/runtime/CMakeLists.txt
index 0b5de9417..1ffd58ad0 100644
--- a/opencl/tests/ocltst/module/runtime/CMakeLists.txt
+++ b/opencl/tests/ocltst/module/runtime/CMakeLists.txt
@@ -68,9 +68,10 @@ target_include_directories(oclruntime
     PRIVATE
         $<TARGET_PROPERTY:Common,INTERFACE_INCLUDE_DIRECTORIES>)
 
-target_link_libraries(oclruntime
-    PRIVATE
-        OpenCL)
+target_link_libraries(oclruntime PRIVATE OpenCL::OpenCL ${CMAKE_DL_LIBS})
+if(NOT WIN32)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+endif()
 
 add_custom_command(
     TARGET oclruntime POST_BUILD
diff --git a/opencl/tools/clinfo/CMakeLists.txt b/opencl/tools/clinfo/CMakeLists.txt
index 217f18225..da795267d 100644
--- a/opencl/tools/clinfo/CMakeLists.txt
+++ b/opencl/tools/clinfo/CMakeLists.txt
@@ -4,7 +4,7 @@ target_compile_definitions(clinfo PRIVATE CL_TARGET_OPENCL_VERSION=220 HAVE_CL2_
 
 target_include_directories(clinfo PRIVATE ${OPENCL_ICD_LOADER_HEADERS_DIR})
 
-target_link_libraries(clinfo OpenCL)
+target_link_libraries(clinfo OpenCL::OpenCL)
 
 INSTALL(TARGETS clinfo
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})