diff --git a/core/alpine-baselayout/APKBUILD b/core/alpine-baselayout/APKBUILD
index 14865fb73b9..9a82b30c49e 100644
--- a/core/alpine-baselayout/APKBUILD
+++ b/core/alpine-baselayout/APKBUILD
@@ -2,6 +2,7 @@ pkgname=alpine-baselayout
 pkgver=1.12.1
 pkgdesc="Alpine base dir structure and init scripts"
 url=http://dev.alpinelinux.org/alpine/alpine-baselayout
+depends="uclibc"
 source="http://dev.alpinelinux.org/alpine/$pkgname/$pkgname-$pkgver.tar.gz
 	modloop.initd
 	install-D.patch
diff --git a/core/autoconf/APKBUILD b/core/autoconf/APKBUILD
index 02a6050e7c6..67bf8646d6d 100644
--- a/core/autoconf/APKBUILD
+++ b/core/autoconf/APKBUILD
@@ -7,7 +7,6 @@ arch=i486
 license="GPL2 GPL3"
 url="http://www.gnu.org/software/autoconf"
 depends="m4 perl"
-makedepends="binutils gcc make linux-headers perl uclibc-dev"
 source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"
 subpackages="$pkgname-doc"
 
diff --git a/core/busybox/APKBUILD b/core/busybox/APKBUILD
index 47c9a897c88..b13dd917c1c 100644
--- a/core/busybox/APKBUILD
+++ b/core/busybox/APKBUILD
@@ -4,8 +4,7 @@ pkgrel=1
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 license=GPL-2
-arch=i486
-makedepends="binutils gcc linux-headers make patch uclibc-dev"
+depends=uclibc
 
 source="http://busybox.net/downloads/busybox-1.12.1.tar.bz2
 	http://busybox.net/downloads/fixes-1.12.1/busybox-1.12.1-grep.patch
diff --git a/core/fakeroot/APKBUILD b/core/fakeroot/APKBUILD
index a4d2a6bd5f5..aa27376ba44 100644
--- a/core/fakeroot/APKBUILD
+++ b/core/fakeroot/APKBUILD
@@ -5,7 +5,6 @@ pkgdesc="Gives a fake root environment, useful for building packages as a non-pr
 license='GPL'
 url="http://packages.debian.org/fakeroot"
 depends='uclibc'
-makedepends='binutils gcc make linux-headers uclibc-dev'
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.tar.gz
 	busybox-compat.patch"
diff --git a/core/libtool/APKBUILD b/core/libtool/APKBUILD
index cfb5415ea83..22d5156cb6c 100644
--- a/core/libtool/APKBUILD
+++ b/core/libtool/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="A generic library support script"
 license='GPL'
 url="http://www.gnu.org/software/libtool"
 source="ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.gz"
+depends=uclibc
 subpackages="libltdl"
 
 build() {
diff --git a/core/linux-grsec-sources/APKBUILD b/core/linux-grsec-sources/APKBUILD
index 680bf659d25..5db184abe10 100644
--- a/core/linux-grsec-sources/APKBUILD
+++ b/core/linux-grsec-sources/APKBUILD
@@ -5,7 +5,6 @@ pkgdesc="Linux kernel sources with grsecurity patch"
 _kernver=2.6.26
 _grsecver=2.1.12-2.6.26.6-200810131006
 pkgrel=1
-makedepends=patch
 arch=i486
 license=GPL-2
 url=http://kernel.org
diff --git a/core/linux-sources/APKBUILD b/core/linux-sources/APKBUILD
index ba391d20ae2..3dd6044aaf9 100644
--- a/core/linux-sources/APKBUILD
+++ b/core/linux-sources/APKBUILD
@@ -3,7 +3,6 @@ pkgver=2.6.27.4
 _kernver=2.6.27
 pkgrel=1
 pkgdesc="The vanilla Linux kernel sources"
-makedepends=patch
 arch=i486
 license=GPL-2
 url=http://kernel.org
diff --git a/core/m4/APKBUILD b/core/m4/APKBUILD
index 275ce5a65f1..992ba1e4b18 100644
--- a/core/m4/APKBUILD
+++ b/core/m4/APKBUILD
@@ -6,7 +6,6 @@ arch=i486
 url="http://www.gnu.org/software/m4"
 source=ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz
 depends=uclibc
-makedepends="binutils gcc linux-headers make uclibc-dev"
 license=GPL
 subpackages="m4-doc"
 origin="core/$pkgname"
diff --git a/core/ncurses/APKBUILD b/core/ncurses/APKBUILD
index c83138955cc..d822ced7397 100644
--- a/core/ncurses/APKBUILD
+++ b/core/ncurses/APKBUILD
@@ -1,10 +1,10 @@
-#!/bin/sh
 pkgname=ncurses
 pkgver=5.6
 pkgrel=0
 pkgdesc="Console display library"
 url="http://www.gnu.org/software/ncurses/"
 license=MIT
+depends=uclibc
 source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	ftp://invisible-island.net/ncurses/${pkgver}/${pkgname}-${pkgver}-coverity.patch.gz
 	"
diff --git a/core/openntpd/APKBUILD b/core/openntpd/APKBUILD
index 70590de5db8..4d13163d849 100644
--- a/core/openntpd/APKBUILD
+++ b/core/openntpd/APKBUILD
@@ -7,7 +7,7 @@ url=http://www.openntpd.org/
 install=openntpd.install
 
 subpackages="openntpd-doc"
-
+depends="uclibc openssl"
 makedepends="openssl-dev"
 license=BSD
 source="
diff --git a/core/patch/APKBUILD b/core/patch/APKBUILD
index c4f12bbe3dc..2006c9fb9d7 100644
--- a/core/patch/APKBUILD
+++ b/core/patch/APKBUILD
@@ -5,7 +5,6 @@ pkgdesc="Utility to apply diffs to files"
 url="http://www.gnu.org/software/patch/patch.html"
 license='GPL'
 depends='uclibc'
-makedepends='binutils gcc make linux-headers uclibc-dev'
 source=http://alpha.gnu.org/gnu/diffutils/$pkgname-$pkgver.tar.gz
 
 subpackages="$pkgname-doc"
diff --git a/core/sfic/APKBUILD b/core/sfic/APKBUILD
index 1c884a48e66..e1e2ca602bd 100644
--- a/core/sfic/APKBUILD
+++ b/core/sfic/APKBUILD
@@ -4,7 +4,8 @@ pkgver=0.1.7
 pkgrel=0
 depends=uclibc
 license=GPL
-makedepends="autoconf automake binutils gcc make uclibc-dev"
+makedepends="autoconf automake"
+depends="tdb uclibc"
 arch=i486
 url=http://sfic.sourceforge.net
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/core/tdb/APKBUILD b/core/tdb/APKBUILD
index 7b2870a15a8..4e9c2b8360d 100644
--- a/core/tdb/APKBUILD
+++ b/core/tdb/APKBUILD
@@ -9,7 +9,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 license="GPL-2"
 
 subpackages="$pkgname-dev $pkgname-doc"
-makedepends="binutils gcc linux-headers make uclibc-dev"
+depends="uclibc"
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
diff --git a/core/uclibc/APKBUILD b/core/uclibc/APKBUILD
index 730e3a710de..f7819103054 100644
--- a/core/uclibc/APKBUILD
+++ b/core/uclibc/APKBUILD
@@ -5,8 +5,6 @@ url=http://uclibc.org
 license="LGPL-2"
 _mynamever=uClibc-0.9.30-rc3
 
-makedepends="binutils gcc linux-headers make uclibc-dev"
-
 subpackages="$pkgname-dev"
 
 source="http://uclibc.org/downloads/$_mynamever.tar.bz2