diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf
index 838682a85..27ee5c2ce 100644
--- a/package/base/linux/linux.conf
+++ b/package/base/linux/linux.conf
@@ -532,23 +532,23 @@ main_lx() {
 main_lx_headers() {
 	lx_source
 
+	for x in $confdir/linux26-hdrs/*.patch; do
+		[ -f $x ] || continue
+		echo "Applying linux userspace headers patch $x.."
+		patch -p1 --no-backup-if-mismatch < $x
+	done
+
 	versionhotfix 2.6.25
 	find include/ -type f | xargs -r sed -i "/include/ s,<asm/,<asm-$lx_src_cpu/,g"
 
 	$MAKE mrproper
 	$MAKE INSTALL_HDR_PATH=dest headers_check
+	find dest/ -name '.check.*' | xargs rm -vf
 
 	versionhotfix 2.6.25
 	rm -f dest/include/asm
 	ln -sv asm-$lx_src_cpu dest/include/asm
 
-	for x in $confdir/linux26-hdrs/*.patch; do
-		[ -f $x ] || continue
-		echo "Applying linux userspace headers patch $x.."
-		( cd dest/include && patch -p1 --no-backup-if-mismatch < $x; )
-	done
-
-	rm -rf dest/include/scsi
 	mkdir -p $CLFS/$prefix/include
 	for x in $(ls dest/include/); do
 		rm -rf $CLFS/$prefix/include/$x
diff --git a/package/base/linux/linux26-hdrs/compiler_h.patch b/package/base/linux/linux26-hdrs/compiler_h.patch
index 65c1d859c..f0c1f5f84 100644
--- a/package/base/linux/linux26-hdrs/compiler_h.patch
+++ b/package/base/linux/linux26-hdrs/compiler_h.patch
@@ -1,4 +1,4 @@
---- ./linux/compiler.h.orig	2007-05-21 21:54:33.000000000 +0200
-+++ ./linux/compiler.h	2007-05-21 12:19:01.000000000 +0200
+--- ./include/linux/compiler.h.orig	2007-05-21 21:54:33.000000000 +0200
++++ ./include/linux/compiler.h	2007-05-21 12:19:01.000000000 +0200
 @@ -0,0 +1 @@
 +/* just a dummy placeholder */
diff --git a/package/base/linux/linux26-hdrs/types_blkcnt_t.patch b/package/base/linux/linux26-hdrs/types_blkcnt_t.patch
index de357e2e2..fdddbbe86 100644
--- a/package/base/linux/linux26-hdrs/types_blkcnt_t.patch
+++ b/package/base/linux/linux26-hdrs/types_blkcnt_t.patch
@@ -1,5 +1,5 @@
---- ./linux/types.h	2007-05-20 23:27:49.000000000 +0200
-+++ ./linux/types.h	2007-05-20 23:30:30.000000000 +0200
+--- ./include/linux/types.h	2007-05-20 23:27:49.000000000 +0200
++++ ./include/linux/types.h	2007-05-20 23:30:30.000000000 +0200
 @@ -121,6 +121,8 @@
   * any application/library that wants linux/types.h.
   */