diff --git a/src/amd/common/ac_shader_args.c b/src/amd/common/ac_shader_args.c
index 6eee1e92a25..6246347972e 100644
--- a/src/amd/common/ac_shader_args.c
+++ b/src/amd/common/ac_shader_args.c
@@ -5,8 +5,8 @@
  */
 
 #include "ac_shader_args.h"
-
-#include "nir/nir_builder.h"
+#include "nir/nir_defines.h"
+#include <assert.h>
 
 void ac_add_arg(struct ac_shader_args *info, enum ac_arg_regfile regfile, unsigned size,
                 enum ac_arg_type type, struct ac_arg *arg)
diff --git a/src/amd/llvm/ac_llvm_build.h b/src/amd/llvm/ac_llvm_build.h
index 2e5df630049..319737eab53 100644
--- a/src/amd/llvm/ac_llvm_build.h
+++ b/src/amd/llvm/ac_llvm_build.h
@@ -11,7 +11,7 @@
 #include "ac_shader_args.h"
 #include "ac_shader_util.h"
 #include "amd_family.h"
-#include "compiler/nir/nir.h"
+#include "nir_opcodes.h"
 #include <llvm-c/Core.h>
 
 #include <stdbool.h>
diff --git a/src/amd/llvm/ac_shader_abi.h b/src/amd/llvm/ac_shader_abi.h
index 5cc4511157e..024ca3f1221 100644
--- a/src/amd/llvm/ac_shader_abi.h
+++ b/src/amd/llvm/ac_shader_abi.h
@@ -10,7 +10,7 @@
 #include "ac_shader_args.h"
 #include "ac_shader_util.h"
 #include "compiler/shader_enums.h"
-#include "nir.h"
+#include "nir_defines.h"
 #include <llvm-c/Core.h>
 
 #include <assert.h>
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm.c b/src/gallium/drivers/radeonsi/si_shader_llvm.c
index b5c46ade90f..4e18188e478 100644
--- a/src/gallium/drivers/radeonsi/si_shader_llvm.c
+++ b/src/gallium/drivers/radeonsi/si_shader_llvm.c
@@ -8,6 +8,7 @@
 #include "ac_nir.h"
 #include "ac_nir_to_llvm.h"
 #include "ac_rtld.h"
+#include "nir.h"
 #include "si_pipe.h"
 #include "si_shader_internal.h"
 #include "si_shader_llvm.h"