diff --git a/lib/libc/arch/alpha/sys/__sigtramp1.S b/lib/libc/arch/alpha/sys/__sigtramp1.S
index 42a57c87e68b..360751ed2b6d 100644
--- a/lib/libc/arch/alpha/sys/__sigtramp1.S
+++ b/lib/libc/arch/alpha/sys/__sigtramp1.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigtramp1.S,v 1.2 2003/10/07 17:08:07 skd Exp $	*/
+/*	$NetBSD: __sigtramp1.S,v 1.3 2004/03/26 21:29:07 drochner Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -27,7 +27,6 @@
  * rights to redistribute these changes.
  */
 
-#define __HAVE_SIGINFO
 #include "SYS.h"
 
 /*
diff --git a/lib/libc/arch/i386/sys/__sigreturn14.S b/lib/libc/arch/i386/sys/__sigreturn14.S
index 97eedf7df362..872435969af9 100644
--- a/lib/libc/arch/i386/sys/__sigreturn14.S
+++ b/lib/libc/arch/i386/sys/__sigreturn14.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigreturn14.S,v 1.6 2003/09/12 13:29:46 christos Exp $	*/
+/*	$NetBSD: __sigreturn14.S,v 1.7 2004/03/26 21:29:07 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -33,10 +33,10 @@
  *
  *	from: @(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
  */
-#define __HAVE_SIGINFO
+
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: __sigreturn14.S,v 1.6 2003/09/12 13:29:46 christos Exp $")
+	RCSID("$NetBSD: __sigreturn14.S,v 1.7 2004/03/26 21:29:07 drochner Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/arch/i386/sys/__sigtramp1.S b/lib/libc/arch/i386/sys/__sigtramp1.S
index 80a4517357cc..2e04040e08e0 100644
--- a/lib/libc/arch/i386/sys/__sigtramp1.S
+++ b/lib/libc/arch/i386/sys/__sigtramp1.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigtramp1.S,v 1.3 2003/09/12 13:29:47 christos Exp $	*/
+/*	$NetBSD: __sigtramp1.S,v 1.4 2004/03/26 21:29:07 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#define __HAVE_SIGINFO
+
 #include "SYS.h"
 
 /*
diff --git a/lib/libc/arch/m68k/sys/__sigreturn14.S b/lib/libc/arch/m68k/sys/__sigreturn14.S
index 50ab485e683f..7d5ee3c41302 100644
--- a/lib/libc/arch/m68k/sys/__sigreturn14.S
+++ b/lib/libc/arch/m68k/sys/__sigreturn14.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigreturn14.S,v 1.8 2003/09/22 14:42:03 cl Exp $	*/
+/*	$NetBSD: __sigreturn14.S,v 1.9 2004/03/26 21:29:07 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -33,14 +33,13 @@
  * SUCH DAMAGE.
  */
 
-#define __HAVE_SIGINFO
 #include "SYS.h"
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 	RCSID("from: @(#)sigreturn.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: __sigreturn14.S,v 1.8 2003/09/22 14:42:03 cl Exp $")
+	RCSID("$NetBSD: __sigreturn14.S,v 1.9 2004/03/26 21:29:07 drochner Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/arch/m68k/sys/__sigtramp1.S b/lib/libc/arch/m68k/sys/__sigtramp1.S
index b1f3405bbfae..60e366b86787 100644
--- a/lib/libc/arch/m68k/sys/__sigtramp1.S
+++ b/lib/libc/arch/m68k/sys/__sigtramp1.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigtramp1.S,v 1.2 2003/09/22 14:42:04 cl Exp $	*/
+/*	$NetBSD: __sigtramp1.S,v 1.3 2004/03/26 21:29:07 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define __HAVE_SIGINFO
 #include "SYS.h"
 
 /*