Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index 1170dc6..04ccba5 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -1,9 +1,13 @@
 ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
 header-y  += kvm.h
+else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),)
+header-y  += kvm.h
 endif
 
 ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
 unifdef-y += a.out.h
+else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),)
+unifdef-y += a.out.h
 endif
 unifdef-y += auxvec.h
 unifdef-y += byteorder.h
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 5939125..49e0fbd 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -41,6 +41,7 @@ header-y += baycom.h
 header-y += bfs_fs.h
 header-y += blkpg.h
 header-y += bpqether.h
+header-y += byteorder.h
 header-y += can.h
 header-y += cdk.h
 header-y += chio.h
@@ -167,7 +168,9 @@ unifdef-y += acct.h
 unifdef-y += adb.h
 unifdef-y += adfs_fs.h
 unifdef-y += agpgart.h
-ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),)
+unifdef-y += a.out.h
+else ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
 unifdef-y += a.out.h
 endif
 unifdef-y += apm_bios.h
@@ -260,6 +263,8 @@ unifdef-y += kernel.h
 unifdef-y += keyboard.h
 ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
 unifdef-y += kvm.h
+else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),)
+unifdef-y += kvm.h
 endif
 unifdef-y += llc.h
 unifdef-y += loop.h
@@ -334,6 +339,7 @@ unifdef-y += soundcard.h
 unifdef-y += stat.h
 unifdef-y += stddef.h
 unifdef-y += string.h
+unifdef-y += swab.h
 unifdef-y += synclink.h
 unifdef-y += sysctl.h
 unifdef-y += tcp.h