diff --git a/pkg/bash/build b/pkg/bash/build
index 3d230ee..f15bb2c 100755
--- a/pkg/bash/build
+++ b/pkg/bash/build
@@ -3,7 +3,7 @@ SRCDIR="bash-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/bash/"
 SHA256SUM="b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d"
-DEPENDS="ncurses-dev readline-dev crt-dev basefiles"
+DEPENDS="ncurses-dev readline-dev toolchain"
 SUBPKG="bash bash-dev"
 
 prepare() {
diff --git a/pkg/btrfs-progs/build b/pkg/btrfs-progs/build
index b6e3c2b..ca88d1a 100755
--- a/pkg/btrfs-progs/build
+++ b/pkg/btrfs-progs/build
@@ -3,7 +3,7 @@ SRCDIR="btrfs-progs-v${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs"
 SHA256SUM="890f8b7e162f2bbfaa5c7b23e8b6f791fd3f325239a0510871fa4b45e4a80e7c"
-DEPENDS="libuuid-dev libblkid-dev zlib-dev lzo-dev crt-dev"
+DEPENDS="libuuid-dev libblkid-dev zlib-dev lzo-dev toolchain"
 SUBPKG="btrfs-progs-dev btrfs-progs"
 
 prepare() {
diff --git a/pkg/expat/build b/pkg/expat/build
index 1bf2612..a252e4e 100644
--- a/pkg/expat/build
+++ b/pkg/expat/build
@@ -3,7 +3,7 @@ SRCDIR="libexpat-${VERSION}/expat"
 TARBALL="${VERSION}.tar.gz"
 URL="https://github.com/libexpat/libexpat/archive"
 SHA256SUM="574499cba22a599393e28d99ecfa1e7fc85be7d6651d543045244d5b561cb7ff"
-DEPENDS="libbsd-dev crt-dev"
+DEPENDS="libbsd-dev toolchain"
 SUBPKG="expat expat-dev"
 
 prepare() {
diff --git a/pkg/file/build b/pkg/file/build
index bf989ff..8c664aa 100755
--- a/pkg/file/build
+++ b/pkg/file/build
@@ -3,7 +3,7 @@ SRCDIR="file-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="ftp://ftp.astron.com/pub/file"
 SHA256SUM="fb608290c0fd2405a8f63e5717abf6d03e22e183fb21884413d1edd918184379"
-DEPENDS="zlib-dev crt-dev"
+DEPENDS="zlib-dev toolchain"
 SUBPKG="file file-dev"
 
 prepare() {
diff --git a/pkg/gmp/build b/pkg/gmp/build
index 7fecb38..5cf3573 100755
--- a/pkg/gmp/build
+++ b/pkg/gmp/build
@@ -3,7 +3,7 @@ SRCDIR="gmp-$VERSION"
 TARBALL="gmp-$VERSION.tar.bz2"
 URL="http://ftp.gnu.org/gnu/gmp"
 SHA256SUM="5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2"
-DEPENDS="toolchain libstdc++-dev"
+DEPENDS="toolchain"
 SUBPKG="gmp gmp-dev gmp++ gmp++-dev"
 
 prepare() {
diff --git a/pkg/hostapd/build b/pkg/hostapd/build
index 0464eda..3dc5c6a 100755
--- a/pkg/hostapd/build
+++ b/pkg/hostapd/build
@@ -3,7 +3,7 @@ SRCDIR="hostapd-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://w1.fi/releases/"
 SHA256SUM="21b0dda3cc3abe75849437f6b9746da461f88f0ea49dd621216936f87440a141"
-DEPENDS="libnl3-dev openssl-dev crt-dev"
+DEPENDS="libnl3-dev openssl-dev toolchain"
 
 prepare() {
 	return
diff --git a/pkg/inetutils/build b/pkg/inetutils/build
index 914db11..bf7fe82 100755
--- a/pkg/inetutils/build
+++ b/pkg/inetutils/build
@@ -3,7 +3,7 @@ SRCDIR="inetutils-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/inetutils/"
 SHA256SUM="849d96f136effdef69548a940e3e0ec0624fc0c81265296987986a0dd36ded37"
-DEPENDS="ncurses-dev readline-dev crt-dev"
+DEPENDS="ncurses-dev readline-dev toolchain"
 
 prepare() {
 	return
diff --git a/pkg/iproute2/build b/pkg/iproute2/build
index 0203937..20bceaa 100755
--- a/pkg/iproute2/build
+++ b/pkg/iproute2/build
@@ -3,7 +3,7 @@ SRCDIR="iproute2-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://www.kernel.org/pub/linux/utils/net/iproute2/"
 SHA256SUM="c8adaa6a40f888476b23acb283cfa30c0dd55f07b5aa20663ed5ba2ef1f6fda8"
-DEPENDS="libmnl-dev crt-dev"
+DEPENDS="toolchain libmnl-dev"
 SUBPKG="iproute2 iproute2-dev"
 
 prepare() {
diff --git a/pkg/iw/build b/pkg/iw/build
index d2d16a1..5ef12e9 100755
--- a/pkg/iw/build
+++ b/pkg/iw/build
@@ -3,7 +3,7 @@ SRCDIR="iw-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://mirrors.edge.kernel.org/pub/software/network/iw"
 SHA256SUM="1e38ea794a223525b2ea7fe78fd14f2a56121e62e21ba5f9dbe8c494b35b5c0d"
-DEPENDS="libnl3-dev crt-dev"
+DEPENDS="libnl3-dev toolchain"
 
 prepare() {
 	return
diff --git a/pkg/kmod/build b/pkg/kmod/build
index a9d0b8d..b76ec0c 100644
--- a/pkg/kmod/build
+++ b/pkg/kmod/build
@@ -3,7 +3,7 @@ SRCDIR="kmod-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://www.kernel.org/pub/linux/utils/kernel/kmod/"
 SHA256SUM="57bb22c8bb56435991f6b0810a042b0a65e2f1e217551efa58235b7034cdbb9d"
-DEPENDS="zlib-dev xz-dev crt-dev"
+DEPENDS="zlib-dev xz-dev toolchain"
 SUBPKG="kmod kmod-dev"
 
 prepare() {
diff --git a/pkg/ldns/build b/pkg/ldns/build
index b1ae1e8..3ae612c 100755
--- a/pkg/ldns/build
+++ b/pkg/ldns/build
@@ -3,7 +3,7 @@ SRCDIR="ldns-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://www.nlnetlabs.nl/downloads/ldns"
 SHA256SUM="c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc"
-DEPENDS="openssl-dev crt-dev"
+DEPENDS="openssl-dev toolchain"
 SUBPKG="ldns ldns-dev"
 
 prepare() {
diff --git a/pkg/less/build b/pkg/less/build
index e213ccb..c7de8bf 100755
--- a/pkg/less/build
+++ b/pkg/less/build
@@ -3,7 +3,7 @@ SRCDIR="less-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/less/"
 SHA256SUM="503f91ab0af4846f34f0444ab71c4b286123f0044a4964f1ae781486c617f2e2"
-DEPENDS="ncurses-dev crt-dev"
+DEPENDS="ncurses-dev toolchain"
 
 prepare() {
 	return
diff --git a/pkg/libnftnl/build b/pkg/libnftnl/build
index bc6030b..c0a02a7 100644
--- a/pkg/libnftnl/build
+++ b/pkg/libnftnl/build
@@ -3,7 +3,7 @@ SRCDIR="libnftnl-${VERSION}"
 TARBALL="${SRCDIR}.tar.bz2"
 URL="https://netfilter.org/projects/libnftnl/files"
 SHA256SUM="a5c7b7a6c13c9c5898b13fcb1126fefce2015d5a96d7c354b19aaa40b6aece5d"
-DEPENDS="libmnl-dev crt-dev"
+DEPENDS="libmnl-dev toolchain"
 SUBPKG="libnftnl libnftnl-dev"
 
 prepare() {
diff --git a/pkg/libpcap/build b/pkg/libpcap/build
index eb37c85..0b4ca5c 100755
--- a/pkg/libpcap/build
+++ b/pkg/libpcap/build
@@ -3,7 +3,7 @@ SRCDIR="libpcap-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="http://www.tcpdump.org/release/"
 SHA256SUM="2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019"
-DEPENDS="libnl3-dev crt-dev"
+DEPENDS="libnl3-dev toolchain"
 SUBPKG="libpcap libpcap-dev"
 
 prepare() {
diff --git a/pkg/nano/build b/pkg/nano/build
index 40efced..b3560fd 100644
--- a/pkg/nano/build
+++ b/pkg/nano/build
@@ -3,7 +3,7 @@ SRCDIR="nano-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/nano/"
 SHA256SUM="d12773af3589994b2e4982c5792b07c6240da5b86c5aef2103ab13b401fe6349"
-DEPENDS="ncurses-dev crt-dev"
+DEPENDS="ncurses-dev toolchain"
 
 prepare() {
 	return
diff --git a/pkg/ncurses/build b/pkg/ncurses/build
index a31180a..a05c558 100755
--- a/pkg/ncurses/build
+++ b/pkg/ncurses/build
@@ -3,7 +3,7 @@ SRCDIR="ncurses-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/ncurses/"
 SHA256SUM="aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17"
-DEPENDS="toolchain libstdc++-dev"
+DEPENDS="toolchain toolchain"
 SUBPKG="ncurses-dev ncurses++-dev ncurses"
 
 prepare() {
diff --git a/pkg/nftables/build b/pkg/nftables/build
index 457faf5..25fcda2 100644
--- a/pkg/nftables/build
+++ b/pkg/nftables/build
@@ -3,7 +3,7 @@ SRCDIR="nftables-${VERSION}"
 TARBALL="${SRCDIR}.tar.bz2"
 URL="https://netfilter.org/projects/nftables/files"
 SHA256SUM="ad8181b5fcb9ca572f444bed54018749588522ee97e4c21922648bb78d7e7e91"
-DEPENDS="libmnl-dev libnftnl-dev gmp-dev readline-dev ncurses-dev crt-dev"
+DEPENDS="libmnl-dev libnftnl-dev gmp-dev readline-dev ncurses-dev toolchain"
 SUBPKG="nftables nftables-dev"
 
 prepare() {
diff --git a/pkg/nginx/build b/pkg/nginx/build
index 07d5e19..699998e 100755
--- a/pkg/nginx/build
+++ b/pkg/nginx/build
@@ -3,7 +3,7 @@ SRCDIR="nginx-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://nginx.org/download"
 SHA256SUM="e4cfba989bba614cd53f3f406ac6da9f05977d6b1296e5d20a299f10c2d7ae43"
-DEPENDS="zlib-dev openssl-dev pcre-dev crt-dev"
+DEPENDS="zlib-dev openssl-dev pcre-dev toolchain"
 
 prepare() {
 	apply_patches
diff --git a/pkg/ntp/build b/pkg/ntp/build
index 87facea..cff6394 100644
--- a/pkg/ntp/build
+++ b/pkg/ntp/build
@@ -3,7 +3,7 @@ SRCDIR="ntp-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2"
 SHA256SUM="288772cecfcd9a53694ffab108d1825a31ba77f3a8466b0401baeca3bc232a38"
-DEPENDS="openssl-dev zlib-dev readline-dev crt-dev"
+DEPENDS="openssl-dev zlib-dev readline-dev toolchain"
 
 prepare() {
 	return
diff --git a/pkg/openssh/build b/pkg/openssh/build
index 21781b7..35c5ca4 100644
--- a/pkg/openssh/build
+++ b/pkg/openssh/build
@@ -3,7 +3,7 @@ SRCDIR="openssh-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable"
 SHA256SUM="6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad"
-DEPENDS="openssl-dev zlib-dev crt-dev"
+DEPENDS="openssl-dev zlib-dev toolchain"
 
 prepare() {
 	return
diff --git a/pkg/openssl/build b/pkg/openssl/build
index b7ecb1c..7a40d62 100755
--- a/pkg/openssl/build
+++ b/pkg/openssl/build
@@ -3,7 +3,7 @@ SRCDIR="openssl-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://www.openssl.org/source"
 SHA256SUM="5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b"
-DEPENDS="zlib-dev crt-dev"
+DEPENDS="zlib-dev toolchain"
 SUBPKG="openssl openssl-dev"
 
 prepare() {
diff --git a/pkg/pcre/build b/pkg/pcre/build
index e14a327..2020e25 100755
--- a/pkg/pcre/build
+++ b/pkg/pcre/build
@@ -3,7 +3,7 @@ SRCDIR="pcre-${VERSION}"
 TARBALL="${SRCDIR}.tar.bz2"
 URL="https://ftp.pcre.org/pub/pcre"
 SHA256SUM="91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b"
-DEPENDS="toolchain libstdc++-dev"
+DEPENDS="toolchain"
 SUBPKG="pcre pcre-dev pcre++ pcre++-dev"
 
 prepare() {
diff --git a/pkg/procps-ng/build b/pkg/procps-ng/build
index cb243ad..f1afc1c 100755
--- a/pkg/procps-ng/build
+++ b/pkg/procps-ng/build
@@ -3,7 +3,7 @@ SRCDIR="procps-ng-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://sourceforge.net/projects/procps-ng/files/Production"
 SHA256SUM="10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465"
-DEPENDS="ncurses-dev crt-dev"
+DEPENDS="ncurses-dev toolchain"
 SUBPKG="procps-ng procps-ng-dev"
 
 prepare() {
diff --git a/pkg/psmisc/build b/pkg/psmisc/build
index 34ba74a..e063e3f 100755
--- a/pkg/psmisc/build
+++ b/pkg/psmisc/build
@@ -3,7 +3,7 @@ SRCDIR="psmisc-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://sourceforge.net/projects/psmisc/files/psmisc"
 SHA256SUM="4b7cbffdc9373474da49b85dc3457ae511c43dc7fa7d94513fe06f89dcb87880"
-DEPENDS="ncurses-dev crt-dev"
+DEPENDS="ncurses-dev toolchain"
 
 prepare() {
 	return
diff --git a/pkg/readline/build b/pkg/readline/build
index b46b58a..6ae1814 100755
--- a/pkg/readline/build
+++ b/pkg/readline/build
@@ -3,7 +3,7 @@ SRCDIR="readline-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/readline/"
 SHA256SUM="e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461"
-DEPENDS="ncurses-dev crt-dev"
+DEPENDS="ncurses-dev toolchain"
 SUBPKG="readline readline-dev"
 
 prepare() {
diff --git a/pkg/sqlite3/build b/pkg/sqlite3/build
index 0adcc7c..2482dc3 100755
--- a/pkg/sqlite3/build
+++ b/pkg/sqlite3/build
@@ -3,7 +3,7 @@ SRCDIR="sqlite-autoconf-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://sqlite.org/2018/"
 SHA256SUM="00ebf97be13928941940cc71de3d67e9f852698233cd98ce2d178fd08092f3dd"
-DEPENDS="readline-dev crt-dev"
+DEPENDS="readline-dev toolchain"
 
 prepare() {
 	return
diff --git a/pkg/tcpdump/build b/pkg/tcpdump/build
index 72abcf6..b1e82a4 100755
--- a/pkg/tcpdump/build
+++ b/pkg/tcpdump/build
@@ -3,7 +3,7 @@ SRCDIR="tcpdump-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="http://www.tcpdump.org/release/"
 SHA256SUM="798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79"
-DEPENDS="libnl3-dev openssl-dev libpcap-dev crt-dev"
+DEPENDS="libnl3-dev openssl-dev libpcap-dev toolchain"
 
 prepare() {
 	apply_patches
diff --git a/pkg/toolchain/build b/pkg/toolchain/build
index ed22132..fbbc2c7 100755
--- a/pkg/toolchain/build
+++ b/pkg/toolchain/build
@@ -1,4 +1,4 @@
-DEPENDS="tc-binutils crt-dev tc-pkg-config tc-file tc-pkgtool basefiles"
+DEPENDS="tc-binutils crt-dev libstdc++-dev tc-pkg-config tc-file tc-pkgtool basefiles"
 
 build() {
 	return
diff --git a/pkg/unbound/build b/pkg/unbound/build
index ac8df97..81e866e 100644
--- a/pkg/unbound/build
+++ b/pkg/unbound/build
@@ -3,7 +3,7 @@ SRCDIR="unbound-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://www.unbound.net/downloads"
 SHA256SUM="415af94b8392bc6b2c52e44ac8f17935cc6ddf2cc81edfb47c5be4ad205ab917"
-DEPENDS="openssl-dev expat-dev libbsd-dev crt-dev"
+DEPENDS="openssl-dev expat-dev libbsd-dev toolchain"
 SUBPKG="unbound libunbound libunbound-dev"
 
 prepare() {
diff --git a/pkg/util-linux/build b/pkg/util-linux/build
index 4620879..204a88e 100755
--- a/pkg/util-linux/build
+++ b/pkg/util-linux/build
@@ -3,7 +3,7 @@ SRCDIR="util-linux-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://www.kernel.org/pub/linux/utils/util-linux/v$VERSION/"
 SHA256SUM="f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a"
-DEPENDS="bash-dev ncurses-dev zlib-dev crt-dev"
+DEPENDS="bash-dev ncurses-dev zlib-dev toolchain"
 SUBPKG="libblkid libblkid-dev libfdisk libfdisk-dev libmount libmount-dev libsmartcols libsmartcols-dev libuuid libuuid-dev util-linux"
 
 prepare() {