diff --git a/projects/rocr-runtime/runtime/hsa-ext-image/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-ext-image/CMakeLists.txt
index 242c436871..6f2aaa7aff 100755
--- a/projects/rocr-runtime/runtime/hsa-ext-image/CMakeLists.txt
+++ b/projects/rocr-runtime/runtime/hsa-ext-image/CMakeLists.txt
@@ -53,7 +53,7 @@ include_directories( ${HSAKMT_INC_PATH} )
 link_directories( ${HSAKMT_LIB_PATH} )
 
 ## Find the hsa-runtime and include files
-get_include_path( HSA_INC_PATH "ROCr include path" NAMES "hsa.h" "hsa/hsa.h" HINTS "${CMAKE_BINARY_DIR}/../../include" "${CMAKE_CURRENT_SOURCE_DIR}/../hsa-runtime/inc" PATHS "/opt/rocm/include")
+get_include_path( HSA_INC_PATH "ROCr include path" NAMES "inc/hsa.h" HINTS "${CMAKE_CURRENT_SOURCE_DIR}/../hsa-runtime" "${CMAKE_BINARY_DIR}/../../include" PATHS "/opt/rocm/include")
 get_library_path( HSA_LIB_PATH "ROCr library path" NAMES "libhsa-runtime64.so" HINTS "${CMAKE_BINARY_DIR}/../../lib" "${CMAKE_BINARY_DIR}/../hsa-core" "${CMAKE_CURRENT_SOURCE_DIR}/../hsa-runtime/build" PATHS "/opt/rocm/lib")
 include_directories( ${HSA_INC_PATH} )
 link_directories( ${HSA_LIB_PATH} )
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt
index 9796aaef1f..642bd09a6c 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt
+++ b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt
@@ -103,8 +103,6 @@ link_directories ( ${HSAKMT_LIB_PATH} )
 
 ## Set include directories for ROCr runtime
 include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} )
-include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/inc )
-include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/core/inc )
 include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/libamdhsacode )
 
 ## ROCr build internal versioning
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/common/hsa_table_interface.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/common/hsa_table_interface.cpp
index bebe1c8f1d..d453888f1f 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/common/hsa_table_interface.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/common/hsa_table_interface.cpp
@@ -40,7 +40,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "hsa_api_trace.h"
+#include "inc/hsa_api_trace.h"
 #include "core/inc/hsa_api_trace_int.h"
 
 static const HsaApiTable* hsaApiTable;
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_hsa_code.hpp b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_hsa_code.hpp
index b3fcbc2fbf..61ee1d58ce 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_hsa_code.hpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_hsa_code.hpp
@@ -82,11 +82,11 @@ mes of its
 #ifndef AMD_HSA_CODE_HPP_
 #define AMD_HSA_CODE_HPP_
 
-#include "amd_elf_image.hpp"
-#include "amd_hsa_elf.h"
-#include "amd_hsa_kernel_code.h"
-#include "hsa.h"
-#include "hsa_ext_finalize.h"
+#include "core/inc/amd_elf_image.hpp"
+#include "inc/amd_hsa_elf.h"
+#include "inc/amd_hsa_kernel_code.h"
+#include "inc/hsa.h"
+#include "inc/hsa_ext_finalize.h"
 #include <memory>
 #include <sstream>
 #include <cassert>
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_hsa_loader.hpp b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_hsa_loader.hpp
index b592f3a41e..a7f2d6a961 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_hsa_loader.hpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_hsa_loader.hpp
@@ -45,10 +45,10 @@
 
 #include <cstddef>
 #include <cstdint>
-#include "hsa.h"
-#include "hsa_ext_image.h"
-#include "hsa_ven_amd_loader.h"
-#include "amd_hsa_elf.h"
+#include "inc/hsa.h"
+#include "inc/hsa_ext_image.h"
+#include "inc/hsa_ven_amd_loader.h"
+#include "inc/amd_hsa_elf.h"
 #include <string>
 #include <mutex>
 #include <vector>
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/hsa_ext_amd_impl.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/hsa_ext_amd_impl.h
index ec17a6b07f..9d38cedffa 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/hsa_ext_amd_impl.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/hsa_ext_amd_impl.h
@@ -45,9 +45,9 @@
 #ifndef HSA_RUNTIME_CORE_INC_EXT_AMD_H_
 #define HSA_RUNTIME_CORE_INC_EXT_AMD_H_
 
-#include "hsa.h"
-#include "hsa_ext_image.h"
-#include "hsa_ext_amd.h"
+#include "inc/hsa.h"
+#include "inc/hsa_ext_image.h"
+#include "inc/hsa_ext_amd.h"
 
 // Wrap internal implementation inside AMD namespace
 namespace AMD {
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/hsa_ext_interface.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/hsa_ext_interface.h
index 236a165c73..d3b4e92fbf 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/hsa_ext_interface.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/hsa_ext_interface.h
@@ -46,7 +46,7 @@
 #include <string>
 #include <vector>
 
-#include "hsa_api_trace_int.h"
+#include "core/inc/hsa_api_trace_int.h"
 
 #include "core/util/os.h"
 #include "core/util/utils.h"
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/runtime.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/runtime.h
index c160631b98..b76c35e97f 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/runtime.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/runtime.h
@@ -66,7 +66,7 @@
 #include "core/util/utils.h"
 
 #include "core/inc/amd_loader_context.hpp"
-#include "amd_hsa_code.hpp"
+#include "core/inc/amd_hsa_code.hpp"
 
 //---------------------------------------------------------------------------//
 //    Constants                                                              //
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_cpu_agent.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_cpu_agent.cpp
index 59493c1ebe..c5b33e4f20 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_cpu_agent.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_cpu_agent.cpp
@@ -48,7 +48,7 @@
 #include "core/inc/amd_memory_region.h"
 #include "core/inc/host_queue.h"
 
-#include "hsa_ext_image.h"
+#include "inc/hsa_ext_image.h"
 
 namespace amd {
 CpuAgent::CpuAgent(HSAuint32 node, const HsaNodeProperties& node_props)
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa_ven_amd_loader.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa_ven_amd_loader.cpp
index 6b4cb774d2..7277ea76ad 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa_ven_amd_loader.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa_ven_amd_loader.cpp
@@ -40,7 +40,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "hsa_ven_amd_loader.h"
+#include "inc/hsa_ven_amd_loader.h"
 
 #include "core/inc/amd_hsa_loader.hpp"
 #include "core/inc/runtime.h"
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_elf_image.cpp b/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_elf_image.cpp
index d24e19849c..b7aa7abdac 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_elf_image.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_elf_image.cpp
@@ -40,7 +40,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "amd_elf_image.hpp"
+#include "core/inc/amd_elf_image.hpp"
 #include "amd_hsa_code_util.hpp"
 #include <gelf.h>
 #include <errno.h>
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp b/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp
index 7a133ff9cb..93f6bb54b9 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp
@@ -44,10 +44,10 @@
 #include <cstring>
 #include <iomanip>
 #include <algorithm>
-#include "amd_hsa_code.hpp"
+#include "core/inc/amd_hsa_code.hpp"
 #include "amd_hsa_code_util.hpp"
 #include <libelf.h>
-#include "amd_hsa_elf.h"
+#include "inc/amd_hsa_elf.h"
 #include <fstream>
 #include <sstream>
 #include <cstdlib>
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code_util.cpp b/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code_util.cpp
index 7ada07bc99..40080b868b 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code_util.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code_util.cpp
@@ -59,7 +59,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #endif // _WIN32
-#include "Brig.h"
+#include "inc/Brig.h"
 
 namespace {
 auto eq = " = ";
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code_util.hpp b/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code_util.hpp
index 113a888c66..c6c6717406 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code_util.hpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/libamdhsacode/amd_hsa_code_util.hpp
@@ -52,10 +52,10 @@
 #else // _WIN32
 #include <cstdlib>
 #endif // _WIN32
-#include "amd_hsa_kernel_code.h"
-#include "amd_hsa_elf.h"
-#include "hsa.h"
-#include "hsa_ext_finalize.h"
+#include "inc/amd_hsa_kernel_code.h"
+#include "inc/amd_hsa_elf.h"
+#include "inc/hsa.h"
+#include "inc/hsa_ext_finalize.h"
 
 #define hsa_error(e) static_cast<hsa_status_t>(e)
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/loader/executable.cpp b/projects/rocr-runtime/runtime/hsa-runtime/loader/executable.cpp
index 2713e9a07e..6299983af8 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/loader/executable.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/loader/executable.cpp
@@ -50,9 +50,9 @@
 #include <fstream>
 #include <libelf.h>
 #include <unistd.h>
-#include "amd_hsa_elf.h"
-#include "amd_hsa_kernel_code.h"
-#include "amd_hsa_code.hpp"
+#include "inc/amd_hsa_elf.h"
+#include "inc/amd_hsa_kernel_code.h"
+#include "core/inc/amd_hsa_code.hpp"
 #include "amd_hsa_code_util.hpp"
 #include "amd_options.hpp"
 #include "core/util/utils.h"
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/loader/executable.hpp b/projects/rocr-runtime/runtime/hsa-runtime/loader/executable.hpp
index dc674509fc..e9318f9924 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/loader/executable.hpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/loader/executable.hpp
@@ -55,11 +55,11 @@
 #include <utility>
 #include <vector>
 #include <cstring>
-#include "hsa.h"
-#include "hsa_ext_image.h"
-#include "amd_hsa_loader.hpp"
-#include "amd_hsa_code.hpp"
-#include "amd_hsa_kernel_code.h"
+#include "inc/hsa.h"
+#include "inc/hsa_ext_image.h"
+#include "core/inc/amd_hsa_loader.hpp"
+#include "core/inc/amd_hsa_code.hpp"
+#include "inc/amd_hsa_kernel_code.h"
 #include "amd_hsa_locks.hpp"
 
 namespace amd {
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/loader/loaders.hpp b/projects/rocr-runtime/runtime/hsa-runtime/loader/loaders.hpp
index a16eac078e..d28ffb73fc 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/loader/loaders.hpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/loader/loaders.hpp
@@ -43,7 +43,7 @@
 #ifndef LOADERS_HPP_
 #define LOADERS_HPP_
 
-#include "amd_hsa_loader.hpp"
+#include "core/inc/amd_hsa_loader.hpp"
 #include <set>
 #include <iostream>