diff --git a/projects/clr/rocclr/CMakeLists.txt b/projects/clr/rocclr/CMakeLists.txt
index 9c4ec2619c..0498e200fa 100644
--- a/projects/clr/rocclr/CMakeLists.txt
+++ b/projects/clr/rocclr/CMakeLists.txt
@@ -64,7 +64,6 @@ if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
   add_definitions(-DDEBUG)
 endif()
 
-include_directories(${ROCR_INCLUDES})
 if (DEFINED LLVM_INCLUDES AND NOT ${LLVM_INCLUDES} STREQUAL "")
   include_directories(${LLVM_INCLUDES})
 endif() # if (DEFINED LLVM_INCLUDES AND NOT ${LLVM_INCLUDES} STREQUAL "")
@@ -136,7 +135,8 @@ add_library(oclruntime OBJECT
 )
 
 target_include_directories(oclruntime PUBLIC
-    $<TARGET_PROPERTY:amd_comgr,INTERFACE_INCLUDE_DIRECTORIES>)
+  $<TARGET_PROPERTY:amd_comgr,INTERFACE_INCLUDE_DIRECTORIES>
+  PRIVATE ${ROCR_INCLUDES} ${ROCT_INCLUDES})
 
 target_compile_definitions(oclruntime PRIVATE BSD_LIBELF)
 
diff --git a/projects/clr/rocclr/device/rocm/CMakeLists.txt b/projects/clr/rocclr/device/rocm/CMakeLists.txt
index b4650976bc..b31673f5a4 100644
--- a/projects/clr/rocclr/device/rocm/CMakeLists.txt
+++ b/projects/clr/rocclr/device/rocm/CMakeLists.txt
@@ -24,7 +24,8 @@ target_include_directories(oclrocm
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler/lib/loaders/elf/utils/libelf
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${ROCM_OCL_INCLUDES})
+    ${ROCM_OCL_INCLUDES}
+    ${ROCR_INCLUDES})
 
 
 # FIXME: Move this to config header.