diff --git a/arch/mips/bits/signal.h b/arch/mips/bits/signal.h
index 818e0a7..50a0061 100644
--- a/arch/mips/bits/signal.h
+++ b/arch/mips/bits/signal.h
@@ -73,6 +73,18 @@ typedef struct __ucontext {
 #define SIG_UNBLOCK   2
 #define SIG_SETMASK   3
 
+#undef SI_ASYNCIO
+#undef SI_MESGQ
+#undef SI_TIMER
+#define SI_ASYNCIO (-2)
+#define SI_MESGQ (-4)
+#define SI_TIMER (-3)
+
+#undef si_errno
+#undef si_code
+#define si_errno __si_code
+#define si_code  __si_errno
+
 #endif
 
 #define SIGHUP    1
diff --git a/include/signal.h b/include/signal.h
index 559362f..3496942 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -86,7 +86,7 @@ union sigval {
 };
 
 typedef struct {
-	int si_signo, si_errno, si_code;
+	int si_signo, __si_errno, __si_code;
 	union {
 		char __pad[128 - 2*sizeof(int) - sizeof(long)];
 		struct {
@@ -127,6 +127,8 @@ typedef struct {
 		} __sigsys;
 	} __si_fields;
 } siginfo_t;
+#define si_errno   __si_errno
+#define si_code    __si_code
 #define si_pid     __si_fields.__si_common.__first.__piduid.si_pid
 #define si_uid     __si_fields.__si_common.__first.__piduid.si_uid
 #define si_status  __si_fields.__si_common.__second.__sigchld.si_status