diff --git a/include/hip/driver_types.h b/include/hip/driver_types.h
index 1a8aa0daa8..18313d70de 100644
--- a/include/hip/driver_types.h
+++ b/include/hip/driver_types.h
@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include <hip/hip_common.h>
 
 #if (defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__)) && !(defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
-#include <hip/amd_detail/driver_types.h>
+#include <hip/amd_detail/amd_driver_types.h>
 #elif !(defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__)) && (defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
 #include "driver_types.h"
 #else
diff --git a/include/hip/hip_texture_types.h b/include/hip/hip_texture_types.h
index 7a03e32e51..af9ec90eee 100644
--- a/include/hip/hip_texture_types.h
+++ b/include/hip/hip_texture_types.h
@@ -27,7 +27,7 @@ THE SOFTWARE.
 #if (defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__)) && !(defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
 #include <hip/amd_detail/amd_hip_texture_types.h>
 #elif !(defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__)) && (defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
-#include <hip/nvidia_detail/hip_texture_types.h>
+#include <hip/nvidia_detail/nvidia_hip_texture_types.h>
 #else
 #error("Must define exactly one of __HIP_PLATFORM_AMD__ or __HIP_PLATFORM_NVIDIA__");
 #endif
diff --git a/include/hip/hiprtc.h b/include/hip/hiprtc.h
index f52697b942..471dd3714b 100644
--- a/include/hip/hiprtc.h
+++ b/include/hip/hiprtc.h
@@ -26,7 +26,7 @@ THE SOFTWARE.
 #if (defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__)) && !(defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
     #include <hip/amd_detail/amd_hiprtc.h>
 #elif !(defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__)) && (defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
-    #include <hip/nvidia_detail/hiprtc.h>
+    #include <hip/nvidia_detail/nvidia_hiprtc.h>
 #else
     #error("Must define exactly one of __HIP_PLATFORM_AMD__ or __HIP_PLATFORM_NVIDIA__");
 #endif