diff --git a/sysdeps/mach/hurd/alpha/sigcontext.h b/sysdeps/mach/hurd/alpha/sigcontext.h
index 2f8dee8274..85feda2a64 100644
--- a/sysdeps/mach/hurd/alpha/sigcontext.h
+++ b/sysdeps/mach/hurd/alpha/sigcontext.h
@@ -26,7 +26,7 @@ struct sigcontext
     /* These first members are machine-independent.  */
 
     long int sc_onstack;	/* Nonzero if running on sigstack.  */
-    sigset_t sc_mask;		/* Blocked signals to restore.  */
+    __sigset_t sc_mask;		/* Blocked signals to restore.  */
 
     /* MiG reply port this thread is using.  */
     unsigned long int sc_reply_port;
diff --git a/sysdeps/mach/hurd/mips/sigcontext.h b/sysdeps/mach/hurd/mips/sigcontext.h
index 37922361f6..81d1f25f25 100644
--- a/sysdeps/mach/hurd/mips/sigcontext.h
+++ b/sysdeps/mach/hurd/mips/sigcontext.h
@@ -25,7 +25,7 @@ struct sigcontext
     /* These first members are machine-independent.  */
 
     int sc_onstack;		/* Nonzero if running on sigstack.  */
-    sigset_t sc_mask;		/* Blocked signals to restore.  */
+    __sigset_t sc_mask;		/* Blocked signals to restore.  */
 
     /* MiG reply port this thread is using.  */
     unsigned int sc_reply_port;
diff --git a/sysdeps/unix/bsd/sun/m68k/sigcontext.h b/sysdeps/unix/bsd/sun/m68k/sigcontext.h
index 926c44f69c..471b516bdc 100644
--- a/sysdeps/unix/bsd/sun/m68k/sigcontext.h
+++ b/sysdeps/unix/bsd/sun/m68k/sigcontext.h
@@ -1,5 +1,5 @@
 /* Structure describing state saved while handling a signal.  Sun 3 version.
-Copyright (C) 1993 Free Software Foundation, Inc.
+Copyright (C) 1993, 1994 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@ Cambridge, MA 02139, USA.  */
 struct sigcontext
   {
     int sc_onstack;
-    sigset_t sc_mask;
+    __sigset_t sc_mask;
 
     int sc_sp, sc_pc, sc_ps;
   };
diff --git a/sysdeps/unix/bsd/sun/sparc/sigcontext.h b/sysdeps/unix/bsd/sun/sparc/sigcontext.h
index 4834f2ff9e..290bf817af 100644
--- a/sysdeps/unix/bsd/sun/sparc/sigcontext.h
+++ b/sysdeps/unix/bsd/sun/sparc/sigcontext.h
@@ -1,5 +1,5 @@
 /* Structure describing state saved while handling a signal.  Sparc version.
-Copyright (C) 1992 Free Software Foundation, Inc.
+Copyright (C) 1992, 1994 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@ Cambridge, MA 02139, USA.  */
 struct sigcontext
   {
     int sc_onstack;
-    sigset_t sc_mask;
+    __sigset_t sc_mask;
 
 #define	SPARC_MAXREGWINDOW 31	/* Maximum usable register windows.  */
     int sc_sp, sc_pc, sc_npc, sc_psr, sc_g1, sc_o0;
diff --git a/sysdeps/unix/bsd/ultrix4/mips/sigcontext.h b/sysdeps/unix/bsd/ultrix4/mips/sigcontext.h
index 107d2fc5f6..4bddcf2f4b 100644
--- a/sysdeps/unix/bsd/ultrix4/mips/sigcontext.h
+++ b/sysdeps/unix/bsd/ultrix4/mips/sigcontext.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1994 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@ struct sigcontext
     int sc_onstack;
     
     /* Signal mask to restore.  */
-    sigset_t sc_mask;
+    __sigset_t sc_mask;
     
     /* Program counter when the signal hit.  */
     __ptr_t sc_pc;