diff --git a/inc/roctracer_hsa.h b/inc/roctracer_hsa.h
index 33e16de7da..4ec56662d1 100644
--- a/inc/roctracer_hsa.h
+++ b/inc/roctracer_hsa.h
@@ -21,8 +21,8 @@
 #ifndef INC_ROCTRACER_HSA_H_
 #define INC_ROCTRACER_HSA_H_
 
-#include <hsa.h>
-#include <hsa_ext_amd.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
 
 #include <roctracer.h>
 #include <rocprofiler/activity.h>
@@ -38,7 +38,7 @@ enum hsa_op_id_t {
 
 #ifdef __cplusplus
 #include <iostream>
-#include <hsa_api_trace.h>
+#include <hsa/hsa_api_trace.h>
 
 namespace roctracer {
 namespace hsa_support {
diff --git a/src/roctracer/tracker.h b/src/roctracer/tracker.h
index 5c7e5329bd..1e5e3abeb5 100644
--- a/src/roctracer/tracker.h
+++ b/src/roctracer/tracker.h
@@ -21,10 +21,10 @@
 #ifndef SRC_CORE_TRACKER_H_
 #define SRC_CORE_TRACKER_H_
 
-#include <amd_hsa_signal.h>
 #include <assert.h>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
+#include <hsa/amd_hsa_signal.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
 
 #include <atomic>
 
@@ -80,12 +80,10 @@ class Tracker {
 
     // Creating a proxy signal
     status = hsa_signal_create(1, 0, NULL, &(entry->signal));
-    if (status != HSA_STATUS_SUCCESS)
-      FATAL_LOGGING("hsa_signal_create failed");
+    if (status != HSA_STATUS_SUCCESS) FATAL_LOGGING("hsa_signal_create failed");
     status =
         hsa_amd_signal_async_handler(entry->signal, HSA_SIGNAL_CONDITION_LT, 1, Handler, entry);
-    if (status != HSA_STATUS_SUCCESS)
-      FATAL_LOGGING("hsa_amd_signal_async_handler failed");
+    if (status != HSA_STATUS_SUCCESS) FATAL_LOGGING("hsa_amd_signal_async_handler failed");
   }
 
   // Delete tracker entry
@@ -100,8 +98,7 @@ class Tracker {
     static uint64_t sysclock_period = []() {
       uint64_t sysclock_hz = 0;
       hsa_status_t status = hsa_system_get_info(HSA_SYSTEM_INFO_TIMESTAMP_FREQUENCY, &sysclock_hz);
-      if (status != HSA_STATUS_SUCCESS)
-        FATAL_LOGGING("hsa_system_get_info failed");
+      if (status != HSA_STATUS_SUCCESS) FATAL_LOGGING("hsa_system_get_info failed");
       return (uint64_t)1000000000 / sysclock_hz;
     }();
 
diff --git a/test/app/hsaco_test.cpp b/test/app/hsaco_test.cpp
index 2cc7c1e2cc..b6e08cc51f 100644
--- a/test/app/hsaco_test.cpp
+++ b/test/app/hsaco_test.cpp
@@ -18,9 +18,9 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE. */
 
-#include <hsa.h>
-#include <hsa_api_trace.h>
-#include <hsa_ven_amd_loader.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_api_trace.h>
+#include <hsa/hsa_ven_amd_loader.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/test/hip_stats/hip_stats.cpp b/test/hip_stats/hip_stats.cpp
index 4cfc140bd4..54306bd545 100644
--- a/test/hip_stats/hip_stats.cpp
+++ b/test/hip_stats/hip_stats.cpp
@@ -237,7 +237,7 @@ void DumpStatistics() {
 
 }  // namespace
 
-#include <hsa_api_trace.h>
+#include <hsa/hsa_api_trace.h>
 
 extern "C" ROCTRACER_EXPORT bool OnLoad(HsaApiTable* /* table */, uint64_t /* runtime_version */,
                                         uint64_t /* failed_tool_count */,
diff --git a/test/hsa/copy.cpp b/test/hsa/copy.cpp
index e0244831a6..5d313b46ca 100644
--- a/test/hsa/copy.cpp
+++ b/test/hsa/copy.cpp
@@ -18,9 +18,9 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE. */
 
-#include "hsa.h"
-#include "hsa_ext_amd.h"
-#include "hsa_ext_image.h"
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ext_image.h>
 
 #include <fcntl.h>
 #include <assert.h>
diff --git a/test/hsa/load_unload_reload.cpp b/test/hsa/load_unload_reload.cpp
index 4c49f1d492..a8b5d1f628 100644
--- a/test/hsa/load_unload_reload.cpp
+++ b/test/hsa/load_unload_reload.cpp
@@ -18,7 +18,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 <cassert>
 #include <cstdlib>