diff --git a/src/amd/common/ac_nir.h b/src/amd/common/ac_nir.h
index bcc89ca3431..279b8f060b6 100644
--- a/src/amd/common/ac_nir.h
+++ b/src/amd/common/ac_nir.h
@@ -39,6 +39,11 @@ enum {
    AC_EXP_FLAG_VALID_MASK = (1 << 2),
 };
 
+struct ac_nir_config {
+   enum amd_gfx_level gfx_level;
+   bool uses_aco;
+};
+
 /* TODO: Remove these once radeonsi gathers shader_info before lowering. */
 #define AC_VECTOR_ARG_FLAG(name, value)      (((name) & 0xf) | ((value) << 4))
 #define     AC_VECTOR_ARG_UNSET              0
diff --git a/src/amd/common/ac_shader_util.h b/src/amd/common/ac_shader_util.h
index b972dc7dd05..ac52c51dc0a 100644
--- a/src/amd/common/ac_shader_util.h
+++ b/src/amd/common/ac_shader_util.h
@@ -240,11 +240,6 @@ enum ac_descriptor_type
    AC_DESC_PLANE_2,
 };
 
-struct ac_nir_config {
-   enum amd_gfx_level gfx_level;
-   bool uses_aco;
-};
-
 unsigned ac_get_spi_shader_z_format(bool writes_z, bool writes_stencil, bool writes_samplemask,
                                     bool writes_mrt0_alpha);