diff --git a/src/compiler/glsl/gl_nir_link_atomics.c b/src/compiler/glsl/gl_nir_link_atomics.c
index e590e0fa4f4..aedcacd6f1b 100644
--- a/src/compiler/glsl/gl_nir_link_atomics.c
+++ b/src/compiler/glsl/gl_nir_link_atomics.c
@@ -26,7 +26,8 @@
 #include "linker_util.h"
 #include "gl_nir_linker.h"
 #include "compiler/glsl/ir_uniform.h" /* for gl_uniform_storage */
-#include "main/context.h"
+#include "main/consts_exts.h"
+#include "main/shader_types.h"
 
 /**
  * This file do the common link for GLSL atomic counter uniforms, using NIR,
diff --git a/src/compiler/glsl/link_atomics.cpp b/src/compiler/glsl/link_atomics.cpp
index d98edcc18e2..1db03ece53b 100644
--- a/src/compiler/glsl/link_atomics.cpp
+++ b/src/compiler/glsl/link_atomics.cpp
@@ -27,7 +27,8 @@
 #include "linker.h"
 #include "main/errors.h"
 #include "main/macros.h"
-#include "main/mtypes.h"
+#include "main/consts_exts.h"
+#include "main/shader_types.h"
 
 namespace {
    /*
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 94c32c05626..ee13065b6bd 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2352,26 +2352,6 @@ struct gl_uniform_block
    GLboolean _RowMajor;
 };
 
-/**
- * Structure that represents a reference to an atomic buffer from some
- * shader program.
- */
-struct gl_active_atomic_buffer
-{
-   /** Uniform indices of the atomic counters declared within it. */
-   GLuint *Uniforms;
-   GLuint NumUniforms;
-
-   /** Binding point index associated with it. */
-   GLuint Binding;
-
-   /** Minimum reasonable size it is expected to have. */
-   GLuint MinimumSize;
-
-   /** Shader stages making use of it. */
-   GLboolean StageReferences[MESA_SHADER_STAGES];
-};
-
 /**
  * Data container for shader queries. This holds only the minimal
  * amount of required information for resource queries to work.
diff --git a/src/mesa/main/shader_types.h b/src/mesa/main/shader_types.h
index 5a31425e72d..17f10f0dc2c 100644
--- a/src/mesa/main/shader_types.h
+++ b/src/mesa/main/shader_types.h
@@ -689,5 +689,24 @@ struct gl_program
    };
 };
 
+/**
+ * Structure that represents a reference to an atomic buffer from some
+ * shader program.
+ */
+struct gl_active_atomic_buffer
+{
+   /** Uniform indices of the atomic counters declared within it. */
+   GLuint *Uniforms;
+   GLuint NumUniforms;
+
+   /** Binding point index associated with it. */
+   GLuint Binding;
+
+   /** Minimum reasonable size it is expected to have. */
+   GLuint MinimumSize;
+
+   /** Shader stages making use of it. */
+   GLboolean StageReferences[MESA_SHADER_STAGES];
+};
 
 #endif