diff --git a/include/arch/alpha/klibc/archsignal.h b/include/arch/alpha/klibc/archsignal.h
index b870a05..2193a35 100644
--- a/include/arch/alpha/klibc/archsignal.h
+++ b/include/arch/alpha/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/arm/klibc/archsignal.h b/include/arch/arm/klibc/archsignal.h
index 77685e6..a589527 100644
--- a/include/arch/arm/klibc/archsignal.h
+++ b/include/arch/arm/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/cris/klibc/archsignal.h b/include/arch/cris/klibc/archsignal.h
index 73b2e19..7fa7454 100644
--- a/include/arch/cris/klibc/archsignal.h
+++ b/include/arch/cris/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/i386/klibc/archsignal.h b/include/arch/i386/klibc/archsignal.h
index b092ba6..bfa0d95 100644
--- a/include/arch/i386/klibc/archsignal.h
+++ b/include/arch/i386/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/ia64/klibc/archsignal.h b/include/arch/ia64/klibc/archsignal.h
index d13907a..f1f89de 100644
--- a/include/arch/ia64/klibc/archsignal.h
+++ b/include/arch/ia64/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 #define _NSIG        64
 #define _NSIG_BPW    64
 #define _NSIG_WORDS (_NSIG / _NSIG_BPW)
diff --git a/include/arch/m32r/klibc/archsignal.h b/include/arch/m32r/klibc/archsignal.h
index 02596e9..b753026 100644
--- a/include/arch/m32r/klibc/archsignal.h
+++ b/include/arch/m32r/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/m68k/klibc/archsignal.h b/include/arch/m68k/klibc/archsignal.h
index 714527f..bf7912a 100644
--- a/include/arch/m68k/klibc/archsignal.h
+++ b/include/arch/m68k/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/mips/klibc/archsignal.h b/include/arch/mips/klibc/archsignal.h
index 3b72908..b9ca756 100644
--- a/include/arch/mips/klibc/archsignal.h
+++ b/include/arch/mips/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/mips64/klibc/archsignal.h b/include/arch/mips64/klibc/archsignal.h
index 56b0fd3..f350af9 100644
--- a/include/arch/mips64/klibc/archsignal.h
+++ b/include/arch/mips64/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/parisc/klibc/archsignal.h b/include/arch/parisc/klibc/archsignal.h
index 3190e85..7ca5ec6 100644
--- a/include/arch/parisc/klibc/archsignal.h
+++ b/include/arch/parisc/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 #define _NSIG    64
 #define _NSIG_SZ (_NSIG / LONG_BIT)
 
diff --git a/include/arch/ppc/klibc/archsignal.h b/include/arch/ppc/klibc/archsignal.h
index 567a547..9c3ac92 100644
--- a/include/arch/ppc/klibc/archsignal.h
+++ b/include/arch/ppc/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/ppc64/klibc/archsignal.h b/include/arch/ppc64/klibc/archsignal.h
index 8452f6e..2c4cef0 100644
--- a/include/arch/ppc64/klibc/archsignal.h
+++ b/include/arch/ppc64/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/s390/klibc/archsignal.h b/include/arch/s390/klibc/archsignal.h
index 1f8de28..a16b977 100644
--- a/include/arch/s390/klibc/archsignal.h
+++ b/include/arch/s390/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/s390x/klibc/archsignal.h b/include/arch/s390x/klibc/archsignal.h
index 08c9a00..cef96bc 100644
--- a/include/arch/s390x/klibc/archsignal.h
+++ b/include/arch/s390x/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/sh/klibc/archsignal.h b/include/arch/sh/klibc/archsignal.h
index 6c4e597..8e48e51 100644
--- a/include/arch/sh/klibc/archsignal.h
+++ b/include/arch/sh/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/sparc/klibc/archsignal.h b/include/arch/sparc/klibc/archsignal.h
index 3be67a2..3347bcd 100644
--- a/include/arch/sparc/klibc/archsignal.h
+++ b/include/arch/sparc/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* Hidden definitions */
 
 struct __new_sigaction {
diff --git a/include/arch/sparc64/klibc/archsignal.h b/include/arch/sparc64/klibc/archsignal.h
index f81bd66..4d45a14 100644
--- a/include/arch/sparc64/klibc/archsignal.h
+++ b/include/arch/sparc64/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* No special stuff for this architecture */
 
 #endif
diff --git a/include/arch/x86_64/klibc/archsignal.h b/include/arch/x86_64/klibc/archsignal.h
index 5272414..6c8ec77 100644
--- a/include/arch/x86_64/klibc/archsignal.h
+++ b/include/arch/x86_64/klibc/archsignal.h
@@ -8,6 +8,7 @@
 #ifndef _KLIBC_ARCHSIGNAL_H
 #define _KLIBC_ARCHSIGNAL_H
 
+#include <asm/signal.h>
 /* The x86-64 headers defines NSIG 32, but it's actually 64 */
 #undef  _NSIG
 #undef  NSIG
diff --git a/include/signal.h b/include/signal.h
index d82fce9..b6cff2a 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -10,9 +10,8 @@
 #include <string.h>		/* For memset() */
 #include <limits.h>		/* For LONG_BIT */
 #include <sys/types.h>
-#include <asm/signal.h>
 
-#include <klibc/archsignal.h>
+#include <klibc/archsignal.h>	/* Includes <asm/signal.h> if appropriate */
 
 /* glibc seems to use sig_atomic_t as "int" pretty much on all architectures.
    Do the same, but allow the architecture to override. */