3 files changed, 11 insertions, 11 deletions
diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index 81c8d65dca1..c87f0b6c0be 100644
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -49,7 +49,7 @@ libglcpp = static_library(
   'glcpp',
   [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')],
   dependencies : idep_mesautil,
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _extra_args],
   build_by_default : false,
@@ -59,7 +59,7 @@ libglcpp_standalone = static_library(
   'glcpp_standalone',
   'pp_standalone_scaffolding.c',
   link_with : libglcpp,
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _extra_args],
   build_by_default : false,
@@ -69,7 +69,7 @@ glcpp = executable(
   'glcpp',
   'glcpp.c',
   dependencies : [dep_m, idep_getopt],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   link_with : [libglcpp_standalone, libglsl_util],
   c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args],
   build_by_default : false,
diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index eff98fef109..215c472ebae 100644
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -231,7 +231,7 @@ libglsl = static_library(
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
   link_with : libglcpp,
-  include_directories : [inc_common, inc_compiler],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler],
   dependencies : idep_nir,
   build_by_default : false,
 )
@@ -241,7 +241,7 @@ libglsl_standalone = static_library(
   [files_libglsl_standalone, ir_expression_operation_h],
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   link_with : [libglsl, libglsl_util, libglcpp_standalone],
   dependencies : [idep_mesautil, idep_getopt],
   build_by_default : false,
@@ -253,7 +253,7 @@ glsl_compiler = executable(
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
   dependencies : [dep_clock, dep_thread, idep_getopt],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   link_with : [libglsl_standalone],
   build_by_default : with_tools.contains('glsl'),
   install : with_tools.contains('glsl'),
@@ -265,7 +265,7 @@ glsl_test = executable(
    ir_expression_operation_h],
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : [dep_clock, dep_thread, idep_getopt],
   link_with : [libglsl, libglsl_standalone, libglsl_util],
   build_by_default : with_tools.contains('glsl'),
diff --git a/src/compiler/glsl/tests/meson.build b/src/compiler/glsl/tests/meson.build
index 3526110dbc1..41f8ae615d1 100644
--- a/src/compiler/glsl/tests/meson.build
+++ b/src/compiler/glsl/tests/meson.build
@@ -25,7 +25,7 @@ if with_shader_cache
       'cache_test',
       'cache_test.c',
       c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-      include_directories : [inc_common, inc_glsl],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
       link_with : [libglsl],
       dependencies : [dep_clock, dep_thread],
     ),
@@ -42,7 +42,7 @@ test(
      'lower_int64_test.cpp', 'opt_add_neg_to_sub_test.cpp',
      'varyings_test.cpp', ir_expression_operation_h],
     cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-    include_directories : [inc_common, inc_glsl],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
     link_with : [libglsl, libglsl_standalone, libglsl_util],
     dependencies : [dep_clock, dep_thread, idep_gtest],
   ),
@@ -57,7 +57,7 @@ test(
      'uniform_initializer_utils.cpp', 'uniform_initializer_utils.h',
      ir_expression_operation_h],
     cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-    include_directories : [inc_common, inc_glsl],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
     link_with : [libglsl, libglsl_util],
     dependencies : [dep_thread, idep_gtest],
   ),
@@ -70,7 +70,7 @@ test(
     'sampler_types_test',
     ['sampler_types_test.cpp', ir_expression_operation_h],
     cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-    include_directories : [inc_common, inc_glsl],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
     link_with : [libglsl, libglsl_util],
     dependencies : [dep_thread, idep_gtest],
   ),