diff --git a/packages/addons/addon-depends/chrome-depends/icu/package.mk b/packages/addons/addon-depends/chrome-depends/icu/package.mk
index a356b4ad01..d354bc11b4 100644
--- a/packages/addons/addon-depends/chrome-depends/icu/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/icu/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"
 PKG_LICENSE="Custom"
 PKG_SITE="http://www.icu-project.org"
 PKG_URL="http://download.icu-project.org/files/icu4c/${PKG_VERSION}/icu4c-${PKG_VERSION//./_}-src.tgz"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain icu:host"
 PKG_LONGDESC="International Components for Unicode library."
 
diff --git a/packages/addons/addon-depends/cxxtools/package.mk b/packages/addons/addon-depends/cxxtools/package.mk
index 2af05c5295..60c19e6e4d 100644
--- a/packages/addons/addon-depends/cxxtools/package.mk
+++ b/packages/addons/addon-depends/cxxtools/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="8cebb6d6cda7c93cc4f7c0d552a68d50dd5530b699cf87916bb3b708fdc4e342"
 PKG_LICENSE="GPL-2"
 PKG_SITE="http://www.tntnet.org/cxxtools.html"
 PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain cxxtools:host"
 PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes."
 PKG_BUILD_FLAGS="+pic"
diff --git a/packages/addons/addon-depends/pngquant/package.mk b/packages/addons/addon-depends/pngquant/package.mk
index c95512df70..e42c221320 100644
--- a/packages/addons/addon-depends/pngquant/package.mk
+++ b/packages/addons/addon-depends/pngquant/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="0e540c64bb58c05f2a05b4eaf1d3d165f0d3278500f15abfeac47f93f8fa8fa8"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://pngquant.org"
 PKG_URL="http://pngquant.org/pngquant-${PKG_VERSION}-src.tar.gz"
-PKG_DEPENDS_HOST="toolchain libpng:host zlib:host"
+PKG_DEPENDS_HOST="toolchain:host libpng:host zlib:host"
 PKG_LONGDESC="A lossy PNG compressor."
 
 configure_host() {
diff --git a/packages/addons/addon-depends/protobuf/package.mk b/packages/addons/addon-depends/protobuf/package.mk
index 08bd5aa4d2..b95dc4d93c 100644
--- a/packages/addons/addon-depends/protobuf/package.mk
+++ b/packages/addons/addon-depends/protobuf/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="51ceea9957c875bdedeb1f64396b5b0f3864fe830eed6a2d9c066448373ea2d6"
 PKG_LICENSE="OSS"
 PKG_SITE="https://developers.google.com/protocol-buffers/"
 PKG_URL="https://github.com/google/$PKG_NAME/releases/download/v$PKG_VERSION/$PKG_NAME-cpp-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="toolchain zlib:host"
+PKG_DEPENDS_HOST="toolchain:host zlib:host"
 PKG_DEPENDS_TARGET="toolchain zlib protobuf:host"
 PKG_LONGDESC="Protocol Buffers for Google's data interchange format."
 
diff --git a/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk
index 9dfc879c6f..a2fbdf1ff1 100644
--- a/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk
@@ -8,7 +8,7 @@ PKG_ARCH="x86_64"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://github.com/rhboot/efivar"
 PKG_URL="https://github.com/rhboot/efivar/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain efivar:host"
 PKG_LONGDESC="Tools and library to manipulate EFI variables."
 
diff --git a/packages/addons/addon-depends/system-tools-depends/file/package.mk b/packages/addons/addon-depends/system-tools-depends/file/package.mk
index 67c67276d7..fa08821c23 100644
--- a/packages/addons/addon-depends/system-tools-depends/file/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/file/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="acc16f878576ad0bb29bbb7c724e29d2827f14ddb39fe94d76c3a859d4a3d0d9"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.darwinsys.com/file/"
 PKG_URL="https://github.com/file/file/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="toolchain"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain file:host zlib"
 PKG_LONGDESC="The file utility is used to determine the types of various files."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/addons/service/mariadb/package.mk b/packages/addons/service/mariadb/package.mk
index df0390b8df..a2289c5c77 100644
--- a/packages/addons/service/mariadb/package.mk
+++ b/packages/addons/service/mariadb/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="ba1c94d92fc8ebdf9b8a1d1b93ed6aeeead33da507efbbd4afcf49f32023e054"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://mariadb.org"
 PKG_URL="https://downloads.mariadb.org/interstitial/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="toolchain ncurses:host"
+PKG_DEPENDS_HOST="toolchain:host ncurses:host"
 PKG_DEPENDS_TARGET="toolchain binutils bzip2 libaio libxml2 lzo ncurses openssl systemd zlib mariadb:host"
 PKG_SHORTDESC="MariaDB is a community-developed fork of the MySQL."
 PKG_LONGDESC="MariaDB (${PKG_VERSION}) is a fast SQL database server and a drop-in replacement for MySQL."
diff --git a/packages/compress/bzip2/package.mk b/packages/compress/bzip2/package.mk
index 7b7d434230..4767dec9ab 100644
--- a/packages/compress/bzip2/package.mk
+++ b/packages/compress/bzip2/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"
 PKG_LICENSE="GPL"
 PKG_SITE="https://sourceware.org/bzip2/"
 PKG_URL="https://sourceware.org/pub/bzip2/bzip2-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="ccache:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A high-quality bzip2 data compressor."
 PKG_BUILD_FLAGS="+pic +pic:host"
diff --git a/packages/compress/cpio/package.mk b/packages/compress/cpio/package.mk
index bbe40b5169..6537b938d3 100644
--- a/packages/compress/cpio/package.mk
+++ b/packages/compress/cpio/package.mk
@@ -7,5 +7,5 @@ PKG_SHA256="08a35e92deb3c85d269a0059a27d4140a9667a6369459299d08c17f713a92e73"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/cpio/"
 PKG_URL="http://ftpmirror.gnu.org/cpio/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="toolchain"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_LONGDESC="A program to manage archives of files."
diff --git a/packages/compress/libarchive/package.mk b/packages/compress/libarchive/package.mk
index 3546027962..ed1ff230c8 100644
--- a/packages/compress/libarchive/package.mk
+++ b/packages/compress/libarchive/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.libarchive.org"
 PKG_URL="https://www.libarchive.org/downloads/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="toolchain"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SHORTDESC="A multi-format archive and compression library."
 
diff --git a/packages/compress/lz4/package.mk b/packages/compress/lz4/package.mk
index 02f935da31..5002eb5706 100644
--- a/packages/compress/lz4/package.mk
+++ b/packages/compress/lz4/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="f8377c89dad5c9f266edc0be9b73595296ecafd5bfa1000de148096c50052dc4"
 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"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="lz4 data compressor/decompressor"
 
diff --git a/packages/compress/lzo/package.mk b/packages/compress/lzo/package.mk
index a861a63e95..87f52fe1a8 100644
--- a/packages/compress/lzo/package.mk
+++ b/packages/compress/lzo/package.mk
@@ -7,7 +7,7 @@ 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"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A data compression library which is suitable for data de-/compression."
 PKG_BUILD_FLAGS="+pic"
diff --git a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk b/packages/compress/p7zip/package.mk
similarity index 95%
rename from packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
rename to packages/compress/p7zip/package.mk
index 7076ab4913..6c70056ead 100644
--- a/packages/addons/addon-depends/system-tools-depends/p7zip/package.mk
+++ b/packages/compress/p7zip/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f"
 PKG_LICENSE="GPL"
 PKG_SITE="http://p7zip.sourceforge.net/"
 PKG_URL="http://downloads.sourceforge.net/project/p7zip/p7zip/${PKG_VERSION}/p7zip_${PKG_VERSION}_src_all.tar.bz2"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="ccache:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="p7zip is a port of 7za.exe for POSIX systems like Unix."
 PKG_TOOLCHAIN="manual"
diff --git a/packages/compress/zstd/package.mk b/packages/compress/zstd/package.mk
index 331c27f709..5eafad7a5d 100644
--- a/packages/compress/zstd/package.mk
+++ b/packages/compress/zstd/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="e88ec8d420ff228610b77fba4fbf22b9f8b9d3f223a40ef59c9c075fcdad5767"
 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.gz"
-PKG_DEPENDS_HOST="gcc:host ninja:host"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A fast real-time compression algorithm."
 
diff --git a/packages/databases/mysql/package.mk b/packages/databases/mysql/package.mk
index 8ebc1fa813..ee014f9535 100644
--- a/packages/databases/mysql/package.mk
+++ b/packages/databases/mysql/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="5397549bb7c238f396c123db2df4cad2191b11adf8986de7fe63bff8e2786487"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.mysql.com"
 PKG_URL="http://ftp.gwdg.de/pub/misc/$PKG_NAME/Downloads/MySQL-5.7/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="toolchain zlib:host"
+PKG_DEPENDS_HOST="toolchain:host zlib:host"
 PKG_DEPENDS_TARGET="toolchain zlib ncurses openssl boost mysql:host"
 PKG_LONGDESC="A SQL database server."
 
diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk
index a33c2115d7..158b394da2 100644
--- a/packages/databases/sqlite/package.mk
+++ b/packages/databases/sqlite/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="8e7c1e2950b5b04c5944a981cb31fffbf9d2ddda939d536838ebc854481afd5b"
 PKG_LICENSE="PublicDomain"
 PKG_SITE="https://www.sqlite.org/"
 PKG_URL="https://www.sqlite.org/2019/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host"
 PKG_DEPENDS_TARGET="toolchain 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
diff --git a/packages/debug/libunwind/package.mk b/packages/debug/libunwind/package.mk
index eeedf998b7..790131dffd 100644
--- a/packages/debug/libunwind/package.mk
+++ b/packages/debug/libunwind/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nongnu.org/libunwind/"
 PKG_URL="http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="gcc:host"
+PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="library to determine the call-chain of a program"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
diff --git a/packages/devel/flatbuffers/package.mk b/packages/devel/flatbuffers/package.mk
index 4f4224c052..7617f0a3ff 100644
--- a/packages/devel/flatbuffers/package.mk
+++ b/packages/devel/flatbuffers/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/google/flatbuffers"
 PKG_URL="https://github.com/google/flatbuffers/archive/v$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="toolchain"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="An efficient cross platform serialization library for games and other memory constrained apps."
 
diff --git a/packages/devel/heimdal/package.mk b/packages/devel/heimdal/package.mk
index 15f6dfd7d8..10879da584 100644
--- a/packages/devel/heimdal/package.mk
+++ b/packages/devel/heimdal/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="f7d414d0914abb0e151a276b4de22cf4977fd6c28bd9ecdd990407b1138a945c"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="http://www.h5l.org/"
 PKG_URL="https://github.com/heimdal/heimdal/archive/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="toolchain e2fsprogs:host Python2:host ncurses:host"
+PKG_DEPENDS_HOST="toolchain:host e2fsprogs:host Python2:host ncurses: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/libffi/package.mk b/packages/devel/libffi/package.mk
index 0cb80e05dd..97e113daaa 100644
--- a/packages/devel/libffi/package.mk
+++ b/packages/devel/libffi/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sourceware.org/$PKG_NAME/"
 PKG_URL="ftp://sourceware.org/pub/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host libtool:host pkg-config:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Foreign Function Interface Library."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk
index 4c1f1f79be..6e0cd693c4 100644
--- a/packages/devel/ncurses/package.mk
+++ b/packages/devel/ncurses/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="08b07c3e792961f300829512c283d5fefc0b1c421a57b76922c3d13303ed677d"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.gnu.org/software/ncurses/"
 PKG_URL="http://invisible-mirror.net/archives/ncurses/current/ncurses-$PKG_VERSION.tgz"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="ccache:host"
 PKG_DEPENDS_TARGET="toolchain zlib ncurses:host"
 PKG_LONGDESC="A library is a free software emulation of curses in System V Release 4.0, and more."
 # causes some segmentation fault's (dialog) when compiled with gcc's link time optimization.
diff --git a/packages/devel/pcre/package.mk b/packages/devel/pcre/package.mk
index e9fb9cc0d1..7fc787dcf2 100644
--- a/packages/devel/pcre/package.mk
+++ b/packages/devel/pcre/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.pcre.org/"
 PKG_URL="https://ftp.pcre.org/pub/pcre/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A set of functions that implement regular expression pattern matching."
 PKG_TOOLCHAIN="configure"
diff --git a/packages/graphics/libjpeg-turbo/package.mk b/packages/graphics/libjpeg-turbo/package.mk
index a374121840..827a1581f0 100644
--- a/packages/graphics/libjpeg-turbo/package.mk
+++ b/packages/graphics/libjpeg-turbo/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="a69598bf079463b34d45ca7268462a18b6507fdaa62bb1dfd212f02041499b5d"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libjpeg-turbo.org/"
 PKG_URL="https://github.com/libjpeg-turbo/libjpeg-turbo/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="toolchain"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A high-speed version of libjpeg for x86 and x86-64 processors which uses SIMD."
 PKG_BUILD_FLAGS="+pic +pic:host"
diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index ece410df19..21b245cac9 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -9,7 +9,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://gcc.gnu.org/"
 PKG_URL="http://ftpmirror.gnu.org/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host"
-PKG_DEPENDS_TARGET="gcc:host"
+PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host glibc"
 PKG_DEPENDS_INIT="toolchain"
 PKG_LONGDESC="This package contains the GNU Compiler Collection."
diff --git a/packages/lang/llvm/package.mk b/packages/lang/llvm/package.mk
index e166c78591..1a017bf314 100644
--- a/packages/lang/llvm/package.mk
+++ b/packages/lang/llvm/package.mk
@@ -9,7 +9,7 @@ PKG_ARCH="x86_64"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="http://llvm.org/"
 PKG_URL="https://releases.llvm.org/${PKG_VERSION}/llvm-${PKG_VERSION}.src.tar.xz"
-PKG_DEPENDS_HOST="toolchain"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain llvm:host zlib"
 PKG_LONGDESC="Low-Level Virtual Machine (LLVM) is a compiler infrastructure."
 
diff --git a/packages/mediacenter/JsonSchemaBuilder/package.mk b/packages/mediacenter/JsonSchemaBuilder/package.mk
index 91fefc90ec..698fa07f69 100644
--- a/packages/mediacenter/JsonSchemaBuilder/package.mk
+++ b/packages/mediacenter/JsonSchemaBuilder/package.mk
@@ -6,7 +6,7 @@ PKG_NAME="JsonSchemaBuilder"
 PKG_VERSION="0"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
-PKG_DEPENDS_HOST="toolchain"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_UNPACK="kodi"
 PKG_NEED_UNPACK="$(get_pkg_directory $MEDIACENTER)"
 PKG_LONGDESC="kodi-platform:"
diff --git a/packages/print/freetype/package.mk b/packages/print/freetype/package.mk
index 5a13dd7ce4..686ca80cb5 100644
--- a/packages/print/freetype/package.mk
+++ b/packages/print/freetype/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="fccc62928c65192fff6c98847233b28eb7ce05f12d2fea3f6cc90e8b4e5fbe06"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.freetype.org"
 PKG_URL="http://download.savannah.gnu.org/releases/freetype/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain zlib libpng"
 PKG_LONGDESC="The FreeType engine is a free and portable TrueType font rendering engine."
 PKG_TOOLCHAIN="configure"
diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk
index 7357ce1ebf..215fd684c8 100644
--- a/packages/sysutils/busybox/package.mk
+++ b/packages/sysutils/busybox/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="0e4925392fd9f3743cc517e031b68b012b24a63b0cf6c1ff03cce7bb3846cc99"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.busybox.net"
 PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain busybox:host hdparm dosfstools e2fsprogs zip unzip usbutils parted procps-ng gptfdisk libtirpc"
 PKG_DEPENDS_INIT="toolchain libtirpc"
 PKG_LONGDESC="BusyBox combines tiny versions of many common UNIX utilities into a single small executable."
diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk
index f6c78c5034..627bb3b803 100644
--- a/packages/sysutils/dosfstools/package.mk
+++ b/packages/sysutils/dosfstools/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/dosfstools/dosfstools"
 PKG_URL="https://github.com/dosfstools/dosfstools/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_INIT="toolchain dosfstools"
 PKG_LONGDESC="dosfstools contains utilities for making and checking MS-DOS FAT filesystems."
diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk
index c0b54b6645..37152b5016 100644
--- a/packages/sysutils/e2fsprogs/package.mk
+++ b/packages/sysutils/e2fsprogs/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="4952c9ae91e36d762e13cc5b9e8f7eeb5453e4aee4cd9b7402e73f2d4e65e009"
 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="gcc:host"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_INIT="toolchain"
 PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs, dumpe2fs, fsck, and others."
diff --git a/packages/sysutils/kmod/package.mk b/packages/sysutils/kmod/package.mk
index 0cc005aeb3..b969d8e017 100644
--- a/packages/sysutils/kmod/package.mk
+++ b/packages/sysutils/kmod/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397"
 PKG_LICENSE="GPL"
 PKG_SITE="http://git.profusion.mobi/cgit.cgi/kmod.git/"
 PKG_URL="https://www.kernel.org/pub/linux/utils/kernel/kmod/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_HOST="toolchain"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="kmod offers the needed flexibility and fine grained control over insertion, removal, configuration and listing of kernel modules."
 
diff --git a/packages/sysutils/parted/package.mk b/packages/sysutils/parted/package.mk
index 818ab3cf0c..b71a52a95e 100644
--- a/packages/sysutils/parted/package.mk
+++ b/packages/sysutils/parted/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/parted/"
 PKG_URL="http://ftpmirror.gnu.org/parted/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_HOST="toolchain util-linux:host"
+PKG_DEPENDS_HOST="toolchain:host util-linux:host"
 PKG_DEPENDS_TARGET="toolchain util-linux parted:host"
 PKG_DEPENDS_INIT="toolchain util-linux:init parted"
 PKG_LONGDESC="GNU Parted is a program for creating, destroying, resizing, checking and copying partitions."
diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk
index 0316b1a9da..1f8a725cc2 100644
--- a/packages/sysutils/util-linux/package.mk
+++ b/packages/sysutils/util-linux/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.33.2"
 PKG_SHA256="631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97"
 PKG_LICENSE="GPL"
 PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_HOST="gcc:host pkg-config:host"
+PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host pkg-config:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_INIT="toolchain"
 PKG_LONGDESC="A large variety of low-level system utilities that are necessary for a Linux system to function."
diff --git a/packages/tools/led_tools/package.mk b/packages/tools/led_tools/package.mk
index dfcf597683..ad535e8d92 100644
--- a/packages/tools/led_tools/package.mk
+++ b/packages/tools/led_tools/package.mk
@@ -8,8 +8,8 @@ PKG_SHA256="0484b4a2da9d586accef87ba7dd18595baae1d602c1b1bd9e0a8565ab50419a2"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.fiveninjas.com"
 PKG_URL="http://updates.fiveninjas.com/src/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain zlib libpng slice"
-PKG_DEPENDS_HOST="toolchain"
 PKG_LONGDESC="LED tools, these are a set of tools to control the LEDs on Slice"
 
 make_target() {
diff --git a/packages/tools/mkbootimg/package.mk b/packages/tools/mkbootimg/package.mk
index adc1d3acd6..3d56252c51 100644
--- a/packages/tools/mkbootimg/package.mk
+++ b/packages/tools/mkbootimg/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="d84870e055414d638a3e7eb4b7a3ebf415899841218f24cb3647d06ecf6ddb17"
 PKG_LICENSE="GPL"
 PKG_SITE="https://android.googlesource.com/platform/system/core/+/master/mkbootimg/"
 PKG_URL="https://github.com/codesnake/mkbootimg/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_LONGDESC="mkbootimg: Creates kernel boot images for Android"
 
 makeinstall_host() {
diff --git a/packages/tools/mtools/package.mk b/packages/tools/mtools/package.mk
index eed9d81b93..e59e3dbb94 100644
--- a/packages/tools/mtools/package.mk
+++ b/packages/tools/mtools/package.mk
@@ -8,6 +8,6 @@ PKG_SHA256="f188db26751aeb5692a79b2380b440ecc05fd1848a52f869d7ca1193f2ef8ee3"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/mtools/"
 PKG_URL="http://ftpmirror.gnu.org/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_LONGDESC="mtools: A collection of utilities to access MS-DOS disks"
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/tools/qemu/package.mk b/packages/tools/qemu/package.mk
index 419344858a..a3d20ae319 100644
--- a/packages/tools/qemu/package.mk
+++ b/packages/tools/qemu/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="13a93dfe75b86734326f8d5b475fde82ec692d5b5a338b4262aeeb6b0fa4e469"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wiki.qemu.org"
 PKG_URL="https://download.qemu.org/qemu-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_HOST="toolchain glib:host pixman:host Python2:host zlib:host"
+PKG_DEPENDS_HOST="toolchain:host glib:host pixman:host Python2:host zlib:host"
 PKG_LONGDESC="QEMU is a generic and open source machine emulator and virtualizer."
 
 pre_configure_host() {
diff --git a/packages/virtual/toolchain/package.mk b/packages/virtual/toolchain/package.mk
index d8c7acc605..8e93be6079 100644
--- a/packages/virtual/toolchain/package.mk
+++ b/packages/virtual/toolchain/package.mk
@@ -7,6 +7,7 @@ PKG_VERSION=""
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host intltool:host libtool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host p7zip:host pigz:host ninja:host meson:host"
+PKG_DEPENDS_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 p7zip:host pigz:host pkg-config:host sed:host xmlstarlet:host xz:host"
+PKG_DEPENDS_TARGET="toolchain:host gcc:host"
 PKG_SECTION="virtual"
 PKG_LONGDESC="LibreELEC.tv' toolchain to compile all packages"
diff --git a/packages/x11/lib/pixman/package.mk b/packages/x11/lib/pixman/package.mk
index 631a570444..760987b520 100644
--- a/packages/x11/lib/pixman/package.mk
+++ b/packages/x11/lib/pixman/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain util-macros"
 PKG_LONGDESC="Pixman is a generic library for manipulating pixel regions, contains low-level pixel manipulation routines."