diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index 1f8c3df1c26d5c25abf54df71c31c943a7c21497..d00fd67e636767bf64285a7dbd8403cca99b3b7f 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -29,5 +29,4 @@ unifdef-y += types.h
 unifdef-y += unistd.h
 
 # These probably shouldn't be exported
-unifdef-y += elf.h
 unifdef-y += page.h
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 6723bc973dac7656f2cacb92532cf6f8da013068..0d4f55d97ae93315c36cd9a6a001a25f6eb90fa4 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -60,7 +60,6 @@ header-y += dqblk_v2.h
 header-y += dqblk_xfs.h
 header-y += efs_fs_sb.h
 header-y += elf-fdpic.h
-header-y += elf.h
 header-y += elf-em.h
 header-y += fadvise.h
 header-y += fd.h
@@ -190,6 +189,7 @@ unifdef-y += dccp.h
 unifdef-y += dirent.h
 unifdef-y += dlm.h
 unifdef-y += edd.h
+unifdef-y += elf.h
 unifdef-y += elfcore.h
 unifdef-y += errno.h
 unifdef-y += errqueue.h
diff --git a/include/linux/elf.h b/include/linux/elf.h
index 7ceb24d87c1a970b06835f5c645bb0ab2e31f1d0..ed98c761bae7f77afbe772506d2d0f75a9a95b92 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -3,7 +3,9 @@
 
 #include <linux/types.h>
 #include <linux/elf-em.h>
+#ifdef __KERNEL__
 #include <asm/elf.h>
+#endif
 
 struct file;
 
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h
index 0432de7d47077f2e3dd06b611e771ea34410de21..5ca54d77079f1dd14b713d54e5f4566f01da59dd 100644
--- a/include/linux/elfcore.h
+++ b/include/linux/elfcore.h
@@ -16,7 +16,9 @@ struct elf_siginfo
 	int	si_errno;			/* errno */
 };
 
+#ifdef __KERNEL__
 #include <asm/elf.h>
+#endif
 
 #ifndef __KERNEL__
 typedef elf_greg_t greg_t;