diff --git a/src/freedreno/common/meson.build b/src/freedreno/common/meson.build
index b569de0eeb0..0c08f8dff2b 100644
--- a/src/freedreno/common/meson.build
+++ b/src/freedreno/common/meson.build
@@ -40,7 +40,7 @@ libfreedreno_common = static_library(
     freedreno_devices_h,
     sha1_h,
   ],
-  include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+  include_directories : [inc_freedreno, inc_include, inc_src],
   c_args : [no_override_init_args],
   build_by_default : true,
   dependencies: [idep_mesautil],
diff --git a/src/freedreno/computerator/meson.build b/src/freedreno/computerator/meson.build
index dba703cf154..dcdfd80885d 100644
--- a/src/freedreno/computerator/meson.build
+++ b/src/freedreno/computerator/meson.build
@@ -38,10 +38,6 @@ computerator = executable(
     inc_freedreno,
     inc_include,
     inc_src,
-    inc_mapi,
-    inc_mesa,
-    inc_gallium,
-    inc_gallium_aux,
   ],
   link_with : [
     libfreedreno_drm,
diff --git a/src/freedreno/drm-shim/meson.build b/src/freedreno/drm-shim/meson.build
index 2b4bddbf2ba..9c6462bbe8f 100644
--- 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_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  include_directories: [inc_include, inc_src],
   dependencies: dep_drm_shim,
   gnu_symbol_visibility : 'hidden',
   install : true,
diff --git a/src/freedreno/drm/meson.build b/src/freedreno/drm/meson.build
index 90ce1921228..2c2d58bd651 100644
--- a/src/freedreno/drm/meson.build
+++ b/src/freedreno/drm/meson.build
@@ -37,10 +37,6 @@ libfreedreno_drm_includes = [
   inc_freedreno,
   inc_include,
   inc_src,
-  inc_mapi,
-  inc_mesa,
-  inc_gallium,
-  inc_gallium_aux,
 ]
 
 libfreedreno_drm_msm_files = files(
diff --git a/src/freedreno/drm/msm/msm_priv.h b/src/freedreno/drm/msm/msm_priv.h
index ee6e7a5abc0..ed9c785420a 100644
--- a/src/freedreno/drm/msm/msm_priv.h
+++ b/src/freedreno/drm/msm/msm_priv.h
@@ -31,8 +31,6 @@
 
 #include "util/timespec.h"
 
-#include "pipe/p_defines.h"
-
 #ifndef __user
 #define __user
 #endif
diff --git a/src/freedreno/drm/virtio/virtio_priv.h b/src/freedreno/drm/virtio/virtio_priv.h
index fa0fefcac45..58d09ff2635 100644
--- a/src/freedreno/drm/virtio/virtio_priv.h
+++ b/src/freedreno/drm/virtio/virtio_priv.h
@@ -34,8 +34,6 @@
 #include "util/timespec.h"
 #include "util/vma.h"
 
-#include "pipe/p_defines.h"
-
 #include "drm-uapi/virtgpu_drm.h"
 /* We also use some types/defines from the host drm/msm uabi: */
 #include "drm-uapi/msm_drm.h"
diff --git a/src/freedreno/fdl/fd6_format_table.c b/src/freedreno/fdl/fd6_format_table.c
index ec6ac8ebb29..985ca43e887 100644
--- a/src/freedreno/fdl/fd6_format_table.c
+++ b/src/freedreno/fdl/fd6_format_table.c
@@ -25,7 +25,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#include "pipe/p_defines.h"
 #include "util/format/u_format.h"
 
 #include "fd6_format_table.h"
diff --git a/src/freedreno/fdl/meson.build b/src/freedreno/fdl/meson.build
index 479d3dcab16..98fc02dd5c1 100644
--- a/src/freedreno/fdl/meson.build
+++ b/src/freedreno/fdl/meson.build
@@ -28,7 +28,7 @@ libfreedreno_layout = static_library(
     'freedreno_layout.c',
     freedreno_xml_header_files,
   ],
-  include_directories : [inc_freedreno, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  include_directories : [inc_freedreno, inc_include, inc_src],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
   dependencies : [idep_nir_headers, idep_mesautil],
@@ -50,10 +50,6 @@ foreach major : ['5', '6']
       include_directories: [
         inc_include,
         inc_src,
-        inc_mapi,
-        inc_mesa,
-        inc_gallium,
-        inc_gallium_aux,
         inc_freedreno],
     ),
     suite : ['freedreno'],
diff --git a/src/freedreno/ir3/meson.build b/src/freedreno/ir3/meson.build
index 16abc5335da..0e051958805 100644
--- a/src/freedreno/ir3/meson.build
+++ b/src/freedreno/ir3/meson.build
@@ -118,7 +118,7 @@ libfreedreno_ir3_files = files(
 libfreedreno_ir3 = static_library(
   'freedreno_ir3',
   [libfreedreno_ir3_files, ir3_nir_trig_c, ir3_nir_imul_c, ir3_parser[0], ir3_parser[1], ir3_lexer],
-  include_directories : [inc_freedreno, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  include_directories : [inc_freedreno, inc_include, inc_src],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
   link_with: [libir3decode, libir3encode, libfreedreno_common],
@@ -133,7 +133,7 @@ test('ir3_disasm',
     link_args : [ld_args_build_id],
     link_with: [libfreedreno_ir3, libir3decode],
     dependencies: [idep_mesautil, idep_nir],
-    include_directories: [inc_freedreno, inc_include, inc_src, inc_gallium],
+    include_directories: [inc_freedreno, inc_include, inc_src],
   ),
   suite: ['freedreno'],
 )
@@ -145,7 +145,7 @@ test('ir3_delay_test',
     link_with: libfreedreno_ir3,
     link_args: ld_args_build_id,
     dependencies: [idep_mesautil, idep_nir],
-    include_directories: [inc_freedreno, inc_include, inc_src, inc_mesa, inc_gallium],
+    include_directories: [inc_freedreno, inc_include, inc_src],
   ),
   suite: ['freedreno'],
 )
diff --git a/src/freedreno/isa/meson.build b/src/freedreno/isa/meson.build
index 0fba8b040a5..35a46e8d73c 100644
--- a/src/freedreno/isa/meson.build
+++ b/src/freedreno/isa/meson.build
@@ -54,9 +54,6 @@ libir3decode = static_library(
   include_directories: [
     inc_include,
     inc_src,
-    # Hack for src/util/half_float.h indirect dependency on
-    # gallium headers:
-    inc_gallium,
   ],
   gnu_symbol_visibility: 'hidden',
 )
@@ -96,7 +93,6 @@ libir3encode = static_library(
     inc_src,
     inc_include,
     inc_freedreno,
-    inc_gallium,
   ],
   gnu_symbol_visibility: 'hidden',
 )
diff --git a/src/freedreno/perfcntrs/meson.build b/src/freedreno/perfcntrs/meson.build
index d58e676563b..e26b1eaee20 100644
--- a/src/freedreno/perfcntrs/meson.build
+++ b/src/freedreno/perfcntrs/meson.build
@@ -31,7 +31,7 @@ libfreedreno_perfcntrs_files = files(
 libfreedreno_perfcntrs = static_library(
   'freedreno_perfcntrs',
   [libfreedreno_perfcntrs_files, freedreno_xml_header_files],
-  include_directories : [inc_freedreno, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  include_directories : [inc_freedreno, inc_include, inc_src],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
   link_with : [libfreedreno_common],
@@ -50,10 +50,6 @@ if dep_libconfig.found() and dep_curses.found()
       inc_freedreno,
       inc_include,
       inc_src,
-      inc_mapi,
-      inc_mesa,
-      inc_gallium,
-      inc_gallium_aux,
     ],
     link_with : [
       libfreedreno_common,
diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build
index 0e28354138f..aeb78455a56 100644
--- a/src/freedreno/vulkan/meson.build
+++ b/src/freedreno/vulkan/meson.build
@@ -137,10 +137,6 @@ libvulkan_freedreno = shared_library(
   include_directories : [
     inc_include,
     inc_src,
-    inc_mapi,
-    inc_mesa,
-    inc_gallium,
-    inc_gallium_aux,
     inc_compiler,
     inc_freedreno,
   ],
diff --git a/src/freedreno/vulkan/tu_pipeline.cc b/src/freedreno/vulkan/tu_pipeline.cc
index d58d070eda4..e67c4585c2f 100644
--- a/src/freedreno/vulkan/tu_pipeline.cc
+++ b/src/freedreno/vulkan/tu_pipeline.cc
@@ -12,7 +12,6 @@
 #include "common/freedreno_guardband.h"
 
 #include "ir3/ir3_nir.h"
-#include "main/menums.h"
 #include "nir/nir.h"
 #include "nir/nir_builder.h"
 #include "nir/nir_serialize.h"