diff --git a/include/setjmp.h b/include/setjmp.h
index 65ad80e2d3cb..6e3bf6a4ba0f 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: setjmp.h,v 1.16 1999/01/14 09:05:46 castor Exp $	*/
+/*	$NetBSD: setjmp.h,v 1.17 1999/01/15 03:43:56 castor Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -47,16 +47,16 @@
 
 #include <machine/setjmp.h>
 
-#ifndef __JB_ATTRIBUTES
-#define __JB_ATTRIBUTES	/**/
+#ifndef _JB_ATTRIBUTES
+#define _JB_ATTRIBUTES	/**/
 #else
 #endif
 
 #ifndef _ANSI_SOURCE
-typedef long sigjmp_buf[_JBLEN + 1] __JB_ATTRIBUTES;
+typedef long sigjmp_buf[_JBLEN + 1] _JB_ATTRIBUTES;
 #endif /* not ANSI */
 
-typedef long jmp_buf[_JBLEN] __JB_ATTRIBUTES;
+typedef long jmp_buf[_JBLEN] _JB_ATTRIBUTES;
 
 #include <sys/cdefs.h>
 
diff --git a/sys/arch/mips/include/setjmp.h b/sys/arch/mips/include/setjmp.h
index d06ff6c111d9..04363de26869 100644
--- a/sys/arch/mips/include/setjmp.h
+++ b/sys/arch/mips/include/setjmp.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: setjmp.h,v 1.3 1999/01/14 18:45:45 castor Exp $	*/
+/*	$NetBSD: setjmp.h,v 1.4 1999/01/15 03:43:56 castor Exp $	*/
 
 /*
  * mips/setjmp.h: machine dependent setjmp-related information.
@@ -7,8 +7,6 @@
  * struct sigcontext to restore it.
  */
 
-#ifndef __JBLEN
-#include <machine/pubassym.h>
+#ifndef _JBLEN		/* Size in longs of jmp_buf */
+#include <machine/pubassym.h> 
 #endif
-
-#define _JBLEN __JBLEN	/* Size in longs of jmp_buf */