diff --git a/projects/clr/hipamd/bin/hipconfig b/projects/clr/hipamd/bin/hipconfig
index 520a58cc2c..caa425e66c 100755
--- a/projects/clr/hipamd/bin/hipconfig
+++ b/projects/clr/hipamd/bin/hipconfig
@@ -92,7 +92,7 @@ if (not defined $HIP_PLATFORM) {
 $HIP_PATH=$ENV{'HIP_PATH'} // Cwd::realpath (dirname (dirname $0)); # use parent directory of this tool
 
 if ($HIP_PLATFORM eq "hcc") {
-    $CPP_CONFIG= " -D__HIP_PLATFORM_HCC__=   -I$HIP_PATH/include -I$HCC_HOME/include";
+    $CPP_CONFIG= " -D__HIP_PLATFORM_HCC__=   -I$HIP_PATH/include -I$HCC_HOME/include -I$HSA_PATH/include";
 }
 if ($HIP_PLATFORM eq "nvcc") {
     $CPP_CONFIG = " -D__HIP_PLATFORM_NVCC__=  -I$HIP_PATH/include -I$CUDA_PATH/include";
diff --git a/projects/clr/hipamd/hip-config-clang.cmake.in b/projects/clr/hipamd/hip-config-clang.cmake.in
index 9680b2ff8e..199dca774a 100644
--- a/projects/clr/hipamd/hip-config-clang.cmake.in
+++ b/projects/clr/hipamd/hip-config-clang.cmake.in
@@ -1,4 +1,16 @@
 @PACKAGE_INIT@
+if(NOT DEFINED HSA_PATH)
+    if(NOT DEFINED ENV{HSA_PATH})
+        set(HSA_PATH "/opt/rocm/hsa" CACHE PATH "Path to which HSA runtime has been installed")
+    else()
+        set(HSA_PATH $ENV{HSA_PATH} CACHE PATH "Path to which HSA runtime has been installed")
+    endif()
+endif()
+if(IS_ABSOLUTE ${HSA_PATH} AND EXISTS ${HSA_PATH} AND IS_DIRECTORY ${HSA_PATH})
+    message(STATUS "Looking for HSA runtime in: " ${HSA_PATH})
+else()
+    message(FATAL_ERROR "Don't know where to find HSA runtime. Please specify absolute path using -DHSA_PATH")
+endif()
 
 include(CMakeFindDependencyMacro OPTIONAL RESULT_VARIABLE _CMakeFindDependencyMacro_FOUND)
 if (NOT _CMakeFindDependencyMacro_FOUND)
@@ -43,7 +55,8 @@ set(HIP_COMPILER "@HIP_COMPILER@")
 set(HIP_RUNTIME "@HIP_RUNTIME@")
 
 set_and_check( hip_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" )
-set_and_check( hip_INCLUDE_DIRS "${hip_INCLUDE_DIR}" )
+set_and_check( HSA_INCLUDE_PATH "${HSA_PATH}/include" )
+set( hip_INCLUDE_DIRS "${hip_INCLUDE_DIR}" "${HSA_INCLUDE_PATH}" )
 set_and_check( hip_LIB_INSTALL_DIR "@PACKAGE_LIB_INSTALL_DIR@" )
 set_and_check( hip_BIN_INSTALL_DIR "@PACKAGE_BIN_INSTALL_DIR@" )
 
diff --git a/projects/clr/hipamd/hip-config-hcc.cmake.in b/projects/clr/hipamd/hip-config-hcc.cmake.in
index c0ffc6e2af..b385f5ea8e 100644
--- a/projects/clr/hipamd/hip-config-hcc.cmake.in
+++ b/projects/clr/hipamd/hip-config-hcc.cmake.in
@@ -1,4 +1,16 @@
 @PACKAGE_INIT@
+if(NOT DEFINED HSA_PATH)
+    if(NOT DEFINED ENV{HSA_PATH})
+        set(HSA_PATH "/opt/rocm/hsa" CACHE PATH "Path to which HSA runtime has been installed")
+    else()
+        set(HSA_PATH $ENV{HSA_PATH} CACHE PATH "Path to which HSA runtime has been installed")
+    endif()
+endif()
+if(IS_ABSOLUTE ${HSA_PATH} AND EXISTS ${HSA_PATH} AND IS_DIRECTORY ${HSA_PATH})
+    message(STATUS "Looking for HSA runtime in: " ${HSA_PATH})
+else()
+    message(FATAL_ERROR "Don't know where to find HSA runtime. Please specify absolute path using -DHSA_PATH")
+endif()
 
 include(CMakeFindDependencyMacro OPTIONAL RESULT_VARIABLE _CMakeFindDependencyMacro_FOUND)
 if (NOT _CMakeFindDependencyMacro_FOUND)
@@ -43,7 +55,8 @@ set(HIP_COMPILER "@HIP_COMPILER@")
 set(HIP_RUNTIME "@HIP_RUNTIME@")
 
 set_and_check( hip_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" )
-set_and_check( hip_INCLUDE_DIRS "${hip_INCLUDE_DIR}" )
+set_and_check( HSA_INCLUDE_PATH "${HSA_PATH}/include" )
+set( hip_INCLUDE_DIRS "${hip_INCLUDE_DIR}" "${HSA_INCLUDE_PATH}" )
 set_and_check( hip_LIB_INSTALL_DIR "@PACKAGE_LIB_INSTALL_DIR@" )
 set_and_check( hip_BIN_INSTALL_DIR "@PACKAGE_BIN_INSTALL_DIR@" )