diff --git a/hipamd/hip-config-clang.cmake.in b/hipamd/hip-config-clang.cmake.in
index 199dca774a..9680b2ff8e 100644
--- a/hipamd/hip-config-clang.cmake.in
+++ b/hipamd/hip-config-clang.cmake.in
@@ -1,16 +1,4 @@
 @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)
@@ -55,8 +43,7 @@ set(HIP_COMPILER "@HIP_COMPILER@")
 set(HIP_RUNTIME "@HIP_RUNTIME@")
 
 set_and_check( hip_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" )
-set_and_check( HSA_INCLUDE_PATH "${HSA_PATH}/include" )
-set( hip_INCLUDE_DIRS "${hip_INCLUDE_DIR}" "${HSA_INCLUDE_PATH}" )
+set_and_check( hip_INCLUDE_DIRS "${hip_INCLUDE_DIR}" )
 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/hipamd/hip-config-hcc.cmake.in b/hipamd/hip-config-hcc.cmake.in
index b385f5ea8e..c0ffc6e2af 100644
--- a/hipamd/hip-config-hcc.cmake.in
+++ b/hipamd/hip-config-hcc.cmake.in
@@ -1,16 +1,4 @@
 @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)
@@ -55,8 +43,7 @@ set(HIP_COMPILER "@HIP_COMPILER@")
 set(HIP_RUNTIME "@HIP_RUNTIME@")
 
 set_and_check( hip_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" )
-set_and_check( HSA_INCLUDE_PATH "${HSA_PATH}/include" )
-set( hip_INCLUDE_DIRS "${hip_INCLUDE_DIR}" "${HSA_INCLUDE_PATH}" )
+set_and_check( hip_INCLUDE_DIRS "${hip_INCLUDE_DIR}" )
 set_and_check( hip_LIB_INSTALL_DIR "@PACKAGE_LIB_INSTALL_DIR@" )
 set_and_check( hip_BIN_INSTALL_DIR "@PACKAGE_BIN_INSTALL_DIR@" )