8 files changed, 9 insertions, 8 deletions
diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build
index 69db8050ee4..580391ac10e 100644
--- 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),
diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build
index e48b61b8955..7a1d18a6394 100644
--- 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],
diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build
index 2d0789db802..92f043ea0a0 100644
--- 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,
diff --git a/src/gallium/drivers/r600/meson.build b/src/gallium/drivers/r600/meson.build
index ecdf8504032..55d84241276 100644
--- 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],
diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build
index 6b6ec3652ec..e68d962ed84 100644
--- 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,
 )
 
diff --git a/src/gallium/drivers/virgl/meson.build b/src/gallium/drivers/virgl/meson.build
index 0c04370d4ec..dd33d2b7c66 100644
--- 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
 )
 
diff --git a/src/gallium/drivers/virgl/tests/meson.build b/src/gallium/drivers/virgl/tests/meson.build
index 86cb27db4e1..ec538c9e0b0 100644
--- 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'],
diff --git a/src/gallium/drivers/zink/meson.build b/src/gallium/drivers/zink/meson.build
index ccef3ff3b21..cab79ddae18 100644
--- 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],
 )