diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build
index 283650c6475..60d00a4f098 100644
--- a/src/amd/addrlib/meson.build
+++ b/src/amd/addrlib/meson.build
@@ -79,7 +79,7 @@ libamdgpu_addrlib = static_library(
       'inc', 'src', 'src/core', 'src/chip/gfx9', 'src/chip/r800',
       'src/chip/gfx10', 'src/chip/gfx11',
     ),
-    inc_amd_common, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux,
+    inc_amd_common, inc_include, inc_src
   ],
   cpp_args : cpp_args_addrlib,
   gnu_symbol_visibility : 'hidden',
diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build
index c94d7355d17..7b4f94eb55f 100644
--- a/src/amd/common/meson.build
+++ b/src/amd/common/meson.build
@@ -120,7 +120,7 @@ libamd_common = static_library(
   'amd_common',
   [amd_common_files, sid_tables_h, amdgfxregs_h, gfx10_format_table_c],
   include_directories : [
-    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_mapi, inc_amd,
+    inc_include, inc_src, inc_compiler, inc_amd,
   ],
   dependencies : [
     dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind,
@@ -141,7 +141,7 @@ if with_tests and not with_platform_windows
       ['ac_surface_modifier_test.c'],
       link_with: [libamd_common, libamdgpu_addrlib],
       include_directories : [
-        inc_amd, inc_gallium, inc_include, inc_src,
+        inc_amd, inc_include, inc_src,
       ],
       dependencies: [idep_amdgfxregs_h, dep_libdrm_amdgpu, idep_mesautil],
     ),
@@ -157,7 +157,7 @@ if with_tests and not with_platform_windows
         ['ac_surface_meta_address_test.c'],
         link_with: [libamd_common, libamdgpu_addrlib],
         include_directories : [
-          inc_amd, inc_gallium, inc_include, inc_src,
+          inc_amd, inc_include, inc_src,
         ],
         dependencies: [idep_amdgfxregs_h, dep_libdrm_amdgpu, idep_mesautil, dep_openmp],
       ),
diff --git a/src/amd/compiler/tests/meson.build b/src/amd/compiler/tests/meson.build
index 6d06d8bf0b5..21e160a8592 100644
--- a/src/amd/compiler/tests/meson.build
+++ b/src/amd/compiler/tests/meson.build
@@ -59,7 +59,7 @@ test(
                 '-DACO_TEST_PYTHON_BIN="@0@"'.format(prog_python.full_path())] +
                cpp_args_aco,
     include_directories : [
-      inc_include, inc_src, inc_compiler, inc_mesa, inc_mapi, inc_amd, inc_amd_common, inc_amd_common_llvm,
+      inc_include, inc_src, inc_compiler, inc_amd, inc_amd_common, inc_amd_common_llvm,
     ],
     link_with : [
       libamd_common, libamd_common_llvm, libvulkan_radeon,
diff --git a/src/amd/llvm/meson.build b/src/amd/llvm/meson.build
index 183dc607fe6..a1f8ee1f90e 100644
--- a/src/amd/llvm/meson.build
+++ b/src/amd/llvm/meson.build
@@ -33,7 +33,7 @@ libamd_common_llvm = static_library(
   'amd_common_llvm',
   [amd_common_llvm_files],
   include_directories : [
-    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_amd, inc_amd_common
+    inc_include, inc_src, inc_compiler, inc_amd, inc_amd_common
   ],
   link_with: [
     libamd_common
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index d3775fb98d8..8db4d587c5b 100644
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -194,7 +194,7 @@ libvulkan_radeon = shared_library(
   [libradv_files, radv_entrypoints, sha1_h, radix_sort_spv, bvh_spv],
   vs_module_defs : vulkan_api_def,
   include_directories : [
-    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_include, inc_src, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util,
   ],
   link_with : [
     libamd_common, libamd_common_llvm, libamdgpu_addrlib,