diff --git a/packages/compress/7-zip/package.mk b/packages/compress/7-zip/package.mk
index 326f4e9367..8662c6ab1f 100644
--- a/packages/compress/7-zip/package.mk
+++ b/packages/compress/7-zip/package.mk
@@ -8,7 +8,7 @@ PKG_LICENSE="7-Zip"
 PKG_SITE="https://www.7-zip.org"
 PKG_URL="https://www.7-zip.org/a/7z${PKG_VERSION/./}-src.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="make:host gcc:host"
 PKG_LONGDESC="7-Zip is a file archiver with a high compression ratio"
 PKG_TAR_STRIP_COMPONENTS="--strip-components=0"
 PKG_TOOLCHAIN="manual"
diff --git a/packages/compress/bzip2/package.mk b/packages/compress/bzip2/package.mk
index ac9ac5d3ff..eb5f33f3ce 100644
--- a/packages/compress/bzip2/package.mk
+++ b/packages/compress/bzip2/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://sourceware.org/bzip2/"
 PKG_URL="https://sourceware.org/pub/bzip2/bzip2-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="make:host gcc:host"
 PKG_LONGDESC="A high-quality bzip2 data compressor."
 PKG_BUILD_FLAGS="+pic +pic:host"
 
diff --git a/packages/compress/libarchive/package.mk b/packages/compress/libarchive/package.mk
index b829ee20c0..5f4e67dd20 100644
--- a/packages/compress/libarchive/package.mk
+++ b/packages/compress/libarchive/package.mk
@@ -7,8 +7,8 @@ PKG_SHA256="63e7a7174638fc7d6b79b4c8b0ad954e0f4f45abe7239c1ecb200232aa9a43d2"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.libarchive.org"
 PKG_URL="https://www.libarchive.org/downloads/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_HOST="cmake:host ninja:host"
+PKG_DEPENDS_TARGET="cmake:host gcc:host"
 PKG_SHORTDESC="A multi-format archive and compression library."
 
 PKG_CMAKE_OPTS_TARGET="-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
diff --git a/packages/compress/lz4/package.mk b/packages/compress/lz4/package.mk
index 03537b276f..345eb5b2ca 100644
--- a/packages/compress/lz4/package.mk
+++ b/packages/compress/lz4/package.mk
@@ -7,8 +7,8 @@ PKG_SHA256="0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lz4/lz4"
 PKG_URL="https://github.com/lz4/lz4/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_HOST="cmake:host ninja:host"
+PKG_DEPENDS_TARGET="cmake:host gcc:host"
 PKG_LONGDESC="lz4 data compressor/decompressor"
 
 configure_package() {
diff --git a/packages/compress/lzo/package.mk b/packages/compress/lzo/package.mk
index dc0ed3bb7f..ceba4b88ca 100644
--- a/packages/compress/lzo/package.mk
+++ b/packages/compress/lzo/package.mk
@@ -7,8 +7,8 @@ PKG_SHA256="c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.oberhumer.com/opensource/lzo"
 PKG_URL="http://www.oberhumer.com/opensource/lzo/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_HOST="cmake:host ninja:host"
+PKG_DEPENDS_TARGET="cmake:host gcc:host"
 PKG_LONGDESC="A data compression library which is suitable for data de-/compression."
 PKG_BUILD_FLAGS="+pic"
 
diff --git a/packages/compress/xz/package.mk b/packages/compress/xz/package.mk
index 43bbe2a29b..a2aba8e348 100644
--- a/packages/compress/xz/package.mk
+++ b/packages/compress/xz/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://tukaani.org/xz/"
 PKG_URL="https://github.com/tukaani-project/xz/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="autotools:host gcc:host"
 PKG_LONGDESC="A free general-purpose data compression software with high compression ratio."
 PKG_BUILD_FLAGS="+pic +pic:host"
 PKG_TOOLCHAIN="configure"
diff --git a/packages/compress/zip/package.mk b/packages/compress/zip/package.mk
index 7f2204afd5..f485f4c5c1 100644
--- a/packages/compress/zip/package.mk
+++ b/packages/compress/zip/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369"
 PKG_LICENSE="Info-ZIP"
 PKG_SITE="http://www.info-zip.org/pub/infozip/"
 PKG_URL="${SOURCEFORGE_SRC}/infozip/Zip%203.x%20%28latest%29/3.0/${PKG_NAME}${PKG_VERSION/./}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain bzip2"
+PKG_DEPENDS_TARGET="make:host gcc:host bzip2"
 PKG_LONGDESC="A compression and file packaging utility."
 PKG_TOOLCHAIN="manual"
 
diff --git a/packages/compress/zlib/package.mk b/packages/compress/zlib/package.mk
index bc99f6fd9b..289a4d6b0c 100644
--- a/packages/compress/zlib/package.mk
+++ b/packages/compress/zlib/package.mk
@@ -8,7 +8,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.zlib.net"
 PKG_URL="https://zlib.net/fossils/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host cmake:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="cmake:host gcc:host"
 PKG_LONGDESC="A general purpose (ZIP) data compression library."
 PKG_TOOLCHAIN="cmake-make"
 
diff --git a/packages/compress/zstd/package.mk b/packages/compress/zstd/package.mk
index 6b90474ccb..092dc7340c 100644
--- a/packages/compress/zstd/package.mk
+++ b/packages/compress/zstd/package.mk
@@ -8,7 +8,7 @@ PKG_LICENSE="BSD/GPLv2"
 PKG_SITE="http://www.zstd.net"
 PKG_URL="https://github.com/facebook/zstd/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.zst"
 PKG_DEPENDS_HOST="cmake:host make:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="cmake:host gcc:host"
 PKG_LONGDESC="A fast real-time compression algorithm."
 # Override toolchain as meson and ninja are not built yet
 # and zstd is a dependency of ccache
diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk
index 45c3810f50..c168a501e6 100644
--- a/packages/databases/sqlite/package.mk
+++ b/packages/databases/sqlite/package.mk
@@ -10,7 +10,7 @@ PKG_LICENSE="PublicDomain"
 PKG_SITE="https://www.sqlite.org/"
 PKG_URL="https://www.sqlite.org/2024/${PKG_NAME}-autoconf-${PKG_VERSION_SQLITE/./0}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host"
-PKG_DEPENDS_TARGET="toolchain ncurses"
+PKG_DEPENDS_TARGET="autotools:host gcc:host ncurses"
 PKG_LONGDESC="An Embeddable SQL Database Engine."
 # libsqlite3.a(sqlite3.o): requires dynamic R_X86_64_PC32 reloc against 'sqlite3_stricmp' which may overflow at runtime
 PKG_BUILD_FLAGS="+pic +pic:host -parallel"
diff --git a/packages/debug/libunwind/package.mk b/packages/debug/libunwind/package.mk
index e05fffdebd..5877a0207b 100644
--- a/packages/debug/libunwind/package.mk
+++ b/packages/debug/libunwind/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="38833b7b1582db7d76485a62a213706c9252b3dab7380069fea5824e823d8e41"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.nongnu.org/libunwind/"
 PKG_URL="https://github.com/libunwind/libunwind/archive/refs/tags/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain zlib"
+PKG_DEPENDS_TARGET="autotools:host gcc:host zlib"
 PKG_LONGDESC="library to determine the call-chain of a program"
 PKG_BUILD_FLAGS="+pic"
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/devel/attr/package.mk b/packages/devel/attr/package.mk
index 051a9ab9c1..fadb689a84 100644
--- a/packages/devel/attr/package.mk
+++ b/packages/devel/attr/package.mk
@@ -9,7 +9,7 @@ PKG_SHA256="39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87"
 PKG_LICENSE="GPL"
 PKG_SITE="https://savannah.nongnu.org/projects/attr"
 PKG_URL="http://download.savannah.nongnu.org/releases/attr/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="autotools:host gcc:host"
 PKG_LONGDESC="Extended Attributes Of Filesystem Objects."
 PKG_BUILD_FLAGS="+pic"
 
diff --git a/packages/devel/gettext/package.mk b/packages/devel/gettext/package.mk
index e35c091609..aef05453ee 100644
--- a/packages/devel/gettext/package.mk
+++ b/packages/devel/gettext/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://www.gnu.org/s/gettext/"
 PKG_URL="https://ftp.gnu.org/pub/gnu/gettext/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="make:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="autotools:host make:host gcc:host"
 PKG_LONGDESC="A program internationalization library and tools."
 PKG_BUILD_FLAGS="+local-cc"
 
diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk
index d9e3f46c67..d5f741cd58 100644
--- a/packages/devel/glib/package.mk
+++ b/packages/devel/glib/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="LGPL"
 PKG_SITE="https://www.gtk.org/"
 PKG_URL="https://download.gnome.org/sources/glib/$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="libffi:host pcre2:host Python3:host meson:host ninja:host"
-PKG_DEPENDS_TARGET="toolchain glib:host libffi pcre2 Python3:host util-linux zlib"
+PKG_DEPENDS_TARGET="meson:host ninja:host gcc:host glib:host libffi pcre2 Python3:host util-linux zlib"
 PKG_LONGDESC="A library which includes support routines for C such as lists, trees, hashes, memory allocation."
 
 PKG_MESON_OPTS_HOST="-Ddefault_library=static \
diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk
index c3bbb78ced..ee3b0c797e 100644
--- a/packages/devel/glibc/package.mk
+++ b/packages/devel/glibc/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="f77bd47cf8170c57365ae7bf86696c118adb3b120d3259c64c502d3dc1e2d926"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.gnu.org/software/libc/"
 PKG_URL="https://ftp.gnu.org/pub/gnu/glibc/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="ccache:host autotools:host linux:host gcc:bootstrap pigz:host Python3:host"
+PKG_DEPENDS_TARGET="ccache:host autotools:host linux:host gcc:bootstrap Python3:host"
 PKG_DEPENDS_INIT="glibc"
 PKG_LONGDESC="The Glibc package contains the main C library."
 PKG_BUILD_FLAGS="+bfd"
diff --git a/packages/devel/gmp/package.mk b/packages/devel/gmp/package.mk
index ff5a6c2d6c..a9177c79ee 100644
--- a/packages/devel/gmp/package.mk
+++ b/packages/devel/gmp/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="LGPLv3+"
 PKG_SITE="http://gmplib.org/"
 PKG_URL="https://gmplib.org/download/gmp/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host m4:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="autotools:host gcc:host"
 PKG_LONGDESC="A library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers."
 PKG_BUILD_FLAGS="+pic:host"
 
diff --git a/packages/devel/heimdal/package.mk b/packages/devel/heimdal/package.mk
index f3c1202ffa..59cce1116b 100644
--- a/packages/devel/heimdal/package.mk
+++ b/packages/devel/heimdal/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="2576c5e2d793db53c86e108fd117b278437bb02d6c6db2bec4d1b86958f1980a"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="http://www.h5l.org/"
 PKG_URL="https://github.com/heimdal/heimdal/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="toolchain:host Python3:host ncurses:host asn1c:host"
+PKG_DEPENDS_HOST="autotools:host Python3:host ncurses:host asn1c:host flex:host"
 PKG_LONGDESC="Kerberos 5, PKIX, CMS, GSS-API, SPNEGO, NTLM, Digest-MD5 and, SASL implementation."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="-parallel"
diff --git a/packages/devel/libaio/package.mk b/packages/devel/libaio/package.mk
index bf1f6f0cfe..5ea574884e 100644
--- a/packages/devel/libaio/package.mk
+++ b/packages/devel/libaio/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="716c7059703247344eb066b54ecbc3ca2134f0103307192e6c2b7dab5f9528ab"
 PKG_LICENSE="GPL"
 PKG_SITE="https://pagure.io/libaio"
 PKG_URL="https://pagure.io/${PKG_NAME}/archive/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="make:host gcc:host"
 PKG_LONGDESC="Kernel Asynchronous I/O (AIO) Support for Linux."
 
 make_target() {
diff --git a/packages/devel/libcap/package.mk b/packages/devel/libcap/package.mk
index f4e1211fc3..cd6afe926a 100644
--- a/packages/devel/libcap/package.mk
+++ b/packages/devel/libcap/package.mk
@@ -10,7 +10,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://git.kernel.org/pub/scm/libs/libcap/libcap.git/log/"
 PKG_URL="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="make:host gcc:host"
 PKG_LONGDESC="A library for getting and setting POSIX.1e capabilities."
 PKG_BUILD_FLAGS="+pic"
 
diff --git a/packages/devel/libdaemon/package.mk b/packages/devel/libdaemon/package.mk
index 076a34ee53..1dc8790b76 100644
--- a/packages/devel/libdaemon/package.mk
+++ b/packages/devel/libdaemon/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834"
 PKG_LICENSE="GPL"
 PKG_SITE="http://0pointer.de/lennart/projects/libdaemon/"
 PKG_URL="http://0pointer.de/lennart/projects/libdaemon/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="autotools:host make:host sed:host gcc:host"
 PKG_LONGDESC="A lightweight C library which eases the writing of UNIX daemons."
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_setpgrp_void=no \
diff --git a/packages/devel/libffi/package.mk b/packages/devel/libffi/package.mk
index 513e2c024c..1553994a88 100644
--- a/packages/devel/libffi/package.mk
+++ b/packages/devel/libffi/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://sourceware.org/${PKG_NAME}/"
 PKG_URL="https://github.com/libffi/libffi/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host libtool:host pkg-config:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="autotools:host gcc:host"
 PKG_LONGDESC="Foreign Function Interface Library."
 PKG_TOOLCHAIN="autotools"
 
diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk
index 31e8ac699a..1d77598f0a 100644
--- a/packages/devel/ncurses/package.mk
+++ b/packages/devel/ncurses/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="MIT"
 PKG_SITE="http://www.gnu.org/software/ncurses/"
 PKG_URL="http://invisible-mirror.net/archives/ncurses/ncurses-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_DEPENDS_TARGET="toolchain zlib ncurses:host"
+PKG_DEPENDS_TARGET="autotools:host gcc:host zlib ncurses:host"
 PKG_LONGDESC="A library is a free software emulation of curses in System V Release 4.0, and more."
 PKG_BUILD_FLAGS="+pic"
 
diff --git a/packages/devel/patchelf/package.mk b/packages/devel/patchelf/package.mk
index 62951b7a79..7c8c66aea6 100644
--- a/packages/devel/patchelf/package.mk
+++ b/packages/devel/patchelf/package.mk
@@ -7,6 +7,6 @@ PKG_SHA256="1952b2a782ba576279c211ee942e341748fdb44997f704dd53def46cd055470b"
 PKG_LICENSE="GPL-3.0-or-later"
 PKG_SITE="https://github.com/NixOS/patchelf"
 PKG_URL="https://github.com/NixOS/patchelf/releases/download/${PKG_VERSION}/patchelf-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_HOST="toolchain:host"
+PKG_DEPENDS_HOST="autotools:host"
 PKG_LONGDESC="A small utility to modify the dynamic linker and RPATH of ELF executables"
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/devel/pax-utils/package.mk b/packages/devel/pax-utils/package.mk
index 329bcfaecd..44aaca32d2 100644
--- a/packages/devel/pax-utils/package.mk
+++ b/packages/devel/pax-utils/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="907fdcfc6c6c2913a8e42847f8096027b0a953b9344208d14daf2324fd711638"
 PKG_LICENSE="GPL-2.0"
 PKG_SITE="https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities"
 PKG_URL="https://gitweb.gentoo.org/proj/pax-utils.git/snapshot/pax-utils-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_HOST="toolchain:host"
+PKG_DEPENDS_HOST="meson:host ninja:host"
 PKG_LONGDESC="ELF utils that can check files for security relevant properties"
 
 PKG_MESON_OPTS_HOST="-Duse_libcap=disabled"
diff --git a/packages/devel/pcre2/package.mk b/packages/devel/pcre2/package.mk
index de07fbdd07..9185c0a922 100644
--- a/packages/devel/pcre2/package.mk
+++ b/packages/devel/pcre2/package.mk
@@ -7,8 +7,8 @@ PKG_SHA256="d34f02e113cf7193a1ebf2770d3ac527088d485d4e047ed10e5d217c6ef5de96"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.pcre.org/"
 PKG_URL="https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PKG_VERSION}/pcre2-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain pcre2:host"
+PKG_DEPENDS_HOST="cmake:host ninja:host"
+PKG_DEPENDS_TARGET="cmake:host ninja:host gcc:host pcre2:host"
 PKG_LONGDESC="A set of functions that implement regular expression pattern matching using the same syntax."
 PKG_BUILD_FLAGS="+pic"
 
diff --git a/packages/devel/popt/package.mk b/packages/devel/popt/package.mk
index 75ba06e3b1..a05a71a86e 100644
--- a/packages/devel/popt/package.mk
+++ b/packages/devel/popt/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/rpm-software-management/popt"
 PKG_URL="http://ftp.rpm.org/popt/releases/popt-1.x/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="cmake:host gcc:host"
 PKG_LONGDESC="The popt library exists essentially for parsing command-line options."
 
 pre_configure_target() {
diff --git a/packages/devel/readline/package.mk b/packages/devel/readline/package.mk
index b44e04f822..8e8f01c471 100644
--- a/packages/devel/readline/package.mk
+++ b/packages/devel/readline/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.gnu.org/software/readline/"
 PKG_URL="http://ftpmirror.gnu.org/readline/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain ncurses"
+PKG_DEPENDS_TARGET="autotools:host gcc:host ncurses"
 PKG_LONGDESC="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in."
 PKG_BUILD_FLAGS="+pic"
 
diff --git a/packages/lang/Python3/package.mk b/packages/lang/Python3/package.mk
index e836c383ac..c2c80d8b01 100644
--- a/packages/lang/Python3/package.mk
+++ b/packages/lang/Python3/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="https://www.python.org/"
 PKG_URL="https://www.python.org/ftp/python/${PKG_VERSION}/${PKG_NAME::-1}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="zlib:host bzip2:host libffi:host util-linux:host xz:host autoconf-archive:host"
-PKG_DEPENDS_TARGET="toolchain Python3:host sqlite expat zlib bzip2 xz openssl libffi readline ncurses util-linux"
+PKG_DEPENDS_TARGET="autotools:host gcc:host Python3:host sqlite expat zlib bzip2 xz openssl libffi readline ncurses util-linux"
 PKG_LONGDESC="Python3 is an interpreted object-oriented programming language."
 PKG_TOOLCHAIN="autotools"
 
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 0d443ef4d9..1db974c8de 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -62,6 +62,10 @@ if [[ "${KERNEL_TARGET}" = uImage* ]]; then
   PKG_DEPENDS_TARGET+=" u-boot-tools:host"
 fi
 
+if [ "${BOOTLOADER}" = "bcm2835-bootloader" -a "${TARGET_KERNEL_ARCH}" = "arm64" ]; then
+  PKG_DEPENDS_TARGET+=" pigz:host"
+fi
+
 # Ensure that the dependencies of initramfs:target are built correctly, but
 # we don't want to add initramfs:target as a direct dependency as we install
 # this "manually" from within linux:target
diff --git a/packages/network/avahi/package.mk b/packages/network/avahi/package.mk
index e0305ee755..a1b0705340 100644
--- a/packages/network/avahi/package.mk
+++ b/packages/network/avahi/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="c15e750ef7c6df595fb5f2ce10cac0fee2353649600e6919ad08ae8871e4945f"
 PKG_LICENSE="GPL"
 PKG_SITE="http://avahi.org/"
 PKG_URL="https://github.com/lathiat/avahi/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain expat libdaemon dbus connman gettext"
+PKG_DEPENDS_TARGET="autotools:host gcc:host expat libdaemon dbus connman gettext"
 PKG_LONGDESC="Service Discovery for Linux using mDNS/DNS-SD, compatible with Bonjour."
 PKG_TOOLCHAIN="configure"
 
diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk
index c5ced46a23..c9b458113f 100644
--- a/packages/network/connman/package.mk
+++ b/packages/network/connman/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="680320f1c3de0c283b2df0d61807cd0ca88e012dc3ec906a0414b20a5866f19d"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.connman.net"
 PKG_URL="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain dbus glib iptables iwd readline"
+PKG_DEPENDS_TARGET="autotools:host gcc:host dbus glib iptables iwd readline"
 PKG_LONGDESC="A modular network connection manager."
 PKG_TOOLCHAIN="autotools"
 
diff --git a/packages/network/iptables/package.mk b/packages/network/iptables/package.mk
index 394d235deb..5e68070eab 100644
--- a/packages/network/iptables/package.mk
+++ b/packages/network/iptables/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.netfilter.org/"
 PKG_URL="https://www.netfilter.org/projects/iptables/files/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain linux:host libmnl libnftnl"
+PKG_DEPENDS_TARGET="autotools:host gcc:host linux:host libmnl libnftnl"
 PKG_LONGDESC="IP packet filter administration."
 PKG_TOOLCHAIN="autotools"
 
diff --git a/packages/network/iwd/package.mk b/packages/network/iwd/package.mk
index 7c40bf45f1..c37b15ddd7 100644
--- a/packages/network/iwd/package.mk
+++ b/packages/network/iwd/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="100d029171d161411f6cd8e1f95708e3a4351fb19e6847ba04819377b5fed13e"
 PKG_LICENSE="GPL"
 PKG_SITE="https://git.kernel.org/cgit/network/wireless/iwd.git/about/"
 PKG_URL="https://www.kernel.org/pub/linux/network/wireless/iwd-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain readline dbus"
+PKG_DEPENDS_TARGET="autotools:host gcc:host readline dbus"
 PKG_LONGDESC="Wireless daemon for Linux"
 PKG_TOOLCHAIN="autotools"
 
diff --git a/packages/network/libmnl/package.mk b/packages/network/libmnl/package.mk
index 0dd46cb41d..08a0821e10 100644
--- a/packages/network/libmnl/package.mk
+++ b/packages/network/libmnl/package.mk
@@ -8,5 +8,5 @@ PKG_SHA256="274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525"
 PKG_LICENSE="GPL"
 PKG_SITE="http://netfilter.org/projects/libmnl"
 PKG_URL="http://netfilter.org/projects/libmnl/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="autotools:host gcc:host"
 PKG_LONGDESC="A minimalistic user-space library oriented to Netlink developers."
diff --git a/packages/network/libnftnl/package.mk b/packages/network/libnftnl/package.mk
index 2c0eac4004..cce3eaadea 100644
--- a/packages/network/libnftnl/package.mk
+++ b/packages/network/libnftnl/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="ceeaea2cd92147da19f13a35a7f1a4bc2767ff897e838e4b479cf54b59c777f4"
 PKG_LICENSE="GPL"
 PKG_SITE="https://netfilter.org/projects/libnftnl"
 PKG_URL="https://netfilter.org/projects/libnftnl/files/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libmnl"
+PKG_DEPENDS_TARGET="autotools:host gcc:host libmnl"
 PKG_LONGDESC="A userspace library providing a low-level netlink programming interface (API) to the in-kernel nf_tables subsystem."
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk
index cfadc4159e..bf2be76d80 100644
--- a/packages/network/samba/package.mk
+++ b/packages/network/samba/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="f969ffed58ccf3e85cbbcc0e33a1726d025c2b40f42a653b1125b82b92d2e0e5"
 PKG_LICENSE="GPLv3+"
 PKG_SITE="https://www.samba.org"
 PKG_URL="https://download.samba.org/pub/samba/stable/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain attr heimdal:host e2fsprogs Python3 libunwind zlib readline popt libaio connman gnutls wsdd2"
+PKG_DEPENDS_TARGET="autotools:host gcc:host attr heimdal:host e2fsprogs Python3 libunwind zlib readline popt libaio connman gnutls wsdd2"
 PKG_NEED_UNPACK="$(get_pkg_directory heimdal) $(get_pkg_directory e2fsprogs)"
 PKG_LONGDESC="A free SMB / CIFS fileserver and client."
 
diff --git a/packages/network/wsdd2/package.mk b/packages/network/wsdd2/package.mk
index e634655fc7..eaf378a115 100644
--- a/packages/network/wsdd2/package.mk
+++ b/packages/network/wsdd2/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="b0b6b31522f4a5e39d075b31d59d57af9a567f543e0b39b2fbdfec324d30310a"
 PKG_LICENSE="GPL 3.0"
 PKG_SITE="https://github.com/Netgear/wsdd2/"
 PKG_URL="https://github.com/Netgear/wsdd2/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="make:host gcc:host"
 PKG_LONGDESC="WSD/LLMNR Discovery/Name Service Daemon"
 PKG_BUILD_FLAGS="+size"
 
diff --git a/packages/security/gnutls/package.mk b/packages/security/gnutls/package.mk
index f1b9b763d2..6f0bcc7835 100644
--- a/packages/security/gnutls/package.mk
+++ b/packages/security/gnutls/package.mk
@@ -8,8 +8,8 @@ PKG_SHA256="66269a2cfe0e1c2dabec87bdbbd8ab656f396edd9a40dd006978e003cfa52bfc"
 PKG_LICENSE="LGPL2.1"
 PKG_SITE="https://gnutls.org"
 PKG_URL="https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKG_VERSION:0:3}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_HOST="toolchain:host libidn2:host nettle:host zlib:host"
-PKG_DEPENDS_TARGET="toolchain libidn2 nettle zlib"
+PKG_DEPENDS_HOST="autotools:host libidn2:host nettle:host zlib:host"
+PKG_DEPENDS_TARGET="autotools:host gcc:host libidn2 nettle zlib"
 PKG_LONGDESC="A library which provides a secure layer over a reliable transport layer."
 
 PKG_CONFIGURE_OPTS_COMMON="--disable-doc \
diff --git a/packages/security/libgcrypt/package.mk b/packages/security/libgcrypt/package.mk
index 47fb1d1694..ebe47527e2 100644
--- a/packages/security/libgcrypt/package.mk
+++ b/packages/security/libgcrypt/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://www.gnupg.org/"
 PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgcrypt/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain libgpg-error"
+PKG_DEPENDS_TARGET="autotools:host gcc:host libgpg-error"
 PKG_LONGDESC="A General purpose cryptographic library."
 PKG_TOOLCHAIN="autotools"
 # libgcrypt-1.7.x fails to build with LTO support
diff --git a/packages/security/libgpg-error/package.mk b/packages/security/libgpg-error/package.mk
index a1092632c7..d98a18abac 100644
--- a/packages/security/libgpg-error/package.mk
+++ b/packages/security/libgpg-error/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://www.gnupg.org"
 PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgpg-error/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="autotools:host gcc:host"
 PKG_LONGDESC="A library that defines common error values for all GnuPG components."
 
 pre_configure_target() {
diff --git a/packages/security/nettle/package.mk b/packages/security/nettle/package.mk
index 219d614599..e698b33be8 100644
--- a/packages/security/nettle/package.mk
+++ b/packages/security/nettle/package.mk
@@ -8,8 +8,8 @@ PKG_SHA256="b4c518adb174e484cb4acea54118f02380c7133771e7e9beb98a0787194ee47c"
 PKG_LICENSE="GPL2"
 PKG_SITE="http://www.lysator.liu.se/~nisse/nettle"
 PKG_URL="https://ftp.gnu.org/gnu/nettle/nettle-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="toolchain:host gmp:host"
-PKG_DEPENDS_TARGET="toolchain gmp"
+PKG_DEPENDS_HOST="autotools:host gmp:host"
+PKG_DEPENDS_TARGET="autotools:host gcc:host gmp"
 PKG_LONGDESC="A low-level cryptographic library."
 
 PKG_CONFIGURE_OPTS_COMMON="--disable-documentation \
diff --git a/packages/security/nspr/package.mk b/packages/security/nspr/package.mk
index 80cc8ab769..299c1190ef 100644
--- a/packages/security/nspr/package.mk
+++ b/packages/security/nspr/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="4.35"
 PKG_LICENSE="Mozilla Public License"
 PKG_SITE="http://www.linuxfromscratch.org/blfs/view/svn/general/nspr.html"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_DEPENDS_TARGET="toolchain nss:host nspr:host"
+PKG_DEPENDS_TARGET="autotools:host gcc:host nss:host nspr:host"
 PKG_DEPENDS_UNPACK="nss"
 PKG_LONGDESC="Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions"
 PKG_TOOLCHAIN="configure"
diff --git a/packages/security/nss/package.mk b/packages/security/nss/package.mk
index bd26dbeac1..67893318d5 100644
--- a/packages/security/nss/package.mk
+++ b/packages/security/nss/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="Mozilla Public License"
 PKG_SITE="http://ftp.mozilla.org/"
 PKG_URL="https://ftp.mozilla.org/pub/security/nss/releases/NSS_${PKG_VERSION//./_}_RTM/src/nss-${PKG_VERSION}-with-nspr-$(get_pkg_version nspr).tar.gz"
 PKG_DEPENDS_HOST="nspr:host zlib:host"
-PKG_DEPENDS_TARGET="toolchain nss:host nspr zlib sqlite"
+PKG_DEPENDS_TARGET="make:host gcc:host nss:host nspr zlib sqlite"
 PKG_LONGDESC="The Network Security Services (NSS) package is a set of libraries designed to support cross-platform development of security-enabled client and server applications"
 PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="-parallel"
diff --git a/packages/security/openssl/package.mk b/packages/security/openssl/package.mk
index dddc4bce38..098a2c5d7e 100644
--- a/packages/security/openssl/package.mk
+++ b/packages/security/openssl/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://www.openssl.org"
 PKG_URL="https://www.openssl.org/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="autotools:host gcc:host"
 PKG_LONGDESC="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security"
 PKG_TOOLCHAIN="configure"
 
diff --git a/packages/sysutils/dbus/package.mk b/packages/sysutils/dbus/package.mk
index aede094817..8f89ebffbc 100644
--- a/packages/sysutils/dbus/package.mk
+++ b/packages/sysutils/dbus/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="84fc597e6ec82f05dc18a7d12c17046f95bad7be99fc03c15bc254c4701ed204"
 PKG_LICENSE="GPL"
 PKG_SITE="https://dbus.freedesktop.org"
 PKG_URL="https://dbus.freedesktop.org/releases/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain expat systemd"
+PKG_DEPENDS_TARGET="meson:host gcc:host expat systemd"
 PKG_LONGDESC="D-Bus is a message bus, used for sending messages between applications."
 
 PKG_MESON_OPTS_TARGET="--libexecdir=/usr/lib/dbus \
diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk
index b602cb0b6c..67235cdc49 100644
--- a/packages/sysutils/e2fsprogs/package.mk
+++ b/packages/sysutils/e2fsprogs/package.mk
@@ -8,9 +8,9 @@ PKG_SHA256="5a33dc047fd47284bca4bb10c13cfe7896377ae3d01cb81a05d406025d99e0d1"
 PKG_LICENSE="GPL"
 PKG_SITE="http://e2fsprogs.sourceforge.net/"
 PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/${PKG_NAME}/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_DEPENDS_INIT="toolchain"
+PKG_DEPENDS_HOST="autotools:host"
+PKG_DEPENDS_TARGET="autotools:host gcc:host"
+PKG_DEPENDS_INIT="autotools:host gcc:host"
 PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs, dumpe2fs, fsck, and others."
 PKG_BUILD_FLAGS="-parallel"
 
diff --git a/packages/sysutils/entropy/package.mk b/packages/sysutils/entropy/package.mk
index 758ebffaad..defaecba16 100644
--- a/packages/sysutils/entropy/package.mk
+++ b/packages/sysutils/entropy/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0"
 PKG_LICENSE="GPL"
 PKG_SITE=""
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET=""
 PKG_LONGDESC="A simple way to add entropy at boot"
 PKG_TOOLCHAIN="manual"
 
diff --git a/packages/sysutils/kmod/package.mk b/packages/sysutils/kmod/package.mk
index eaefe47630..e957093e40 100644
--- a/packages/sysutils/kmod/package.mk
+++ b/packages/sysutils/kmod/package.mk
@@ -7,8 +7,8 @@ PKG_SHA256="630ed0d92275a88cb9a7bf68f5700e911fdadaf02e051cf2e4680ff8480bd492"
 PKG_LICENSE="GPL"
 PKG_SITE="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git"
 PKG_URL="https://www.kernel.org/pub/linux/utils/kernel/kmod/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_HOST="autotools:host"
+PKG_DEPENDS_TARGET="autotools:host gcc:host"
 PKG_LONGDESC="kmod offers the needed flexibility and fine grained control over insertion, removal, configuration and listing of kernel modules."
 
 PKG_CONFIGURE_OPTS_HOST="--enable-tools \
diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk
index 921305ca46..c52abf194d 100644
--- a/packages/sysutils/systemd/package.mk
+++ b/packages/sysutils/systemd/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="9c9243209e5b1bf429fc213ade6111a95769531a3a741bdf01c8a5dbeeab9f8a"
 PKG_LICENSE="LGPL2.1+"
 PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
 PKG_URL="https://github.com/systemd/systemd/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux entropy libidn2 wait-time-sync Jinja2:host"
+PKG_DEPENDS_TARGET="meson:host ninja:host gcc:host libcap kmod util-linux entropy libidn2 wait-time-sync Jinja2:host"
 PKG_LONGDESC="A system and session manager for Linux, compatible with SysV and LSB init scripts."
 
 PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk
index 4c415bed35..da83b4898e 100644
--- a/packages/sysutils/util-linux/package.mk
+++ b/packages/sysutils/util-linux/package.mk
@@ -8,8 +8,8 @@ PKG_SHA256="d57a626081f9ead02fa44c63a6af162ec19c58f53e993f206ab7c3a6641c2cd7"
 PKG_LICENSE="GPL"
 PKG_URL="https://www.kernel.org/pub/linux/utils/util-linux/v$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host intltool:host libtool:host pkg-config:host"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_DEPENDS_INIT="toolchain"
+PKG_DEPENDS_TARGET="autotools:host gcc:host"
+PKG_DEPENDS_INIT="autotools:host gcc:host"
 PKG_LONGDESC="A large variety of low-level system utilities that are necessary for a Linux system to function."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="+pic:host"
diff --git a/packages/sysutils/wait-time-sync/package.mk b/packages/sysutils/wait-time-sync/package.mk
index b45468f08b..bf0066ee93 100644
--- a/packages/sysutils/wait-time-sync/package.mk
+++ b/packages/sysutils/wait-time-sync/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.0"
 PKG_LICENSE="GPL"
 PKG_SITE=""
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="make:host gcc:host"
 PKG_LONGDESC="A simple tool and systemd service to wait until NTP time is synced"
 
 
diff --git a/packages/textproc/expat/package.mk b/packages/textproc/expat/package.mk
index 8180520895..2542f84f56 100644
--- a/packages/textproc/expat/package.mk
+++ b/packages/textproc/expat/package.mk
@@ -8,8 +8,8 @@ PKG_SHA256="ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364"
 PKG_LICENSE="OSS"
 PKG_SITE="https://libexpat.github.io"
 PKG_URL="https://github.com/libexpat/libexpat/releases/download/R_${PKG_VERSION//./_}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_HOST="cmake:host ninja:host"
+PKG_DEPENDS_TARGET="cmake:host ninja:host gcc:host"
 PKG_LONGDESC="Expat is an XML parser library written in C."
 
 PKG_CMAKE_OPTS_TARGET="-DEXPAT_BUILD_DOCS=OFF \
@@ -17,6 +17,7 @@ PKG_CMAKE_OPTS_TARGET="-DEXPAT_BUILD_DOCS=OFF \
                        -DEXPAT_BUILD_EXAMPLES=OFF \
                        -DEXPAT_BUILD_TESTS=OFF \
                        -DEXPAT_SHARED_LIBS=ON"
+
 PKG_CMAKE_OPTS_HOST="-DEXPAT_BUILD_DOCS=OFF \
                      -DEXPAT_BUILD_TOOLS=OFF \
                      -DEXPAT_BUILD_EXAMPLES=OFF \
diff --git a/packages/textproc/libidn2/package.mk b/packages/textproc/libidn2/package.mk
index 2490965385..1288827b3b 100644
--- a/packages/textproc/libidn2/package.mk
+++ b/packages/textproc/libidn2/package.mk
@@ -7,8 +7,8 @@ PKG_SHA256="4c21a791b610b9519b9d0e12b8097bf2f359b12f8dd92647611a929e6bfd7d64"
 PKG_LICENSE="LGPL3"
 PKG_SITE="https://www.gnu.org/software/libidn/"
 PKG_URL="https://ftpmirror.gnu.org/gnu/libidn/libidn2-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_HOST="autotools:host"
+PKG_DEPENDS_TARGET="autotools:host gcc:host"
 PKG_LONGDESC="Free software implementation of IDNA2008, Punycode and TR46."
 
 PKG_CONFIGURE_OPTS_COMMON="--disable-doc \
diff --git a/packages/tools/bcm2835-utils/package.mk b/packages/tools/bcm2835-utils/package.mk
index 25c5d783b3..6678e8b0ec 100644
--- a/packages/tools/bcm2835-utils/package.mk
+++ b/packages/tools/bcm2835-utils/package.mk
@@ -8,7 +8,7 @@ PKG_ARCH="arm aarch64"
 PKG_LICENSE="BSD-3-Clause"
 PKG_SITE="https://github.com/raspberrypi/utils"
 PKG_URL="https://github.com/raspberrypi/utils/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain dtc"
+PKG_DEPENDS_TARGET="cmake:host gcc:host dtc"
 PKG_LONGDESC="Raspberry Pi related collection of scripts and simple applications"
 
 makeinstall_target() {
diff --git a/packages/tools/dtc/package.mk b/packages/tools/dtc/package.mk
index 09ec2e782d..ce91827d8c 100644
--- a/packages/tools/dtc/package.mk
+++ b/packages/tools/dtc/package.mk
@@ -8,8 +8,8 @@ PKG_SHA256="8bca9b594702267d84453e530cc974b7f8e06aea7e60d65614d4bf23be3167d2"
 PKG_LICENSE="GPL"
 PKG_SITE="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
 PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_HOST="make:host flex:host ninja:host"
+PKG_DEPENDS_TARGET="make:host gcc:host ninja:host"
 PKG_LONGDESC="The Device Tree Compiler"
 PKG_TOOLCHAIN="make"
 
diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk
index 005bb7cf23..04dac096a7 100644
--- a/packages/virtual/image/package.mk
+++ b/packages/virtual/image/package.mk
@@ -4,7 +4,7 @@
 PKG_NAME="image"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
-PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware ${BOOTLOADER} busybox util-linux corefonts network misc-packages debug exfatprogs"
+PKG_DEPENDS_TARGET="toolchain squashfs-tools:host pigz:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware ${BOOTLOADER} busybox util-linux corefonts network misc-packages debug exfatprogs"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Root package used to build and create complete image"
 
diff --git a/packages/virtual/toolchain/package.mk b/packages/virtual/toolchain/package.mk
index a0c205c21b..6d48ca460d 100644
--- a/packages/virtual/toolchain/package.mk
+++ b/packages/virtual/toolchain/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION=""
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_HOST="7-zip:host autoconf:host autoconf-archive:host automake:host bison:host configtools:host cmake:host flex:host intltool:host libtool:host ninja:host make:host meson:host openssl:host pigz:host sed:host xmlstarlet:host xz:host"
+PKG_DEPENDS_HOST="7-zip:host autoconf:host autoconf-archive:host automake:host bison:host configtools:host cmake:host flex:host intltool:host libtool:host ninja:host make:host meson:host openssl:host sed:host xmlstarlet:host xz:host"
 PKG_DEPENDS_TARGET="toolchain:host gcc:host patchelf:host pax-utils:host"
 PKG_SECTION="virtual"
 PKG_LONGDESC="LibreELEC.tv' toolchain to compile all packages"