diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index 893671b607a..fd582c44deb 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -49,6 +49,7 @@
 #include "common/intel_aux_map.h"
 #include "common/intel_defines.h"
 #include "intel/common/intel_gem.h"
+#include "intel/compiler/brw_compiler.h"
 #include "intel/ds/intel_tracepoints.h"
 #include "util/hash_table.h"
 #include "util/u_debug.h"
diff --git a/src/gallium/drivers/iris/iris_blorp.c b/src/gallium/drivers/iris/iris_blorp.c
index 2869d624ebd..f838dc5db65 100644
--- a/src/gallium/drivers/iris/iris_blorp.c
+++ b/src/gallium/drivers/iris/iris_blorp.c
@@ -42,6 +42,7 @@
 
 #include "util/u_upload_mgr.h"
 #include "intel/common/intel_l3_config.h"
+#include "intel/compiler/brw_compiler.h"
 
 #include "blorp/blorp_genX_exec.h"
 
diff --git a/src/gallium/drivers/iris/iris_clear.c b/src/gallium/drivers/iris/iris_clear.c
index ecb52fc9d08..29cc436de17 100644
--- a/src/gallium/drivers/iris/iris_clear.c
+++ b/src/gallium/drivers/iris/iris_clear.c
@@ -33,7 +33,6 @@
 #include "iris_context.h"
 #include "iris_resource.h"
 #include "iris_screen.h"
-#include "intel/compiler/brw_compiler.h"
 
 static bool
 iris_is_color_fast_clear_compatible(struct iris_context *ice,
diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h
index 9918e73d709..8d8b205cd76 100644
--- a/src/gallium/drivers/iris/iris_context.h
+++ b/src/gallium/drivers/iris/iris_context.h
@@ -34,7 +34,7 @@
 #include "intel/blorp/blorp.h"
 #include "intel/dev/intel_debug.h"
 #include "intel/common/intel_l3_config.h"
-#include "intel/compiler/brw_compiler.h"
+#include "intel/compiler/intel_shader_enums.h"
 #include "intel/ds/intel_driver_ds.h"
 #include "iris_batch.h"
 #include "iris_binder.h"
diff --git a/src/gallium/drivers/iris/iris_disk_cache.c b/src/gallium/drivers/iris/iris_disk_cache.c
index 5c8182ee5f1..a99005871a6 100644
--- a/src/gallium/drivers/iris/iris_disk_cache.c
+++ b/src/gallium/drivers/iris/iris_disk_cache.c
@@ -36,6 +36,7 @@
 #include "util/build_id.h"
 #include "util/disk_cache.h"
 #include "util/mesa-sha1.h"
+#include "intel/compiler/brw_compiler.h"
 
 #include "iris_context.h"
 
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 9d62255c613..ea7adb4233f 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -99,6 +99,7 @@
 #include "intel/common/intel_aux_map.h"
 #include "intel/common/intel_l3_config.h"
 #include "intel/common/intel_sample_positions.h"
+#include "intel/compiler/brw_compiler.h"
 #include "intel/ds/intel_tracepoints.h"
 #include "iris_batch.h"
 #include "iris_context.h"