diff --git a/src/mesa/state_tracker/st_nir_builtins.c b/src/mesa/state_tracker/st_nir_builtins.c
index ebfc3502ec2..7574ce306d5 100644
--- a/src/mesa/state_tracker/st_nir_builtins.c
+++ b/src/mesa/state_tracker/st_nir_builtins.c
@@ -23,7 +23,8 @@
 #include "tgsi/tgsi_from_mesa.h"
 #include "st_glsl_types.h"
 #include "st_nir.h"
-#include "nir_builder.h"
+
+#include "compiler/nir/nir_builder.h"
 
 struct pipe_shader_state *
 st_nir_finish_builtin_shader(struct st_context *st,
diff --git a/src/mesa/state_tracker/st_pbo.c b/src/mesa/state_tracker/st_pbo.c
index af6aa50fa9e..6d530f073dd 100644
--- a/src/mesa/state_tracker/st_pbo.c
+++ b/src/mesa/state_tracker/st_pbo.c
@@ -33,7 +33,6 @@
 #include "state_tracker/st_pbo.h"
 #include "state_tracker/st_cb_bufferobjects.h"
 
-#include "nir_builder.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
@@ -43,6 +42,8 @@
 #include "util/u_inlines.h"
 #include "util/u_upload_mgr.h"
 
+#include "compiler/nir/nir_builder.h"
+
 /* Conversion to apply in the fragment shader. */
 enum st_pbo_conversion {
    ST_PBO_CONVERT_NONE = 0,