diff --git a/include/hip/hcc_detail/hip_runtime.h b/include/hip/hcc_detail/hip_runtime.h
index 48818fb15d..267f970377 100644
--- a/include/hip/hcc_detail/hip_runtime.h
+++ b/include/hip/hcc_detail/hip_runtime.h
@@ -110,9 +110,9 @@ extern int HIP_TRACE_API;
 #include <hip/hcc_detail/host_defines.h>
 #include <hip/hcc_detail/math_functions.h>
 #include <hip/hcc_detail/device_functions.h>
+#include <hip/hcc_detail/surface_functions.h>
 #if __HCC__
 #include <hip/hcc_detail/texture_functions.h>
-#include <hip/hcc_detail/surface_functions.h>
 #endif // __HCC__
 
 // TODO-HCC remove old definitions ; ~1602 hcc supports __HCC_ACCELERATOR__ define.
diff --git a/include/hip/hcc_detail/surface_functions.h b/include/hip/hcc_detail/surface_functions.h
index 562cc440ed..607f221901 100644
--- a/include/hip/hcc_detail/surface_functions.h
+++ b/include/hip/hcc_detail/surface_functions.h
@@ -23,8 +23,6 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_HIP_HCC_DETAIL_SURFACE_FUNCTIONS_H
 #define HIP_INCLUDE_HIP_HCC_DETAIL_SURFACE_FUNCTIONS_H
 
-#include <hc.hpp>
-#include <hc_short_vector.hpp>
 #include <hip/hcc_detail/hip_surface_types.h>
 
 #define __SURFACE_FUNCTIONS_DECL__ static __inline__ __device__