meson: inline `inc_common`

Let's make it clear what includes are being added everywhere, so that they can be cleaned up. Signed-off-by: Eric Engestrom <eric@engestrom.ch> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4360>
2019-03-05 16:21:47 +00:00 · 2019-03-05 16:21:47 +00:00 · 79af30768d
parent 5a32dda8e6
commit 79af30768d
98 changed files with 199 additions and 158 deletions
--- a/src/amd/addrlib/meson.build
+++ b/src/amd/addrlib/meson.build
@ -60,7 +60,7 @@ libamdgpu_addrlib = static_library(
      'inc', 'src', 'src/core', 'src/chip/gfx9', 'src/chip/r800',
      'src/chip/gfx10',
    ),
-    inc_amd_common, inc_common, inc_src,
+    inc_amd_common, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux,
  ],
  cpp_args : [cpp_vis_args, '-Wno-unused-variable'],
 )
--- a/src/amd/common/meson.build
+++ b/src/amd/common/meson.build
@ -58,7 +58,7 @@ libamd_common = static_library(
  'amd_common',
  [amd_common_files, sid_tables_h, amdgfxregs_h],
  include_directories : [
-    inc_common, inc_compiler, inc_mesa, inc_mapi, inc_amd,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_mapi, inc_amd,
  ],
  dependencies : [
    dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind,
--- a/src/amd/compiler/meson.build
+++ b/src/amd/compiler/meson.build
@ -86,7 +86,7 @@ _libaco = static_library(
  'aco',
  [libaco_files, aco_opcodes_c, aco_opcodes_h, aco_builder_h],
  include_directories : [
-   inc_common, inc_compiler, inc_mesa, inc_mapi, inc_amd, inc_amd_common, inc_amd_common_llvm,
+   inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_amd, inc_amd_common, inc_amd_common_llvm,
  ],
  link_with : [
    libamd_common
--- a/src/amd/llvm/meson.build
+++ b/src/amd/llvm/meson.build
@ -35,7 +35,7 @@ libamd_common_llvm = static_library(
  'amd_common_llvm',
  [amd_common_llvm_files],
  include_directories : [
-    inc_common, inc_compiler, inc_mesa, inc_mapi, inc_amd, inc_amd_common
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_amd, inc_amd_common
  ],
  link_with: [
    libamd_common
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@ -161,7 +161,7 @@ libvulkan_radeon = shared_library(
  'vulkan_radeon',
  [libradv_files, radv_entrypoints, radv_extensions_c, amd_vk_format_table_c, sha1_h, radv_gfx10_format_table_h],
  include_directories : [
-    inc_common, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util, inc_vulkan_wsi,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util, inc_vulkan_wsi,
  ],
  link_with : [
    libamd_common, libamd_common_llvm, libamdgpu_addrlib, libvulkan_wsi,
--- a/src/broadcom/cle/meson.build
+++ b/src/broadcom/cle/meson.build
@ -56,7 +56,7 @@ v3d_xml_h = custom_target(
 libbroadcom_cle = static_library(
  ['broadcom_cle', v3d_xml_h],
  'v3d_decoder.c',
-  include_directories : [inc_common, inc_broadcom],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
  c_args : [c_vis_args, no_override_init_args],
  dependencies : [dep_libdrm, dep_valgrind, dep_expat, dep_zlib],
  build_by_default : false,
--- a/src/broadcom/compiler/meson.build
+++ b/src/broadcom/compiler/meson.build
@ -45,7 +45,7 @@ libbroadcom_compiler_files = files(
 libbroadcom_compiler = static_library(
  ['broadcom_compiler', v3d_xml_pack],
  libbroadcom_compiler_files,
-  include_directories : [inc_common, inc_broadcom],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
  c_args : [c_vis_args, no_override_init_args],
  dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers],
  build_by_default : false,
--- a/src/broadcom/drm-shim/meson.build
+++ b/src/broadcom/drm-shim/meson.build
@ -21,7 +21,7 @@
 libv3d_noop_drm_shim = shared_library(
  ['v3d_noop_drm_shim'],
  'v3d_noop.c',
-  include_directories: inc_common,
+  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies: dep_drm_shim,
  c_args : c_vis_args,
  install : true,
@ -41,7 +41,7 @@ if dep_v3dv3.found()
                            'v3dx.c',
                            v3d_xml_pack
        ],
-        include_directories : [inc_common, inc_broadcom, inc_src, inc_gallium_v3d],
+        include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_gallium_v3d],
        c_args : [c_vis_args, no_override_init_args, '-DV3D_VERSION=' + ver, v3dv3_c_args],
        dependencies: [dep_valgrind, dep_thread, dep_v3dv3],
    )
@ -55,7 +55,7 @@ if dep_v3dv3.found()
    ],
    dependencies: [idep_mesautil, dep_dl, dep_drm_shim, dep_v3dv3],
    link_with: per_version_libs,
-    include_directories : [inc_common, inc_broadcom, inc_gallium_v3d],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_gallium_v3d],
    c_args : [c_vis_args, no_override_init_args, '-std=gnu99', v3dv3_c_args],
    cpp_args : [v3dv3_c_args]
  )
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@ -42,7 +42,7 @@ foreach ver : v3d_versions
      files('clif/v3dx_dump.c'),
      v3d_xml_pack
    ],
-    include_directories : [inc_common, inc_broadcom, inc_src],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
    c_args : [c_vis_args, no_override_init_args, '-DV3D_VERSION=' + ver],
    dependencies: [dep_valgrind, dep_thread],
  )
@ -54,7 +54,7 @@ libbroadcom_v3d = static_library(
    files('common/v3d_debug.c', 'common/v3d_device_info.c', 'clif/clif_dump.c'),
    v3d_xml_pack,
  ],
-  include_directories : [inc_common, inc_broadcom, inc_src],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
  c_args : [c_vis_args, no_override_init_args],
  link_whole : v3d_libs + per_version_libs,
  build_by_default : false,
--- a/src/broadcom/qpu/meson.build
+++ b/src/broadcom/qpu/meson.build
@ -27,7 +27,7 @@ libbroadcom_qpu_files = files(
 libbroadcom_qpu = static_library(
  ['broadcom_qpu', v3d_xml_pack],
  libbroadcom_qpu_files,
-  include_directories : [inc_common, inc_broadcom],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
  c_args : [c_vis_args, no_override_init_args],
  dependencies : [dep_libdrm, dep_valgrind],
  build_by_default : false,
@ -41,7 +41,7 @@ test(
    'qpu_disasm', 'tests/qpu_disasm.c',
    link_with: libbroadcom_qpu,
    dependencies : idep_mesautil,
-    include_directories: inc_common
+    include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux]
  ),
  suite : ['broadcom'],
 )
--- 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,
--- 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'),
--- 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],
  ),
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@ -44,7 +44,7 @@ ir_expression_operation_h = custom_target(
 libcompiler = static_library(
  'compiler',
  [files_libcompiler, ir_expression_operation_h],
-  include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_common],
+  include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_include, inc_src, inc_gallium, inc_gallium_aux],
  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
  cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
  dependencies : [dep_valgrind],
@ -61,7 +61,7 @@ spirv2nir = executable(
  'spirv2nir',
  files('spirv/spirv2nir.c'),
  dependencies : [dep_m, idep_nir, idep_mesautil],
-  include_directories : [inc_common, include_directories('spirv')],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, include_directories('spirv')],
  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
  build_by_default : with_tools.contains('nir'),
  install : with_tools.contains('nir'),
--- a/src/compiler/nir/meson.build
+++ b/src/compiler/nir/meson.build
@ -253,7 +253,7 @@ _libnir = static_library(
  [files_libnir, spirv_info_c, nir_opt_algebraic_c, nir_opcodes_c,
   nir_opcodes_h, nir_constant_expressions_c, nir_builder_opcodes_h,
   vtn_gather_types_c, nir_intrinsics_c, nir_intrinsics_h],
-  include_directories : [inc_common, inc_compiler, include_directories('../spirv')],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, include_directories('../spirv')],
  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
  link_with : libcompiler,
  build_by_default : false,
@ -280,7 +280,7 @@ if with_tests
      'nir_builder_test',
      files('tests/builder_tests.cpp'),
      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_thread, idep_gtest, idep_nir, idep_mesautil],
    ),
    suite : ['compiler', 'nir'],
@ -292,7 +292,7 @@ if with_tests
      'nir_control_flow_test',
      files('tests/control_flow_tests.cpp'),
      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_thread, idep_gtest, idep_nir, idep_mesautil],
    ),
    suite : ['compiler', 'nir'],
@ -304,7 +304,7 @@ if with_tests
      'nir_vars_test',
      files('tests/vars_tests.cpp'),
      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_thread, idep_gtest, idep_nir, idep_mesautil],
    ),
    suite : ['compiler', 'nir'],
@ -325,7 +325,7 @@ if with_tests
      'negative_equal',
      files('tests/negative_equal_tests.cpp'),
      c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-      include_directories : [inc_common],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
      dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
    ),
    suite : ['compiler', 'nir'],
@ -337,7 +337,7 @@ if with_tests
      'comparison_pre',
      files('tests/comparison_pre_tests.cpp'),
      c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-      include_directories : [inc_common],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
      dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
    ),
    suite : ['compiler', 'nir'],
@ -349,7 +349,7 @@ if with_tests
      'load_store_vectorizer',
      files('tests/load_store_vectorizer_tests.cpp'),
      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_thread, idep_gtest, idep_nir, idep_mesautil],
    ),
    suite : ['compiler', 'nir'],
@ -362,7 +362,7 @@ if with_tests
      'nir_serialize_test',
      files('tests/serialize_tests.cpp'),
      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_thread, idep_gtest, idep_nir, idep_mesautil],
    ),
    suite : ['compiler', 'nir'],
--- a/src/drm-shim/meson.build
+++ b/src/drm-shim/meson.build
@ -24,7 +24,7 @@ drm_shim = static_library(
    'device.c',
    'drm_shim.c',
  ],
-  include_directories: [inc_common],
+  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies: [idep_mesautil, dep_dl],
  c_args : [c_vis_args, '-std=gnu99'],
 )
--- a/src/etnaviv/drm-shim/meson.build
+++ b/src/etnaviv/drm-shim/meson.build
@ -23,7 +23,7 @@
 libetnaviv_noop_drm_shim = shared_library(
  'etnaviv_noop_drm_shim',
  'etnaviv_noop.c',
-  include_directories: inc_common,
+  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies: dep_drm_shim,
  c_args : c_vis_args,
  install : true,
--- a/src/etnaviv/drm/meson.build
+++ b/src/etnaviv/drm/meson.build
@ -35,7 +35,12 @@ libetnaviv_drm = static_library(
  libetnaviv_drm_files,
  include_directories : [
    inc_etnaviv,
-    inc_common,
+    inc_include,
+    inc_src,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
  ],
  c_args : [c_vis_args, no_override_init_args],
  cpp_args : [cpp_vis_args],
--- a/src/etnaviv/drm/tests/meson.build
+++ b/src/etnaviv/drm/tests/meson.build
@ -23,7 +23,12 @@ etnaviv_cmd_stream_test = executable(
  'etnaviv_cmd_stream_test.c',
  include_directories : [
    inc_etnaviv,
-    inc_common,
+    inc_include,
+    inc_src,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
  ],
  c_args : [c_vis_args, no_override_init_args],
  cpp_args : [cpp_vis_args],
@ -41,7 +46,12 @@ etnaviv_bo_cache_test = executable(
  'etnaviv_bo_cache_test.c',
  include_directories : [
    inc_etnaviv,
-    inc_common,
+    inc_include,
+    inc_src,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
  ],
  c_args : [c_vis_args, no_override_init_args],
  cpp_args : [cpp_vis_args],
--- a/src/freedreno/computerator/meson.build
+++ b/src/freedreno/computerator/meson.build
@ -50,8 +50,13 @@ computerator = executable(
  'computerator',
  computerator_files,
  include_directories : [
-    inc_common,
    inc_freedreno,
+    inc_include,
+    inc_src,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
  ],
  link_with : [
    libfreedreno_drm,
--- a/src/freedreno/drm-shim/meson.build
+++ b/src/freedreno/drm-shim/meson.build
@ -22,7 +22,7 @@
 libfreedreno_noop_drm_shim = shared_library(
  ['freedreno_noop_drm_shim'],
  'freedreno_noop.c',
-  include_directories: inc_common,
+  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies: dep_drm_shim,
  c_args : c_vis_args,
  install : true,
--- a/src/freedreno/drm/meson.build
+++ b/src/freedreno/drm/meson.build
@ -40,7 +40,12 @@ libfreedreno_drm = static_library(
  libfreedreno_drm_files,
  include_directories : [
    inc_freedreno,
-    inc_common,
+    inc_include,
+    inc_src,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
  ],
  c_args : [c_vis_args, no_override_init_args],
  cpp_args : [cpp_vis_args],
--- a/src/freedreno/fdl/meson.build
+++ b/src/freedreno/fdl/meson.build
@ -24,7 +24,7 @@ libfreedreno_layout = static_library(
    'fd6_layout.c',
    'freedreno_layout.c',
  ],
-  include_directories : [inc_freedreno, inc_common],
+  include_directories : [inc_freedreno, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  c_args : [c_vis_args, no_override_init_args],
  cpp_args : [cpp_vis_args],
  dependencies : idep_nir_headers,
--- a/src/freedreno/ir3/meson.build
+++ b/src/freedreno/ir3/meson.build
@ -86,7 +86,7 @@ libfreedreno_ir3_files = files(
 libfreedreno_ir3 = static_library(
  'freedreno_ir3',
  [libfreedreno_ir3_files, ir3_nir_trig_c, ir3_nir_imul_c],
-  include_directories : [inc_freedreno, inc_common],
+  include_directories : [inc_freedreno, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  c_args : [c_vis_args, no_override_init_args],
  cpp_args : [cpp_vis_args],
  dependencies : idep_nir_headers,
--- a/src/freedreno/perfcntrs/meson.build
+++ b/src/freedreno/perfcntrs/meson.build
@ -29,7 +29,7 @@ libfreedreno_perfcntrs_files = files(
 libfreedreno_perfcntrs = static_library(
  'freedreno_perfcntrs',
  [libfreedreno_perfcntrs_files, freedreno_xml_header_files],
-  include_directories : [inc_freedreno, inc_common],
+  include_directories : [inc_freedreno, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  c_args : [c_vis_args, no_override_init_args],
  cpp_args : [cpp_vis_args],
  dependencies : idep_nir_headers,
@ -44,8 +44,13 @@ if dep_libconfig.found() and dep_ncurses.found()
    'fdperf',
    'fdperf.c',
    include_directories : [
-      inc_common,
      inc_freedreno,
+      inc_include,
+      inc_src,
+      inc_mapi,
+      inc_mesa,
+      inc_gallium,
+      inc_gallium_aux,
    ],
    link_with : [
      libfreedreno_drm,
--- a/src/freedreno/vulkan/meson.build
+++ b/src/freedreno/vulkan/meson.build
@ -101,7 +101,12 @@ libvulkan_freedreno = shared_library(
  'vulkan_freedreno',
  [libtu_files, tu_entrypoints, tu_extensions_c, freedreno_xml_header_files],
  include_directories : [
-    inc_common,
+    inc_include,
+    inc_src,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
    inc_compiler,
    inc_vulkan_wsi,
    inc_freedreno,
--- a/src/gallium/drivers/iris/meson.build
+++ b/src/gallium/drivers/iris/meson.build
@ -69,7 +69,7 @@ foreach v : ['80', '90', '100', '110', '120']
  iris_gen_libs += static_library(
    'iris_gen@0@'.format(v),
    ['iris_blorp.c', 'iris_query.c', 'iris_state.c', gen_xml_pack],
-    include_directories : [inc_common, inc_intel],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
    c_args : [
      c_vis_args, no_override_init_args, c_sse2_args,
      '-DGEN_VERSIONx10=@0@'.format(v),
--- a/src/gallium/drivers/nouveau/meson.build
+++ b/src/gallium/drivers/nouveau/meson.build
@ -212,7 +212,7 @@ libnouveau = static_library(
  'nouveau',
  files_libnouveau,
  include_directories : [
-    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_common,
+    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_mapi, inc_mesa,
  ],
  c_args : [c_vis_args],
  cpp_args : [cpp_vis_args],
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@ -47,7 +47,8 @@ files_panfrost = files(
 )

 panfrost_includes = [
-  inc_common,
+  inc_mapi,
+  inc_mesa,
  inc_gallium,
  inc_gallium_aux,
  inc_include,
--- a/src/gallium/drivers/r600/meson.build
+++ b/src/gallium/drivers/r600/meson.build
@ -187,7 +187,7 @@ libr600 = static_library(
  c_args : [c_vis_args, r600_c_args, '-Wstrict-overflow=0'],
  cpp_args : [cpp_vis_args],
  include_directories : [
-    inc_src, inc_common, inc_include, inc_compiler, inc_gallium, inc_gallium_aux, inc_amd_common,
+    inc_src, inc_mapi, inc_mesa, inc_include, inc_compiler, inc_gallium, inc_gallium_aux, inc_amd_common,
    inc_gallium_drivers,
  ],
  dependencies: [dep_libdrm_radeon, dep_elf, dep_llvm, idep_nir, idep_nir_headers],
--- a/src/gallium/drivers/swr/meson.build
+++ b/src/gallium/drivers/swr/meson.build
@ -383,7 +383,7 @@ libmesaswr = static_library(
    cpp_msvc_compat_args, cpp_vis_args, swr_cpp_args, swr_avx_args,
    swr_defines,
  ],
-  include_directories : [inc_common, swr_incs],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, swr_incs],
  dependencies : dep_llvm,
 )

--- a/src/gallium/drivers/virgl/meson.build
+++ b/src/gallium/drivers/virgl/meson.build
@ -47,7 +47,7 @@ libvirgl = static_library(
  'virgl',
  [ files_libvirgl, virgl_driinfo_h ],
  c_args : c_vis_args,
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies : dep_libdrm
 )

--- a/src/gallium/drivers/virgl/tests/meson.build
+++ b/src/gallium/drivers/virgl/tests/meson.build
@ -24,7 +24,7 @@ test(
    'virgl_staging_mgr_test',
    files('virgl_staging_mgr_test.cpp'),
    dependencies : [dep_thread, idep_gtest],
-    include_directories : [inc_common, include_directories('..')],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, include_directories('..')],
    link_with : [libvirgl, libgallium],
  ),
  suite : ['virgl'],
--- a/src/gallium/drivers/zink/meson.build
+++ b/src/gallium/drivers/zink/meson.build
@ -43,7 +43,7 @@ libzink = static_library(
  'zink',
  files_libzink,
  c_args : c_vis_args,
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies: [dep_vulkan, idep_nir_headers],
 )

--- a/src/gallium/state_trackers/glx/xlib/meson.build
+++ b/src/gallium/state_trackers/glx/xlib/meson.build
@ -22,6 +22,6 @@ libxlib = static_library(
  'xlib',
  files('glx_api.c', 'glx_getproc.c', 'glx_usefont.c', 'xm_api.c', 'xm_st.c'),
  c_args : c_vis_args,
-  include_directories : [inc_common, inc_mapi, inc_mesa],
+  include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_mapi, inc_mesa],
  dependencies : [dep_x11, dep_xext, dep_xcb, dep_glproto],
 )
--- a/src/gallium/state_trackers/omx/meson.build
+++ b/src/gallium/state_trackers/omx/meson.build
@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.

-inc_st_omx = [inc_common]
+inc_st_omx = [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux]
 dep_st_omx = [
  dep_omx, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm,
 ]
--- a/src/gallium/state_trackers/va/meson.build
+++ b/src/gallium/state_trackers/va/meson.build
@ -34,7 +34,7 @@ libva_st = static_library(
      libva_version[0], libva_version[1]
    ),
  ],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies : [
    dep_va_headers, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3,
    dep_libdrm,
--- a/src/gallium/state_trackers/xa/meson.build
+++ b/src/gallium/state_trackers/xa/meson.build
@ -39,7 +39,7 @@ libxa_st = static_library(
    'xa_tracker.c', 'xa_yuv.c',
  )],
  c_args : [c_vis_args, '-pedantic'],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
 )

 install_headers('xa_composite.h', 'xa_context.h')
--- a/src/gallium/state_trackers/xvmc/meson.build
+++ b/src/gallium/state_trackers/xvmc/meson.build
@ -22,7 +22,7 @@ libxvmc_st = static_library(
  'xvmc_st',
  files('attributes.c', 'block.c', 'context.c', 'surface.c', 'subpicture.c'),
  c_args : [c_vis_args],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies : [
    dep_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xv,
    dep_libdrm,
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@ -41,7 +41,7 @@ libgallium_dri = shared_library(
  'gallium_dri',
  files('target.c'),
  include_directories : [
-    inc_common, inc_util, inc_dri_common, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_dri_common, inc_gallium_drivers,
    inc_gallium_winsys, include_directories('../../state_trackers/dri'),
  ],
  c_args : [c_vis_args],
--- a/src/gallium/targets/graw-null/meson.build
+++ b/src/gallium/targets/graw-null/meson.build
@ -22,14 +22,14 @@ libgraw_util = static_library(
  'graw_util',
  ['graw_util.c'],
  c_args : [c_vis_args, c_msvc_compat_args],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
 )

 libgraw_null = shared_library(
  'graw_null',
  ['graw_null.c'],
  c_args : [c_vis_args, c_msvc_compat_args],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  link_with : libgallium,
  dependencies : idep_mesautil,
  name_prefix : host_machine.system() == 'windows' ? '' : 'lib',  # otherwise mingw will create libgraw_null.dll
--- a/src/gallium/targets/graw-xlib/meson.build
+++ b/src/gallium/targets/graw-xlib/meson.build
@ -22,7 +22,7 @@ libgraw_xlib = shared_library(
  'graw_xlib',
  ['graw_xlib.c'],
  c_args : [c_vis_args],
-  include_directories : [inc_common, inc_gallium_drivers, inc_gallium_winsys],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_gallium_winsys],
  link_with : [
    libgraw_util, libgallium, libws_xlib
  ],
--- a/src/gallium/targets/haiku-softpipe/meson.build
+++ b/src/gallium/targets/haiku-softpipe/meson.build
@ -22,7 +22,7 @@ libswpipe = shared_library(
  'swpipe',
  files('SoftwareRenderer.cpp', 'GalliumContext.cpp'),
  include_directories : [
-    inc_common, inc_util, inc_haikugl, inc_gallium_drivers, inc_gallium_winsys,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_haikugl, inc_gallium_drivers, inc_gallium_winsys,
    include_directories('../../state_trackers/hgl'),
    include_directories('/boot/system/develop/headers/private')
  ],
--- a/src/gallium/targets/libgl-gdi/meson.build
+++ b/src/gallium/targets/libgl-gdi/meson.build
@ -31,7 +31,7 @@ libopengl32 = shared_library(
  ['libgl_gdi.c'],
  vs_module_defs : ogldef,
  include_directories : [
-    inc_common, inc_wgl, inc_gallium_winsys_sw, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_wgl, inc_gallium_winsys_sw, inc_gallium_drivers,
  ],
  link_whole : [libwgl],
  link_with : [
--- a/src/gallium/targets/libgl-xlib/meson.build
+++ b/src/gallium/targets/libgl-xlib/meson.build
@ -41,7 +41,7 @@ libgl = shared_library(
  'GL',
  files('xlib.c'),
  include_directories : [
-    inc_common, inc_gallium_winsys, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers,
    include_directories('../../state_trackers/glx/xlib'),
  ],
  c_args : [c_vis_args, gallium_xlib_c_args],
--- a/src/gallium/targets/omx/meson.build
+++ b/src/gallium/targets/omx/meson.build
@ -37,7 +37,7 @@ libomx_gallium = shared_library(
  cpp_args : cpp_vis_args,
  link_args : [omx_link_args, ld_args_gc_sections],
  include_directories : [
-    inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers,
  ],
  link_whole : [libomx_st],
  link_with : [
--- a/src/gallium/targets/osmesa/meson.build
+++ b/src/gallium/targets/osmesa/meson.build
@ -77,7 +77,7 @@ if with_tests
    executable(
      'osmesa-render',
      'test-render.cpp',
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
      link_with: libosmesa,
      dependencies : [idep_gtest],
    ),
--- a/src/gallium/targets/va/meson.build
+++ b/src/gallium/targets/va/meson.build
@ -38,7 +38,7 @@ libva_gallium = shared_library(
  cpp_args : cpp_vis_args,
  link_args : [va_link_args, ld_args_gc_sections],
  include_directories : [
-    inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers,
  ],
  link_whole : [libva_st],
  link_with : [
--- a/src/gallium/targets/vdpau/meson.build
+++ b/src/gallium/targets/vdpau/meson.build
@ -43,7 +43,7 @@ libvdpau_gallium = shared_library(
  cpp_args : cpp_vis_args,
  link_args : [vdpau_link_args, ld_args_gc_sections],
  include_directories : [
-    inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers,
  ],
  link_whole : [libvdpau_st],
  link_with : [
--- a/src/gallium/targets/xa/meson.build
+++ b/src/gallium/targets/xa/meson.build
@ -39,7 +39,7 @@ libxatracker = shared_library(
  cpp_args : cpp_vis_args,
  link_args : [xa_link_args, ld_args_gc_sections],
  include_directories : [
-    inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers,
  ],
  link_whole : [libxa_st],
  link_with : [
--- a/src/gallium/targets/xvmc/meson.build
+++ b/src/gallium/targets/xvmc/meson.build
@ -38,7 +38,7 @@ libxvmc_gallium = shared_library(
  cpp_args : cpp_vis_args,
  link_args : [xvmc_link_args, ld_args_gc_sections],
  include_directories : [
-    inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers,
  ],
  link_whole : [libxvmc_st],
  link_with : [
--- a/src/gallium/tests/graw/meson.build
+++ b/src/gallium/tests/graw/meson.build
@ -29,7 +29,7 @@ foreach t : progs
  executable(
    'graw-' + t,
    t + '.c',
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
    link_with : [libgraw, libgraw_util, libgallium],
    dependencies : [dep_m, idep_mesautil],
  )
--- a/src/gallium/tests/trivial/meson.build
+++ b/src/gallium/tests/trivial/meson.build
@ -22,7 +22,7 @@ foreach t : ['compute', 'tri', 'quad-tex']
  executable(
    t,
    '@0@.c'.format(t),
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
    link_with : [libgallium, libpipe_loader_dynamic],
    dependencies : idep_mesautil,
    install : false,
--- a/src/gallium/tests/unit/meson.build
+++ b/src/gallium/tests/unit/meson.build
@ -23,7 +23,7 @@ foreach t : ['pipe_barrier_test', 'u_cache_test', 'u_half_test',
  exe = executable(
    t,
    '@0@.c'.format(t),
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
    link_with : libgallium,
    dependencies : idep_mesautil,
    install : false,
--- a/src/gallium/winsys/sw/xlib/meson.build
+++ b/src/gallium/winsys/sw/xlib/meson.build
@ -22,6 +22,6 @@ libws_xlib = static_library(
  'ws_xlib',
  files('xlib_sw_winsys.c'),
  c_args : c_vis_args,
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies : [dep_x11, dep_xext, dep_xcb],
 )
--- a/src/gallium/winsys/virgl/common/meson.build
+++ b/src/gallium/winsys/virgl/common/meson.build
@ -22,7 +22,7 @@ libvirglcommon = static_library(
  'virglcommon',
  'virgl_resource_cache.c',
  c_args : c_vis_args,
-  include_directories : [inc_common, inc_gallium_drivers],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
 )

 dep_libvirglcommon = declare_dependency(
--- a/src/gallium/winsys/virgl/drm/meson.build
+++ b/src/gallium/winsys/virgl/drm/meson.build
@ -22,6 +22,6 @@ libvirgldrm = static_library(
  'virgldrm',
  'virgl_drm_winsys.c',
  c_args : c_vis_args,
-  include_directories : [inc_common, inc_gallium_drivers],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
  dependencies : [dep_libdrm, dep_libvirglcommon],
 )
--- a/src/gallium/winsys/virgl/vtest/meson.build
+++ b/src/gallium/winsys/virgl/vtest/meson.build
@ -22,6 +22,6 @@ libvirglvtest = static_library(
  'virglvtest',
  ['virgl_vtest_socket.c', 'virgl_vtest_winsys.c'],
  c_args : c_vis_args,
-  include_directories : [inc_common, inc_gallium_drivers],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
  dependencies : dep_libvirglcommon,
 )
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@ -139,7 +139,7 @@ gl_lib_cargs = [
 libglx = static_library(
  'glx',
  [files_libglx, glx_generated],
-  include_directories : [inc_common, inc_glapi, inc_loader],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glapi, inc_loader],
  c_args : [
    c_vis_args, gl_lib_cargs,
    '-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
--- a/src/intel/blorp/meson.build
+++ b/src/intel/blorp/meson.build
@ -31,7 +31,7 @@ files_libblorp = files(
 libblorp = static_library(
  'blorp',
  files_libblorp,
-  include_directories : [inc_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
  c_args : [c_vis_args, no_override_init_args],
  dependencies : [idep_nir_headers, idep_genxml],
 )
--- a/src/intel/common/meson.build
+++ b/src/intel/common/meson.build
@ -42,7 +42,7 @@ files_libintel_common = files(
 libintel_common = static_library(
  ['intel_common', genX_xml_h],
  files_libintel_common,
-  include_directories : [inc_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
  c_args : [c_vis_args, no_override_init_args],
  link_with : [libisl],
  dependencies : [dep_expat, dep_libdrm, dep_thread, idep_genxml],
@ -70,7 +70,7 @@ if install_intel_gpu_tests
        cpp_vis_args, cpp_msvc_compat_args,
        '-DGEN_VERSIONx10=@0@'.format(g[0])
      ],
-      include_directories : [inc_common, inc_intel],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
      link_with : [libintel_dev],
      dependencies : [dep_libdrm, idep_gtest, idep_genxml, idep_mesautil],
      install : install_intel_gpu_tests,
@ -97,7 +97,7 @@ if with_tests
    executable(
      'genxml_test',
      ['tests/genxml_test.c', gentest_pack],
-      include_directories : [inc_common, inc_intel],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
      dependencies : idep_mesautil,
      link_with : libintel_common,
      c_args : [
--- a/src/intel/compiler/meson.build
+++ b/src/intel/compiler/meson.build
@ -139,7 +139,7 @@ brw_nir_trig = custom_target(
 libintel_compiler = static_library(
  'intel_compiler',
  [libintel_compiler_files, brw_nir_trig, ir_expression_operation_h],
-  include_directories : [inc_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
  c_args : [c_vis_args, no_override_init_args],
  cpp_args : [cpp_vis_args],
  dependencies : idep_nir_headers,
@ -158,7 +158,7 @@ if with_tests
      executable(
        [t, ir_expression_operation_h],
        'test_@0@.cpp'.format(t),
-        include_directories : [inc_common, inc_intel],
+        include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
        link_with : [
          libintel_compiler, libintel_common, libintel_dev, libisl,
        ],
--- a/src/intel/dev/meson.build
+++ b/src/intel/dev/meson.build
@ -30,7 +30,7 @@ files_libintel_dev = files(
 libintel_dev = static_library(
  ['intel_dev'],
  files_libintel_dev,
-  include_directories : [inc_common, inc_intel, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
  c_args : [c_vis_args, no_override_init_args],
 )

--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@ -62,7 +62,7 @@ foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files],
  isl_gen_libs += static_library(
    'isl_gen@0@'.format(_gen),
    [g[1], isl_gen_files, gen_xml_pack],
-    include_directories : [inc_common, inc_intel],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
    c_args : [c_vis_args, no_override_init_args,
              '-DGEN_VERSIONx10=@0@'.format(_gen)],
  )
@ -87,7 +87,7 @@ isl_tiled_memcpy = static_library(
  'isl_tiled_memcpy',
  [files_isl_tiled_memcpy],
  include_directories : [
-    inc_common, inc_intel, inc_include,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel,
  ],
  c_args : [c_vis_args, no_override_init_args, '-msse2'],
  extra_files : ['isl_tiled_memcpy.c']
@ -98,7 +98,7 @@ if with_sse41
    'isl_tiled_memcpy_sse41',
    [files_isl_tiled_memcpy_sse41],
    include_directories : [
-      inc_common, inc_intel, inc_include,
+      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel,
    ],
    link_args : ['-Wl,--exclude-libs=ALL'],
    c_args : [c_vis_args, no_override_init_args, '-msse2', sse41_args],
@ -122,7 +122,7 @@ libisl_files = files(
 libisl = static_library(
  'isl',
  [libisl_files, isl_format_layout_c, genX_bits_h],
-  include_directories : [inc_common, inc_intel, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
  link_with : [isl_gen_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41],
  c_args : [c_vis_args, no_override_init_args],
 )
@ -134,7 +134,7 @@ if with_tests
      'isl_surf_get_image_offset_test',
      'tests/isl_surf_get_image_offset_test.c',
      dependencies : [dep_m, idep_mesautil],
-      include_directories : [inc_common, inc_intel],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
      link_with : [libisl, libintel_dev],
    ),
    suite : ['intel'],
@ -148,7 +148,7 @@ if with_tests
        'isl_aux_info.c',
      ],
      dependencies : [dep_m, idep_gtest, idep_mesautil],
-      include_directories : [inc_common, inc_intel],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
      c_args : '-DIN_UNIT_TEST',
      cpp_args : '-DIN_UNIT_TEST',
    ),
--- a/src/intel/perf/meson.build
+++ b/src/intel/perf/meson.build
@ -36,7 +36,7 @@ libintel_perf = static_library(
  'intel_perf',
  gen_perf_sources,
  include_directories : [
-    inc_common, inc_intel, inc_util,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_util,
  ],
  c_args : [c_vis_args, no_override_init_args, '-msse2'],
  cpp_args : [cpp_vis_args, '-msse2'],
--- a/src/intel/tools/imgui/meson.build
+++ b/src/intel/tools/imgui/meson.build
@ -6,7 +6,7 @@ libintel_imgui_gtk_deps = [
 libintel_imgui_gtk = static_library(
  'intel_imgui_gtk',
  files('imgui_impl_gtk3.cpp', 'imgui_impl_opengl3.cpp'),
-  include_directories: inc_common,
+  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies : libintel_imgui_gtk_deps,
  cpp_args : ['-w'],
  install: false
--- a/src/intel/tools/meson.build
+++ b/src/intel/tools/meson.build
@ -21,7 +21,7 @@
 libaub = static_library(
  'aub',
  files('aub_read.c', 'aub_mem.c'),
-  include_directories : [inc_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
  dependencies : idep_mesautil,
  link_with : [libintel_common, libintel_dev],
  c_args : [c_vis_args, no_override_init_args],
@ -32,7 +32,7 @@ aubinator = executable(
  'aubinator',
  files('aubinator.c'),
  dependencies : [idep_mesautil, dep_expat, dep_zlib, dep_dl, dep_thread, dep_m],
-  include_directories : [inc_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
  link_with : [libintel_common, libintel_compiler, libintel_dev, libaub],
  c_args : [c_vis_args, no_override_init_args],
  install : true
@ -42,7 +42,7 @@ aubinator_error_decode = executable(
  'aubinator_error_decode',
  files('aubinator_error_decode.c'),
  dependencies : [idep_mesautil, dep_zlib, dep_thread],
-  include_directories : [inc_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
  link_with : [libintel_common, libintel_compiler, libintel_dev],
  c_args : [c_vis_args, no_override_init_args],
  install : true
@ -52,7 +52,7 @@ i965_disasm = executable(
  'i965_disasm',
  files('i965_disasm.c'),
  dependencies : [idep_mesautil, dep_thread],
-  include_directories : [inc_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
  link_with : [libintel_common, libintel_compiler, libintel_dev],
  c_args : [c_vis_args, no_override_init_args],
  install : true
@ -62,7 +62,7 @@ error2aub = executable(
  'intel_error2aub',
  files('aub_write.h', 'aub_write.c', 'error2aub.c'),
  dependencies : [dep_zlib, dep_dl, dep_thread, dep_m],
-  include_directories : [inc_common, inc_intel, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
  link_with : [libintel_dev],
  c_args : [c_vis_args, no_override_init_args],
  install : true
@ -85,7 +85,7 @@ libintel_sanitize_gpu = shared_library(
  'intel_sanitize_gpu',
  files('intel_sanitize_gpu.c'),
  dependencies : [idep_mesautil, dep_dl, dep_thread],
-  include_directories : [inc_common, inc_intel, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
  link_with : libintel_common,
  c_args : [c_vis_args, no_override_init_args, c_sse2_args],
  install_dir : get_option('libexecdir'),
@ -107,7 +107,7 @@ libintel_dump_gpu = shared_library(
    'aub_write.h', 'aub_write.c', 'intel_dump_gpu.c',
  ),
  dependencies : dep_dl,
-  include_directories : [inc_common, inc_intel, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
  link_with : libintel_dev,
  c_args : [c_vis_args, no_override_init_args],
  install_dir : get_option('libexecdir'),
@ -121,7 +121,7 @@ if with_tools.contains('intel-ui')
    'aubinator_viewer',
    files('aubinator_viewer.cpp', 'aubinator_viewer_decoder.cpp'),
    dependencies : [idep_mesautil, dep_zlib, dep_dl, dep_thread, dep_m, libintel_imgui_gtk_dep],
-    include_directories : [inc_common, inc_intel],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
    link_with : [libintel_common, libintel_compiler, libintel_dev, libaub],
    c_args : [c_vis_args, no_override_init_args],
    cpp_args : ['-fpermissive', '-Wno-parentheses', '-Wno-class-memaccess'],
@ -150,7 +150,7 @@ i965_asm = executable(
   'i965_asm',
   ['i965_asm.c', i965_gram_tab[0], i965_gram_tab[1], i965_lex_yy_c],
   dependencies : [idep_mesautil, dep_thread],
-   include_directories : [inc_common, inc_intel],
+   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
   link_with : [libintel_common, libintel_compiler, libintel_dev],
   c_args : [c_vis_args, no_override_init_args],
   install : true
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@ -86,7 +86,7 @@ foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
    'anv_gen@0@'.format(_gen),
    [anv_gen_files, g[1], anv_entrypoints[0], anv_extensions_h],
    include_directories : [
-      inc_common, inc_compiler, inc_include, inc_intel, inc_vulkan_wsi,
+      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_intel, inc_vulkan_wsi,
    ],
    c_args : [
      c_vis_args, no_override_init_args, c_sse2_args,
@ -180,7 +180,7 @@ libanv_common = static_library(
    gen_xml_pack,
  ],
  include_directories : [
-    inc_common, inc_intel, inc_compiler, inc_include,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_compiler,
    inc_vulkan_wsi, inc_util,
  ],
  c_args : anv_flags,
@ -191,7 +191,7 @@ libvulkan_intel = shared_library(
  'vulkan_intel',
  [files('anv_gem.c'), anv_entrypoints[0], anv_extensions_h],
  include_directories : [
-    inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_wsi,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_compiler, inc_vulkan_wsi,
  ],
  link_whole : [libanv_common, libanv_gen_libs],
  link_with : [
@ -225,7 +225,7 @@ if with_tests
    'vulkan_intel_test',
    [files('anv_gem_stubs.c'), anv_entrypoints[0], anv_extensions_h],
    include_directories : [
-      inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_wsi,
+      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_compiler, inc_vulkan_wsi,
    ],
    link_whole : libanv_common,
    link_with : [
@ -251,7 +251,7 @@ if with_tests
        link_with : libvulkan_intel_test,
        dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind, idep_vulkan_util, ],
        include_directories : [
-          inc_common, inc_intel, inc_compiler, inc_vulkan_wsi,
+          inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_compiler, inc_vulkan_wsi,
        ],
      ),
      suite : ['intel'],
--- a/src/mesa/drivers/dri/common/meson.build
+++ b/src/mesa/drivers/dri/common/meson.build
@ -23,7 +23,7 @@ inc_dri_common = include_directories('.')
 libdricommon = static_library(
  'dricommon',
  files('utils.c', 'utils.h', 'dri_util.c', 'dri_util.h'),
-  include_directories : [inc_common, inc_util],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util],
  c_args : c_vis_args,
  dependencies : [dep_libdrm, idep_xmlconfig_headers],
  build_by_default : false,
@ -32,7 +32,7 @@ libdricommon = static_library(
 libmegadriver_stub = static_library(
  'megadriver_stub',
  'megadriver_stub.c',
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  c_args : c_vis_args,
  dependencies : dep_libdrm,
  build_by_default : false,
--- a/src/mesa/drivers/dri/i915/meson.build
+++ b/src/mesa/drivers/dri/i915/meson.build
@ -87,7 +87,7 @@ files_i915 = files(
 libi915 = static_library(
  'i915',
  files_i915,
-  include_directories : [inc_common, inc_dri_common, inc_util],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util],
  c_args : [c_vis_args, no_override_init_args],
  cpp_args : [cpp_vis_args],
  dependencies : [dep_libdrm, dep_libdrm_intel, idep_xmlconfig_headers],
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@ -136,7 +136,7 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100', '110']
    'i965_gen@0@'.format(v),
    ['genX_blorp_exec.c', 'genX_boilerplate.h', 'genX_pipe_control.c',
     'genX_state_upload.c', gen_xml_pack],
-    include_directories : [inc_common, inc_intel, inc_dri_common],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_dri_common],
    c_args : [
      c_vis_args, no_override_init_args, c_sse2_args,
      '-DGEN_VERSIONx10=@0@'.format(v),
@ -150,7 +150,7 @@ libi965 = static_library(
  'i965',
  [files_i965, ir_expression_operation_h],
  include_directories : [
-    inc_common, inc_intel, inc_dri_common, inc_include,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_dri_common,
  ],
  c_args : [c_vis_args, no_override_init_args, c_sse2_args],
  cpp_args : [cpp_vis_args, c_sse2_args],
--- a/src/mesa/drivers/dri/nouveau/meson.build
+++ b/src/mesa/drivers/dri/nouveau/meson.build
@ -82,7 +82,7 @@ files_nouveau_vieux = files(
 libnouveau_vieux = static_library(
  'nouveau_vieux',
  files_nouveau_vieux,
-  include_directories : [inc_common, inc_dri_common, inc_util],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util],
  c_args : [c_vis_args],
  cpp_args : [cpp_vis_args],
  dependencies : [dep_libdrm, dep_libdrm_nouveau, idep_xmlconfig_headers],
--- a/src/mesa/drivers/dri/r200/meson.build
+++ b/src/mesa/drivers/dri/r200/meson.build
@ -80,7 +80,7 @@ libr200 = static_library(
  'r200',
  files_r200,
  include_directories : [
-    inc_common, inc_dri_common, inc_util, include_directories('server'),
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util, include_directories('server'),
  ],
  c_args : [c_vis_args, '-DRADEON_R200'],
  cpp_args : [cpp_vis_args],
--- a/src/mesa/drivers/dri/radeon/meson.build
+++ b/src/mesa/drivers/dri/radeon/meson.build
@ -76,7 +76,7 @@ libr100 = static_library(
  'r100',
  files_r100,
  include_directories : [
-    inc_common, inc_dri_common, inc_util, include_directories('server'),
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util, include_directories('server'),
  ],
  c_args : [c_vis_args, '-DRADEON_R100'],
  cpp_args : [cpp_vis_args],
--- a/src/mesa/drivers/dri/swrast/meson.build
+++ b/src/mesa/drivers/dri/swrast/meson.build
@ -22,6 +22,6 @@ libswrast_dri = static_library(
  'swrast_dri',
  files('swrast.c', 'swrast_priv.h'),
  c_args : [c_vis_args],
-  include_directories : [inc_common, inc_dri_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common],
  dependencies : dep_libdrm,
 )
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@ -705,7 +705,7 @@ if with_sse41
    'mesa_sse41',
    files('main/streaming-load-memcpy.c', 'main/sse_minmax.c'),
    c_args : [c_vis_args, c_msvc_compat_args, sse41_args],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  )
 else
  libmesa_sse41 = []
@ -728,7 +728,7 @@ libmesa_common = static_library(
  files_libmesa_common,
  c_args : [c_vis_args, c_msvc_compat_args, _mesa_windows_args],
  cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _mesa_windows_args],
-  include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_libmesa_asm, include_directories('main')],
  dependencies : idep_nir_headers,
  build_by_default : false,
 )
@ -738,7 +738,7 @@ libmesa_classic = static_library(
  files_libmesa_classic,
  c_args : [c_vis_args, c_msvc_compat_args],
  cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-  include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_libmesa_asm, include_directories('main')],
  link_with : [libmesa_common, libglsl, libmesa_sse41],
  dependencies : idep_nir_headers,
  build_by_default : false,
@ -749,7 +749,7 @@ libmesa_gallium = static_library(
  files_libmesa_gallium,
  c_args : [c_vis_args, c_msvc_compat_args, _mesa_windows_args],
  cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _mesa_windows_args],
-  include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_libmesa_asm, include_directories('main')],
  link_with : [libmesa_common, libglsl, libmesa_sse41],
  dependencies : [idep_nir_headers, dep_vdpau],
  build_by_default : false,
--- a/src/mesa/state_tracker/tests/meson.build
+++ b/src/mesa/state_tracker/tests/meson.build
@ -21,7 +21,7 @@
 libmesa_st_test_common = static_library(
  'mesa_st_test_common',
  ['st_tests_common.cpp', ir_expression_operation_h],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies : idep_gtest,
 )

@ -30,7 +30,7 @@ test(
  executable(
    'st_format_test',
    ['st_format.c'],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
    link_with : [
      libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
    ],
@ -44,7 +44,7 @@ test(
  executable(
    'st_renumerate_test',
    ['test_glsl_to_tgsi_lifetime.cpp', ir_expression_operation_h],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
    link_with : [
      libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
    ],
@ -58,7 +58,7 @@ test(
  executable(
    'st_array_merge_test',
    ['test_glsl_to_tgsi_array_merge.cpp', ir_expression_operation_h],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
    link_with : [
      libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
    ],
--- a/src/meson.build
+++ b/src/meson.build
@ -25,7 +25,6 @@ inc_gallium = include_directories('gallium/include')
 inc_gallium_aux = include_directories('gallium/auxiliary')
 inc_amd_common = include_directories('amd/common')
 inc_amd_common_llvm = include_directories('amd/llvm')
-inc_common = [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux]

 libglsl_util = static_library(
  'glsl_util',
@ -34,7 +33,7 @@ libglsl_util = static_library(
    'mesa/program/prog_parameter.c', 'mesa/program/symbol_table.c',
    'mesa/program/dummy_errors.c',
  ),
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  c_args : [c_vis_args],
  build_by_default : false,
 )
--- a/src/panfrost/bifrost/meson.build
+++ b/src/panfrost/bifrost/meson.build
@ -48,7 +48,7 @@ bifrost_nir_algebraic_c = custom_target(
 libpanfrost_bifrost = static_library(
  'panfrost_bifrost',
  [libpanfrost_bifrost_files, bifrost_nir_algebraic_c],
-  include_directories : [inc_common, inc_include, inc_src, inc_panfrost_hw],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
  dependencies: [idep_nir],
  link_with: [libpanfrost_util],
  c_args : [c_vis_args, no_override_init_args],
--- a/src/panfrost/encoder/meson.build
+++ b/src/panfrost/encoder/meson.build
@ -36,7 +36,7 @@ libpanfrost_encoder_files = files(
 libpanfrost_encoder = static_library(
  'panfrost_encoder',
  [libpanfrost_encoder_files],
-  include_directories : [inc_common, inc_panfrost_hw],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
  c_args : [c_vis_args, no_override_init_args],
  cpp_args : [cpp_vis_args],
  dependencies: [dep_libdrm],
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@ -42,7 +42,10 @@ bifrost_compiler = executable(
  'bifrost_compiler',
  [files_bifrost],
  include_directories : [
-    inc_common,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
    inc_include,
    inc_src,
    inc_panfrost,
--- a/src/panfrost/midgard/meson.build
+++ b/src/panfrost/midgard/meson.build
@ -59,7 +59,10 @@ libpanfrost_midgard = static_library(
  'panfrost_midgard',
  [libpanfrost_midgard_files, midgard_nir_algebraic_c],
  include_directories : [
-   inc_common,
+   inc_mapi,
+   inc_mesa,
+   inc_gallium,
+   inc_gallium_aux,
   inc_include,
   inc_src,
   inc_panfrost_hw,
--- a/src/panfrost/pandecode/meson.build
+++ b/src/panfrost/pandecode/meson.build
@ -28,7 +28,7 @@ libpanfrost_decode_files = files(
 libpanfrost_decode = static_library(
  'panfrost_decode',
  [libpanfrost_decode_files],
-  include_directories : [inc_common, inc_panfrost],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost],
  c_args : [c_vis_args, no_override_init_args],
  cpp_args : [cpp_vis_args],
  build_by_default : false,
--- a/src/panfrost/shared/meson.build
+++ b/src/panfrost/shared/meson.build
@ -30,7 +30,7 @@ libpanfrost_shared_files = files(
 libpanfrost_shared = static_library(
  'panfrost_shared',
  [libpanfrost_shared_files],
-  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, '-O3'],
  cpp_args : [cpp_vis_args],
  build_by_default : false,
--- a/src/panfrost/util/meson.build
+++ b/src/panfrost/util/meson.build
@ -31,7 +31,7 @@ libpanfrost_util_files = files(
 libpanfrost_util = static_library(
  'panfrost_util',
  [libpanfrost_util_files],
-  include_directories : [inc_common, inc_panfrost_hw],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
  dependencies: [idep_nir],
  c_args : [c_vis_args, no_override_init_args],
  cpp_args : [cpp_vis_args],
--- a/src/util/format/meson.build
+++ b/src/util/format/meson.build
@ -43,7 +43,7 @@ u_format_table_c = custom_target(
 libmesa_format = static_library(
  'mesa_format',
  [files_mesa_format, u_format_table_c],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies : dep_m,
  c_args : [c_msvc_compat_args, c_vis_args],
  build_by_default : false
--- a/src/util/meson.build
+++ b/src/util/meson.build
@ -170,7 +170,7 @@ endif
 _libmesa_util = static_library(
  'mesa_util',
  [files_mesa_util, format_srgb],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies : deps_for_libmesa_util,
  link_with: libmesa_format,
  c_args : [c_msvc_compat_args, c_vis_args],
@ -186,7 +186,7 @@ idep_mesautil = declare_dependency(
 _libxmlconfig = static_library(
  'xmlconfig',
  files_xmlconfig,
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies : [idep_mesautil, dep_expat, dep_m],
  c_args : [
    c_msvc_compat_args, c_vis_args,
@ -211,7 +211,7 @@ if with_tests
    executable(
      'u_atomic_test',
      files('u_atomic_test.c'),
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
      dependencies : idep_mesautil,
      c_args : [c_msvc_compat_args],
    ),
@ -223,7 +223,7 @@ if with_tests
    executable(
      'blob_test',
      files('blob_test.c'),
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
      dependencies : idep_mesautil,
      c_args : [c_msvc_compat_args],
    ),
@ -235,7 +235,7 @@ if with_tests
    executable(
      'rb_tree_test',
      files('rb_tree_test.c'),
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
      dependencies : idep_mesautil,
      c_args : [c_msvc_compat_args],
    ),
@ -247,7 +247,7 @@ if with_tests
    executable(
      'roundeven_test',
      files('roundeven_test.c'),
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
      c_args : [c_msvc_compat_args],
      dependencies : [dep_m],
    ),
@ -262,7 +262,7 @@ if with_tests
      executable(
        'mesa-sha1_test',
        files('mesa-sha1_test.c'),
-        include_directories : inc_common,
+        include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
        link_with : _libmesa_util,
        c_args : [c_msvc_compat_args],
      ),
@ -275,7 +275,7 @@ if with_tests
    executable(
       'bitset_test',
       files('bitset_test.cpp'),
-       include_directories : inc_common,
+       include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : [idep_mesautil, idep_gtest],
     ),
     suite : ['util'],
@ -284,7 +284,7 @@ if with_tests
  process_test_exe = executable(
    'process_test',
    files('process_test.c'),
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
    dependencies : idep_mesautil,
    c_args : [c_msvc_compat_args],
  )
--- a/src/util/tests/fast_idiv_by_const/meson.build
+++ b/src/util/tests/fast_idiv_by_const/meson.build
@ -24,7 +24,7 @@ test(
    'fast_idiv_by_const_test',
    'fast_idiv_by_const_test.cpp',
    dependencies : [idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  ),
  suite : ['util'],
  timeout: 60,
--- a/src/util/tests/fast_urem_by_const/meson.build
+++ b/src/util/tests/fast_urem_by_const/meson.build
@ -25,7 +25,7 @@ test(
    'fast_urem_by_const_test',
    'fast_urem_by_const_test.cpp',
    dependencies : [idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  ),
  suite : ['util'],
 )
--- a/src/util/tests/format/meson.build
+++ b/src/util/tests/format/meson.build
@ -3,7 +3,7 @@ foreach t : ['srgb', 'u_format_test', 'u_format_compatible_test']
    executable(
      t,
      '@0@.c'.format(t),
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
      dependencies : idep_mesautil,
    ),
    suite : 'format',
--- a/src/util/tests/set/meson.build
+++ b/src/util/tests/set/meson.build
@ -24,7 +24,7 @@ test(
    'set_test',
    'set_test.cpp',
    dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  ),
  suite : ['util'],
 )
--- a/src/util/tests/sparse_array/meson.build
+++ b/src/util/tests/sparse_array/meson.build
@ -24,7 +24,7 @@ test(
    'multi_threaded',
    'multi_threaded.c',
    dependencies : [idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  ),
  suite : ['util'],
  timeout: 60,
--- a/src/util/tests/string_buffer/meson.build
+++ b/src/util/tests/string_buffer/meson.build
@ -25,7 +25,7 @@ test(
    'string_buffer_test.cpp',
    cpp_args : [cpp_msvc_compat_args],
    dependencies : [idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  ),
  suite : ['util'],
 )
--- a/src/util/tests/timespec/meson.build
+++ b/src/util/tests/timespec/meson.build
@ -24,7 +24,7 @@ test(
    'timespec_test',
    'timespec_test.cpp',
    dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  ),
  suite : ['util'],
 )
--- a/src/util/tests/vector/meson.build
+++ b/src/util/tests/vector/meson.build
@ -24,7 +24,7 @@ test(
    'vector_test',
    'vector_test.cpp',
    dependencies : [idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  ),
  suite : ['util'],
 )
--- a/src/vulkan/overlay-layer/meson.build
+++ b/src/vulkan/overlay-layer/meson.build
@ -42,7 +42,7 @@ vklayer_mesa_overlay = shared_library(
  c_args : [c_vis_args, no_override_init_args, vulkan_wsi_args],
  cpp_args : [cpp_vis_args, vulkan_wsi_args],
  dependencies : [idep_vulkan_util, idep_mesautil, vulkan_wsi_deps, libimgui_core_dep, dep_dl],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  link_args : cc.get_supported_link_arguments(['-Wl,-Bsymbolic-functions', '-Wl,-z,relro']),
  install : true
 )
--- a/src/vulkan/util/meson.build
+++ b/src/vulkan/util/meson.build
@ -40,7 +40,7 @@ vk_enum_to_str = custom_target(
 libvulkan_util = static_library(
  'vulkan_util',
  [files_vulkan_util, vk_enum_to_str],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies : vulkan_wsi_deps,
  c_args : [c_vis_args, vulkan_wsi_args],
  build_by_default : false,
--- a/src/vulkan/wsi/meson.build
+++ b/src/vulkan/wsi/meson.build
@ -41,7 +41,7 @@ endif
 libvulkan_wsi = static_library(
  'vulkan_wsi',
  files_vulkan_wsi,
-  include_directories : [inc_common, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies : [vulkan_wsi_deps, dep_libdrm, idep_vulkan_util, idep_xmlconfig],
  c_args : [c_vis_args, vulkan_wsi_args],
  build_by_default : false,