diff --git a/opencl/tools/cltrace/CMakeLists.txt b/opencl/tools/cltrace/CMakeLists.txt
index cd9a6c2cca..3be17bba16 100644
--- a/opencl/tools/cltrace/CMakeLists.txt
+++ b/opencl/tools/cltrace/CMakeLists.txt
@@ -9,10 +9,15 @@ set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic -Wl,--unresolved-symbols=report-al
 
 include_directories(${CMAKE_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2)
+
+# FIXME: Remove this
 include_directories(${ROCclr_DIR}/include)
 
 add_definitions(-DHAVE_CL2_HPP -DCL_TARGET_OPENCL_VERSION=220)
 
 add_library(cltrace SHARED cltrace.cpp cltrace.def)
+target_include_directories(cltrace
+  PRIVATE
+    $<TARGET_PROPERTY:amdrocclr_static,INTERFACE_INCLUDE_DIRECTORIES>)
 
 target_link_libraries(cltrace OpenCL)