diff --git a/packages/assimp/build.sh b/packages/assimp/build.sh
index ec06d9aa7..a020c891f 100644
--- a/packages/assimp/build.sh
+++ b/packages/assimp/build.sh
@@ -7,6 +7,7 @@ TERMUX_PKG_SRCURL=https://github.com/assimp/assimp/archive/v$TERMUX_PKG_VERSION.
 TERMUX_PKG_SHA256=ad76c5d86c380af65a9d9f64e8fc57af692ffd80a90f613dfc6bd945d0b80bb4
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, zlib"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_BREAKS="assimp-dev"
 TERMUX_PKG_REPLACES="assimp-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DASSIMP_BUILD_SAMPLES=OFF"
diff --git a/packages/bastet/build.sh b/packages/bastet/build.sh
index fb118ccbc..27f2a5b3d 100644
--- a/packages/bastet/build.sh
+++ b/packages/bastet/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=8
 TERMUX_PKG_SRCURL=https://github.com/fph/bastet/archive/$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=f219510afc1d83e4651fbffd5921b1e0b926d5311da4f8fa7df103dc7f2c403f
 TERMUX_PKG_DEPENDS="libc++, ncurses"
-TERMUX_PKG_BUILD_DEPENDS="boost-static"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers, boost-static"
 TERMUX_PKG_EXTRA_MAKE_ARGS=" BOOST_PO=$TERMUX_PREFIX/lib/libboost_program_options.a"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_GROUPS="games"
diff --git a/packages/cgal/build.sh b/packages/cgal/build.sh
index 8eaa80d15..5c4d45a97 100644
--- a/packages/cgal/build.sh
+++ b/packages/cgal/build.sh
@@ -7,6 +7,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/CGAL/cgal/releases/download/v${TERMUX_PKG_VERSION}/CGAL-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=ab76633b023d72ea3ca9ad22e2fa39ed3b5c8fb4e2c091a78035fabb5eb3fccf
 TERMUX_PKG_DEPENDS="boost, libc++, libgmp, libmpfr, zlib"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_GROUPS="science"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/crypto-monitor/build.sh b/packages/crypto-monitor/build.sh
index b6e342e60..4a60c2ef0 100644
--- a/packages/crypto-monitor/build.sh
+++ b/packages/crypto-monitor/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/edghyhdz/crypto_monitor.git
 TERMUX_PKG_GIT_BRANCH=main
 TERMUX_PKG_DEPENDS="libc++, libcurl, ncurses-ui-libs, openssl"
-TERMUX_PKG_BUILD_DEPENDS="boost"
+TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_post_get_source() {
diff --git a/packages/enblend/build.sh b/packages/enblend/build.sh
index e183e62e6..117c7977a 100644
--- a/packages/enblend/build.sh
+++ b/packages/enblend/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_VERSION=${_VERSION//_/}
 TERMUX_PKG_SRCURL=https://dev.gentoo.org/~soap/distfiles/enblend-${_VERSION}.tar.xz
 TERMUX_PKG_SHA256=4fe05af3d697bd6b2797facc8ba5aeabdc91e233156552301f1c7686232ff4c3
 TERMUX_PKG_DEPENDS="gsl, libandroid-glob, libc++, libtiff, libvigra, littlecms"
-TERMUX_PKG_BUILD_DEPENDS="boost, libjpeg-turbo, libpng, zlib"
+TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers, libjpeg-turbo, libpng, zlib"
 
 termux_step_pre_configure() {
 	autoreconf -fi
diff --git a/packages/i2pd/build.sh b/packages/i2pd/build.sh
index f68c9cd31..a68ae76eb 100644
--- a/packages/i2pd/build.sh
+++ b/packages/i2pd/build.sh
@@ -9,6 +9,7 @@ TERMUX_PKG_SRCURL=https://github.com/PurpleI2P/i2pd/archive/$TERMUX_PKG_VERSION.
 TERMUX_PKG_SHA256=7b333cd26670903ef0672cf87aa9f895814ce2bbef2e587e69d66ad9427664e6
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, miniupnpc, openssl, zlib"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_FORCE_CMAKE=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DWITH_UPNP:BOOL=ON"
 TERMUX_PKG_RM_AFTER_INSTALL="src"
diff --git a/packages/innoextract/build.sh b/packages/innoextract/build.sh
index 0a6065085..e8c5f12d5 100644
--- a/packages/innoextract/build.sh
+++ b/packages/innoextract/build.sh
@@ -7,3 +7,4 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://constexpr.org/innoextract/files/innoextract-${TERMUX_PKG_VERSION}/innoextract-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=6344a69fc1ed847d4ed3e272e0da5998948c6b828cb7af39c6321aba6cf88126
 TERMUX_PKG_DEPENDS="libc++, boost, liblzma, libiconv"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
diff --git a/packages/ledger/build.sh b/packages/ledger/build.sh
index e52e257f5..5b2a307fe 100644
--- a/packages/ledger/build.sh
+++ b/packages/ledger/build.sh
@@ -8,9 +8,9 @@ TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION
 TERMUX_PKG_SHA256=92bf09bc385b171987f456fe3ee9fa998ed5e40b97b3acdd562b663aa364384a
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, libc++, libedit, libmpfr, libgmp, python"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers, utf8cpp"
 TERMUX_PKG_BREAKS="ledger-dev"
 TERMUX_PKG_REPLACES="ledger-dev"
-TERMUX_PKG_BUILD_DEPENDS="utf8cpp"
 # See https://gitlab.kitware.com/cmake/cmake/issues/18865:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBoost_NO_BOOST_CMAKE=ON
diff --git a/packages/lgogdownloader/build.sh b/packages/lgogdownloader/build.sh
index 27cc380c0..6174bebec 100644
--- a/packages/lgogdownloader/build.sh
+++ b/packages/lgogdownloader/build.sh
@@ -7,4 +7,5 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/Sude-/lgogdownloader/releases/download/v${TERMUX_PKG_VERSION}/lgogdownloader-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=2f4941f07b94f4e96557ca86f33f7d839042bbcac7535f6f9736092256d31eb5
 TERMUX_PKG_DEPENDS="boost, jsoncpp, libc++, libcurl, libhtmlcxx, libtinyxml2, rhash"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DHELP2MAN=OFF"
diff --git a/packages/libmsgpack-cxx/build.sh b/packages/libmsgpack-cxx/build.sh
index 1e7ef833d..d12f327c5 100644
--- a/packages/libmsgpack-cxx/build.sh
+++ b/packages/libmsgpack-cxx/build.sh
@@ -7,3 +7,4 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/msgpack/msgpack-c/releases/download/cpp-${TERMUX_PKG_VERSION}/msgpack-cxx-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=9b3c1803b9855b7b023d7f181f66ebb0d6941275ba41d692037e0aa27736443f
 TERMUX_PKG_DEPENDS="boost"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
diff --git a/packages/libosmium/build.sh b/packages/libosmium/build.sh
index 51e2597ac..e97b09fab 100644
--- a/packages/libosmium/build.sh
+++ b/packages/libosmium/build.sh
@@ -7,5 +7,6 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/osmcode/libosmium/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=4a7672d7caf4da3bc68619912b298462370c423c697871a0be6273c6686e10d6
 TERMUX_PKG_DEPENDS="libprotobuf, libosmpbf, libprotozero, libexpat, zlib, libbz2, boost, gdal, proj, liblz4"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_GROUPS="science"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DINSTALL_UTFCPP=ON -DBUILD_EXAMPLES=OFF -DBUILD_DATA_TESTS=OFF"
diff --git a/packages/librime/build.sh b/packages/librime/build.sh
index de5f54f53..3c1e277cc 100644
--- a/packages/librime/build.sh
+++ b/packages/librime/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/rime/librime/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=c76b937a27d7b9352c3eea9eb3adaebf70c93457104c7d47d40c006009092c20
 TERMUX_PKG_DEPENDS="boost, capnproto, google-glog, leveldb, libc++, libopencc, libyaml-cpp, marisa"
-TERMUX_PKG_BUILD_DEPENDS="gflags, openssl"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers, gflags, openssl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBUILD_TEST=OFF
 "
diff --git a/packages/libtins/build.sh b/packages/libtins/build.sh
index f36bffff2..520c779c7 100644
--- a/packages/libtins/build.sh
+++ b/packages/libtins/build.sh
@@ -8,5 +8,6 @@ TERMUX_PKG_SRCURL=https://github.com/mfontanini/libtins/archive/refs/tags/v$TERM
 TERMUX_PKG_SHA256=c70bce5a41a27258bf0e3ad535d8238fb747d909a4b87ea14620f25dd65828fd
 TRRMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="openssl, libpcap, boost"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_BREAKS="libtins-dev"
 TERMUX_PKG_REPLACES="libtins-dev"
diff --git a/packages/libtorrent-rasterbar/build.sh b/packages/libtorrent-rasterbar/build.sh
index 4bdc90fd4..e4db63c2e 100644
--- a/packages/libtorrent-rasterbar/build.sh
+++ b/packages/libtorrent-rasterbar/build.sh
@@ -7,6 +7,7 @@ TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/arvidn/libtorrent/releases/download/v${TERMUX_PKG_VERSION}/libtorrent-rasterbar-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=e965c2e53170c61c0db3a2d898a61769cb7acd541bbf157cbbef97a185930ea5
 TERMUX_PKG_DEPENDS="boost, openssl, python"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dboost-python-module-name=python
diff --git a/packages/libupscaledb/build.sh b/packages/libupscaledb/build.sh
index 0c9e8ae09..b45562683 100644
--- a/packages/libupscaledb/build.sh
+++ b/packages/libupscaledb/build.sh
@@ -10,6 +10,7 @@ TERMUX_PKG_SRCURL=https://github.com/cruppstahl/upscaledb.git
 TERMUX_PKG_GIT_BRANCH=master
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_DEPENDS="boost, libc++, libsnappy, openssl, zlib"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-simd
 --disable-java
diff --git a/packages/mkvtoolnix/build.sh b/packages/mkvtoolnix/build.sh
index 0a90c9fde..f43216272 100644
--- a/packages/mkvtoolnix/build.sh
+++ b/packages/mkvtoolnix/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://gitlab.com/mbunkus/mkvtoolnix/-/archive/release-$TERMUX_PKG_VERSION/mkvtoolnix-release-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=eca97e3da994799527b31bcf795c676dc9553949787808daa6598100f57aa221
 TERMUX_PKG_DEPENDS="boost, file, libflac, libogg, libvorbis, pcre2, zlib"
-TERMUX_PKG_BUILD_DEPENDS="fmt, libebml, libmatroska"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers, fmt, libebml, libmatroska"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-static
diff --git a/packages/monero/build.sh b/packages/monero/build.sh
index b72fcf4d1..839277c85 100644
--- a/packages/monero/build.sh
+++ b/packages/monero/build.sh
@@ -6,6 +6,7 @@ TERMUX_PKG_VERSION=0.17.3.0
 TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/monero-project/monero.git
 TERMUX_PKG_DEPENDS="boost, libprotobuf, libzmq, openssl, readline, unbound"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 
 termux_step_pre_configure() {
 	termux_setup_protobuf
diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh
index 2ccfa9319..af41b1827 100644
--- a/packages/mpd/build.sh
+++ b/packages/mpd/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=0.23.5
 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=d57aec9100539dc6bdb8b06d40114e44d765481bee6bc900d6403e7b67dc8e92
 TERMUX_PKG_DEPENDS="libc++, libcurl, libexpat, libid3tag, libopus, pulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib"
-TERMUX_PKG_BUILD_DEPENDS="boost"
+TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dalsa=disabled
 -Dao=disabled
diff --git a/packages/mpdscribble/build.sh b/packages/mpdscribble/build.sh
index 775f40a93..de91b0a4c 100644
--- a/packages/mpdscribble/build.sh
+++ b/packages/mpdscribble/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/mpdscribble/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=8b3b79538fa9871ce61d7fb793d442c72b6aadf80af4c5eb664286f613d1feee
 TERMUX_PKG_DEPENDS="libcurl, libgcrypt, mpd, libmpdclient, glib"
-TERMUX_PKG_BUILD_DEPENDS="boost"
+TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
 TERMUX_PKG_CONFFILES="etc/mpdscribble.conf"
 # mpdscribble already puts timestamps in the info printed to stdout so no need for svlogd -tt,
 # therefore we override the mpdscribble/log run script
diff --git a/packages/ncmpcpp/build.sh b/packages/ncmpcpp/build.sh
index 9952ef6c5..a1ad5d315 100644
--- a/packages/ncmpcpp/build.sh
+++ b/packages/ncmpcpp/build.sh
@@ -7,6 +7,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://rybczak.net/ncmpcpp/stable/ncmpcpp-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
 TERMUX_PKG_DEPENDS="fftw, boost, readline, libandroid-support, libc++, libcurl, libicu, libmpdclient, ncurses, zlib"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-visualizer --enable-outputs --enable-clock"
 
diff --git a/packages/openbabel/build.sh b/packages/openbabel/build.sh
index 662b55914..3696cdbab 100644
--- a/packages/openbabel/build.sh
+++ b/packages/openbabel/build.sh
@@ -7,6 +7,7 @@ TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://github.com/openbabel/openbabel/archive/openbabel-${TERMUX_PKG_VERSION//./-}.tar.gz
 TERMUX_PKG_SHA256=c97023ac6300d26176c97d4ef39957f06e68848d64f1a04b0b284ccff2744f02
 TERMUX_PKG_DEPENDS="libc++, libcairo, libxml2, eigen, boost"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_BREAKS="openbabel-dev"
 TERMUX_PKG_REPLACES="openbabel-dev"
 TERMUX_PKG_GROUPS="science"
diff --git a/packages/openfoam/build.sh b/packages/openfoam/build.sh
index c1cd2bc08..4ca5669a8 100644
--- a/packages/openfoam/build.sh
+++ b/packages/openfoam/build.sh
@@ -6,6 +6,7 @@ TERMUX_PKG_VERSION=2112
 TERMUX_PKG_SRCURL=https://develop.openfoam.com/Development/openfoam/-/archive/OpenFOAM-v${TERMUX_PKG_VERSION}/openfoam-OpenFOAM-v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=ede3e2f6d7aed50969e5b9dbc06a0667f6d69b0d76adfc53f474d9ba5bf42272
 TERMUX_PKG_DEPENDS="openmpi, flex, boost, cgal, fftw, readline, libc++"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_GROUPS="science"
 TERMUX_PKG_RM_AFTER_INSTALL="opt/OpenFOAM-v${TERMUX_PKG_VERSION}/build"
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/packages/openscad/build.sh b/packages/openscad/build.sh
index fe778ee16..63a6cb1d8 100644
--- a/packages/openscad/build.sh
+++ b/packages/openscad/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=7
 TERMUX_PKG_SRCURL=https://files.openscad.org/openscad-$TERMUX_PKG_VERSION.src.tar.gz
 TERMUX_PKG_SHA256=0a16c4263ce52380819dd91c609a719d38f12f6b8c4da0e828dcbe5b70996f59
 TERMUX_PKG_DEPENDS="boost, cgal, double-conversion, fontconfig, harfbuzz, libzip"
-TERMUX_PKG_BUILD_DEPENDS="eigen"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers, eigen"
 TERMUX_PKG_GROUPS="science"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBoost_USE_STATIC_LIBS=OFF
diff --git a/packages/osm2pgsql/build.sh b/packages/osm2pgsql/build.sh
index 5aa883994..00578d0dd 100644
--- a/packages/osm2pgsql/build.sh
+++ b/packages/osm2pgsql/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=1.6.0
 TERMUX_PKG_SRCURL=https://github.com/openstreetmap/osm2pgsql/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=0ec8b58ab972ac8356185af4161270c1b625a77299f09e5fb7f45e616ef1a9a5
 TERMUX_PKG_DEPENDS="libexpat, proj, bzip2, zlib, postgresql, lua54"
-TERMUX_PKG_BUILD_DEPENDS="boost"
+TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
 TERMUX_PKG_GROUPS="science"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DEXTERNAL_FMT=OFF
diff --git a/packages/osmium-tool/build.sh b/packages/osmium-tool/build.sh
index 50bb669b2..b75fa01c4 100644
--- a/packages/osmium-tool/build.sh
+++ b/packages/osmium-tool/build.sh
@@ -8,4 +8,5 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/osmcode/osmium-tool/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=d6273e2614d390d8444b767018b7023bdac3538cbe094d2799eee50b6f08cd03
 TERMUX_PKG_DEPENDS="libosmium, libprotozero, boost, libbz2, zlib, liblz4, libexpat"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_GROUPS="science"
diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh
index 1a46226aa..371e9c3d4 100644
--- a/packages/poppler/build.sh
+++ b/packages/poppler/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d
 TERMUX_PKG_DEPENDS="fontconfig, freetype, glib, libc++, libcairo, libcurl, libiconv, libjpeg-turbo, libpng, libtiff, littlecms, openjpeg, openjpeg-tools, zlib"
-TERMUX_PKG_BUILD_DEPENDS="boost"
+TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
 TERMUX_PKG_BREAKS="poppler-dev"
 TERMUX_PKG_REPLACES="poppler-dev"
 #texlive needs the xpdf headers
diff --git a/packages/povray/build.sh b/packages/povray/build.sh
index bcba9c59e..ddbdad971 100644
--- a/packages/povray/build.sh
+++ b/packages/povray/build.sh
@@ -7,6 +7,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/POV-Ray/povray/releases/download/v${TERMUX_PKG_VERSION}/povunix-v${TERMUX_PKG_VERSION}-src.tar.gz
 TERMUX_PKG_SHA256=4717c9bed114deec47cf04a8175cc4060dafc159f26e7896480a60f4411ca5ad
 TERMUX_PKG_DEPENDS="boost, libjpeg-turbo, libpng, libtiff, zlib"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-debug
diff --git a/packages/qrsspig/build.sh b/packages/qrsspig/build.sh
index c6ace23d3..358f838a3 100644
--- a/packages/qrsspig/build.sh
+++ b/packages/qrsspig/build.sh
@@ -7,6 +7,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://gitlab.com/hb9fxx/qrsspig/-/archive/v${TERMUX_PKG_VERSION}/qrsspig-v${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=4bf0ad0fb9351587ac9bec87d8977d210dad670e32a8fdb62b1dac7b133d79c2
 TERMUX_PKG_DEPENDS="boost, fftw, libc++, libcurl, libgd, libliquid-dsp, libssh, libyaml-cpp, pulseaudio"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/systemd"
 
 termux_step_pre_configure() {
diff --git a/packages/ravencoin/build.sh b/packages/ravencoin/build.sh
index 4882f36a7..315f53376 100644
--- a/packages/ravencoin/build.sh
+++ b/packages/ravencoin/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/RavenProject/Ravencoin/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=02e6c12220ba0f9378a3af790a57a0a6e11d7b091adfd91f555aab07341d62e3
 TERMUX_PKG_DEPENDS="boost, libevent, openssl"
-TERMUX_PKG_BUILD_DEPENDS="libdb"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers, libdb"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-tests
 --disable-wallet
diff --git a/packages/snapcast-server/build.sh b/packages/snapcast-server/build.sh
index 287190b5d..b94c44caf 100644
--- a/packages/snapcast-server/build.sh
+++ b/packages/snapcast-server/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/badaix/snapcast/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=c4e449cb693e091261727421f4965492be049632537e034fa9c59c92d091a846
 TERMUX_PKG_DEPENDS="libc++, libexpat, libflac, libopus, libsoxr, libvorbis"
-TERMUX_PKG_BUILD_DEPENDS="boost"
+TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBUILD_TESTS=OFF
 -DBoost_INCLUDE_DIR=$TERMUX_PREFIX/include
diff --git a/packages/solidity/build.sh b/packages/solidity/build.sh
index 76bee20db..57bb601c3 100644
--- a/packages/solidity/build.sh
+++ b/packages/solidity/build.sh
@@ -7,6 +7,7 @@ TERMUX_PKG_SRCURL=https://github.com/ethereum/solidity/releases/download/v${TERM
 TERMUX_PKG_SHA256=c63c2caf64feaef9fbde7c8d26e3d15aa9b159d08e7213e1e6bd3e4fd06c8308
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, jsoncpp"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DUSE_Z3=OFF
 -DUSE_CVC4=OFF
diff --git a/packages/stuntman/build.sh b/packages/stuntman/build.sh
index 3c3b0389e..931b155d8 100644
--- a/packages/stuntman/build.sh
+++ b/packages/stuntman/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=http://www.stunprotocol.org/stunserver-${TERMUX_PKG_VERSION}.tgz
 TERMUX_PKG_SHA256=4479e1ae070651dfc4836a998267c7ac2fba4f011abcfdca3b8ccd7736d4fd26
 TERMUX_PKG_DEPENDS="libc++, openssl"
-TERMUX_PKG_BUILD_DEPENDS="boost"
+TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="T=" # In case if environment variable `T` is defined
 
diff --git a/packages/taglib/build.sh b/packages/taglib/build.sh
index 3325e8306..a5fc1cf43 100644
--- a/packages/taglib/build.sh
+++ b/packages/taglib/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=1.12
 TERMUX_PKG_SRCURL=http://taglib.github.io/releases/taglib-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=7fccd07669a523b07a15bd24c8da1bbb92206cb19e9366c3692af3d79253b703
 TERMUX_PKG_DEPENDS="zlib"
-TERMUX_PKG_BUILD_DEPENDS="boost"
+TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers"
 TERMUX_PKG_BREAKS="taglib-dev"
 TERMUX_PKG_REPLACES="taglib-dev"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/taglib-config"
diff --git a/packages/tizonia/build.sh b/packages/tizonia/build.sh
index 706953d37..0054e5298 100644
--- a/packages/tizonia/build.sh
+++ b/packages/tizonia/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/tizonia/tizonia-openmax-il/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=0750cae23ed600fb4b4699a392f43a5e03dcd0870383d64da4b8c28ea94a82f8
 TERMUX_PKG_DEPENDS="boost, dbus, libandroid-wordexp, libcurl, libflac, liblog4c, libmad, libmediainfo, libmp3lame, liboggz, libopus, libsndfile, libsqlite, libuuid, libvpx, mpg123, opusfile, pulseaudio, python, taglib"
-TERMUX_PKG_BUILD_DEPENDS="libev"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers, libev"
 TERMUX_PKG_HOSTBUILD=true
 
 termux_step_host_build() {
diff --git a/packages/wasmedge/build.sh b/packages/wasmedge/build.sh
index af65a7d10..85d6d52ba 100644
--- a/packages/wasmedge/build.sh
+++ b/packages/wasmedge/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_VERSION=0.9.1
 TERMUX_PKG_SRCURL=https://github.com/WasmEdge/WasmEdge/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=b4a48bf5a009d6c4bf99479f87bf3bf8ebd6386d636fdeb721540456330dce59
 TERMUX_PKG_DEPENDS="libc++, libllvm"
-TERMUX_PKG_BUILD_DEPENDS="boost-static, libllvm-static, libpolly, lld, llvm"
+TERMUX_PKG_BUILD_DEPENDS="boost-headers, boost-static, libllvm-static, libpolly, lld, llvm"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DWASMEDGE_FORCE_DISABLE_LTO=ON
 "