diff --git a/src/amd/compiler/aco_assembler.cpp b/src/amd/compiler/aco_assembler.cpp
index 8e14166984e..1b081b3d7c1 100644
--- a/src/amd/compiler/aco_assembler.cpp
+++ b/src/amd/compiler/aco_assembler.cpp
@@ -24,7 +24,8 @@
 
 #include "aco_builder.h"
 #include "aco_ir.h"
-#include "sid.h"
+
+#include "common/sid.h"
 
 #include "util/memstream.h"
 
diff --git a/src/amd/compiler/aco_insert_waitcnt.cpp b/src/amd/compiler/aco_insert_waitcnt.cpp
index 7f49ac89b17..83c6dac0263 100644
--- a/src/amd/compiler/aco_insert_waitcnt.cpp
+++ b/src/amd/compiler/aco_insert_waitcnt.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "aco_ir.h"
-#include "sid.h"
+#include "common/sid.h"
 
 #include <map>
 #include <stack>
diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index d27a7ebb840..403c785f5c6 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -28,8 +28,8 @@
 #include "aco_builder.h"
 #include "aco_ir.h"
 
-#include "ac_exp_param.h"
-#include "sid.h"
+#include "common/ac_exp_param.h"
+#include "common/sid.h"
 #include "vulkan/radv_descriptor_set.h"
 
 #include "util/fast_idiv_by_const.h"
diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index a38caeee154..191c8e86cce 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -24,8 +24,8 @@
 
 #include "aco_instruction_selection.h"
 
-#include "ac_exp_param.h"
-#include "sid.h"
+#include "common/ac_exp_param.h"
+#include "common/sid.h"
 #include "vulkan/radv_descriptor_set.h"
 
 #include "nir_control_flow.h"
diff --git a/src/amd/compiler/aco_lower_to_hw_instr.cpp b/src/amd/compiler/aco_lower_to_hw_instr.cpp
index eff8fdfde66..59cae568d68 100644
--- a/src/amd/compiler/aco_lower_to_hw_instr.cpp
+++ b/src/amd/compiler/aco_lower_to_hw_instr.cpp
@@ -24,7 +24,7 @@
 
 #include "aco_builder.h"
 #include "aco_ir.h"
-#include "sid.h"
+#include "common/sid.h"
 
 #include <map>
 #include <vector>
diff --git a/src/amd/compiler/aco_print_asm.cpp b/src/amd/compiler/aco_print_asm.cpp
index 73dc20832ca..ec86327e212 100644
--- a/src/amd/compiler/aco_print_asm.cpp
+++ b/src/amd/compiler/aco_print_asm.cpp
@@ -23,7 +23,8 @@
  */
 
 #include "aco_ir.h"
-#include "ac_llvm_util.h"
+
+#include "llvm/ac_llvm_util.h"
 
 #include "llvm-c/Disassembler.h"
 #include <llvm/ADT/StringRef.h>
diff --git a/src/amd/compiler/aco_print_ir.cpp b/src/amd/compiler/aco_print_ir.cpp
index 48e95704adf..219a852529c 100644
--- a/src/amd/compiler/aco_print_ir.cpp
+++ b/src/amd/compiler/aco_print_ir.cpp
@@ -25,8 +25,8 @@
 #include "aco_builder.h"
 #include "aco_ir.h"
 
-#include "sid.h"
-#include "ac_shader_util.h"
+#include "common/ac_shader_util.h"
+#include "common/sid.h"
 
 #include <array>
 
diff --git a/src/amd/compiler/aco_scheduler.cpp b/src/amd/compiler/aco_scheduler.cpp
index 8a8fd67a865..59338b3d042 100644
--- a/src/amd/compiler/aco_scheduler.cpp
+++ b/src/amd/compiler/aco_scheduler.cpp
@@ -24,7 +24,8 @@
 
 #include "aco_builder.h"
 #include "aco_ir.h"
-#include "amdgfxregs.h"
+
+#include "common/amdgfxregs.h"
 
 #include <algorithm>
 #include <unordered_set>
diff --git a/src/amd/compiler/aco_spill.cpp b/src/amd/compiler/aco_spill.cpp
index 87588be9d06..c0f0471fff9 100644
--- a/src/amd/compiler/aco_spill.cpp
+++ b/src/amd/compiler/aco_spill.cpp
@@ -25,7 +25,7 @@
 
 #include "aco_builder.h"
 #include "aco_ir.h"
-#include "sid.h"
+#include "common/sid.h"
 
 #include <map>
 #include <set>