diff --git a/opencl/amdocl/CMakeLists.txt b/opencl/amdocl/CMakeLists.txt
index 53e8702b5f..116c0308ff 100644
--- a/opencl/amdocl/CMakeLists.txt
+++ b/opencl/amdocl/CMakeLists.txt
@@ -19,10 +19,10 @@ if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
   add_definitions(-DDEBUG)
 endif()
 
-include_directories(${CMAKE_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/khronos)
-include_directories(${CMAKE_SOURCE_DIR}/khronos/headers)
-include_directories(${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2)
+include_directories(${CMAKE_CURRENT_LIST_DIR}/..)
+include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos)
+include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers)
+include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers/opencl2.2)
 
 if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
    (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang"))
diff --git a/opencl/tools/cltrace/CMakeLists.txt b/opencl/tools/cltrace/CMakeLists.txt
index 5ce7e9ec02..ec867f2219 100644
--- a/opencl/tools/cltrace/CMakeLists.txt
+++ b/opencl/tools/cltrace/CMakeLists.txt
@@ -3,10 +3,10 @@ if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
 endif()
 
 set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic -Wl,--unresolved-symbols=report-all -Wl,--version-script=${CMAKE_SOURCE_DIR}/tools/cltrace/cltrace.map")
+set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic -Wl,--unresolved-symbols=report-all -Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/cltrace.map")
 
-include_directories(${CMAKE_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2)
+include_directories(${CMAKE_CURRENT_LIST_DIR}/../../)
+include_directories(${CMAKE_CURRENT_LIST_DIR}/../../khronos/headers/opencl2.2)
 
 # FIXME: Remove this
 include_directories(${ROCclr_DIR}/include)