12 files changed, 13 insertions, 13 deletions
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index ae25a21cb33..8da21b3394a 100644
--- 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],
diff --git a/src/gallium/targets/graw-null/meson.build b/src/gallium/targets/graw-null/meson.build
index 7e539b04418..39471b64064 100644
--- 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
diff --git a/src/gallium/targets/graw-xlib/meson.build b/src/gallium/targets/graw-xlib/meson.build
index 92f483733cf..0e5d91b9fdd 100644
--- 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
   ],
diff --git a/src/gallium/targets/haiku-softpipe/meson.build b/src/gallium/targets/haiku-softpipe/meson.build
index d92f583210d..e35fab5dacf 100644
--- 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')
   ],
diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build
index cd4e02d1fa9..6332267fff4 100644
--- 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 : [
diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build
index 921f948ca3a..8aec6219a87 100644
--- 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],
diff --git a/src/gallium/targets/omx/meson.build b/src/gallium/targets/omx/meson.build
index 98f01cd7510..86311c30cb9 100644
--- 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 : [
diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build
index e43aba9029f..92cd0aa06a5 100644
--- 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],
     ),
diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build
index 24d291c78a9..e9a3ee126fa 100644
--- 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 : [
diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build
index 2032fa09674..4ea12c4ef02 100644
--- 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 : [
diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build
index c669b0135b9..d61dbd9842b 100644
--- 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 : [
diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build
index c1f20191b4b..b96a9d34465 100644
--- 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 : [