diff --git a/catch/unit/module/CMakeLists.txt b/catch/unit/module/CMakeLists.txt
index 5d951cf27c..bda6f79cfc 100644
--- a/catch/unit/module/CMakeLists.txt
+++ b/catch/unit/module/CMakeLists.txt
@@ -34,28 +34,28 @@ set(TEST_SRC
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/get_function_module.code
                    COMMAND ${CMAKE_CXX_COMPILER} --genco --std=c++17 ${CMAKE_CURRENT_SOURCE_DIR}/get_function_module.cc
                    -o get_function_module.code
-                   -I${ROCM_PATH}/include/ --rocm-path=${ROCM_PATH}
+                   -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/get_function_module.cc)
 add_custom_target(get_function_module ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/get_function_module.code)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/launch_kernel_module.code
                    COMMAND ${CMAKE_CXX_COMPILER} --genco --std=c++17 ${CMAKE_CURRENT_SOURCE_DIR}/launch_kernel_module.cc
                    -o launch_kernel_module.code
-                   -I${ROCM_PATH}/include/ --rocm-path=${ROCM_PATH}
+                   -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/launch_kernel_module.cc)
 add_custom_target(launch_kernel_module ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/launch_kernel_module.code)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/get_global_test_module.code
                    COMMAND ${CMAKE_CXX_COMPILER} --genco --std=c++17 ${CMAKE_CURRENT_SOURCE_DIR}/get_global_test_module.cc
                    -o get_global_test_module.code
-                   -I${ROCM_PATH}/include/ --rocm-path=${ROCM_PATH}
+                   -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/get_global_test_module.cc)
 add_custom_target(get_global_test_module ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/get_global_test_module.code)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/get_tex_ref_module.code
                    COMMAND ${CMAKE_CXX_COMPILER} --genco --std=c++17 ${CMAKE_CURRENT_SOURCE_DIR}/get_tex_ref_module.cc
                    -o get_tex_ref_module.code
-                   -I${ROCM_PATH}/include/ --rocm-path=${ROCM_PATH}
+                   -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/get_tex_ref_module.cc)
 add_custom_target(get_tex_ref_module ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/get_tex_ref_module.code)
 
@@ -71,20 +71,20 @@ add_custom_target(empty_module.code
                   COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR}
                   ${CMAKE_CURRENT_SOURCE_DIR}/empty_module.cc
                   -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/empty_module.code
-                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                   -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
 
 add_custom_target(copyKernel.code
                   COMMAND ${CMAKE_CXX_COMPILER} -mcode-object-version=5 --genco ${OFFLOAD_ARCH_STR}
                   ${CMAKE_CURRENT_SOURCE_DIR}/copyKernel.cc
                   -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copyKernel.code
-                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                   -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
 
 add_custom_target(copyKernel.s
                   COMMAND ${CMAKE_CXX_COMPILER} -mcode-object-version=5 -S ${CMAKE_CURRENT_SOURCE_DIR}/copyKernel.cc
                   -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copyKernel.s
-                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                   -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
 
 if(UNIX)
@@ -96,7 +96,7 @@ add_custom_target(copiousArgKernel.code
                   COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR}
                   ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc
                   -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel.code
-                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                   -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
 
 add_custom_target(copiousArgKernel0.code
@@ -104,7 +104,7 @@ add_custom_target(copiousArgKernel0.code
                   -mllvm -amdgpu-kernarg-preload-count=0
                   ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc
                   -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel0.code
-                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                   -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
 
 add_custom_target(copiousArgKernel1.code
@@ -112,7 +112,7 @@ add_custom_target(copiousArgKernel1.code
                   -mllvm -amdgpu-kernarg-preload-count=1
                   ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc
                   -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel1.code
-                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                   -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
 
 add_custom_target(copiousArgKernel2.code
@@ -120,7 +120,7 @@ add_custom_target(copiousArgKernel2.code
                   -mllvm -amdgpu-kernarg-preload-count=2
                   ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc
                   -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel2.code
-                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                   -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
 
 add_custom_target(copiousArgKernel3.code
@@ -128,7 +128,7 @@ add_custom_target(copiousArgKernel3.code
                   -mllvm -amdgpu-kernarg-preload-count=3
                   ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc
                   -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel3.code
-                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                   -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
 
 add_custom_target(copiousArgKernel16.code
@@ -136,7 +136,7 @@ add_custom_target(copiousArgKernel16.code
                   -mllvm -amdgpu-kernarg-preload-count=16
                   ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc
                   -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel16.code
-                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                   -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
 
 add_custom_target(copiousArgKernel17.code
@@ -144,7 +144,7 @@ add_custom_target(copiousArgKernel17.code
                   -mllvm -amdgpu-kernarg-preload-count=17
                   ${CMAKE_CURRENT_SOURCE_DIR}/copiousArgKernel.cc
                   -o ${CMAKE_CURRENT_BINARY_DIR}/../../unit/module/copiousArgKernel17.code
-                  -I${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/
+                  -I${HIP_PATH}/include/ --rocm-path=${ROCM_PATH}
                   -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
 endif()
 endif()