diff --git a/projects/rocprofiler/inc/rocprofiler.h b/projects/rocprofiler/inc/rocprofiler.h
index 4a9661905c..390965d96f 100644
--- a/projects/rocprofiler/inc/rocprofiler.h
+++ b/projects/rocprofiler/inc/rocprofiler.h
@@ -41,10 +41,10 @@ THE SOFTWARE.
 #ifndef INC_ROCPROFILER_H_
 #define INC_ROCPROFILER_H_
 
-#include <amd_hsa_kernel_code.h>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
-#include <hsa_ven_amd_aqlprofile.h>
+#include <hsa/amd_hsa_kernel_code.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ven_amd_aqlprofile.h>
 #include <stdint.h>
 
 #define ROCPROFILER_VERSION_MAJOR 8
diff --git a/projects/rocprofiler/src/core/context.h b/projects/rocprofiler/src/core/context.h
index f629ef1ce4..34e3835632 100644
--- a/projects/rocprofiler/src/core/context.h
+++ b/projects/rocprofiler/src/core/context.h
@@ -25,8 +25,8 @@ THE SOFTWARE.
 
 #include "inc/rocprofiler.h"
 
-#include <hsa.h>
-#include <hsa_ext_amd.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
 #include <unistd.h> // usleep
 #include <atomic>
 #include <list>
diff --git a/projects/rocprofiler/src/core/gpu_command.cpp b/projects/rocprofiler/src/core/gpu_command.cpp
index e337367bac..67a0e0aab2 100644
--- a/projects/rocprofiler/src/core/gpu_command.cpp
+++ b/projects/rocprofiler/src/core/gpu_command.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 #include "gpu_command.h"
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 
 #include <map>
 
diff --git a/projects/rocprofiler/src/core/gpu_command.h b/projects/rocprofiler/src/core/gpu_command.h
index e8439c4a68..9b0d56dc95 100644
--- a/projects/rocprofiler/src/core/gpu_command.h
+++ b/projects/rocprofiler/src/core/gpu_command.h
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef SRC_CORE_GPU_COMMAND_H_
 #define SRC_CORE_GPU_COMMAND_H_
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 
 #include "core/types.h"
 #include "util/exception.h"
diff --git a/projects/rocprofiler/src/core/hsa_interceptor.h b/projects/rocprofiler/src/core/hsa_interceptor.h
index 8b943241d1..abad9b94d8 100644
--- a/projects/rocprofiler/src/core/hsa_interceptor.h
+++ b/projects/rocprofiler/src/core/hsa_interceptor.h
@@ -26,9 +26,9 @@ SOFTWARE.
 #define _SRC_CORE_HSA_INTERCEPTOR_H
 
 #include <cxxabi.h>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
-#include <hsa_ven_amd_loader.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ven_amd_loader.h>
 
 #include <atomic>
 #include <mutex>
diff --git a/projects/rocprofiler/src/core/hsa_proxy_queue.h b/projects/rocprofiler/src/core/hsa_proxy_queue.h
index 3713bfaca8..defbb8ce24 100644
--- a/projects/rocprofiler/src/core/hsa_proxy_queue.h
+++ b/projects/rocprofiler/src/core/hsa_proxy_queue.h
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef _SRC_CORE_HSA_PROXY_QUEUE_H
 #define _SRC_CORE_HSA_PROXY_QUEUE_H
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <atomic>
 #include <map>
 #include <mutex>
diff --git a/projects/rocprofiler/src/core/intercept_queue.h b/projects/rocprofiler/src/core/intercept_queue.h
index c0c8deab24..103d5c391d 100644
--- a/projects/rocprofiler/src/core/intercept_queue.h
+++ b/projects/rocprofiler/src/core/intercept_queue.h
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef _SRC_CORE_INTERCEPT_QUEUE_H
 #define _SRC_CORE_INTERCEPT_QUEUE_H
 
-#include <amd_hsa_kernel_code.h>
+#include <hsa/amd_hsa_kernel_code.h>
 #include <dlfcn.h>
 #include <sys/syscall.h>
 
diff --git a/projects/rocprofiler/src/core/profile.h b/projects/rocprofiler/src/core/profile.h
index f12e7a9ef0..904e309570 100644
--- a/projects/rocprofiler/src/core/profile.h
+++ b/projects/rocprofiler/src/core/profile.h
@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 #include "inc/rocprofiler.h"
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <vector>
 
 #include "core/types.h"
diff --git a/projects/rocprofiler/src/core/proxy_queue.h b/projects/rocprofiler/src/core/proxy_queue.h
index e719fed4c7..b0a1ed6653 100644
--- a/projects/rocprofiler/src/core/proxy_queue.h
+++ b/projects/rocprofiler/src/core/proxy_queue.h
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef _SRC_CORE_PROXY_QUEUE_H
 #define _SRC_CORE_PROXY_QUEUE_H
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <string.h>
 #include <atomic>
 #include <map>
diff --git a/projects/rocprofiler/src/core/rocprofiler.cpp b/projects/rocprofiler/src/core/rocprofiler.cpp
index b50bd51d63..4e08302ba9 100644
--- a/projects/rocprofiler/src/core/rocprofiler.cpp
+++ b/projects/rocprofiler/src/core/rocprofiler.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 #include "inc/rocprofiler.h"
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <string.h>
 
 #include <sstream>
diff --git a/projects/rocprofiler/src/core/simple_proxy_queue.h b/projects/rocprofiler/src/core/simple_proxy_queue.h
index 8bad833a04..f58b38b398 100644
--- a/projects/rocprofiler/src/core/simple_proxy_queue.h
+++ b/projects/rocprofiler/src/core/simple_proxy_queue.h
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef _SRC_CORE_SIMPLE_PROXY_QUEUE_H
 #define _SRC_CORE_SIMPLE_PROXY_QUEUE_H
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <atomic>
 #include <map>
 #include <mutex>
diff --git a/projects/rocprofiler/src/core/tracker.h b/projects/rocprofiler/src/core/tracker.h
index f98c355ee6..8d9c29f928 100644
--- a/projects/rocprofiler/src/core/tracker.h
+++ b/projects/rocprofiler/src/core/tracker.h
@@ -23,10 +23,10 @@ THE SOFTWARE.
 #ifndef SRC_CORE_TRACKER_H_
 #define SRC_CORE_TRACKER_H_
 
-#include <amd_hsa_signal.h>
+#include <hsa/amd_hsa_signal.h>
 #include <assert.h>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
 
 #include <atomic>
 #include <list>
diff --git a/projects/rocprofiler/src/core/types.h b/projects/rocprofiler/src/core/types.h
index c72bb34302..8e9db3b536 100644
--- a/projects/rocprofiler/src/core/types.h
+++ b/projects/rocprofiler/src/core/types.h
@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 #include <iostream>
 
-#include <hsa_ven_amd_aqlprofile.h>
+#include <hsa/hsa_ven_amd_aqlprofile.h>
 
 namespace rocprofiler {
 typedef hsa_ven_amd_aqlprofile_pfn_t pfn_t;
diff --git a/projects/rocprofiler/src/util/exception.h b/projects/rocprofiler/src/util/exception.h
index d09a88e798..92228209a1 100644
--- a/projects/rocprofiler/src/util/exception.h
+++ b/projects/rocprofiler/src/util/exception.h
@@ -23,8 +23,8 @@ THE SOFTWARE.
 #ifndef SRC_UTIL_EXCEPTION_H_
 #define SRC_UTIL_EXCEPTION_H_
 
-#include <hsa.h>
-#include <hsa_ven_amd_aqlprofile.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ven_amd_aqlprofile.h>
 
 #include <exception>
 #include <sstream>
diff --git a/projects/rocprofiler/src/util/hsa_rsrc_factory.cpp b/projects/rocprofiler/src/util/hsa_rsrc_factory.cpp
index 9d980312a1..6d60882b23 100644
--- a/projects/rocprofiler/src/util/hsa_rsrc_factory.cpp
+++ b/projects/rocprofiler/src/util/hsa_rsrc_factory.cpp
@@ -27,9 +27,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <cxxabi.h>
 #include <dlfcn.h>
 #include <fcntl.h>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
-#include <hsa_ext_finalize.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ext_finalize.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/projects/rocprofiler/src/util/hsa_rsrc_factory.h b/projects/rocprofiler/src/util/hsa_rsrc_factory.h
index e6b19b5f2e..da5f838d29 100644
--- a/projects/rocprofiler/src/util/hsa_rsrc_factory.h
+++ b/projects/rocprofiler/src/util/hsa_rsrc_factory.h
@@ -27,12 +27,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define AMD_INTERNAL_BUILD
 
-#include <hsa.h>
-#include <hsa_api_trace.h>
-#include <hsa_ext_amd.h>
-#include <hsa_ext_finalize.h>
-#include <hsa_ven_amd_aqlprofile.h>
-#include <hsa_ven_amd_loader.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_api_trace.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ext_finalize.h>
+#include <hsa/hsa_ven_amd_aqlprofile.h>
+#include <hsa/hsa_ven_amd_loader.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/projects/rocprofiler/test/app/intercept_test.cpp b/projects/rocprofiler/test/app/intercept_test.cpp
index bbcdf806b7..9226b4af50 100644
--- a/projects/rocprofiler/test/app/intercept_test.cpp
+++ b/projects/rocprofiler/test/app/intercept_test.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 *******************************************************************************/
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <string.h>
 #include <unistd.h>
 #include <dlfcn.h>
diff --git a/projects/rocprofiler/test/app/stand_intercept_test.cpp b/projects/rocprofiler/test/app/stand_intercept_test.cpp
index 9764255782..32d7e6ed43 100644
--- a/projects/rocprofiler/test/app/stand_intercept_test.cpp
+++ b/projects/rocprofiler/test/app/stand_intercept_test.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 *******************************************************************************/
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <string.h>
 #include <unistd.h>
 #include <iostream>
diff --git a/projects/rocprofiler/test/app/standalone_test.cpp b/projects/rocprofiler/test/app/standalone_test.cpp
index 1344e0ebcb..7986c2a34b 100644
--- a/projects/rocprofiler/test/app/standalone_test.cpp
+++ b/projects/rocprofiler/test/app/standalone_test.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 *******************************************************************************/
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <string.h>
 #include <unistd.h>
 #include <iostream>
diff --git a/projects/rocprofiler/test/app/test.cpp b/projects/rocprofiler/test/app/test.cpp
index 5406797300..e54bec8227 100644
--- a/projects/rocprofiler/test/app/test.cpp
+++ b/projects/rocprofiler/test/app/test.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 *******************************************************************************/
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <stdio.h>
 #include <string.h>
 #include <iostream>
diff --git a/projects/rocprofiler/test/ctrl/test_aql.h b/projects/rocprofiler/test/ctrl/test_aql.h
index d77363eeca..c066974cba 100644
--- a/projects/rocprofiler/test/ctrl/test_aql.h
+++ b/projects/rocprofiler/test/ctrl/test_aql.h
@@ -23,8 +23,8 @@ THE SOFTWARE.
 #ifndef TEST_CTRL_TEST_AQL_H_
 #define TEST_CTRL_TEST_AQL_H_
 
-#include <hsa.h>
-#include <hsa_ven_amd_aqlprofile.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ven_amd_aqlprofile.h>
 
 #include "util/hsa_rsrc_factory.h"
 
diff --git a/projects/rocprofiler/test/tool/tool.cpp b/projects/rocprofiler/test/tool/tool.cpp
index 1ccce95619..61f5fbe514 100644
--- a/projects/rocprofiler/test/tool/tool.cpp
+++ b/projects/rocprofiler/test/tool/tool.cpp
@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include <assert.h>
 #include <cxxabi.h>
 #include <dirent.h>
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/projects/rocprofiler/test/util/hsa_rsrc_factory.cpp b/projects/rocprofiler/test/util/hsa_rsrc_factory.cpp
index ccc46c0b0f..b40472f8c8 100644
--- a/projects/rocprofiler/test/util/hsa_rsrc_factory.cpp
+++ b/projects/rocprofiler/test/util/hsa_rsrc_factory.cpp
@@ -27,9 +27,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <cxxabi.h>
 #include <dlfcn.h>
 #include <fcntl.h>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
-#include <hsa_ext_finalize.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ext_finalize.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/projects/rocprofiler/test/util/hsa_rsrc_factory.h b/projects/rocprofiler/test/util/hsa_rsrc_factory.h
index 170fa2319a..ae698111e7 100644
--- a/projects/rocprofiler/test/util/hsa_rsrc_factory.h
+++ b/projects/rocprofiler/test/util/hsa_rsrc_factory.h
@@ -27,12 +27,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define AMD_INTERNAL_BUILD
 
-#include <hsa.h>
-#include <hsa_api_trace.h>
-#include <hsa_ext_amd.h>
-#include <hsa_ext_finalize.h>
-#include <hsa_ven_amd_aqlprofile.h>
-#include <hsa_ven_amd_loader.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_api_trace.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ext_finalize.h>
+#include <hsa/hsa_ven_amd_aqlprofile.h>
+#include <hsa/hsa_ven_amd_loader.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>