diff --git a/arch/linux/board/board.c b/arch/linux/board/board.c
index 883e6df74..f214d246e 100644
--- a/arch/linux/board/board.c
+++ b/arch/linux/board/board.c
@@ -4,7 +4,6 @@
 #include <asm/arch/linux.h>
 #include <init.h>
 #include <errno.h>
-#include <asm-generic/errno.h>
 
 static struct device_d tap_device = {
         .name     = "tap",
diff --git a/arch/linux/board/hostfile.c b/arch/linux/board/hostfile.c
index 0bfb243c9..5618d78d9 100644
--- a/arch/linux/board/hostfile.c
+++ b/arch/linux/board/hostfile.c
@@ -4,7 +4,6 @@
 #include <asm/arch/linux.h>
 #include <init.h>
 #include <errno.h>
-#include <asm-generic/errno.h>
 #include <asm/arch/hostfile.h>
 #include <xfuncs.h>
 
diff --git a/common/cmd_edit.c b/common/cmd_edit.c
index 1b0c6f985..61d7ce3b5 100644
--- a/common/cmd_edit.c
+++ b/common/cmd_edit.c
@@ -6,7 +6,6 @@
 #include <fcntl.h>
 #include <readkey.h>
 #include <errno.h>
-#include <asm-generic/errno.h>
 #include <xfuncs.h>
 
 #define TABSPACE 8
diff --git a/common/cmd_fs.c b/common/cmd_fs.c
index 38ebfe196..7697640ca 100644
--- a/common/cmd_fs.c
+++ b/common/cmd_fs.c
@@ -2,7 +2,6 @@
 #include <command.h>
 #include <fs.h>
 #include <errno.h>
-#include <asm-generic/errno.h>
 #include <malloc.h>
 #include <linux/ctype.h>
 #include <getopt.h>
diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index 4027752ef..7ed8170a3 100644
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -33,7 +33,6 @@
 #include <driver.h>
 #include <malloc.h>
 #include <errno.h>
-#include <asm-generic/errno.h>
 #include <fs.h>
 #include <fcntl.h>
 #include <getopt.h>
diff --git a/common/cmd_net.c b/common/cmd_net.c
index 1116d58c7..74a3dbdd5 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -27,7 +27,6 @@
 #include <common.h>
 #include <command.h>
 #include <environment.h>
-#include <asm-generic/errno.h>
 #include <driver.h>
 #include <net.h>
 #include <fs.h>
diff --git a/common/env.c b/common/env.c
index 8a6901721..d0d64873c 100644
--- a/common/env.c
+++ b/common/env.c
@@ -2,7 +2,7 @@
 #include <command.h>
 #include <driver.h>
 #include <malloc.h>
-#include <asm-generic/errno.h>
+#include <errno.h>
 
 static ulong env_size;
 static char *env_name_spec;
diff --git a/common/environment.c b/common/environment.c
index 8dd7338a9..fd8307de0 100644
--- a/common/environment.c
+++ b/common/environment.c
@@ -3,7 +3,6 @@
 #include <driver.h>
 #include <malloc.h>
 #include <errno.h>
-#include <asm-generic/errno.h>
 #include <fs.h>
 #include <fcntl.h>
 #include <linux/stat.h>
diff --git a/common/misc.c b/common/misc.c
index f7617d063..9fded4bbb 100644
--- a/common/misc.c
+++ b/common/misc.c
@@ -1,6 +1,6 @@
 #include <common.h>
 #include <mem_malloc.h>
-#include <asm-generic/errno.h>
+#include <errno.h>
 
 /*
  * Begin and End of memory area for malloc(), and current "brk"
diff --git a/common/mtdpart.c b/common/mtdpart.c
index db18f046d..14bd1e5ae 100644
--- a/common/mtdpart.c
+++ b/common/mtdpart.c
@@ -4,7 +4,7 @@
 #include <init.h>
 #include <driver.h>
 #include <malloc.h>
-#include <asm-generic/errno.h>
+#include <errno.h>
 #include <partition.h>
 
 static void dev_del_partitions(struct device_d *dev)
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c
index 69d333373..7576a863f 100644
--- a/fs/cramfs/cramfs.c
+++ b/fs/cramfs/cramfs.c
@@ -29,7 +29,6 @@
 #include <driver.h>
 #include <init.h>
 #include <errno.h>
-#include <asm-generic/errno.h>
 #include <fs.h>
 #include <xfuncs.h>
 
diff --git a/fs/devfs.c b/fs/devfs.c
index 3a90603e5..3716aaeb2 100644
--- a/fs/devfs.c
+++ b/fs/devfs.c
@@ -5,7 +5,6 @@
 #include <fs.h>
 #include <command.h>
 #include <errno.h>
-#include <asm-generic/errno.h>
 #include <linux/stat.h>
 
 static int devfs_read(struct device_d *_dev, FILE *f, void *buf, size_t size)
diff --git a/fs/fs.c b/fs/fs.c
index f110d1c38..0f6c1601f 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -2,7 +2,6 @@
 #include <fs.h>
 #include <driver.h>
 #include <errno.h>
-#include <asm-generic/errno.h>
 #include <malloc.h>
 #include <linux/stat.h>
 #include <fcntl.h>
diff --git a/fs/ramfs.c b/fs/ramfs.c
index e9d62f3f6..60bd86a26 100644
--- a/fs/ramfs.c
+++ b/fs/ramfs.c
@@ -5,7 +5,6 @@
 #include <fs.h>
 #include <command.h>
 #include <errno.h>
-#include <asm-generic/errno.h>
 #include <linux/stat.h>
 #include <xfuncs.h>
 
diff --git a/include/errno.h b/include/errno.h
index 56ed0ed9d..03d1723ca 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -1,6 +1,8 @@
 #ifndef __ERRNO_H
 #define __ERRNO_H
 
+#include <asm-generic/errno.h>
+
 extern int errno;
 
 void perror(const char *s);
diff --git a/lib_generic/global.c b/lib_generic/global.c
index 23486afca..d4cdcc933 100644
--- a/lib_generic/global.c
+++ b/lib_generic/global.c
@@ -3,7 +3,6 @@
 #include <init.h>
 #include <driver.h>
 #include <malloc.h>
-#include <asm-generic/errno.h>
 #include <errno.h>
 
 static struct device_d global_dev;
diff --git a/lib_generic/misc.c b/lib_generic/misc.c
index 15a43cf85..31db46218 100644
--- a/lib_generic/misc.c
+++ b/lib_generic/misc.c
@@ -6,7 +6,6 @@
 #include <malloc.h>
 #include <linux/ctype.h>
 #include <errno.h>
-#include <asm-generic/errno.h>
 #include <fs.h>
 
 int cmd_get_data_size(char* arg, int default_size)
diff --git a/net/eth.c b/net/eth.c
index 67f4761a7..974c615cf 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -28,7 +28,6 @@
 #include <net.h>
 #include <miiphy.h>
 #include <malloc.h>
-#include <asm-generic/errno.h>
 
 static int enetaddr_set(struct device_d *dev, struct param_d *param, value_t val)
 {