diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt
index 5bdba928ae..e1ce5ef9ae 100644
--- a/hipamd/CMakeLists.txt
+++ b/hipamd/CMakeLists.txt
@@ -166,7 +166,7 @@ if(HIP_PLATFORM STREQUAL "hcc")
     set(HIP_HCC_BUILD_FLAGS "${HIP_HCC_BUILD_FLAGS} -DHIP_VERSION_MAJOR=${HIP_VERSION_MAJOR} -DHIP_VERSION_MINOR=${HIP_VERSION_MINOR} -DHIP_VERSION_PATCH=${HIP_VERSION_PATCH}")
 
     # Add remaining flags
-    set(HIP_HCC_BUILD_FLAGS "${HIP_HCC_BUILD_FLAGS} -fPIC -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -I/opt/rocm/libhsakmt/include/libhsakmt -stdlib=libc++")
+    set(HIP_HCC_BUILD_FLAGS "${HIP_HCC_BUILD_FLAGS} -fPIC -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -I/opt/rocm/libhsakmt/include -stdlib=libc++")
 
     # Set compiler and compiler flags
     set(CMAKE_CXX_COMPILER "${HCC_HOME}/bin/hcc")
diff --git a/hipamd/include/hip b/hipamd/include/hip
deleted file mode 120000
index f5030fe889..0000000000
--- a/hipamd/include/hip
+++ /dev/null
@@ -1 +0,0 @@
-../include
\ No newline at end of file
diff --git a/hipamd/include/hcc.h b/hipamd/include/hip/hcc.h
similarity index 76%
rename from hipamd/include/hcc.h
rename to hipamd/include/hip/hcc.h
index 9766e95935..efb5197cca 100644
--- a/hipamd/include/hcc.h
+++ b/hipamd/include/hip/hcc.h
@@ -2,7 +2,7 @@
 #define HCC_H
 
 #if defined(__HIP_PLATFORM_HCC__) && !defined (__HIP_PLATFORM_NVCC__)
-#include <hcc_detail/hcc_acc.h>
+#include "hip/hcc_detail/hcc_acc.h"
 #endif
 
 #endif
diff --git a/hipamd/include/hcc_detail/cuda/cuda.h b/hipamd/include/hip/hcc_detail/cuda/cuda.h
similarity index 100%
rename from hipamd/include/hcc_detail/cuda/cuda.h
rename to hipamd/include/hip/hcc_detail/cuda/cuda.h
diff --git a/hipamd/include/hcc_detail/cuda/math_functions.h b/hipamd/include/hip/hcc_detail/cuda/math_functions.h
similarity index 100%
rename from hipamd/include/hcc_detail/cuda/math_functions.h
rename to hipamd/include/hip/hcc_detail/cuda/math_functions.h
diff --git a/hipamd/include/hcc_detail/hcc_acc.h b/hipamd/include/hip/hcc_detail/hcc_acc.h
similarity index 100%
rename from hipamd/include/hcc_detail/hcc_acc.h
rename to hipamd/include/hip/hcc_detail/hcc_acc.h
diff --git a/hipamd/include/hcc_detail/hipComplex.h b/hipamd/include/hip/hcc_detail/hipComplex.h
similarity index 100%
rename from hipamd/include/hcc_detail/hipComplex.h
rename to hipamd/include/hip/hcc_detail/hipComplex.h
diff --git a/hipamd/include/hcc_detail/hip_blas.h b/hipamd/include/hip/hcc_detail/hip_blas.h
similarity index 100%
rename from hipamd/include/hcc_detail/hip_blas.h
rename to hipamd/include/hip/hcc_detail/hip_blas.h
diff --git a/hipamd/include/hcc_detail/hip_fp16.h b/hipamd/include/hip/hcc_detail/hip_fp16.h
similarity index 99%
rename from hipamd/include/hcc_detail/hip_fp16.h
rename to hipamd/include/hip/hcc_detail/hip_fp16.h
index f6d3f2311a..9c7b3a6646 100644
--- a/hipamd/include/hcc_detail/hip_fp16.h
+++ b/hipamd/include/hip/hcc_detail/hip_fp16.h
@@ -20,7 +20,7 @@ THE SOFTWARE.
 #ifndef HIP_FP16_H
 #define HIP_FP16_H
 
-#include "hip_runtime.h"
+#include "hip/hip_runtime.h"
 
 typedef struct{
   unsigned x: 16;
diff --git a/hipamd/include/hcc_detail/hip_hcc.h b/hipamd/include/hip/hcc_detail/hip_hcc.h
similarity index 100%
rename from hipamd/include/hcc_detail/hip_hcc.h
rename to hipamd/include/hip/hcc_detail/hip_hcc.h
diff --git a/hipamd/include/hcc_detail/hip_ldg.h b/hipamd/include/hip/hcc_detail/hip_ldg.h
similarity index 95%
rename from hipamd/include/hcc_detail/hip_ldg.h
rename to hipamd/include/hip/hcc_detail/hip_ldg.h
index 8d16ee27ef..6fcb9d9df4 100644
--- a/hipamd/include/hcc_detail/hip_ldg.h
+++ b/hipamd/include/hip/hcc_detail/hip_ldg.h
@@ -21,11 +21,9 @@ THE SOFTWARE.
 #define HIP_LDG_H
 
 #if __HCC__
-#include"hip_vector_types.h"
-#include"host_defines.h"
 #if __hcc_workweek__ >= 16164
-#include"hip/hip_vector_types.h"
-#include"hip/hcc_detail/host_defines.h"
+#include "hip/hip_vector_types.h"
+#include "hip/hcc_detail/host_defines.h"
 
 
 __device__ char                 __ldg(const char* );
diff --git a/hipamd/include/hcc_detail/hip_runtime.h b/hipamd/include/hip/hcc_detail/hip_runtime.h
similarity index 100%
rename from hipamd/include/hcc_detail/hip_runtime.h
rename to hipamd/include/hip/hcc_detail/hip_runtime.h
diff --git a/hipamd/include/hcc_detail/hip_runtime_api.h b/hipamd/include/hip/hcc_detail/hip_runtime_api.h
similarity index 100%
rename from hipamd/include/hcc_detail/hip_runtime_api.h
rename to hipamd/include/hip/hcc_detail/hip_runtime_api.h
diff --git a/hipamd/include/hcc_detail/hip_texture.h b/hipamd/include/hip/hcc_detail/hip_texture.h
similarity index 100%
rename from hipamd/include/hcc_detail/hip_texture.h
rename to hipamd/include/hip/hcc_detail/hip_texture.h
diff --git a/hipamd/include/hcc_detail/hip_util.h b/hipamd/include/hip/hcc_detail/hip_util.h
similarity index 100%
rename from hipamd/include/hcc_detail/hip_util.h
rename to hipamd/include/hip/hcc_detail/hip_util.h
diff --git a/hipamd/include/hcc_detail/hip_vector_types.h b/hipamd/include/hip/hcc_detail/hip_vector_types.h
similarity index 100%
rename from hipamd/include/hcc_detail/hip_vector_types.h
rename to hipamd/include/hip/hcc_detail/hip_vector_types.h
diff --git a/hipamd/include/hcc_detail/host_defines.h b/hipamd/include/hip/hcc_detail/host_defines.h
similarity index 100%
rename from hipamd/include/hcc_detail/host_defines.h
rename to hipamd/include/hip/hcc_detail/host_defines.h
diff --git a/hipamd/include/hcc_detail/trace_helper.h b/hipamd/include/hip/hcc_detail/trace_helper.h
similarity index 100%
rename from hipamd/include/hcc_detail/trace_helper.h
rename to hipamd/include/hip/hcc_detail/trace_helper.h
diff --git a/hipamd/include/hipComplex.h b/hipamd/include/hip/hipComplex.h
similarity index 100%
rename from hipamd/include/hipComplex.h
rename to hipamd/include/hip/hipComplex.h
diff --git a/hipamd/include/hip_common.h b/hipamd/include/hip/hip_common.h
similarity index 100%
rename from hipamd/include/hip_common.h
rename to hipamd/include/hip/hip_common.h
diff --git a/hipamd/include/hip_fp16.h b/hipamd/include/hip/hip_fp16.h
similarity index 100%
rename from hipamd/include/hip_fp16.h
rename to hipamd/include/hip/hip_fp16.h
diff --git a/hipamd/include/hip_runtime.h b/hipamd/include/hip/hip_runtime.h
similarity index 100%
rename from hipamd/include/hip_runtime.h
rename to hipamd/include/hip/hip_runtime.h
diff --git a/hipamd/include/hip_runtime_api.h b/hipamd/include/hip/hip_runtime_api.h
similarity index 100%
rename from hipamd/include/hip_runtime_api.h
rename to hipamd/include/hip/hip_runtime_api.h
diff --git a/hipamd/include/hip_vector_types.h b/hipamd/include/hip/hip_vector_types.h
similarity index 100%
rename from hipamd/include/hip_vector_types.h
rename to hipamd/include/hip/hip_vector_types.h
diff --git a/hipamd/include/hipblas.h b/hipamd/include/hip/hipblas.h
similarity index 100%
rename from hipamd/include/hipblas.h
rename to hipamd/include/hip/hipblas.h
diff --git a/hipamd/include/nvcc_detail/hipComplex.h b/hipamd/include/hip/nvcc_detail/hipComplex.h
similarity index 100%
rename from hipamd/include/nvcc_detail/hipComplex.h
rename to hipamd/include/hip/nvcc_detail/hipComplex.h
diff --git a/hipamd/include/nvcc_detail/hip_blas.h b/hipamd/include/hip/nvcc_detail/hip_blas.h
similarity index 100%
rename from hipamd/include/nvcc_detail/hip_blas.h
rename to hipamd/include/hip/nvcc_detail/hip_blas.h
diff --git a/hipamd/include/nvcc_detail/hip_runtime.h b/hipamd/include/hip/nvcc_detail/hip_runtime.h
similarity index 100%
rename from hipamd/include/nvcc_detail/hip_runtime.h
rename to hipamd/include/hip/nvcc_detail/hip_runtime.h
diff --git a/hipamd/include/nvcc_detail/hip_runtime_api.h b/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
similarity index 100%
rename from hipamd/include/nvcc_detail/hip_runtime_api.h
rename to hipamd/include/hip/nvcc_detail/hip_runtime_api.h
diff --git a/hipamd/src/device_util.cpp b/hipamd/src/device_util.cpp
index bc3677a846..21a58d7070 100644
--- a/hipamd/src/device_util.cpp
+++ b/hipamd/src/device_util.cpp
@@ -17,11 +17,12 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include"hip_runtime.h"
-#include<hc.hpp>
-#include<grid_launch.h>
-
+#include <hc.hpp>
+#include <grid_launch.h>
 #include <hc_math.hpp>
+
+#include "hip/hip_runtime.h"
+
 // TODO: Choose whether default is precise math or fast math based on compilation flag.
 #ifdef __HCC_ACCELERATOR__
 using namespace hc::precise_math;
diff --git a/hipamd/src/hip_context.cpp b/hipamd/src/hip_context.cpp
index d0ee129358..d2199ec11f 100644
--- a/hipamd/src/hip_context.cpp
+++ b/hipamd/src/hip_context.cpp
@@ -22,9 +22,9 @@ THE SOFTWARE.
 
 #include <stack>
 
-#include "hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
+#include "hip/hip_runtime.h"
+#include "hip/hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 // Stack of contexts
 thread_local std::stack<ihipCtx_t *>  tls_ctxStack;
diff --git a/hipamd/src/hip_device.cpp b/hipamd/src/hip_device.cpp
index ef498acfcd..a677402b69 100644
--- a/hipamd/src/hip_device.cpp
+++ b/hipamd/src/hip_device.cpp
@@ -17,9 +17,9 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
+#include "hip/hip_runtime.h"
+#include "hip/hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 //-------------------------------------------------------------------------------------------------
 //Devices
diff --git a/hipamd/src/hip_error.cpp b/hipamd/src/hip_error.cpp
index 97fcaaf714..840362f314 100644
--- a/hipamd/src/hip_error.cpp
+++ b/hipamd/src/hip_error.cpp
@@ -17,9 +17,9 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
+#include "hip/hip_runtime.h"
+#include "hip/hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
diff --git a/hipamd/src/hip_event.cpp b/hipamd/src/hip_event.cpp
index 52b25fc19b..084625b41d 100644
--- a/hipamd/src/hip_event.cpp
+++ b/hipamd/src/hip_event.cpp
@@ -17,9 +17,9 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
+#include "hip/hip_runtime.h"
+#include "hip/hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
diff --git a/hipamd/src/hip_hcc.cpp b/hipamd/src/hip_hcc.cpp
index 3c8dfb1f3e..f76c454e2e 100644
--- a/hipamd/src/hip_hcc.cpp
+++ b/hipamd/src/hip_hcc.cpp
@@ -36,15 +36,15 @@ THE SOFTWARE.
 #include <vector>
 #include <algorithm>
 #include <atomic>
+
 #include <hc.hpp>
 #include <hc_am.hpp>
+#include "hsa/hsa_ext_amd.h"
+#include "libhsakmt/hsakmt.h"
 
-#include "hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
-#include "hsa_ext_amd.h"
-#include "hsakmt.h"
-
-#include "hcc_detail/trace_helper.h"
+#include "hip/hip_runtime.h"
+#include "hip/hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 
 
diff --git a/hipamd/src/hip_ldg.cpp b/hipamd/src/hip_ldg.cpp
index 620ff91076..c59bd6e66b 100644
--- a/hipamd/src/hip_ldg.cpp
+++ b/hipamd/src/hip_ldg.cpp
@@ -18,7 +18,8 @@ THE SOFTWARE.
 */
 
 #include <hc.hpp>
-#include"hcc_detail/hip_ldg.h"
+
+#include "hip/hcc_detail/hip_ldg.h"
 
 __device__ char                 __ldg(const char* ptr)
 {
diff --git a/hipamd/src/hip_memory.cpp b/hipamd/src/hip_memory.cpp
index 68811be8ee..6a869269d3 100644
--- a/hipamd/src/hip_memory.cpp
+++ b/hipamd/src/hip_memory.cpp
@@ -17,12 +17,14 @@
    THE SOFTWARE.
    */
 
-#include "hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
-#include <hsa.h>
 #include <hc_am.hpp>
-#include <hsa_ext_amd.h>
+#include "hsa/hsa.h"
+#include "hsa/hsa_ext_amd.h"
+
+#include "hip/hip_runtime.h"
+#include "hip/hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/trace_helper.h"
+
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 // Memory
diff --git a/hipamd/src/hip_module.cpp b/hipamd/src/hip_module.cpp
index 7ef3ca9933..f556c85456 100644
--- a/hipamd/src/hip_module.cpp
+++ b/hipamd/src/hip_module.cpp
@@ -17,17 +17,19 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "hip_runtime.h"
-#include "hsa/hsa.h"
-#include "hsa/hsa_ext_amd.h"
-#include "hsa/amd_hsa_kernel_code.h"
-#include "hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
 #include <fstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <elf.h>
 
+#include "hsa/hsa.h"
+#include "hsa/hsa_ext_amd.h"
+#include "hsa/amd_hsa_kernel_code.h"
+
+#include "hip/hip_runtime.h"
+#include "hip/hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/trace_helper.h"
+
 //TODO Use Pool APIs from HCC to get memory regions.
 
 namespace hipdrv {
diff --git a/hipamd/src/hip_peer.cpp b/hipamd/src/hip_peer.cpp
index 63ac902a23..c0ebda311d 100644
--- a/hipamd/src/hip_peer.cpp
+++ b/hipamd/src/hip_peer.cpp
@@ -19,9 +19,9 @@ THE SOFTWARE.
 
 #include <hc_am.hpp>
 
-#include "hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
+#include "hip/hip_runtime.h"
+#include "hip/hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 
 // Peer access functions.
diff --git a/hipamd/src/hip_stream.cpp b/hipamd/src/hip_stream.cpp
index 9475e61b21..2b81515784 100644
--- a/hipamd/src/hip_stream.cpp
+++ b/hipamd/src/hip_stream.cpp
@@ -17,9 +17,9 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "hip_runtime.h"
-#include "hcc_detail/hip_hcc.h"
-#include "hcc_detail/trace_helper.h"
+#include "hip/hip_runtime.h"
+#include "hip/hcc_detail/hip_hcc.h"
+#include "hip/hcc_detail/trace_helper.h"
 
 
 //-------------------------------------------------------------------------------------------------