diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index fe10943875c..9a6e6ee2097 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -8860,7 +8860,7 @@ iris_upload_compute_walker(struct iris_context *ice,
          cw.GenerateLocalID = cs_prog_data->generate_local_id != 0;
          cw.EmitLocal       = cs_prog_data->generate_local_id;
          cw.WalkOrder       = cs_prog_data->walk_order;
-         cw.TileLayout = cs_prog_data->walk_order == BRW_WALK_ORDER_YXZ ?
+         cw.TileLayout = cs_prog_data->walk_order == INTEL_WALK_ORDER_YXZ ?
                          TileY32bpe : Linear;
 #endif
 
diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h
index 6abdee1b98a..cff9cff04e2 100644
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/src/intel/blorp/blorp_genX_exec.h
@@ -2227,7 +2227,7 @@ blorp_exec_compute(struct blorp_batch *batch, const struct blorp_params *params)
       cw.GenerateLocalID                = cs_prog_data->generate_local_id != 0;
       cw.EmitLocal                      = cs_prog_data->generate_local_id;
       cw.WalkOrder                      = cs_prog_data->walk_order;
-      cw.TileLayout = cs_prog_data->walk_order == BRW_WALK_ORDER_YXZ ?
+      cw.TileLayout = cs_prog_data->walk_order == INTEL_WALK_ORDER_YXZ ?
                       TileY32bpe : Linear;
 #endif
 
diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h
index b47fd3bf667..30a05d8e287 100644
--- a/src/intel/compiler/brw_compiler.h
+++ b/src/intel/compiler/brw_compiler.h
@@ -1247,15 +1247,6 @@ struct brw_push_const_block {
    unsigned size;       /* Bytes, register aligned */
 };
 
-enum PACKED brw_compute_walk_order {
-   BRW_WALK_ORDER_XYZ = 0,
-   BRW_WALK_ORDER_XZY = 1,
-   BRW_WALK_ORDER_YXZ = 2,
-   BRW_WALK_ORDER_YZX = 3,
-   BRW_WALK_ORDER_ZXY = 4,
-   BRW_WALK_ORDER_ZYX = 5,
-};
-
 struct brw_cs_prog_data {
    struct brw_stage_prog_data base;
 
@@ -1279,7 +1270,7 @@ struct brw_cs_prog_data {
    bool uses_btd_stack_ids;
    bool uses_systolic;
    uint8_t generate_local_id;
-   enum brw_compute_walk_order walk_order;
+   enum intel_compute_walk_order walk_order;
 
    struct {
       struct brw_push_const_block cross_thread;
diff --git a/src/intel/compiler/brw_nir_lower_cs_intrinsics.c b/src/intel/compiler/brw_nir_lower_cs_intrinsics.c
index 10b0dc10db7..fdbe684aa02 100644
--- a/src/intel/compiler/brw_nir_lower_cs_intrinsics.c
+++ b/src/intel/compiler/brw_nir_lower_cs_intrinsics.c
@@ -339,7 +339,7 @@ brw_nir_lower_cs_intrinsics(nir_shader *nir,
          (nir->info.num_images == 0 && nir->info.num_textures == 0);
 
       prog_data->walk_order =
-         linear ? BRW_WALK_ORDER_XYZ : BRW_WALK_ORDER_YXZ;
+         linear ? INTEL_WALK_ORDER_XYZ : INTEL_WALK_ORDER_YXZ;
 
       /* nir_lower_compute_system_values will replace any references to
        * SYSTEM_VALUE_LOCAL_INVOCATION_ID vector components with zero for
diff --git a/src/intel/compiler/intel_shader_enums.h b/src/intel/compiler/intel_shader_enums.h
index 69b65a8f057..98ea9f25b0d 100644
--- a/src/intel/compiler/intel_shader_enums.h
+++ b/src/intel/compiler/intel_shader_enums.h
@@ -169,6 +169,15 @@ struct intel_cs_dispatch_info {
    uint32_t right_mask;
 };
 
+enum PACKED intel_compute_walk_order {
+   INTEL_WALK_ORDER_XYZ = 0,
+   INTEL_WALK_ORDER_XZY = 1,
+   INTEL_WALK_ORDER_YXZ = 2,
+   INTEL_WALK_ORDER_YZX = 3,
+   INTEL_WALK_ORDER_ZXY = 4,
+   INTEL_WALK_ORDER_ZYX = 5,
+};
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/src/intel/vulkan/genX_cmd_compute.c b/src/intel/vulkan/genX_cmd_compute.c
index 33561a68d19..ca89dd9905c 100644
--- a/src/intel/vulkan/genX_cmd_compute.c
+++ b/src/intel/vulkan/genX_cmd_compute.c
@@ -356,7 +356,7 @@ emit_compute_walker(struct anv_cmd_buffer *cmd_buffer,
          .GenerateLocalID                = prog_data->generate_local_id != 0,
          .EmitLocal                      = prog_data->generate_local_id,
          .WalkOrder                      = prog_data->walk_order,
-         .TileLayout = prog_data->walk_order == BRW_WALK_ORDER_YXZ ?
+         .TileLayout = prog_data->walk_order == INTEL_WALK_ORDER_YXZ ?
                        TileY32bpe : Linear,
          .LocalXMaximum                  = prog_data->local_size[0] - 1,
          .LocalYMaximum                  = prog_data->local_size[1] - 1,
diff --git a/src/intel/vulkan/genX_simple_shader.c b/src/intel/vulkan/genX_simple_shader.c
index d3231dbcb12..ca6f9f0b143 100644
--- a/src/intel/vulkan/genX_simple_shader.c
+++ b/src/intel/vulkan/genX_simple_shader.c
@@ -567,7 +567,7 @@ genX(emit_simple_shader_dispatch)(struct anv_simple_shader *state,
          cw.GenerateLocalID                = prog_data->generate_local_id != 0;
          cw.EmitLocal                      = prog_data->generate_local_id;
          cw.WalkOrder                      = prog_data->walk_order;
-         cw.TileLayout = prog_data->walk_order == BRW_WALK_ORDER_YXZ ?
+         cw.TileLayout = prog_data->walk_order == INTEL_WALK_ORDER_YXZ ?
                          TileY32bpe : Linear;
 #endif