diff --git a/src/compiler/glsl/gl_nir_link_uniform_blocks.c b/src/compiler/glsl/gl_nir_link_uniform_blocks.c
index 3cf6d806158..e18100e85ff 100644
--- a/src/compiler/glsl/gl_nir_link_uniform_blocks.c
+++ b/src/compiler/glsl/gl_nir_link_uniform_blocks.c
@@ -25,7 +25,7 @@
 #include "gl_nir_linker.h"
 #include "ir_uniform.h" /* for gl_uniform_storage */
 #include "linker_util.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 /**
  * This file contains code to do a nir-based linking for uniform blocks. This
diff --git a/src/compiler/glsl/gl_nir_link_uniform_initializers.c b/src/compiler/glsl/gl_nir_link_uniform_initializers.c
index 50bb6f5b07e..1c4f317c368 100644
--- a/src/compiler/glsl/gl_nir_link_uniform_initializers.c
+++ b/src/compiler/glsl/gl_nir_link_uniform_initializers.c
@@ -25,7 +25,7 @@
 #include "gl_nir_linker.h"
 #include "compiler/glsl/ir_uniform.h" /* for gl_uniform_storage */
 #include "main/context.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 struct set_opaque_binding_closure {
    struct gl_shader_program *shader_prog;
diff --git a/src/compiler/glsl/gl_nir_link_uniforms.c b/src/compiler/glsl/gl_nir_link_uniforms.c
index 65bb42c3ddb..2e288eab209 100644
--- a/src/compiler/glsl/gl_nir_link_uniforms.c
+++ b/src/compiler/glsl/gl_nir_link_uniforms.c
@@ -27,8 +27,9 @@
 #include "gl_nir_linker.h"
 #include "compiler/glsl/ir_uniform.h" /* for gl_uniform_storage */
 #include "linker_util.h"
-#include "main/context.h"
-#include "main/mtypes.h"
+#include "util/u_dynarray.h"
+#include "main/consts_exts.h"
+#include "main/shader_types.h"
 
 /**
  * This file do the common link for GLSL uniforms, using NIR, instead of IR as
diff --git a/src/compiler/glsl/gl_nir_linker.c b/src/compiler/glsl/gl_nir_linker.c
index e4242161653..23e9cf14c6d 100644
--- a/src/compiler/glsl/gl_nir_linker.c
+++ b/src/compiler/glsl/gl_nir_linker.c
@@ -26,7 +26,8 @@
 #include "gl_nir.h"
 #include "gl_nir_linker.h"
 #include "linker_util.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
+#include "main/consts_exts.h"
 #include "main/shaderobj.h"
 #include "ir_uniform.h" /* for gl_uniform_storage */
 
diff --git a/src/compiler/glsl/gl_nir_lower_atomics.c b/src/compiler/glsl/gl_nir_lower_atomics.c
index 60642e7130a..9ace1e21d0c 100644
--- a/src/compiler/glsl/gl_nir_lower_atomics.c
+++ b/src/compiler/glsl/gl_nir_lower_atomics.c
@@ -30,7 +30,7 @@
 #include "gl_nir.h"
 #include "ir_uniform.h"
 #include "main/config.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 #include <assert.h>
 
 /*
diff --git a/src/compiler/glsl/gl_nir_lower_buffers.c b/src/compiler/glsl/gl_nir_lower_buffers.c
index 603385c383e..12a2aebb858 100644
--- a/src/compiler/glsl/gl_nir_lower_buffers.c
+++ b/src/compiler/glsl/gl_nir_lower_buffers.c
@@ -27,7 +27,7 @@
 #include "ir_uniform.h"
 
 #include "util/compiler.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 static nir_ssa_def *
 get_block_array_index(nir_builder *b, nir_deref_instr *deref,
diff --git a/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c b/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c
index 32109f0bc57..3e6c6f183e9 100644
--- a/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c
+++ b/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c
@@ -62,7 +62,7 @@
 #include "ir_uniform.h"
 
 #include "util/compiler.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 struct lower_samplers_as_deref_state {
    nir_shader *shader;
diff --git a/src/compiler/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp
index 9657703ead8..d280344cbe0 100644
--- a/src/compiler/glsl/ir_set_program_inouts.cpp
+++ b/src/compiler/glsl/ir_set_program_inouts.cpp
@@ -37,7 +37,7 @@
 #include "ir.h"
 #include "ir_visitor.h"
 #include "compiler/glsl_types.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 namespace {
 
diff --git a/src/compiler/glsl/link_functions.cpp b/src/compiler/glsl/link_functions.cpp
index 4998d39dc59..eb1d589f33c 100644
--- a/src/compiler/glsl/link_functions.cpp
+++ b/src/compiler/glsl/link_functions.cpp
@@ -28,7 +28,7 @@
 #include "util/set.h"
 #include "util/hash_table.h"
 #include "linker.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 static ir_function_signature *
 find_matching_signature(const char *name, const exec_list *actual_parameters,
diff --git a/src/compiler/glsl/link_interface_blocks.cpp b/src/compiler/glsl/link_interface_blocks.cpp
index 7899cf56809..61e6a1f0264 100644
--- a/src/compiler/glsl/link_interface_blocks.cpp
+++ b/src/compiler/glsl/link_interface_blocks.cpp
@@ -30,7 +30,7 @@
 #include "glsl_symbol_table.h"
 #include "linker.h"
 #include "main/macros.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 #include "util/hash_table.h"
 #include "util/u_string.h"
 
diff --git a/src/compiler/glsl/link_uniform_blocks.cpp b/src/compiler/glsl/link_uniform_blocks.cpp
index 1d551f5d2bb..2c05835c178 100644
--- a/src/compiler/glsl/link_uniform_blocks.cpp
+++ b/src/compiler/glsl/link_uniform_blocks.cpp
@@ -28,7 +28,8 @@
 #include "util/hash_table.h"
 #include "program.h"
 #include "main/errors.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
+#include "main/consts_exts.h"
 
 namespace {
 
diff --git a/src/compiler/glsl/link_uniform_initializers.cpp b/src/compiler/glsl/link_uniform_initializers.cpp
index 1179a105ed4..4f31a3afd4d 100644
--- a/src/compiler/glsl/link_uniform_initializers.cpp
+++ b/src/compiler/glsl/link_uniform_initializers.cpp
@@ -25,7 +25,7 @@
 #include "linker.h"
 #include "ir_uniform.h"
 #include "string_to_uint_map.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 /* These functions are put in a "private" namespace instead of being marked
  * static so that the unit tests can access them.  See
diff --git a/src/compiler/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp
index 13c771956fe..79d5ae99c4a 100644
--- a/src/compiler/glsl/link_uniforms.cpp
+++ b/src/compiler/glsl/link_uniforms.cpp
@@ -29,7 +29,8 @@
 #include "string_to_uint_map.h"
 #include "ir_array_refcount.h"
 
-#include "main/mtypes.h"
+#include "main/shader_types.h"
+#include "main/consts_exts.h"
 #include "util/strndup.h"
 
 /**
diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp
index ded4f6dcbd8..51c97271e53 100644
--- a/src/compiler/glsl/link_varyings.cpp
+++ b/src/compiler/glsl/link_varyings.cpp
@@ -30,7 +30,8 @@
 
 
 #include "main/errors.h"
-#include "main/mtypes.h"
+#include "main/consts_exts.h"
+#include "main/shader_types.h"
 #include "glsl_symbol_table.h"
 #include "glsl_parser_extras.h"
 #include "ir_optimization.h"
diff --git a/src/compiler/glsl/linker_util.cpp b/src/compiler/glsl/linker_util.cpp
index 90c7a202c3f..a3b7fe9132c 100644
--- a/src/compiler/glsl/linker_util.cpp
+++ b/src/compiler/glsl/linker_util.cpp
@@ -21,12 +21,13 @@
  * IN THE SOFTWARE.
  *
  */
-#include "main/mtypes.h"
 #include "glsl_types.h"
 #include "linker_util.h"
 #include "util/bitscan.h"
 #include "util/set.h"
 #include "ir_uniform.h" /* for gl_uniform_storage */
+#include "main/shader_types.h"
+#include "main/consts_exts.h"
 
 /* Utility methods shared between the GLSL IR and the NIR */
 
diff --git a/src/compiler/glsl/linker_util.h b/src/compiler/glsl/linker_util.h
index 09b9896e7fb..55a4afad778 100644
--- a/src/compiler/glsl/linker_util.h
+++ b/src/compiler/glsl/linker_util.h
@@ -25,6 +25,7 @@
 #define GLSL_LINKER_UTIL_H
 
 #include "util/bitset.h"
+#include "compiler/glsl/list.h"
 
 struct gl_constants;
 struct gl_shader_program;
diff --git a/src/compiler/glsl/loop_unroll.cpp b/src/compiler/glsl/loop_unroll.cpp
index 1a9229acc34..04b8b4f496d 100644
--- a/src/compiler/glsl/loop_unroll.cpp
+++ b/src/compiler/glsl/loop_unroll.cpp
@@ -24,8 +24,7 @@
 #include "compiler/glsl_types.h"
 #include "loop_analysis.h"
 #include "ir_hierarchical_visitor.h"
-
-#include "main/mtypes.h"
+#include "main/consts_exts.h"
 
 namespace {
 
diff --git a/src/compiler/glsl/lower_blend_equation_advanced.cpp b/src/compiler/glsl/lower_blend_equation_advanced.cpp
index 9060e83cdf3..4564c204e42 100644
--- a/src/compiler/glsl/lower_blend_equation_advanced.cpp
+++ b/src/compiler/glsl/lower_blend_equation_advanced.cpp
@@ -29,7 +29,7 @@
 #include "program/prog_statevars.h"
 #include "util/bitscan.h"
 #include "builtin_functions.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 using namespace ir_builder;
 
diff --git a/src/compiler/glsl/lower_cs_derived.cpp b/src/compiler/glsl/lower_cs_derived.cpp
index 6faa99fad16..9fddd61f033 100644
--- a/src/compiler/glsl/lower_cs_derived.cpp
+++ b/src/compiler/glsl/lower_cs_derived.cpp
@@ -43,7 +43,7 @@
 #include "linker.h"
 #include "program/prog_statevars.h"
 #include "builtin_functions.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 using namespace ir_builder;
 
diff --git a/src/compiler/glsl/lower_distance.cpp b/src/compiler/glsl/lower_distance.cpp
index b4e730c64fb..1df0421133a 100644
--- a/src/compiler/glsl/lower_distance.cpp
+++ b/src/compiler/glsl/lower_distance.cpp
@@ -50,7 +50,7 @@
 #include "ir_rvalue_visitor.h"
 #include "ir.h"
 #include "program/prog_instruction.h" /* For WRITEMASK_* */
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 #define GLSL_CLIP_VAR_NAME "gl_ClipDistanceMESA"
 
diff --git a/src/compiler/glsl/lower_named_interface_blocks.cpp b/src/compiler/glsl/lower_named_interface_blocks.cpp
index 98d27b7109e..926f981fdbe 100644
--- a/src/compiler/glsl/lower_named_interface_blocks.cpp
+++ b/src/compiler/glsl/lower_named_interface_blocks.cpp
@@ -64,7 +64,7 @@
 #include "ir_optimization.h"
 #include "ir_rvalue_visitor.h"
 #include "util/hash_table.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 static const glsl_type *
 process_array_type(const glsl_type *type, unsigned idx)
diff --git a/src/compiler/glsl/lower_packed_varyings.cpp b/src/compiler/glsl/lower_packed_varyings.cpp
index 92317be1292..e95c804ea60 100644
--- a/src/compiler/glsl/lower_packed_varyings.cpp
+++ b/src/compiler/glsl/lower_packed_varyings.cpp
@@ -149,7 +149,7 @@
 #include "ir_builder.h"
 #include "ir_optimization.h"
 #include "program/prog_instruction.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 using namespace ir_builder;
 
diff --git a/src/compiler/glsl/lower_precision.cpp b/src/compiler/glsl/lower_precision.cpp
index 38755f2b0d4..680d5a1b7d7 100644
--- a/src/compiler/glsl/lower_precision.cpp
+++ b/src/compiler/glsl/lower_precision.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "main/macros.h"
-#include "main/mtypes.h"
+#include "main/consts_exts.h"
 #include "compiler/glsl_types.h"
 #include "ir.h"
 #include "ir_builder.h"
diff --git a/src/compiler/glsl/lower_shared_reference.cpp b/src/compiler/glsl/lower_shared_reference.cpp
index 8e40beb2121..fc2aaed4a10 100644
--- a/src/compiler/glsl/lower_shared_reference.cpp
+++ b/src/compiler/glsl/lower_shared_reference.cpp
@@ -36,8 +36,9 @@
 #include "linker.h"
 #include "main/macros.h"
 #include "util/list.h"
+#include "main/consts_exts.h"
+#include "main/shader_types.h"
 #include "glsl_parser_extras.h"
-#include "main/mtypes.h"
 
 using namespace ir_builder;
 
diff --git a/src/compiler/glsl/lower_tess_level.cpp b/src/compiler/glsl/lower_tess_level.cpp
index 3e4c7f026ce..4e640d9b2a2 100644
--- a/src/compiler/glsl/lower_tess_level.cpp
+++ b/src/compiler/glsl/lower_tess_level.cpp
@@ -49,7 +49,7 @@
 #include "ir_rvalue_visitor.h"
 #include "ir.h"
 #include "program/prog_instruction.h" /* For WRITEMASK_* */
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 namespace {
 
diff --git a/src/compiler/glsl/lower_ubo_reference.cpp b/src/compiler/glsl/lower_ubo_reference.cpp
index 360ea24b317..ecb9d2dea18 100644
--- a/src/compiler/glsl/lower_ubo_reference.cpp
+++ b/src/compiler/glsl/lower_ubo_reference.cpp
@@ -37,7 +37,7 @@
 #include "ir_builder.h"
 #include "main/macros.h"
 #include "glsl_parser_extras.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 using namespace ir_builder;
 
diff --git a/src/compiler/glsl/lower_vector_derefs.cpp b/src/compiler/glsl/lower_vector_derefs.cpp
index 8a37e35b606..e246efae2b1 100644
--- a/src/compiler/glsl/lower_vector_derefs.cpp
+++ b/src/compiler/glsl/lower_vector_derefs.cpp
@@ -24,7 +24,7 @@
 #include "ir_builder.h"
 #include "ir_rvalue_visitor.h"
 #include "ir_optimization.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 using namespace ir_builder;
 
diff --git a/src/compiler/glsl/lower_vertex_id.cpp b/src/compiler/glsl/lower_vertex_id.cpp
index 3b641caa01e..6092255ca27 100644
--- a/src/compiler/glsl/lower_vertex_id.cpp
+++ b/src/compiler/glsl/lower_vertex_id.cpp
@@ -38,7 +38,7 @@
 #include "linker.h"
 #include "program/prog_statevars.h"
 #include "builtin_functions.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 namespace {
 
diff --git a/src/compiler/glsl/lower_xfb_varying.cpp b/src/compiler/glsl/lower_xfb_varying.cpp
index 9e49a37d185..d0022b9df2c 100644
--- a/src/compiler/glsl/lower_xfb_varying.cpp
+++ b/src/compiler/glsl/lower_xfb_varying.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "ir.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 #include "glsl_symbol_table.h"
 #include "util/strndup.h"
 
diff --git a/src/compiler/glsl/opt_algebraic.cpp b/src/compiler/glsl/opt_algebraic.cpp
index bbb7320e66d..0749759f543 100644
--- a/src/compiler/glsl/opt_algebraic.cpp
+++ b/src/compiler/glsl/opt_algebraic.cpp
@@ -34,7 +34,7 @@
 #include "ir_optimization.h"
 #include "ir_builder.h"
 #include "compiler/glsl_types.h"
-#include "main/mtypes.h"
+#include "main/consts_exts.h"
 
 using namespace ir_builder;
 
diff --git a/src/compiler/glsl/opt_dead_builtin_varyings.cpp b/src/compiler/glsl/opt_dead_builtin_varyings.cpp
index 4b6d74aa28a..47d95df55f5 100644
--- a/src/compiler/glsl/opt_dead_builtin_varyings.cpp
+++ b/src/compiler/glsl/opt_dead_builtin_varyings.cpp
@@ -52,7 +52,8 @@
 #include "ir_print_visitor.h"
 #include "compiler/glsl_types.h"
 #include "link_varyings.h"
-#include "main/mtypes.h"
+#include "main/consts_exts.h"
+#include "main/shader_types.h"
 #include "util/u_string.h"
 
 namespace {
diff --git a/src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp b/src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp
index 9f8bd112ce5..f2d2af6465f 100644
--- a/src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp
+++ b/src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp
@@ -22,7 +22,6 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "util/ralloc.h"
 #include "uniform_initializer_utils.h"
diff --git a/src/compiler/glsl/tests/general_ir_test.cpp b/src/compiler/glsl/tests/general_ir_test.cpp
index e73b9196b40..bfc55a44092 100644
--- a/src/compiler/glsl/tests/general_ir_test.cpp
+++ b/src/compiler/glsl/tests/general_ir_test.cpp
@@ -22,7 +22,6 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "ir.h"
 
diff --git a/src/compiler/glsl/tests/invalidate_locations_test.cpp b/src/compiler/glsl/tests/invalidate_locations_test.cpp
index 7b8317f87f2..7ed7f6a812d 100644
--- a/src/compiler/glsl/tests/invalidate_locations_test.cpp
+++ b/src/compiler/glsl/tests/invalidate_locations_test.cpp
@@ -22,7 +22,6 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "util/ralloc.h"
 #include "ir.h"
diff --git a/src/compiler/glsl/tests/lower_int64_test.cpp b/src/compiler/glsl/tests/lower_int64_test.cpp
index 196710a3c6c..835b49161c7 100644
--- a/src/compiler/glsl/tests/lower_int64_test.cpp
+++ b/src/compiler/glsl/tests/lower_int64_test.cpp
@@ -22,7 +22,6 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "ir.h"
 #include "ir_builder.h"
diff --git a/src/compiler/glsl/tests/sampler_types_test.cpp b/src/compiler/glsl/tests/sampler_types_test.cpp
index d44d840f694..76b87b9b443 100644
--- a/src/compiler/glsl/tests/sampler_types_test.cpp
+++ b/src/compiler/glsl/tests/sampler_types_test.cpp
@@ -22,7 +22,6 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "ir.h"
 
diff --git a/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp
index 56e41057300..9f777b50f69 100644
--- a/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp
+++ b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp
@@ -22,7 +22,7 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 #include "main/macros.h"
 #include "util/ralloc.h"
 #include "string_to_uint_map.h"
diff --git a/src/compiler/glsl/tests/uniform_initializer_utils.cpp b/src/compiler/glsl/tests/uniform_initializer_utils.cpp
index 07109d1a546..42c52013373 100644
--- a/src/compiler/glsl/tests/uniform_initializer_utils.cpp
+++ b/src/compiler/glsl/tests/uniform_initializer_utils.cpp
@@ -21,7 +21,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include <gtest/gtest.h>
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "util/ralloc.h"
 #include "uniform_initializer_utils.h"
diff --git a/src/compiler/glsl/tests/varyings_test.cpp b/src/compiler/glsl/tests/varyings_test.cpp
index 30df36acb2b..04bbb8ffb06 100644
--- a/src/compiler/glsl/tests/varyings_test.cpp
+++ b/src/compiler/glsl/tests/varyings_test.cpp
@@ -22,7 +22,6 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "util/ralloc.h"
 #include "ir.h"