diff --git a/build_files/cmake/Modules/FindHIP.cmake b/build_files/cmake/Modules/FindHIP.cmake
index f8e910735a6..1f93b211573 100644
--- a/build_files/cmake/Modules/FindHIP.cmake
+++ b/build_files/cmake/Modules/FindHIP.cmake
@@ -12,6 +12,9 @@ if(DEFINED HIP_ROOT_DIR AND HIP_ROOT_DIR)
   # Pass.
 elseif(DEFINED ENV{HIP_ROOT_DIR})
   set(HIP_ROOT_DIR $ENV{HIP_ROOT_DIR})
+elseif(DEFINED ENV{HIP_PATH})
+  # Built-in environment variable from SDK.
+  set(HIP_ROOT_DIR $ENV{HIP_PATH})
 else()
   set(HIP_ROOT_DIR "")
 endif()
diff --git a/build_files/cmake/Modules/FindHIPRT.cmake b/build_files/cmake/Modules/FindHIPRT.cmake
index d1ab05e9880..60f97203f5e 100644
--- a/build_files/cmake/Modules/FindHIPRT.cmake
+++ b/build_files/cmake/Modules/FindHIPRT.cmake
@@ -12,6 +12,9 @@ if(DEFINED HIPRT_ROOT_DIR AND HIPRT_ROOT_DIR)
   # Pass.
 elseif(DEFINED ENV{HIPRT_ROOT_DIR})
   set(HIPRT_ROOT_DIR $ENV{HIPRT_ROOT_DIR})
+elseif(DEFINED ENV{HIP_PATH})
+  # Built-in environment variable from SDK.
+  set(HIPRT_ROOT_DIR $ENV{HIP_PATH})
 else()
   set(HIPRT_ROOT_DIR "")
 endif()
@@ -24,6 +27,7 @@ find_path(HIPRT_INCLUDE_DIR
   NAMES
     hiprt/hiprt.h
   HINTS
+    ${_hiprt_SEARCH_DIRS}/include
     ${_hiprt_SEARCH_DIRS}
 )
 
@@ -36,6 +40,7 @@ if(HIPRT_INCLUDE_DIR)
     NAMES
       hiprt${_hiprt_version}_amd_lib_win.bc
     HINTS
+      ${HIPRT_ROOT_DIR}/bin
       ${HIPRT_ROOT_DIR}/dist/bin/Release
     NO_DEFAULT_PATH
   )