From e0ec191f97673d3e9b452030a9565db4b7cea0ae Mon Sep 17 00:00:00 2001
From: Khairul Azhar Kasmiran <kazarmy@gmail.com>
Date: Sun, 29 Mar 2026 17:44:45 +0800
Subject: [PATCH] meson: Fix include_directories sandbox violation (#6119)

---
 librz/include/rz_core.h       | 11 -----------
 librz/include/rz_heap_glibc.h |  5 +----
 meson.build                   |  2 +-
 test/integration/meson.build  |  1 +
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/librz/include/rz_core.h b/librz/include/rz_core.h
index f0408cb568..44de31b346 100644
--- a/librz/include/rz_core.h
+++ b/librz/include/rz_core.h
@@ -32,7 +32,6 @@
 #include <rz_crypto.h>
 #include <rz_bind.h>
 #include <rz_util/rz_annotated_code.h>
-#include <rz_heap_glibc.h>
 #include <rz_windows_heap.h>
 #include <rz_mark.h>
 
@@ -1005,16 +1004,6 @@ RZ_API void rz_core_sysenv_end(RzCore *core);
 
 RZ_API void rz_core_recover_vars(RzCore *core, RzAnalysisFunction *fcn, bool argonly);
 
-/* heap_glibc.c */
-RZ_API RzList /*<RzHeapChunkListItem *>*/ *rz_heap_chunks_list(RzCore *core, ut64 m_arena);
-RZ_API RzList /*<RzArenaListItem *>*/ *rz_heap_arenas_list(RzCore *core);
-RZ_API RzHeapChunkSimple *rz_heap_chunk(RzCore *core, ut64 addr);
-RZ_API RzHeapBin *rz_heap_bin_content(RzCore *core, MallocState *arena, int bin_num, ut64 m_arena);
-RZ_API RzHeapBin *rz_heap_fastbin_content(RzCore *core, MallocState *arena, int bin_num);
-RZ_API MallocState *rz_heap_get_arena(RzCore *core, ut64 m_state);
-RZ_API RzList /*<RzHeapBin *>*/ *rz_heap_tcache_content(RzCore *core, ut64 arena_base);
-RZ_API bool rz_heap_write_chunk(RzCore *core, RzHeapChunkSimple *chunk_simple);
-
 /* cmd_windows_heap.c */
 RZ_API RZ_OWN RzList /*<RzWindowsHeapBlock *>*/ *rz_heap_windows_blocks_list(RzCore *core);
 RZ_API RZ_OWN RzList /*<RzWindowsHeapInfo *>*/ *rz_heap_windows_heap_list(RzCore *core);
diff --git a/librz/include/rz_heap_glibc.h b/librz/include/rz_heap_glibc.h
index 920971a6ca..e64ba3eb37 100644
--- a/librz/include/rz_heap_glibc.h
+++ b/librz/include/rz_heap_glibc.h
@@ -35,6 +35,7 @@ RZ_LIB_VERSION_HEADER(rz_heap_glibc);
 
 RZ_API RzHeapChunkSimple *rz_heap_chunk(RzCore *core, ut64 addr);
 RZ_API RzHeapChunk *rz_heap_get_chunk_at_addr(RzCore *core, ut64 addr);
+RZ_API RzList /*<RzHeapChunkListItem *>*/ *rz_heap_chunks_list(RzCore *core, ut64 m_arena);
 RZ_API RzList /*<RzArenaListItem *>*/ *rz_heap_arenas_list(RzCore *core);
 RZ_API bool rz_heap_resolve_main_arena(RzCore *core, ut64 *m_arena);
 RZ_API double rz_get_glibc_version(RzCore *core, const char *libc_path, ut8 *banner);
@@ -44,10 +45,6 @@ RZ_API RzList /*<RzHeapBin *>*/ *rz_heap_tcache_content(RzCore *core, ut64 arena
 RZ_API MallocState *rz_heap_get_arena(RzCore *core, ut64 m_state);
 RZ_API RzHeapBin *rz_heap_fastbin_content(RzCore *core, MallocState *main_arena, int bin_num);
 RZ_API RzHeapBin *rz_heap_bin_content(RzCore *core, MallocState *main_arena, int bin_num, ut64 m_arena);
-RZ_API RzList /*<RzHeapChunkListItem *>*/ *rz_heap_chunks(RzCore *core, ut64 m_state);
-RZ_API RzList /*<RzArenaListItem *>*/ *rz_heap_arena_list(RzCore *core);
-RZ_IPI RzCmdStatus rz_cmd_heap_fastbins_print_handler(RzCore *core, int argc, const char **argv);
-RZ_IPI RzCmdStatus rz_cmd_heap_bins_list_print_handler(RzCore *core, int argc, const char **argv, RzOutputMode mode);
 RZ_API void rz_heap_bin_free(RzHeapBin *bin);
 
 #ifdef __cplusplus
diff --git a/meson.build b/meson.build
index 6ac2ad60e0..15d7e0a400 100644
--- a/meson.build
+++ b/meson.build
@@ -44,7 +44,7 @@ cc = meson.get_compiler('c')
 cc_native = meson.get_compiler('c', native: true)
 
 platform_deps = []
-platform_inc = ['.', 'librz', 'librz/include', 'subprojects/rzheap']
+platform_inc = ['.', 'librz', 'librz/include']
 if host_machine.system() == 'windows'
   add_project_arguments('-DPSAPI_VERSION=1', language: 'c')
   platform_deps = [
diff --git a/test/integration/meson.build b/test/integration/meson.build
index f64d210702..c3e0935f03 100644
--- a/test/integration/meson.build
+++ b/test/integration/meson.build
@@ -60,6 +60,7 @@ if get_option('enable_tests') and cli_enabled
         rz_hash_dep,
         rz_crypto_dep,
         rz_magic_dep,
+        rzheap_dep,
         lrt,
       ],
       install: false,