diff --git a/projects/hip/bin/hipify b/projects/hip/bin/hipify
index 5c135f653a..af7c7edce7 100755
--- a/projects/hip/bin/hipify
+++ b/projects/hip/bin/hipify
@@ -228,8 +228,8 @@ while (@ARGV) {
 
         #--------
         #Includes:
-        $countIncludes += s/(\s*#\s*include\s+)[<"]cuda_runtime\.h[>"]/$1<hip_runtime.h>/;
-        $countIncludes += s/(\s*#\s*include\s+)[<"]cuda_runtime_api\.h[>"]/$1<hip_runtime_api.h>/;
+        $countIncludes += s/(\s*#\s*include\s+)[<"]cuda_runtime\.h[>"]/$1<hip\/hip_runtime.h>/;
+        $countIncludes += s/(\s*#\s*include\s+)[<"]cuda_runtime_api\.h[>"]/$1<hip\/hip_runtime_api.h>/;
 
 
         #--------
@@ -559,7 +559,7 @@ while (@ARGV) {
                 # If this file makes kernel builtin calls, and does not include the cuda_runtime.h,
                 # then add an #include to match "magic" includes provided by NVCC.
 				# This logic can miss cases where cuda_runtime.h is included by another include file.
-                print $OUTFILE '#include "hip_runtime.h"' . ($is_dos ? "\r\n" : "\n");
+                print $OUTFILE '#include "hip/hip_runtime.h"' . ($is_dos ? "\r\n" : "\n");
             }
             print $OUTFILE  "$_";
         }
diff --git a/projects/hip/include/hcc_detail/hcc_acc.h b/projects/hip/include/hcc_detail/hcc_acc.h
index c66b340579..d0d605d1c9 100644
--- a/projects/hip/include/hcc_detail/hcc_acc.h
+++ b/projects/hip/include/hcc_detail/hcc_acc.h
@@ -1,6 +1,6 @@
 #ifndef HCC_ACC_H
 #define HCC_ACC_H
-#include "hip_runtime_api.h"
+#include "hip/hip_runtime_api.h"
 
 #if __cplusplus
 #ifdef __HCC__
diff --git a/projects/hip/include/hcc_detail/hip_hcc.h b/projects/hip/include/hcc_detail/hip_hcc.h
index deb9fd0b04..4b40a0ac5e 100644
--- a/projects/hip/include/hcc_detail/hip_hcc.h
+++ b/projects/hip/include/hcc_detail/hip_hcc.h
@@ -21,8 +21,8 @@ THE SOFTWARE.
 #define HIP_HCC_H
 
 #include <hc.hpp>
-#include "hcc_detail/hip_util.h"
-#include "hcc_detail/staging_buffer.h"
+#include "hip/hcc_detail/hip_util.h"
+#include "hip/hcc_detail/staging_buffer.h"
 
 #define HIP_HCC
 
diff --git a/projects/hip/include/hcc_detail/hip_runtime.h b/projects/hip/include/hcc_detail/hip_runtime.h
index aa420e992d..e8dabb8bf7 100644
--- a/projects/hip/include/hcc_detail/hip_runtime.h
+++ b/projects/hip/include/hcc_detail/hip_runtime.h
@@ -40,8 +40,8 @@ THE SOFTWARE.
 
 #define CUDA_SUCCESS hipSuccess
 
-#include <hip_runtime_api.h>
-//#include "hcc_detail/hip_hcc.h"
+#include <hip/hip_runtime_api.h>
+//#include "hip/hcc_detail/hip_hcc.h"
 //---
 // Remainder of this file only compiles with HCC
 #ifdef __HCC__
@@ -55,9 +55,9 @@ extern int HIP_TRACE_API;
 //typedef grid_launch_parm hipLaunchParm ;
 #define hipLaunchParm grid_launch_parm
 #ifdef __cplusplus
-#include <hcc_detail/hip_texture.h>
+#include <hip/hcc_detail/hip_texture.h>
 #endif
-#include <hcc_detail/host_defines.h>
+#include <hip/hcc_detail/host_defines.h>
 // TODO-HCC remove old definitions ; ~1602 hcc supports __HCC_ACCELERATOR__ define.
 #if defined (__KALMAR_ACCELERATOR__) && !defined (__HCC_ACCELERATOR__)
 #define __HCC_ACCELERATOR__  __KALMAR_ACCELERATOR__
diff --git a/projects/hip/include/hcc_detail/hip_runtime_api.h b/projects/hip/include/hcc_detail/hip_runtime_api.h
index 79eb369e48..b00360756a 100644
--- a/projects/hip/include/hcc_detail/hip_runtime_api.h
+++ b/projects/hip/include/hcc_detail/hip_runtime_api.h
@@ -30,9 +30,9 @@ THE SOFTWARE.
 #include <stdint.h>
 #include <stddef.h>
 
-#include <hcc_detail/host_defines.h>
-#include <hip_runtime_api.h>
-//#include "hip_hcc.h"
+#include <hip/hcc_detail/host_defines.h>
+#include <hip/hip_runtime_api.h>
+//#include "hip/hip_hcc.h"
 
 #if defined (__HCC__) &&  (__hcc_workweek__ < 16155)
 #error("This version of HIP requires a newer version of HCC.");
diff --git a/projects/hip/include/hcc_detail/hip_texture.h b/projects/hip/include/hcc_detail/hip_texture.h
index 53a6acf2bf..d4c3403ccf 100644
--- a/projects/hip/include/hcc_detail/hip_texture.h
+++ b/projects/hip/include/hcc_detail/hip_texture.h
@@ -32,7 +32,7 @@ THE SOFTWARE.
 
 #include <limits.h>
 
-#include <hip_runtime.h>
+#include <hip/hip_runtime.h>
 
 //----
 //Texture - TODO - likely need to move this to a separate file only included with kernel compilation.
diff --git a/projects/hip/include/hip_runtime.h b/projects/hip/include/hip_runtime.h
index 61a02cb3ea..dff1e19252 100644
--- a/projects/hip/include/hip_runtime.h
+++ b/projects/hip/include/hip_runtime.h
@@ -48,17 +48,17 @@ THE SOFTWARE.
 #endif
 
 
-#include <hip_common.h>
+#include <hip/hip_common.h>
 
 #if defined(__HIP_PLATFORM_HCC__) && !defined (__HIP_PLATFORM_NVCC__)
-#include <hcc_detail/hip_runtime.h>
+#include <hip/hcc_detail/hip_runtime.h>
 #elif defined(__HIP_PLATFORM_NVCC__) && !defined (__HIP_PLATFORM_HCC__)
-#include <nvcc_detail/hip_runtime.h>
+#include <hip/nvcc_detail/hip_runtime.h>
 #else 
 #error("Must define exactly one of __HIP_PLATFORM_HCC__ or __HIP_PLATFORM_NVCC__");
 #endif 
 
 
-#include <hip_runtime_api.h>
-#include <hip_vector_types.h>
+#include <hip/hip_runtime_api.h>
+#include <hip/hip_vector_types.h>
 
diff --git a/projects/hip/include/hip_runtime_api.h b/projects/hip/include/hip_runtime_api.h
index ca49ab5d13..cfb14c816d 100644
--- a/projects/hip/include/hip_runtime_api.h
+++ b/projects/hip/include/hip_runtime_api.h
@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 
 #include <string.h> // for getDeviceProp
-#include <hip_common.h>
+#include <hip/hip_common.h>
 
 typedef struct {
     // 32-bit Atomics
@@ -200,9 +200,9 @@ typedef enum hipDeviceAttribute_t {
  */
 
 #if defined(__HIP_PLATFORM_HCC__) && !defined (__HIP_PLATFORM_NVCC__)
-#include "hcc_detail/hip_runtime_api.h"
+#include "hip/hcc_detail/hip_runtime_api.h"
 #elif defined(__HIP_PLATFORM_NVCC__) && !defined (__HIP_PLATFORM_HCC__)
-#include "nvcc_detail/hip_runtime_api.h"
+#include "hip/nvcc_detail/hip_runtime_api.h"
 #else
 #error("Must define exactly one of __HIP_PLATFORM_HCC__ or __HIP_PLATFORM_NVCC__");
 #endif
diff --git a/projects/hip/include/hip_vector_types.h b/projects/hip/include/hip_vector_types.h
index 64702b8655..16b64e40bf 100644
--- a/projects/hip/include/hip_vector_types.h
+++ b/projects/hip/include/hip_vector_types.h
@@ -23,12 +23,12 @@ THE SOFTWARE.
 
 #pragma once
 
-#include <hip_common.h>
+#include <hip/hip_common.h>
 
 
 #if defined(__HIP_PLATFORM_HCC__) && !defined (__HIP_PLATFORM_NVCC__)
 #if __cplusplus
-#include <hcc_detail/hip_vector_types.h>
+#include <hip/hcc_detail/hip_vector_types.h>
 #endif
 #elif defined(__HIP_PLATFORM_NVCC__) && !defined (__HIP_PLATFORM_HCC__)
 #include <vector_types.h>
diff --git a/projects/hip/include/nvcc_detail/hip_runtime.h b/projects/hip/include/nvcc_detail/hip_runtime.h
index 48f29518c9..cb1253fdf1 100644
--- a/projects/hip/include/nvcc_detail/hip_runtime.h
+++ b/projects/hip/include/nvcc_detail/hip_runtime.h
@@ -23,7 +23,7 @@ THE SOFTWARE.
 
 #include <cuda_runtime.h>
 
-#include <hip_runtime_api.h>
+#include <hip/hip_runtime_api.h>
 
 #define HIP_KERNEL_NAME(...) __VA_ARGS__