1diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in
2index 1a72643a..7f35031f 100644
3--- a/hip-lang-config.cmake.in
4+++ b/hip-lang-config.cmake.in
5@@ -71,8 +71,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH)
6
7
8 #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY
9-file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/include")
10-file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${_IMPORT_PREFIX}/llvm/lib/clang/*/include")
11+file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@llvm@/lib/clang/*/include")
12+file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "@llvm@/lib/clang/*/include")
13 find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h
14 HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS}
15 ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG}
16@@ -87,9 +87,7 @@ endif()
17 #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH=<HSA_PATH>
18 find_path(HSA_HEADER hsa/hsa.h
19 PATHS
20- "${_IMPORT_PREFIX}/../include" #FILE_REORG_BACKWARD_COMPATIBILITY
21- "${_IMPORT_PREFIX}/include"
22- "${ROCM_PATH}/include"
23+ "@rocm_runtime@/include"
24 )
25
26 if (NOT HSA_HEADER)
27@@ -97,7 +94,7 @@ if (HSA_HEADER-NOTFOUND)
28 endif()
29
30 get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY)
31-file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/lib/*")
32+file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@llvm@/lib/clang/*/lib/*")
33 find_library(CLANGRT_BUILTINS
34 NAMES
35 clang_rt.builtins