diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build
index 3e4f1a7f441..42f85485fe0 100644
--- a/src/compiler/clc/meson.build
+++ b/src/compiler/clc/meson.build
@@ -118,7 +118,7 @@ _libmesaclc = static_library(
   'libmesaclc',
   files_libmesaclc,
   sources: _libmesaclc_sources,
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_spirv],
+  include_directories : [inc_include, inc_src, inc_spirv],
   c_args : _libmesaclc_c_args,
   cpp_args : [_libmesaclc_cpp_args, _libmesaclc_c_args],
   dependencies: [idep_nir, dep_clang, dep_llvm, dep_llvmspirvlib,
diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index d61b8ddf15b..50948792d98 100644
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -71,7 +71,7 @@ ir_expression_operation_h = custom_target(
 libcompiler = static_library(
   'compiler',
   [files_libcompiler, ir_expression_operation_h, builtin_types_h, builtin_types_c, builtin_types_cpp_h],
-  include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_include, inc_src, inc_gallium, inc_gallium_aux],
+  include_directories : [inc_compiler, inc_include, inc_src],
   c_args : [c_msvc_compat_args, no_override_init_args],
   cpp_args : [cpp_msvc_compat_args],
   gnu_symbol_visibility : 'hidden',
diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build
index 2a7177f1e78..dbeb897d6a0 100644
--- a/src/compiler/nir/meson.build
+++ b/src/compiler/nir/meson.build
@@ -311,7 +311,7 @@ _libnir = static_library(
   [files_libnir, nir_opt_algebraic_c, nir_opcodes_c,
    nir_opcodes_h, nir_constant_expressions_c, nir_builder_opcodes_h,
    nir_intrinsics_c, nir_intrinsics_h, nir_intrinsics_indices_h],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  include_directories : [inc_include, inc_src],
   c_args : [c_msvc_compat_args, no_override_init_args],
   gnu_symbol_visibility : 'hidden',
   dependencies : [idep_compiler, dep_valgrind],
@@ -366,7 +366,7 @@ if with_tests
       cpp_args : [cpp_msvc_compat_args],
       override_options: [msvc_designated_initializer],
       gnu_symbol_visibility : 'hidden',
-      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+      include_directories : [inc_include, inc_src],
       dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
     ),
     suite : ['compiler', 'nir'],
diff --git a/src/compiler/spirv/meson.build b/src/compiler/spirv/meson.build
index dfb53d6738c..000f54c7627 100644
--- a/src/compiler/spirv/meson.build
+++ b/src/compiler/spirv/meson.build
@@ -83,7 +83,7 @@ spirv2nir = executable(
   'spirv2nir',
   files('spirv2nir.c'),
   dependencies : [dep_m, idep_vtn, idep_mesautil],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa],
+  include_directories : [inc_include, inc_src],
   c_args : [c_msvc_compat_args, no_override_init_args],
   gnu_symbol_visibility : 'hidden',
   build_by_default : with_tools.contains('nir'),
@@ -103,7 +103,7 @@ if with_tests
       ),
       c_args : [c_msvc_compat_args, no_override_init_args],
       gnu_symbol_visibility : 'hidden',
-      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa],
+      include_directories : [inc_include, inc_src],
       dependencies : [idep_vtn, dep_thread, idep_gtest, idep_nir, idep_mesautil],
     ),
     suite : ['compiler', 'spirv'],
diff --git a/src/drm-shim/meson.build b/src/drm-shim/meson.build
index bd56e642c02..09eb60fce2b 100644
--- a/src/drm-shim/meson.build
+++ b/src/drm-shim/meson.build
@@ -25,7 +25,7 @@ drm_shim = static_library(
     'device.c',
     'drm_shim.c',
   ],
-  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  include_directories: [inc_include, inc_src],
   dependencies: [dep_libdrm, idep_mesautil, dep_dl],
   gnu_symbol_visibility : 'hidden',
 )
diff --git a/src/vulkan/runtime/meson.build b/src/vulkan/runtime/meson.build
index 889e0bbb4e8..f397c4bb5d9 100644
--- a/src/vulkan/runtime/meson.build
+++ b/src/vulkan/runtime/meson.build
@@ -234,7 +234,7 @@ libvulkan_runtime = static_library(
    vk_cmd_queue, vk_cmd_enqueue_entrypoints,
    vk_dispatch_trampolines, vk_physical_device_features,
    vk_physical_device_properties, vk_format_info],
-  include_directories : [inc_include, inc_src, inc_gallium],
+  include_directories : [inc_include, inc_src],
   dependencies : vulkan_runtime_deps,
   c_args : c_msvc_compat_args,
   gnu_symbol_visibility : 'hidden',
diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
index dd748eede0a..451ca450720 100644
--- a/src/vulkan/util/meson.build
+++ b/src/vulkan/util/meson.build
@@ -118,7 +118,7 @@ libvulkan_util = static_library(
   'vulkan_util',
   [files_vulkan_util, vk_dispatch_table, vk_enum_to_str,
    vk_struct_type_cast, vk_extensions],
-  include_directories : [inc_include, inc_src, inc_gallium],
+  include_directories : [inc_include, inc_src],
   dependencies : [vulkan_wsi_deps, idep_mesautil, idep_nir_headers],
   c_args : [c_msvc_compat_args],
   gnu_symbol_visibility : 'hidden',
diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build
index 9d0db011767..c8206eac996 100644
--- a/src/vulkan/wsi/meson.build
+++ b/src/vulkan/wsi/meson.build
@@ -62,7 +62,7 @@ wsi_entrypoints = custom_target(
 libvulkan_wsi = static_library(
   'vulkan_wsi',
   [files_vulkan_wsi, wsi_entrypoints],
-  include_directories : [inc_include, inc_src, inc_gallium],
+  include_directories : [inc_include, inc_src],
   dependencies : [
     vulkan_wsi_deps, dep_libdrm, dep_libudev, idep_vulkan_util_headers,
     idep_vulkan_runtime_headers, idep_xmlconfig, idep_mesautil, platform_deps