diff --git a/include/hip/hcc_detail/hip_complex.h b/include/hip/hcc_detail/hip_complex.h
index dd742e484c..26d73a21a8 100644
--- a/include/hip/hcc_detail/hip_complex.h
+++ b/include/hip/hcc_detail/hip_complex.h
@@ -23,8 +23,7 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_HIP_HCC_DETAIL_HIP_COMPLEX_H
 #define HIP_INCLUDE_HIP_HCC_DETAIL_HIP_COMPLEX_H
 
-#include "./hip_fp16.h"
-#include "./hip_vector_types.h"
+#include "hip/hcc_detail/hip_vector_types.h"
 
 #if __cplusplus
 #define COMPLEX_ADD_OP_OVERLOAD(type) \
diff --git a/include/hip/hcc_detail/hip_fp16.h b/include/hip/hcc_detail/hip_fp16.h
index febc1b4fce..0a861b64af 100644
--- a/include/hip/hcc_detail/hip_fp16.h
+++ b/include/hip/hcc_detail/hip_fp16.h
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_HIP_HCC_DETAIL_HIP_FP16_H
 #define HIP_INCLUDE_HIP_HCC_DETAIL_HIP_FP16_H
 
-#include "hip/hip_runtime.h"
+#include "hip/hcc_detail/hip_vector_types.h"
 
 #if __clang_major__ > 3
 
diff --git a/include/hip/hcc_detail/hip_vector_types.h b/include/hip/hcc_detail/hip_vector_types.h
index 42e1d6663c..82bd3b2d6f 100644
--- a/include/hip/hcc_detail/hip_vector_types.h
+++ b/include/hip/hcc_detail/hip_vector_types.h
@@ -32,7 +32,7 @@ THE SOFTWARE.
 #error("This version of HIP requires a newer version of HCC.");
 #endif
 
-#include "host_defines.h"
+#include "hip/hcc_detail/host_defines.h"
 
 #define MAKE_DEFAULT_CONSTRUCTOR_ONE_COMPONENT(type) \
 __device__ __host__ type() {} \