--- a/device/rocm/roccounters.hpp	
+++ a/device/rocm/roccounters.hpp	
@@ -24,7 +24,7 @@ 
 #include "top.hpp"
 #include "device/device.hpp"
 #include "device/rocm/rocdevice.hpp"
-#include "hsa_ven_amd_aqlprofile.h"
+#include "hsa/hsa_ven_amd_aqlprofile.h"
 
 namespace roc {
 
--- a/device/rocm/rocdevice.hpp	
+++ a/device/rocm/rocdevice.hpp	
@@ -40,10 +40,10 @@ 
 #include "device/rocm/rocprintf.hpp"
 #include "device/rocm/rocglinterop.hpp"
 
-#include "hsa.h"
-#include "hsa_ext_image.h"
-#include "hsa_ext_amd.h"
-#include "hsa_ven_amd_loader.h"
+#include "hsa/hsa.h"
+#include "hsa/hsa_ext_image.h"
+#include "hsa/hsa_ext_amd.h"
+#include "hsa/hsa_ven_amd_loader.h"
 
 #include <atomic>
 #include <iostream>
--- a/device/rocm/rocglinterop.hpp	
+++ a/device/rocm/rocglinterop.hpp	
@@ -34,7 +34,7 @@ typedef __GLXcontextRec* GLXContext;
 
 #include "device/rocm/mesa_glinterop.h"
 #include "device/rocm/rocregisters.hpp"
-#include "hsa_ext_amd.h"
+#include "hsa/hsa_ext_amd.h"
 
 namespace roc {
 
--- a/device/rocm/rockernel.cpp	
+++ a/device/rocm/rockernel.cpp	
@@ -19,7 +19,7 @@ 
  THE SOFTWARE. */
 
 #include "rockernel.hpp"
-#include "amd_hsa_kernel_code.h"
+#include "hsa/amd_hsa_kernel_code.h"
 
 #include <algorithm>
 
--- a/device/rocm/rocprogram.cpp	
+++ a/device/rocm/rocprogram.cpp	
@@ -25,7 +25,7 @@ 
 #include "utils/options.hpp"
 #include "rockernel.hpp"
 
-#include "amd_hsa_kernel_code.h"
+#include "hsa/amd_hsa_kernel_code.h"
 
 #include <string>
 #include <vector>
--- a/device/rocm/rocsignal.hpp	
+++ a/device/rocm/rocsignal.hpp	
@@ -22,7 +22,7 @@ 
 
 #include "device/devsignal.hpp"
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 
 namespace roc {
 
@@ -44,4 +44,4 @@ public:
   }
 };
 
-};
+};
--- a/device/rocm/rocvirtual.cpp	
+++ a/device/rocm/rocvirtual.cpp	
@@ -34,8 +34,8 @@ 
 #include "platform/sampler.hpp"
 #include "utils/debug.hpp"
 #include "os/os.hpp"
-#include "amd_hsa_kernel_code.h"
-#include "amd_hsa_queue.h"
+#include "hsa/amd_hsa_kernel_code.h"
+#include "hsa/amd_hsa_queue.h"
 
 #include <fstream>
 #include <limits>
--- a/device/rocm/rocvirtual.hpp	
+++ a/device/rocm/rocvirtual.hpp	
@@ -24,11 +24,11 @@ 
 #include "rocdefs.hpp"
 #include "rocdevice.hpp"
 #include "utils/util.hpp"
-#include "hsa.h"
-#include "hsa_ext_image.h"
-#include "hsa_ext_amd.h"
+#include "hsa/hsa.h"
+#include "hsa/hsa_ext_image.h"
+#include "hsa/hsa_ext_amd.h"
 #include "rocprintf.hpp"
-#include "hsa_ven_amd_aqlprofile.h"
+#include "hsa/hsa_ven_amd_aqlprofile.h"
 #include "rocsched.hpp"
 
 namespace roc {