From d73378ffcca2de43a79c4903221e8164cf256469 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 21 Jan 2026 21:59:38 +0000
Subject: [PATCH 1/4] cmake: Add missed `Boost::headers`

---
 src/ipc/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ipc/CMakeLists.txt b/src/ipc/CMakeLists.txt
index 300da122505..5378ef1924b 100644
--- a/src/ipc/CMakeLists.txt
+++ b/src/ipc/CMakeLists.txt
@@ -20,6 +20,7 @@ target_link_libraries(bitcoin_ipc
   PRIVATE
     core_interface
     univalue
+    Boost::headers
 )
 
 if(BUILD_TESTS)

From b5375c44ed16ed6aae3d46ac6316b3981330f100 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 21 Jan 2026 22:03:20 +0000
Subject: [PATCH 2/4] depends: Prefix include path for headers-only `boost`
 package

---
 depends/packages/boost.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
index 2d027c6839d..02f59abe4d2 100644
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -13,6 +13,8 @@ define $(package)_set_vars
   $(package)_config_opts += -DBOOST_INSTALL_LAYOUT=system
   $(package)_config_opts += -DBUILD_TESTING=OFF
   $(package)_config_opts += -DCMAKE_DISABLE_FIND_PACKAGE_ICU=ON
+  # Install to a unique path to prevent accidental inclusion via other dependencies' -I flags.
+  $(package)_config_opts += -DCMAKE_INSTALL_INCLUDEDIR=$(package)/include
 endef
 
 define $(package)_config_cmds

From 94a692b6aa09d2e5df97bbc9cc810854818f9333 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 21 Jan 2026 22:04:26 +0000
Subject: [PATCH 3/4] cmake: Add missed `USDT::headers`

---
 src/test/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 2466a483921..1f58c4e02c2 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -163,6 +163,7 @@ target_link_libraries(test_bitcoin
   secp256k1
   Boost::headers
   libevent::extra
+  $<TARGET_NAME_IF_EXISTS:USDT::headers>
 )
 
 if(ENABLE_WALLET)

From 65134c7e5f99500baed18d575b576e33a6294ecf Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 21 Jan 2026 22:09:33 +0000
Subject: [PATCH 4/4] depends: Prefix include path for headers-only `systemtap`
 package

---
 depends/packages/systemtap.mk | 10 +++++++---
 depends/toolchain.cmake.in    |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/depends/packages/systemtap.mk b/depends/packages/systemtap.mk
index 668099b04dc..a9f5e35468f 100644
--- a/depends/packages/systemtap.mk
+++ b/depends/packages/systemtap.mk
@@ -6,7 +6,11 @@ $(package)_sha256_hash=966a360fb73a4b65a8d0b51b389577b3c4f92a327e84aae58682103e8
 $(package)_patches=remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch
 
 define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch && \
-  mkdir -p $($(package)_staging_prefix_dir)/include/sys && \
-  cp includes/sys/sdt.h $($(package)_staging_prefix_dir)/include/sys/sdt.h
+  patch -p1 < $($(package)_patch_dir)/remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch
+endef
+
+# Install to a unique path to prevent accidental inclusion via other dependencies' -I flags.
+define $(package)_stage_cmds
+  mkdir -p $($(package)_staging_prefix_dir)/$(package)/include/sys && \
+  cp includes/sys/sdt.h $($(package)_staging_prefix_dir)/$(package)/include/sys/sdt.h
 endef
diff --git a/depends/toolchain.cmake.in b/depends/toolchain.cmake.in
index e31d9eefeef..87189efa1cb 100644
--- a/depends/toolchain.cmake.in
+++ b/depends/toolchain.cmake.in
@@ -163,6 +163,7 @@ if("@usdt_packages@" MATCHES "^[ ]*$")
   set(WITH_USDT OFF CACHE BOOL "")
 else()
   set(WITH_USDT ON CACHE BOOL "")
+  set(USDT_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/systemtap/include" CACHE PATH "")
 endif()
 
 set(ipc_packages @ipc_packages@)