diff --git a/packages/linux/build b/packages/linux/build
index 5ef41aa679..0834f8ff1b 100755
--- a/packages/linux/build
+++ b/packages/linux/build
@@ -8,9 +8,6 @@ $SCRIPTS/build module-init-tools-host
 export INSTALL=$(kernel_path)
 $SCRIPTS/install busybox-initramfs
 
-#[ "$BUSYBOX_STATIC" = "no" ] && \
-#  $SCRIPTS/install uClibc initramfs
-
 unset LDFLAGS
 
 cd $(kernel_path)
diff --git a/packages/linux/unpack b/packages/linux/unpack
index 67e2b7864d..fa7bc92146 100755
--- a/packages/linux/unpack
+++ b/packages/linux/unpack
@@ -8,8 +8,6 @@ $SCRIPTS/install sed
 LINUX=`ls -d $PKG_BUILD`
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
-make -C $LINUX ARCH=$TARGET_ARCH INSTALL_HDR_PATH=dest headers_install
-
 if [ -f $PROJECT_DIR/$PROJECT/$1/$1.$TARGET_ARCH.conf ]; then
   KERNEL_CFG_FILE=$PROJECT_DIR/$PROJECT/$1/$1.$TARGET_ARCH.conf
 else
@@ -27,10 +25,6 @@ sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$PKG_D
   $LINUX/.config
 
   if [ "$DEVTOOLS" = yes ]; then
-    echo "CONFIG_KALLSYMS=y" >> $LINUX/.config
-    echo "CONFIG_KALLSYMS_EXTRA_PASS=y" >> $LINUX/.config
-    echo "# CONFIG_KALLSYMS_ALL is not set" >> $LINUX/.config
-    echo "# CONFIG_KPROBES is not set" >> $LINUX/.config
     echo "CONFIG_DEBUG_KERNEL=y" >> $LINUX/.config # needed for bootchart
     echo "CONFIG_SCHEDSTATS=y" >> $LINUX/.config # needed for bootchart
     echo "CONFIG_SCHED_DEBUG=y" >> $LINUX/.config # needed for bootchart
diff --git a/packages/toolchain/devel/linux-headers/install b/packages/toolchain/devel/linux-headers/install
index 6b8097a5ce..9c5509d113 100755
--- a/packages/toolchain/devel/linux-headers/install
+++ b/packages/toolchain/devel/linux-headers/install
@@ -4,7 +4,9 @@
 
 $SCRIPTS/unpack linux
 
-HEADERS=$SYSROOT_PREFIX/usr/include
+cd $(kernel_path)
+make ARCH=$TARGET_ARCH headers_check
+make ARCH=$TARGET_ARCH INSTALL_HDR_PATH=dest headers_install
 
-mkdir -p $HEADERS
-  cp -PR $(kernel_path)/dest/include/* $HEADERS
+mkdir -p $SYSROOT_PREFIX/usr/include
+  cp -PR dest/include/* $SYSROOT_PREFIX/usr/include