diff --git a/arch/arm/crtools.c b/arch/arm/crtools.c
index eda59a218..a5420b197 100644
--- a/arch/arm/crtools.c
+++ b/arch/arm/crtools.c
@@ -17,6 +17,7 @@
 #include "elf.h"
 #include "parasite-syscall.h"
 #include "restorer.h"
+#include "errno.h"
 
 
 /*
diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h
index 2c310888d..b45869224 100644
--- a/arch/arm/include/asm/types.h
+++ b/arch/arm/include/asm/types.h
@@ -12,11 +12,6 @@
 #define SIGMAX			64
 #define SIGMAX_OLD		31
 
-#define ERESTARTSYS		512
-#define ERESTARTNOINTR		513
-#define ERESTARTNOHAND		514
-#define ERESTART_RESTARTBLOCK	516
-
 #define MAJOR(dev)		((dev)>>8)
 #define MINOR(dev)		((dev) & 0xff)
 
diff --git a/arch/x86/crtools.c b/arch/x86/crtools.c
index 93f8c96c1..0b59d3230 100644
--- a/arch/x86/crtools.c
+++ b/arch/x86/crtools.c
@@ -15,6 +15,7 @@
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
+#include "errno.h"
 
 #include "protobuf.h"
 #include "protobuf/core.pb-c.h"
diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
index f3f2902c3..66b843f41 100644
--- a/arch/x86/include/asm/types.h
+++ b/arch/x86/include/asm/types.h
@@ -13,11 +13,6 @@
 #define SIGMAX			64
 #define SIGMAX_OLD		31
 
-#define ERESTARTSYS		512
-#define ERESTARTNOINTR		513
-#define ERESTARTNOHAND		514
-#define ERESTART_RESTARTBLOCK	516
-
 #define MAJOR(dev)		((dev)>>8)
 #define MINOR(dev)		((dev) & 0xff)
 
diff --git a/include/errno.h b/include/errno.h
new file mode 100644
index 000000000..5c2322e9f
--- /dev/null
+++ b/include/errno.h
@@ -0,0 +1,9 @@
+#ifndef __CR_ERRNO_H__
+#define __CR_ERRNO_H__
+
+#define ERESTARTSYS		512
+#define ERESTARTNOINTR		513
+#define ERESTARTNOHAND		514
+#define ERESTART_RESTARTBLOCK	516
+
+#endif /* __CR_ERRNO_H__ */