diff --git a/opencl/tools/clinfo/CMakeLists.txt b/opencl/tools/clinfo/CMakeLists.txt
index 2af51a0d6b..217f18225b 100644
--- a/opencl/tools/clinfo/CMakeLists.txt
+++ b/opencl/tools/clinfo/CMakeLists.txt
@@ -2,7 +2,7 @@ add_executable(clinfo clinfo.cpp)
 
 target_compile_definitions(clinfo PRIVATE CL_TARGET_OPENCL_VERSION=220 HAVE_CL2_HPP)
 
-target_include_directories(clinfo PRIVATE  "../../khronos/headers/opencl2.2/CL" "../../khronos/headers/opencl2.2/CL/.."  "../../khronos/headers/opencl2.2/CL/../.." "../../khronos/headers/opencl2.2/CL/../../.." "../../khronos/headers/opencl2.2/CL/../../../..")
+target_include_directories(clinfo PRIVATE ${OPENCL_ICD_LOADER_HEADERS_DIR})
 
 target_link_libraries(clinfo OpenCL)
 
diff --git a/opencl/tools/clinfo/clinfo.cpp b/opencl/tools/clinfo/clinfo.cpp
index 89316d52be..5e1bc59907 100644
--- a/opencl/tools/clinfo/clinfo.cpp
+++ b/opencl/tools/clinfo/clinfo.cpp
@@ -44,7 +44,7 @@
 #define __MAX_DEFAULT_VECTOR_SIZE 50
 #define CL_USE_DEPRECATED_OPENCL_1_1_APIS
 #define CL_USE_DEPRECATED_OPENCL_2_0_APIS
-#include "cl.hpp"
+#include "CL/cl.hpp"
 #endif // !HAVE_CL2_HPP
 
 bool verbose = false;