diff --git a/sys/compat/netbsd32/files.netbsd32 b/sys/compat/netbsd32/files.netbsd32
index 7188ec8fc216..49c6d6e4b7c1 100644
--- a/sys/compat/netbsd32/files.netbsd32
+++ b/sys/compat/netbsd32/files.netbsd32
@@ -1,4 +1,4 @@
-#	$NetBSD: files.netbsd32,v 1.5 1999/04/24 19:17:33 eeh Exp $
+#	$NetBSD: files.netbsd32,v 1.6 1999/10/11 01:36:21 eeh Exp $
 #
 # config file description for machine-independent netbsd32 compat code.
 # included by ports that need it.
@@ -14,5 +14,6 @@ file	compat/netbsd32/netbsd32_compat_09.c	compat_netbsd32 & compat_09
 file	compat/netbsd32/netbsd32_compat_10.c	compat_netbsd32 & compat_10
 file	compat/netbsd32/netbsd32_compat_12.c	compat_netbsd32 & compat_12
 file	compat/netbsd32/netbsd32_compat_13.c	compat_netbsd32 & compat_13
+file	compat/netbsd32/netbsd32_compat_14.c	compat_netbsd32 & compat_14
 file	compat/netbsd32/netbsd32_compat_43.c	compat_netbsd32 & compat_43
 file	compat/netbsd32/netbsd32_syscalls.c	compat_netbsd32 & syscall_debug
diff --git a/sys/compat/netbsd32/netbsd32.h b/sys/compat/netbsd32/netbsd32.h
index b157ec18c296..4026388b2b04 100644
--- a/sys/compat/netbsd32/netbsd32.h
+++ b/sys/compat/netbsd32/netbsd32.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32.h,v 1.8 1999/07/12 21:55:20 kleink Exp $	*/
+/*	$NetBSD: netbsd32.h,v 1.9 1999/10/11 01:36:22 eeh Exp $	*/
 
 /*
  * Copyright (c) 1998 Matthew R. Green
@@ -167,6 +167,15 @@ typedef u_int32_t netbsd32_rlimitp_t;
 /* from <sys/ipc.h> */
 typedef u_int32_t netbsd32_ipc_permp_t;
 struct netbsd32_ipc_perm {
+	ushort	cuid;		/* creator user id */
+	ushort	cgid;		/* creator group id */
+	ushort	uid;		/* user id */
+	ushort	gid;		/* group id */
+	ushort	mode;		/* r/w permission */
+	ushort	_seq;		/* sequence # (to generate unique msg/sem/shm id) */
+	netbsd32_key_t	_key;	/* user specified msg/sem/shm key */
+};
+struct netbsd32_ipc_perm14 {
 	ushort	cuid;		/* creator user id */
 	ushort	cgid;		/* creator group id */
 	ushort	uid;		/* user id */
@@ -188,8 +197,29 @@ struct netbsd32_msg {
 };
 
 typedef u_int32_t netbsd32_msqid_dsp_t;
+typedef u_int32_t netbsd32_msgqnum_t;
+typedef netbsd32_size_t netbsd32_msglen_t;
+
 struct netbsd32_msqid_ds {
-	struct	netbsd32_ipc_perm msg_perm;	/* msg queue permission bits */
+	struct netbsd32_ipc_perm	msg_perm;	/* operation permission strucure */
+	netbsd32_msgqnum_t	msg_qnum;	/* number of messages in the queue */
+	netbsd32_msglen_t	msg_qbytes;	/* max # of bytes in the queue */
+	pid_t		msg_lspid;	/* process ID of last msgsend() */
+	pid_t		msg_lrpid;	/* process ID of last msgrcv() */
+	time_t		msg_stime;	/* time of last msgsend() */
+	time_t		msg_rtime;	/* time of last msgrcv() */
+	time_t		msg_ctime;	/* time of last change */
+
+	/*
+	 * These members are private and used only in the internal
+	 * implementation of this interface.
+	 */
+	netbsd32_msgp_t _msg_first;	/* first message in the queue */
+	netbsd32_msgp_t	_msg_last;	/* last message in the queue */
+	netbsd32_msglen_t	_msg_cbytes;	/* # of bytes currently in queue */
+};
+struct netbsd32_msqid_ds14 {
+	struct	netbsd32_ipc_perm14 msg_perm;	/* msg queue permission bits */
 	netbsd32_msgp_t	msg_first;	/* first message in the queue */
 	netbsd32_msgp_t	msg_last;	/* last message in the queue */
 	netbsd32_u_long	msg_cbytes;	/* number of bytes in use on the queue */
@@ -211,6 +241,19 @@ typedef u_int32_t netbsd32_semp_t;
 
 typedef u_int32_t netbsd32_semid_dsp_t;
 struct netbsd32_semid_ds {
+	struct netbsd32_ipc_perm	sem_perm;/* operation permission struct */
+	unsigned short	sem_nsems;	/* number of sems in set */
+	time_t		sem_otime;	/* last operation time */
+	time_t		sem_ctime;	/* last change time */
+
+	/*
+	 * These members are private and used only in the internal
+	 * implementation of this interface.
+	 */
+	netbsd32_semp_t	_sem_base;	/* pointer to first semaphore in set */
+};
+
+struct netbsd32_semid_ds14 {
 	struct netbsd32_ipc_perm	sem_perm;/* operation permission struct */
 	netbsd32_semp_t	sem_base;	/* pointer to first semaphore in set */
 	unsigned short	sem_nsems;	/* number of sems in set */
@@ -248,7 +291,7 @@ struct netbsd32_shmid_ds {
 	time_t		shm_atime;	/* time of last shmat() */
 	time_t		shm_dtime;	/* time of last shmdt() */
 	time_t		shm_ctime;	/* time of last change by shmctl() */
-	netbsd32_voidp	shm_internal;	/* sysv stupidity */
+	netbsd32_voidp	_shm_internal;	/* sysv stupidity */
 };
 
 /* from <sys/signal.h> */
@@ -423,7 +466,7 @@ typedef u_int32_t netbsd32_outsnamep_t;
  *		- type of pointer to above, normally u_int32_t
  *	void netbsd32_setregs(struct proc *p, struct exec_package *pack,
  *	    u_long stack);
- *	int compat_netbsd32_sigreturn(struct proc *p, void *v,
+ *	int netbsd32_sigreturn(struct proc *p, void *v,
  *	    register_t *retval);
  *	void netbsd32_sendsig(sig_t catcher, int sig, int mask, u_long code);
  *	char netbsd32_esigcode[], netbsd32_sigcode[]
diff --git a/sys/compat/netbsd32/netbsd32_compat_09.c b/sys/compat/netbsd32/netbsd32_compat_09.c
index 9fd9e6992b1e..65ca33171c26 100644
--- a/sys/compat/netbsd32/netbsd32_compat_09.c
+++ b/sys/compat/netbsd32/netbsd32_compat_09.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_compat_09.c,v 1.3 1999/03/25 16:58:39 mrg Exp $	*/
+/*	$NetBSD: netbsd32_compat_09.c,v 1.4 1999/10/11 01:36:22 eeh Exp $	*/
 
 /*
  * Copyright (c) 1998 Matthew R. Green
@@ -41,12 +41,12 @@
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 
 int
-compat_09_compat_netbsd32_ogetdomainname(p, v, retval)
+compat_09_netbsd32_ogetdomainname(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_09_compat_netbsd32_ogetdomainname_args /* {
+	struct compat_09_netbsd32_ogetdomainname_args /* {
 		syscallarg(netbsd32_charp) domainname;
 		syscallarg(int) len;
 	} */ *uap = v;
@@ -59,12 +59,12 @@ compat_09_compat_netbsd32_ogetdomainname(p, v, retval)
 }
 
 int
-compat_09_compat_netbsd32_osetdomainname(p, v, retval)
+compat_09_netbsd32_osetdomainname(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_09_compat_netbsd32_osetdomainname_args /* {
+	struct compat_09_netbsd32_osetdomainname_args /* {
 		syscallarg(netbsd32_charp) domainname;
 		syscallarg(int) len;
 	} */ *uap = v;
@@ -79,12 +79,12 @@ compat_09_compat_netbsd32_osetdomainname(p, v, retval)
 }
 
 int
-compat_09_compat_netbsd32_ouname(p, v, retval)
+compat_09_netbsd32_ouname(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_09_compat_netbsd32_uname_args /* {
+	struct compat_09_netbsd32_uname_args /* {
 		syscallarg(netbsd32_outsnamep_t) name;
 	} */ *uap = v;
 	struct compat_09_sys_uname_args ua;
diff --git a/sys/compat/netbsd32/netbsd32_compat_10.c b/sys/compat/netbsd32/netbsd32_compat_10.c
index 800c16cbcd59..168f41f3a3e2 100644
--- a/sys/compat/netbsd32/netbsd32_compat_10.c
+++ b/sys/compat/netbsd32/netbsd32_compat_10.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_compat_10.c,v 1.3 1999/03/25 16:22:49 mrg Exp $	*/
+/*	$NetBSD: netbsd32_compat_10.c,v 1.4 1999/10/11 01:36:22 eeh Exp $	*/
 
 /*
  * Copyright (c) 1994 Adam Glass and Charles M. Hannum.  All rights reserved.
@@ -52,19 +52,19 @@
 
 #ifdef SYSVSEM
 int
-compat_netbsd32_compat_10_sys_semsys(p, v, retval)
+netbsd32_compat_10_sys_semsys(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_compat_10_sys_semsys_args /* {
+	struct netbsd32_compat_10_sys_semsys_args /* {
 		syscallarg(int) which;
 		syscallarg(int) a2;
 		syscallarg(int) a3;
 		syscallarg(int) a4;
 		syscallarg(int) a5;
 	} */ *uap = v;
-	struct sys___semctl_args /* {
+	struct compat_14_sys___semctl_args /* {
 		syscallarg(int) semid;
 		syscallarg(int) semnum;
 		syscallarg(int) cmd;
@@ -93,8 +93,8 @@ compat_netbsd32_compat_10_sys_semsys(p, v, retval)
 		SCARG(&__semctl_args, arg) = stackgap_alloc(&sg,
 			sizeof(union semun *));
 		copyout(&SCARG(uap, a5), SCARG(&__semctl_args, arg),
-			sizeof(union semun));
-		return (sys___semctl(p, &__semctl_args, retval));
+			sizeof(union __semun));
+		return (compat_14_sys___semctl(p, &__semctl_args, retval));
 
 	case 1:						/* semget() */
 		SCARG(&semget_args, key) = SCARG(uap, a2);
@@ -120,12 +120,12 @@ compat_netbsd32_compat_10_sys_semsys(p, v, retval)
 
 #ifdef SYSVSHM
 int
-compat_netbsd32_compat_10_sys_shmsys(p, v, retval)
+netbsd32_compat_10_sys_shmsys(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_compat_10_sys_shmsys_args /* {
+	struct netbsd32_compat_10_sys_shmsys_args /* {
 		syscallarg(int) which;
 		syscallarg(int) a2;
 		syscallarg(int) a3;
@@ -136,7 +136,7 @@ compat_netbsd32_compat_10_sys_shmsys(p, v, retval)
 		syscallarg(void *) shmaddr;
 		syscallarg(int) shmflg;
 	} */ shmat_args;
-	struct sys_shmctl_args /* {
+	struct compat_14_sys_shmctl_args /* {
 		syscallarg(int) shmid;
 		syscallarg(int) cmd;
 		syscallarg(struct shmid_ds *) buf;
@@ -160,8 +160,8 @@ compat_netbsd32_compat_10_sys_shmsys(p, v, retval)
 	case 1:						/* shmctl() */
 		SCARG(&shmctl_args, shmid) = SCARG(uap, a2);
 		SCARG(&shmctl_args, cmd) = SCARG(uap, a3);
-		SCARG(&shmctl_args, buf) = (struct shmid_ds *)SCARG(uap, a4);
-		return (sys_shmctl(p, &shmctl_args, retval));
+		SCARG(&shmctl_args, buf) = (struct shmid_ds14 *)SCARG(uap, a4);
+		return (compat_14_sys_shmctl(p, &shmctl_args, retval));
 
 	case 2:						/* shmdt() */
 		SCARG(&shmdt_args, shmaddr) = (void *)SCARG(uap, a2);
@@ -181,12 +181,12 @@ compat_netbsd32_compat_10_sys_shmsys(p, v, retval)
 
 #ifdef SYSVMSG
 int
-compat_netbsd32_compat_10_sys_msgsys(p, v, retval)
+netbsd32_compat_10_sys_msgsys(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_compat_10_sys_msgsys_args /* {
+	struct netbsd32_compat_10_sys_msgsys_args /* {
 		syscallarg(int) which;
 		syscallarg(int) a2;
 		syscallarg(int) a3;
@@ -194,7 +194,7 @@ compat_netbsd32_compat_10_sys_msgsys(p, v, retval)
 		syscallarg(int) a5;
 		syscallarg(int) a6;
 	} */ *uap = v;
-	struct sys_msgctl_args /* {
+	struct compat_14_sys_msgctl_args /* {
 		syscallarg(int) msqid;
 		syscallarg(int) cmd;
 		syscallarg(struct msqid_ds *) buf;
@@ -222,8 +222,8 @@ compat_netbsd32_compat_10_sys_msgsys(p, v, retval)
 		SCARG(&msgctl_args, msqid) = SCARG(uap, a2);
 		SCARG(&msgctl_args, cmd) = SCARG(uap, a3);
 		SCARG(&msgctl_args, buf) =
-		    (struct msqid_ds *)SCARG(uap, a4);
-		return (sys_msgctl(p, &msgctl_args, retval));
+		    (struct msqid_ds14 *)SCARG(uap, a4);
+		return (compat_14_sys_msgctl(p, &msgctl_args, retval));
 
 	case 1:					/* msgget() */
 		SCARG(&msgget_args, key) = SCARG(uap, a2);
diff --git a/sys/compat/netbsd32/netbsd32_compat_12.c b/sys/compat/netbsd32/netbsd32_compat_12.c
index cd93210a207e..95324f81ab56 100644
--- a/sys/compat/netbsd32/netbsd32_compat_12.c
+++ b/sys/compat/netbsd32/netbsd32_compat_12.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_compat_12.c,v 1.5 1999/03/25 16:58:39 mrg Exp $	*/
+/*	$NetBSD: netbsd32_compat_12.c,v 1.6 1999/10/11 01:36:22 eeh Exp $	*/
 
 /*
  * Copyright (c) 1998 Matthew R. Green
@@ -43,7 +43,7 @@
 
 /* for use with {,fl}stat() */
 static void
-compat_netbsd32_stat12_to_netbsd32(sp12, sp32)
+netbsd32_stat12_to_netbsd32(sp12, sp32)
 	struct stat12 *sp12;
 	struct netbsd32_stat12 *sp32;
 {
@@ -72,12 +72,12 @@ compat_netbsd32_stat12_to_netbsd32(sp12, sp32)
 }
 
 int
-compat_12_compat_netbsd32_reboot(p, v, retval)
+compat_12_netbsd32_reboot(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_12_compat_netbsd32_reboot_args /* {
+	struct compat_12_netbsd32_reboot_args /* {
 		syscallarg(int) opt;
 	} */ *uap = v;
 	struct compat_12_sys_reboot_args ua;
@@ -87,12 +87,12 @@ compat_12_compat_netbsd32_reboot(p, v, retval)
 }
 
 int
-compat_12_compat_netbsd32_msync(p, v, retval)
+compat_12_netbsd32_msync(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_12_compat_netbsd32_msync_args /* {
+	struct compat_12_netbsd32_msync_args /* {
 		syscallarg(netbsd32_caddr_t) addr;
 		syscallarg(netbsd32_size_t) len;
 	} */ *uap = v;
@@ -105,12 +105,12 @@ compat_12_compat_netbsd32_msync(p, v, retval)
 }
 
 int
-compat_12_compat_netbsd32_oswapon(p, v, retval)
+compat_12_netbsd32_oswapon(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_12_compat_netbsd32_oswapon_args /* {
+	struct compat_12_netbsd32_oswapon_args /* {
 		syscallarg(const netbsd32_charp) name;
 	} */ *uap = v;
 	struct sys_swapctl_args ua;
@@ -122,12 +122,12 @@ compat_12_compat_netbsd32_oswapon(p, v, retval)
 }
 
 int
-compat_12_compat_netbsd32_stat12(p, v, retval)
+compat_12_netbsd32_stat12(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_12_compat_netbsd32_stat12_args /* {
+	struct compat_12_netbsd32_stat12_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_stat12p_t) ub;
 	} */ *uap = v;
@@ -146,18 +146,18 @@ compat_12_compat_netbsd32_stat12(p, v, retval)
 	rv = compat_12_sys_stat(p, &ua, retval);
 
 	sp32 = (struct netbsd32_stat12 *)(u_long)SCARG(uap, ub);
-	compat_netbsd32_stat12_to_netbsd32(sp12, sp32);
+	netbsd32_stat12_to_netbsd32(sp12, sp32);
 
 	return (rv);
 }
 
 int
-compat_12_compat_netbsd32_fstat12(p, v, retval)
+compat_12_netbsd32_fstat12(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_12_compat_netbsd32_fstat12_args /* {
+	struct compat_12_netbsd32_fstat12_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_stat12p_t) sb;
 	} */ *uap = v;
@@ -172,18 +172,18 @@ compat_12_compat_netbsd32_fstat12(p, v, retval)
 	rv = compat_12_sys_fstat(p, &ua, retval);
 
 	sp32 = (struct netbsd32_stat12 *)(u_long)SCARG(uap, sb);
-	compat_netbsd32_stat12_to_netbsd32(sp12, sp32);
+	netbsd32_stat12_to_netbsd32(sp12, sp32);
 
 	return (rv);
 }
 
 int
-compat_12_compat_netbsd32_lstat12(p, v, retval)
+compat_12_netbsd32_lstat12(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_12_compat_netbsd32_lstat12_args /* {
+	struct compat_12_netbsd32_lstat12_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_stat12p_t) ub;
 	} */ *uap = v;
@@ -202,18 +202,18 @@ compat_12_compat_netbsd32_lstat12(p, v, retval)
 	rv = compat_12_sys_lstat(p, &ua, retval);
 
 	sp32 = (struct netbsd32_stat12 *)(u_long)SCARG(uap, ub);
-	compat_netbsd32_stat12_to_netbsd32(sp12, sp32);
+	netbsd32_stat12_to_netbsd32(sp12, sp32);
 
 	return (rv);
 }
 
 int
-compat_12_compat_netbsd32_getdirentries(p, v, retval)
+compat_12_netbsd32_getdirentries(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_12_compat_netbsd32_getdirentries_args /* {
+	struct compat_12_netbsd32_getdirentries_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_charp) buf;
 		syscallarg(u_int) count;
diff --git a/sys/compat/netbsd32/netbsd32_compat_13.c b/sys/compat/netbsd32/netbsd32_compat_13.c
index 6cb1ca7813bd..9729c4752378 100644
--- a/sys/compat/netbsd32/netbsd32_compat_13.c
+++ b/sys/compat/netbsd32/netbsd32_compat_13.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_compat_13.c,v 1.3 1999/03/25 16:22:49 mrg Exp $	*/
+/*	$NetBSD: netbsd32_compat_13.c,v 1.4 1999/10/11 01:36:22 eeh Exp $	*/
 
 /*
  * Copyright (c) 1998 Matthew R. Green
@@ -39,12 +39,12 @@
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 
 int
-compat_13_compat_netbsd32_sigaltstack13(p, v, retval)
+compat_13_netbsd32_sigaltstack13(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_13_compat_netbsd32_sigaltstack13_args /* {
+	struct compat_13_netbsd32_sigaltstack13_args /* {
 		syscallarg(const netbsd32_sigaltstack13p_t) nss;
 		syscallarg(netbsd32_sigaltstack13p_t) oss;
 	} */ *uap = v;
diff --git a/sys/compat/netbsd32/netbsd32_compat_14.c b/sys/compat/netbsd32/netbsd32_compat_14.c
new file mode 100644
index 000000000000..e1ec985234a4
--- /dev/null
+++ b/sys/compat/netbsd32/netbsd32_compat_14.c
@@ -0,0 +1,323 @@
+/*	$NetBSD: netbsd32_compat_14.c,v 1.1 1999/10/11 01:36:22 eeh Exp $	*/
+
+/*
+ * Copyright (c) 1999 Eduardo E. Horvath
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/signal.h>
+#include <sys/proc.h>
+#include <sys/mount.h>
+#include <sys/msg.h>
+#include <sys/sem.h>
+#include <sys/shm.h>  
+
+#define	SYSVMSG
+#define	SYSVSEM
+#define	SYSVSHM
+
+#include <sys/syscallargs.h>
+#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscallargs.h>
+
+void
+netbsd32_ipc_perm14_to_native(operm, perm)
+	struct netbsd32_ipc_perm14 *operm;
+	struct ipc_perm *perm;
+{
+
+#define	CVT(x)	perm->x = operm->x
+	CVT(uid);
+	CVT(gid);
+	CVT(cuid);
+	CVT(cgid);
+	CVT(mode);
+#undef CVT
+}
+
+void
+native_to_netbsd32_ipc_perm14(perm, operm)
+	struct ipc_perm *perm;
+	struct netbsd32_ipc_perm14 *operm;
+{
+
+#define	CVT(x)	operm->x = perm->x
+	CVT(uid);
+	CVT(gid);
+	CVT(cuid);
+	CVT(cgid);
+	CVT(mode);
+#undef CVT
+
+	/*
+	 * Not part of the API, but some programs might look at it.
+	 */
+	operm->seq = perm->_seq;
+	operm->key = (key_t)perm->_key;
+}
+
+void
+netbsd32_msqid_ds14_to_native(omsqbuf, msqbuf)
+	struct netbsd32_msqid_ds14 *omsqbuf;
+	struct msqid_ds *msqbuf;
+{
+
+	netbsd32_ipc_perm14_to_native(&omsqbuf->msg_perm, &msqbuf->msg_perm);
+
+#define	CVT(x)	msqbuf->x = omsqbuf->x
+	CVT(msg_qnum);
+	CVT(msg_qbytes);
+	CVT(msg_lspid);
+	CVT(msg_lrpid);
+	CVT(msg_stime);
+	CVT(msg_rtime);
+	CVT(msg_ctime);
+#undef CVT
+}
+
+void
+native_to_netbsd32_msqid_ds14(msqbuf, omsqbuf)
+	struct msqid_ds *msqbuf;
+	struct netbsd32_msqid_ds14 *omsqbuf;
+{
+
+	native_to_netbsd32_ipc_perm14(&msqbuf->msg_perm, &omsqbuf->msg_perm);
+
+#define	CVT(x)	omsqbuf->x = msqbuf->x
+	CVT(msg_qnum);
+	CVT(msg_qbytes);
+	CVT(msg_lspid);
+	CVT(msg_lrpid);
+	CVT(msg_stime);
+	CVT(msg_rtime);
+	CVT(msg_ctime);
+#undef CVT
+
+	/*
+	 * Not part of the API, but some programs might look at it.
+	 */
+	omsqbuf->msg_cbytes = msqbuf->_msg_cbytes;
+}
+
+int
+compat_14_netbsd32_sys_msgctl(p, v, retval)
+	struct proc *p;
+	void *v;
+	register_t *retval;
+{
+	struct compat_14_netbsd32_msgctl_args /* {
+		syscallarg(int) msqid;
+		syscallarg(int) cmd;
+		syscallarg(struct msqid_ds14 *) buf;
+	} */ *uap = v;
+	struct msqid_ds msqbuf;
+	struct netbsd32_msqid_ds14 omsqbuf;
+	int cmd, error;
+
+	cmd = SCARG(uap, cmd);
+
+	if (cmd == IPC_SET) {
+		error = copyin(SCARG(uap, buf), &omsqbuf, sizeof(omsqbuf));
+		if (error) 
+			return (error);
+		netbsd32_msqid_ds14_to_native(&omsqbuf, &msqbuf);
+	}
+
+	error = msgctl1(p, SCARG(uap, msqid), cmd,
+	    (cmd == IPC_SET || cmd == IPC_STAT) ? &msqbuf : NULL);
+
+	if (error == 0 && cmd == IPC_STAT) {
+		native_to_netbsd32_msqid_ds14(&msqbuf, &omsqbuf);     
+		error = copyout(&omsqbuf, SCARG(uap, buf), sizeof(omsqbuf));
+	}
+
+	return (error);
+}
+
+
+void
+netbsd32_semid_ds14_to_native(osembuf, sembuf)
+	struct semid_ds14 *osembuf;
+	struct semid_ds *sembuf;
+{
+
+	netbsd32_ipc_perm14_to_native(&osembuf->sem_perm, &sembuf->sem_perm);
+
+#define	CVT(x)	sembuf->x = osembuf->x
+	CVT(sem_nsems);
+	CVT(sem_otime);
+	CVT(sem_ctime);
+#undef CVT
+}
+
+void
+native_to_netbsd32_semid_ds14(sembuf, osembuf)
+	struct semid_ds *sembuf;
+	struct semid_ds14 *osembuf;
+{
+
+	native_to_netbsd32_ipc_perm14(&sembuf->sem_perm, &osembuf->sem_perm);
+
+#define	CVT(x)	osembuf->x = sembuf->x
+	CVT(sem_nsems);
+	CVT(sem_otime);
+	CVT(sem_ctime);
+#undef CVT
+}
+
+int
+compat_14_netbsd32_sys___semctl(p, v, retval)
+	struct proc *p;
+	void *v;
+	register_t *retval;
+{
+	struct compat_14_netbsd32___semctl_args /* {
+		syscallarg(int) semid;
+		syscallarg(int) semnum;
+		syscallarg(int) cmd;
+		syscallarg(union __semun *) arg;
+	} */ *uap = v;
+	union __semun arg;
+	struct semid_ds sembuf;
+	struct netbsd32_semid_ds14 osembuf;
+	int cmd, error;
+	void *pass_arg = NULL;
+
+	cmd = SCARG(uap, cmd);
+
+	switch (cmd) {
+	case IPC_SET:    
+	case IPC_STAT:
+		pass_arg = &sembuf;
+		break;
+
+	case GETALL:
+	case SETVAL:
+	case SETALL:
+		pass_arg = &arg;
+		break;
+	}
+
+	if (pass_arg != NULL) {
+		error = copyin(SCARG(uap, arg), &arg, sizeof(arg));
+		if (error)
+			return (error);  
+		if (cmd == IPC_SET) { 
+			error = copyin(arg.buf, &osembuf, sizeof(osembuf));
+			if (error)  
+				return (error);
+			netbsd32_semid_ds14_to_native(&osembuf, &sembuf);
+		}
+	}
+
+	error = semctl1(p, SCARG(uap, semid), SCARG(uap, semnum), cmd,
+	    pass_arg, retval);
+
+	if (error == 0 && cmd == IPC_STAT) {
+		native_to_netbsd32_semid_ds14(&sembuf, &osembuf);
+		error = copyout(&osembuf, arg.buf, sizeof(osembuf));
+	}
+
+	return (error);
+}
+
+
+void
+shmid_ds14_to_native(oshmbuf, shmbuf)
+	struct shmid_ds14 *oshmbuf;
+	struct shmid_ds *shmbuf;
+{
+
+	ipc_perm14_to_native(&oshmbuf->shm_perm, &shmbuf->shm_perm);
+
+#define	CVT(x)	shmbuf->x = oshmbuf->x
+	CVT(shm_segsz);
+	CVT(shm_lpid);
+	CVT(shm_cpid);
+	CVT(shm_nattch);
+	CVT(shm_atime);
+	CVT(shm_dtime);
+	CVT(shm_ctime);
+#undef CVT
+}
+
+void
+native_to_shmid_ds14(shmbuf, oshmbuf)
+	struct shmid_ds *shmbuf;
+	struct shmid_ds14 *oshmbuf;
+{
+
+	native_to_ipc_perm14(&shmbuf->shm_perm, &oshmbuf->shm_perm);
+
+#define	CVT(x)	oshmbuf->x = shmbuf->x
+	CVT(shm_segsz);
+	CVT(shm_lpid);
+	CVT(shm_cpid);
+	CVT(shm_nattch);
+	CVT(shm_atime);
+	CVT(shm_dtime);
+	CVT(shm_ctime);
+#undef CVT
+}
+
+int
+compat_14_netbsd32_sys_shmctl(p, v, retval)
+	struct proc *p;
+	void *v;
+	register_t *retval;
+{
+	struct compat_14_netbsd32_shmctl_args /* {
+		syscallarg(int) shmid;
+		syscallarg(int) cmd;
+		syscallarg(struct shmid_ds14 *) buf;
+	} */ *uap = v;
+	struct shmid_ds shmbuf;
+	struct shmid_ds14 oshmbuf;
+	int cmd, error;
+
+	cmd = SCARG(uap, cmd);
+
+	if (cmd == IPC_SET) {
+		error = copyin(SCARG(uap, buf), &oshmbuf, sizeof(oshmbuf));
+		if (error) 
+			return (error);
+		shmid_ds14_to_native(&oshmbuf, &shmbuf);
+	}
+
+	error = shmctl1(p, SCARG(uap, shmid), cmd,
+	    (cmd == IPC_SET || cmd == IPC_STAT) ? &shmbuf : NULL);
+
+	if (error == 0 && cmd == IPC_STAT) {
+		native_to_shmid_ds14(&shmbuf, &oshmbuf);     
+		error = copyout(&oshmbuf, SCARG(uap, buf), sizeof(oshmbuf));
+	}
+
+	return (error);
+}
diff --git a/sys/compat/netbsd32/netbsd32_compat_43.c b/sys/compat/netbsd32/netbsd32_compat_43.c
index 4db302dd2b76..439553cb615c 100644
--- a/sys/compat/netbsd32/netbsd32_compat_43.c
+++ b/sys/compat/netbsd32/netbsd32_compat_43.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_compat_43.c,v 1.7 1999/04/14 02:50:38 mrg Exp $	*/
+/*	$NetBSD: netbsd32_compat_43.c,v 1.8 1999/10/11 01:36:22 eeh Exp $	*/
 
 /*
  * Copyright (c) 1998 Matthew R. Green
@@ -73,12 +73,12 @@ netbsd32_from_stat43(sp43, sp32)
 
 /* file system syscalls */
 int
-compat_43_compat_netbsd32_ocreat(p, v, retval)
+compat_43_netbsd32_ocreat(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_ocreat_args /* {
+	struct compat_43_netbsd32_ocreat_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(mode_t) mode;
 	} */ *uap = v;
@@ -95,12 +95,12 @@ compat_43_compat_netbsd32_ocreat(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_olseek(p, v, retval)
+compat_43_netbsd32_olseek(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_olseek_args /* {
+	struct compat_43_netbsd32_olseek_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_long) offset;
 		syscallarg(int) whence;
@@ -119,12 +119,12 @@ compat_43_compat_netbsd32_olseek(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_stat43(p, v, retval)
+compat_43_netbsd32_stat43(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_stat43_args /* {
+	struct compat_43_netbsd32_stat43_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_stat43p_t) ub;
 	} */ *uap = v;
@@ -149,12 +149,12 @@ compat_43_compat_netbsd32_stat43(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_lstat43(p, v, retval)
+compat_43_netbsd32_lstat43(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_lstat43_args /* {
+	struct compat_43_netbsd32_lstat43_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_stat43p_t) ub;
 	} */ *uap = v;
@@ -179,12 +179,12 @@ compat_43_compat_netbsd32_lstat43(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_fstat43(p, v, retval)
+compat_43_netbsd32_fstat43(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_fstat43_args /* {
+	struct compat_43_netbsd32_fstat43_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_stat43p_t) sb;
 	} */ *uap = v;
@@ -205,12 +205,12 @@ compat_43_compat_netbsd32_fstat43(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_otruncate(p, v, retval)
+compat_43_netbsd32_otruncate(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_otruncate_args /* {
+	struct compat_43_netbsd32_otruncate_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_long) length;
 	} */ *uap = v;
@@ -222,12 +222,12 @@ compat_43_compat_netbsd32_otruncate(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_oftruncate(p, v, retval)
+compat_43_netbsd32_oftruncate(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_oftruncate_args /* {
+	struct compat_43_netbsd32_oftruncate_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_long) length;
 	} */ *uap = v;
@@ -239,12 +239,12 @@ compat_43_compat_netbsd32_oftruncate(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_ogetdirentries(p, v, retval)
+compat_43_netbsd32_ogetdirentries(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_ogetdirentries_args /* {
+	struct compat_43_netbsd32_ogetdirentries_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_charp) buf;
 		syscallarg(u_int) count;
@@ -261,12 +261,12 @@ compat_43_compat_netbsd32_ogetdirentries(p, v, retval)
 
 /* kernel syscalls */
 int
-compat_43_compat_netbsd32_ogetkerninfo(p, v, retval)
+compat_43_netbsd32_ogetkerninfo(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_ogetkerninfo_args /* {
+	struct compat_43_netbsd32_ogetkerninfo_args /* {
 		syscallarg(int) op;
 		syscallarg(netbsd32_charp) where;
 		syscallarg(netbsd32_intp) size;
@@ -282,12 +282,12 @@ compat_43_compat_netbsd32_ogetkerninfo(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_ogethostname(p, v, retval)
+compat_43_netbsd32_ogethostname(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_ogethostname_args /* {
+	struct compat_43_netbsd32_ogethostname_args /* {
 		syscallarg(netbsd32_charp) hostname;
 		syscallarg(u_int) len;
 	} */ *uap = v;
@@ -301,12 +301,12 @@ compat_43_compat_netbsd32_ogethostname(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_osethostname(p, v, retval)
+compat_43_netbsd32_osethostname(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_osethostname_args /* {
+	struct compat_43_netbsd32_osethostname_args /* {
 		syscallarg(netbsd32_charp) hostname;
 		syscallarg(u_int) len;
 	} */ *uap = v;
@@ -321,12 +321,12 @@ compat_43_compat_netbsd32_osethostname(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_sethostid(p, v, retval)
+compat_43_netbsd32_sethostid(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_sethostid_args /* {
+	struct compat_43_netbsd32_sethostid_args /* {
 		syscallarg(int32_t) hostid;
 	} */ *uap = v;
 	struct compat_43_sys_sethostid_args ua;
@@ -336,12 +336,12 @@ compat_43_compat_netbsd32_sethostid(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_ogetrlimit(p, v, retval)
+compat_43_netbsd32_ogetrlimit(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_ogetrlimit_args /* {
+	struct compat_43_netbsd32_ogetrlimit_args /* {
 		syscallarg(int) which;
 		syscallarg(netbsd32_orlimitp_t) rlp;
 	} */ *uap = v;
@@ -353,12 +353,12 @@ compat_43_compat_netbsd32_ogetrlimit(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_osetrlimit(p, v, retval)
+compat_43_netbsd32_osetrlimit(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_osetrlimit_args /* {
+	struct compat_43_netbsd32_osetrlimit_args /* {
 		syscallarg(int) which;
 		syscallarg(netbsd32_orlimitp_t) rlp;
 	} */ *uap = v;
@@ -370,12 +370,12 @@ compat_43_compat_netbsd32_osetrlimit(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_killpg(p, v, retval)
+compat_43_netbsd32_killpg(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_killpg_args /* {
+	struct compat_43_netbsd32_killpg_args /* {
 		syscallarg(int) pgid;
 		syscallarg(int) signum;
 	} */ *uap = v;
@@ -388,12 +388,12 @@ compat_43_compat_netbsd32_killpg(p, v, retval)
 
 /* virtual memory syscalls */
 int
-compat_43_compat_netbsd32_ommap(p, v, retval)
+compat_43_netbsd32_ommap(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_ommap_args /* {
+	struct compat_43_netbsd32_ommap_args /* {
 		syscallarg(netbsd32_caddr_t) addr;
 		syscallarg(netbsd32_size_t) len;
 		syscallarg(int) prot;
@@ -414,12 +414,12 @@ compat_43_compat_netbsd32_ommap(p, v, retval)
 
 /* virtual memory syscalls */
 int
-compat_netbsd32_ovadvise(p, v, retval)
+netbsd32_ovadvise(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_ovadvise_args /* {
+	struct netbsd32_ovadvise_args /* {
 		syscallarg(int) anom;
 	} */ *uap = v;
 	struct sys_ovadvise_args ua;
@@ -430,12 +430,12 @@ compat_netbsd32_ovadvise(p, v, retval)
 
 /* network syscalls */
 int
-compat_43_compat_netbsd32_oaccept(p, v, retval)
+compat_43_netbsd32_oaccept(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_oaccept_args /* {
+	struct compat_43_netbsd32_oaccept_args /* {
 		syscallarg(int) s;
 		syscallarg(netbsd32_caddr_t) name;
 		syscallarg(netbsd32_intp) anamelen;
@@ -449,12 +449,12 @@ compat_43_compat_netbsd32_oaccept(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_osend(p, v, retval)
+compat_43_netbsd32_osend(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_osend_args /* {
+	struct compat_43_netbsd32_osend_args /* {
 		syscallarg(int) s;
 		syscallarg(netbsd32_caddr_t) buf;
 		syscallarg(int) len;
@@ -470,12 +470,12 @@ compat_43_compat_netbsd32_osend(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_orecv(p, v, retval)
+compat_43_netbsd32_orecv(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_orecv_args /* {
+	struct compat_43_netbsd32_orecv_args /* {
 		syscallarg(int) s;
 		syscallarg(netbsd32_caddr_t) buf;
 		syscallarg(int) len;
@@ -495,12 +495,12 @@ compat_43_compat_netbsd32_orecv(p, v, retval)
  * netbsd call.
  */
 int
-compat_43_compat_netbsd32_orecvmsg(p, v, retval)
+compat_43_netbsd32_orecvmsg(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_orecvmsg_args /* {
+	struct compat_43_netbsd32_orecvmsg_args /* {
 		syscallarg(int) s;
 		syscallarg(netbsd32_omsghdrp_t) msg;
 		syscallarg(int) flags;
@@ -536,12 +536,12 @@ compat_43_compat_netbsd32_orecvmsg(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_osendmsg(p, v, retval)
+compat_43_netbsd32_osendmsg(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_osendmsg_args /* {
+	struct compat_43_netbsd32_osendmsg_args /* {
 		syscallarg(int) s;
 		syscallarg(netbsd32_caddr_t) msg;
 		syscallarg(int) flags;
@@ -577,12 +577,12 @@ compat_43_compat_netbsd32_osendmsg(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_orecvfrom(p, v, retval)
+compat_43_netbsd32_orecvfrom(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_orecvfrom_args /* {
+	struct compat_43_netbsd32_orecvfrom_args /* {
 		syscallarg(int) s;
 		syscallarg(netbsd32_caddr_t) buf;
 		syscallarg(netbsd32_size_t) len;
@@ -602,12 +602,12 @@ compat_43_compat_netbsd32_orecvfrom(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_ogetsockname(p, v, retval)
+compat_43_netbsd32_ogetsockname(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_ogetsockname_args /* {
+	struct compat_43_netbsd32_ogetsockname_args /* {
 		syscallarg(int) fdec;
 		syscallarg(netbsd32_caddr_t) asa;
 		syscallarg(netbsd32_intp) alen;
@@ -621,12 +621,12 @@ compat_43_compat_netbsd32_ogetsockname(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_ogetpeername(p, v, retval)
+compat_43_netbsd32_ogetpeername(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_ogetpeername_args /* {
+	struct compat_43_netbsd32_ogetpeername_args /* {
 		syscallarg(int) fdes;
 		syscallarg(netbsd32_caddr_t) asa;
 		syscallarg(netbsd32_intp) alen;
@@ -641,12 +641,12 @@ compat_43_compat_netbsd32_ogetpeername(p, v, retval)
 
 /* signal syscalls */
 int
-compat_43_compat_netbsd32_osigvec(p, v, retval)
+compat_43_netbsd32_osigvec(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_osigvec_args /* {
+	struct compat_43_netbsd32_osigvec_args /* {
 		syscallarg(int) signum;
 		syscallarg(netbsd32_sigvecp_t) nsv;
 		syscallarg(netbsd32_sigvecp_t) osv;
@@ -684,12 +684,12 @@ compat_43_compat_netbsd32_osigvec(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_sigblock(p, v, retval)
+compat_43_netbsd32_sigblock(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_sigblock_args /* {
+	struct compat_43_netbsd32_sigblock_args /* {
 		syscallarg(int) mask;
 	} */ *uap = v;
 	struct compat_43_sys_sigblock_args ua;
@@ -699,12 +699,12 @@ compat_43_compat_netbsd32_sigblock(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_sigsetmask(p, v, retval)
+compat_43_netbsd32_sigsetmask(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_sigsetmask_args /* {
+	struct compat_43_netbsd32_sigsetmask_args /* {
 		syscallarg(int) mask;
 	} */ *uap = v;
 	struct compat_43_sys_sigsetmask_args ua;
@@ -714,12 +714,12 @@ compat_43_compat_netbsd32_sigsetmask(p, v, retval)
 }
 
 int
-compat_43_compat_netbsd32_osigstack(p, v, retval)
+compat_43_netbsd32_osigstack(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_43_compat_netbsd32_osigstack_args /* {
+	struct compat_43_netbsd32_osigstack_args /* {
 		syscallarg(netbsd32_sigstackp_t) nss;
 		syscallarg(netbsd32_sigstackp_t) oss;
 	} */ *uap = v;
diff --git a/sys/compat/netbsd32/netbsd32_exec.c b/sys/compat/netbsd32/netbsd32_exec.c
index 5ddbf1315e57..13b8456df65f 100644
--- a/sys/compat/netbsd32/netbsd32_exec.c
+++ b/sys/compat/netbsd32/netbsd32_exec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_exec.c,v 1.15 1999/03/26 04:29:26 eeh Exp $	*/
+/*	$NetBSD: netbsd32_exec.c,v 1.16 1999/10/11 01:36:22 eeh Exp $	*/
 /*	from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */
 
 /*
@@ -84,7 +84,9 @@ struct emul emul_netbsd32 = {
 	NULL,
 #endif
 	0,
+#if FIXED
 	netbsd32_copyinargs,
+#endif
 	netbsd32_copyargs,
 	netbsd32_setregs,	/* XXX needs to be written?? */
 	netbsd32_sigcode,
diff --git a/sys/compat/netbsd32/netbsd32_ioctl.c b/sys/compat/netbsd32/netbsd32_ioctl.c
index 3d7189266a30..a326ffd33e8d 100644
--- a/sys/compat/netbsd32/netbsd32_ioctl.c
+++ b/sys/compat/netbsd32/netbsd32_ioctl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_ioctl.c,v 1.3 1999/03/25 16:58:40 mrg Exp $	*/
+/*	$NetBSD: netbsd32_ioctl.c,v 1.4 1999/10/11 01:36:23 eeh Exp $	*/
 
 /*
  * Copyright (c) 1998 Matthew R. Green
@@ -356,12 +356,12 @@ netbsd32_from_sioc_sg_req(p, s32p)
  * on the ioctl command before and afterwards.
  */
 int
-compat_netbsd32_ioctl(p, v, retval)
+netbsd32_ioctl(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_ioctl_args /* {
+	struct netbsd32_ioctl_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_u_long) com;
 		syscallarg(netbsd32_voidp) data;
diff --git a/sys/compat/netbsd32/netbsd32_netbsd.c b/sys/compat/netbsd32/netbsd32_netbsd.c
index eeaa34cc711f..3b6e2fc6f924 100644
--- a/sys/compat/netbsd32/netbsd32_netbsd.c
+++ b/sys/compat/netbsd32/netbsd32_netbsd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_netbsd.c,v 1.18 1999/09/28 14:47:02 bouyer Exp $	*/
+/*	$NetBSD: netbsd32_netbsd.c,v 1.19 1999/10/11 01:36:23 eeh Exp $	*/
 
 /*
  * Copyright (c) 1998 Matthew R. Green
@@ -47,6 +47,7 @@
 #include <sys/kernel.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
+#define msg __msg /* Don't ask me! */
 #include <sys/sem.h>
 #include <sys/shm.h>
 #include <sys/malloc.h>
@@ -410,8 +411,8 @@ netbsd32_to_ipc_perm(ip32p, ipp)
 	ipp->uid = ip32p->uid;
 	ipp->gid = ip32p->gid;
 	ipp->mode = ip32p->mode;
-	ipp->seq = ip32p->seq;
-	ipp->key = (key_t)ip32p->key;
+	ipp->_seq = ip32p->_seq;
+	ipp->_key = (key_t)ip32p->_key;
 }
 
 static __inline void
@@ -425,8 +426,8 @@ netbsd32_from_ipc_perm(ipp, ip32p)
 	ip32p->uid = ipp->uid;
 	ip32p->gid = ipp->gid;
 	ip32p->mode = ipp->mode;
-	ip32p->seq = ipp->seq;
-	ip32p->key = (netbsd32_key_t)ipp->key;
+	ip32p->_seq = ipp->_seq;
+	ip32p->_key = (netbsd32_key_t)ipp->_key;
 }
 
 static __inline void
@@ -460,9 +461,9 @@ netbsd32_to_msqid_ds(ds32p, dsp)
 {
 
 	netbsd32_to_ipc_perm(&ds32p->msg_perm, &dsp->msg_perm);
-	netbsd32_to_msg((struct netbsd32_msg *)(u_long)ds32p->msg_first, dsp->msg_first);
-	netbsd32_to_msg((struct netbsd32_msg *)(u_long)ds32p->msg_last, dsp->msg_last);
-	dsp->msg_cbytes = (u_long)ds32p->msg_cbytes;
+	netbsd32_to_msg((struct netbsd32_msg *)(u_long)ds32p->_msg_first, dsp->_msg_first);
+	netbsd32_to_msg((struct netbsd32_msg *)(u_long)ds32p->_msg_last, dsp->_msg_last);
+	dsp->_msg_cbytes = (u_long)ds32p->_msg_cbytes;
 	dsp->msg_qnum = (u_long)ds32p->msg_qnum;
 	dsp->msg_qbytes = (u_long)ds32p->msg_qbytes;
 	dsp->msg_lspid = ds32p->msg_lspid;
@@ -479,9 +480,9 @@ netbsd32_from_msqid_ds(dsp, ds32p)
 {
 
 	netbsd32_from_ipc_perm(&dsp->msg_perm, &ds32p->msg_perm);
-	netbsd32_from_msg(dsp->msg_first, (struct netbsd32_msg *)(u_long)ds32p->msg_first);
-	netbsd32_from_msg(dsp->msg_last, (struct netbsd32_msg *)(u_long)ds32p->msg_last);
-	ds32p->msg_cbytes = (netbsd32_u_long)dsp->msg_cbytes;
+	netbsd32_from_msg(dsp->_msg_first, (struct netbsd32_msg *)(u_long)ds32p->_msg_first);
+	netbsd32_from_msg(dsp->_msg_last, (struct netbsd32_msg *)(u_long)ds32p->_msg_last);
+	ds32p->_msg_cbytes = (netbsd32_u_long)dsp->_msg_cbytes;
 	ds32p->msg_qnum = (netbsd32_u_long)dsp->msg_qnum;
 	ds32p->msg_qbytes = (netbsd32_u_long)dsp->msg_qbytes;
 	ds32p->msg_lspid = dsp->msg_lspid;
@@ -505,7 +506,7 @@ netbsd32_to_shmid_ds(ds32p, dsp)
 	dsp->shm_atime = (long)ds32p->shm_atime;
 	dsp->shm_dtime = (long)ds32p->shm_dtime;
 	dsp->shm_ctime = (long)ds32p->shm_ctime;
-	dsp->shm_internal = (void *)(u_long)ds32p->shm_internal;
+	dsp->_shm_internal = (void *)(u_long)ds32p->_shm_internal;
 }
 
 static __inline void
@@ -522,7 +523,7 @@ netbsd32_from_shmid_ds(dsp, ds32p)
 	ds32p->shm_atime = (netbsd32_long)dsp->shm_atime;
 	ds32p->shm_dtime = (netbsd32_long)dsp->shm_dtime;
 	ds32p->shm_ctime = (netbsd32_long)dsp->shm_ctime;
-	ds32p->shm_internal = (netbsd32_voidp)(u_long)dsp->shm_internal;
+	ds32p->_shm_internal = (netbsd32_voidp)(u_long)dsp->_shm_internal;
 }
 
 static __inline void
@@ -532,7 +533,7 @@ netbsd32_to_semid_ds(s32dsp, dsp)
 {
 
 	netbsd32_from_ipc_perm(&dsp->sem_perm, &s32dsp->sem_perm);
-	dsp->sem_base = (struct sem *)(u_long)s32dsp->sem_base;
+	dsp->_sem_base = (struct __sem *)(u_long)s32dsp->_sem_base;
 	dsp->sem_nsems = s32dsp->sem_nsems;
 	dsp->sem_otime = s32dsp->sem_otime;
 	dsp->sem_ctime = s32dsp->sem_ctime;
@@ -545,7 +546,7 @@ netbsd32_from_semid_ds(dsp, s32dsp)
 {
 
 	netbsd32_to_ipc_perm(&s32dsp->sem_perm, &dsp->sem_perm);
-	s32dsp->sem_base = (netbsd32_semp_t)(u_long)dsp->sem_base;
+	s32dsp->_sem_base = (netbsd32_semp_t)(u_long)dsp->_sem_base;
 	s32dsp->sem_nsems = dsp->sem_nsems;
 	s32dsp->sem_otime = dsp->sem_otime;
 	s32dsp->sem_ctime = dsp->sem_ctime;
@@ -559,12 +560,12 @@ netbsd32_from_semid_ds(dsp, s32dsp)
 
 
 int
-compat_netbsd32_exit(p, v, retval)
+netbsd32_exit(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_exit_args /* {
+	struct netbsd32_exit_args /* {
 		syscallarg(int) rval;
 	} */ *uap = v;
 	struct sys_exit_args ua;
@@ -574,12 +575,12 @@ compat_netbsd32_exit(p, v, retval)
 }
 
 int
-compat_netbsd32_read(p, v, retval)
+netbsd32_read(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_read_args /* {
+	struct netbsd32_read_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_voidp) buf;
 		syscallarg(netbsd32_size_t) nbyte;
@@ -593,12 +594,12 @@ compat_netbsd32_read(p, v, retval)
 }
 
 int
-compat_netbsd32_write(p, v, retval)
+netbsd32_write(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_write_args /* {
+	struct netbsd32_write_args /* {
 		syscallarg(int) fd;
 		syscallarg(const netbsd32_voidp) buf;
 		syscallarg(netbsd32_size_t) nbyte;
@@ -612,12 +613,12 @@ compat_netbsd32_write(p, v, retval)
 }
 
 int
-compat_netbsd32_close(p, v, retval)
+netbsd32_close(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_close_args /* {
+	struct netbsd32_close_args /* {
 		syscallarg(int) fd;
 	} */ *uap = v;
 	struct sys_close_args ua;
@@ -627,12 +628,12 @@ compat_netbsd32_close(p, v, retval)
 }
 
 int
-compat_netbsd32_open(p, v, retval)
+netbsd32_open(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_open_args /* {
+	struct netbsd32_open_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(int) flags;
 		syscallarg(mode_t) mode;
@@ -650,12 +651,12 @@ compat_netbsd32_open(p, v, retval)
 }
 
 int
-compat_netbsd32_wait4(q, v, retval)
+netbsd32_wait4(q, v, retval)
 	struct proc *q;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_wait4_args /* {
+	struct netbsd32_wait4_args /* {
 		syscallarg(int) pid;
 		syscallarg(netbsd32_intp) status;
 		syscallarg(int) options;
@@ -779,12 +780,12 @@ loop:
 }
 
 int
-compat_netbsd32_link(p, v, retval)
+netbsd32_link(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_link_args /* {
+	struct netbsd32_link_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(const netbsd32_charp) link;
 	} */ *uap = v;
@@ -796,12 +797,12 @@ compat_netbsd32_link(p, v, retval)
 }
 
 int
-compat_netbsd32_unlink(p, v, retval)
+netbsd32_unlink(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_unlink_args /* {
+	struct netbsd32_unlink_args /* {
 		syscallarg(const netbsd32_charp) path;
 	} */ *uap = v;
 	struct sys_unlink_args ua;
@@ -812,12 +813,12 @@ compat_netbsd32_unlink(p, v, retval)
 }
 
 int
-compat_netbsd32_chdir(p, v, retval)
+netbsd32_chdir(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_chdir_args /* {
+	struct netbsd32_chdir_args /* {
 		syscallarg(const netbsd32_charp) path;
 	} */ *uap = v;
 	struct sys_chdir_args ua;
@@ -828,12 +829,12 @@ compat_netbsd32_chdir(p, v, retval)
 }
 
 int
-compat_netbsd32_fchdir(p, v, retval)
+netbsd32_fchdir(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_fchdir_args /* {
+	struct netbsd32_fchdir_args /* {
 		syscallarg(int) fd;
 	} */ *uap = v;
 	struct sys_fchdir_args ua;
@@ -844,12 +845,12 @@ compat_netbsd32_fchdir(p, v, retval)
 }
 
 int
-compat_netbsd32_mknod(p, v, retval)
+netbsd32_mknod(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_mknod_args /* {
+	struct netbsd32_mknod_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(mode_t) mode;
 		syscallarg(dev_t) dev;
@@ -864,12 +865,12 @@ compat_netbsd32_mknod(p, v, retval)
 }
 
 int
-compat_netbsd32_chmod(p, v, retval)
+netbsd32_chmod(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_chmod_args /* {
+	struct netbsd32_chmod_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(mode_t) mode;
 	} */ *uap = v;
@@ -882,12 +883,12 @@ compat_netbsd32_chmod(p, v, retval)
 }
 
 int
-compat_netbsd32_chown(p, v, retval)
+netbsd32_chown(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_chown_args /* {
+	struct netbsd32_chown_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(uid_t) uid;
 		syscallarg(gid_t) gid;
@@ -902,12 +903,12 @@ compat_netbsd32_chown(p, v, retval)
 }
 
 int
-compat_netbsd32_break(p, v, retval)
+netbsd32_break(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_break_args /* {
+	struct netbsd32_break_args /* {
 		syscallarg(netbsd32_charp) nsize;
 	} */ *uap = v;
 	struct sys_obreak_args ua;
@@ -918,12 +919,12 @@ compat_netbsd32_break(p, v, retval)
 }
 
 int
-compat_netbsd32_getfsstat(p, v, retval)
+netbsd32_getfsstat(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getfsstat_args /* {
+	struct netbsd32_getfsstat_args /* {
 		syscallarg(netbsd32_statfsp_t) buf;
 		syscallarg(netbsd32_long) bufsize;
 		syscallarg(int) flags;
@@ -954,12 +955,12 @@ compat_netbsd32_getfsstat(p, v, retval)
 }
 
 int
-compat_netbsd32_mount(p, v, retval)
+netbsd32_mount(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_mount_args /* {
+	struct netbsd32_mount_args /* {
 		syscallarg(const netbsd32_charp) type;
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(int) flags;
@@ -975,12 +976,12 @@ compat_netbsd32_mount(p, v, retval)
 }
 
 int
-compat_netbsd32_unmount(p, v, retval)
+netbsd32_unmount(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_unmount_args /* {
+	struct netbsd32_unmount_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(int) flags;
 	} */ *uap = v;
@@ -992,12 +993,12 @@ compat_netbsd32_unmount(p, v, retval)
 }
 
 int
-compat_netbsd32_setuid(p, v, retval)
+netbsd32_setuid(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_setuid_args /* {
+	struct netbsd32_setuid_args /* {
 		syscallarg(uid_t) uid;
 	} */ *uap = v;
 	struct sys_setuid_args ua;
@@ -1007,12 +1008,12 @@ compat_netbsd32_setuid(p, v, retval)
 }
 
 int
-compat_netbsd32_ptrace(p, v, retval)
+netbsd32_ptrace(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_ptrace_args /* {
+	struct netbsd32_ptrace_args /* {
 		syscallarg(int) req;
 		syscallarg(pid_t) pid;
 		syscallarg(netbsd32_caddr_t) addr;
@@ -1028,12 +1029,12 @@ compat_netbsd32_ptrace(p, v, retval)
 }
 
 int
-compat_netbsd32_recvmsg(p, v, retval)
+netbsd32_recvmsg(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_recvmsg_args /* {
+	struct netbsd32_recvmsg_args /* {
 		syscallarg(int) s;
 		syscallarg(netbsd32_msghdrp_t) msg;
 		syscallarg(int) flags;
@@ -1235,18 +1236,18 @@ recvit32(p, s, mp, iov, namelenp, retsize)
 	if (control)
 		m_freem(control);
  out1:
-	FILE_UNUSE(fp);
+	FILE_UNUSE(fp, p);
 	return (error);
 }
 
 
 int
-compat_netbsd32_sendmsg(p, v, retval)
+netbsd32_sendmsg(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_sendmsg_args /* {
+	struct netbsd32_sendmsg_args /* {
 		syscallarg(int) s;
 		syscallarg(const netbsd32_msghdrp_t) msg;
 		syscallarg(int) flags;
@@ -1288,12 +1289,12 @@ done:
 }
 
 int
-compat_netbsd32_recvfrom(p, v, retval)
+netbsd32_recvfrom(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_recvfrom_args /* {
+	struct netbsd32_recvfrom_args /* {
 		syscallarg(int) s;
 		syscallarg(netbsd32_voidp) buf;
 		syscallarg(netbsd32_size_t) len;
@@ -1325,12 +1326,12 @@ compat_netbsd32_recvfrom(p, v, retval)
 }
 
 int
-compat_netbsd32_sendto(p, v, retval)
+netbsd32_sendto(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_sendto_args /* {
+	struct netbsd32_sendto_args /* {
 		syscallarg(int) s;
 		syscallarg(const netbsd32_voidp) buf;
 		syscallarg(netbsd32_size_t) len;
@@ -1355,12 +1356,12 @@ compat_netbsd32_sendto(p, v, retval)
 }
 
 int
-compat_netbsd32_accept(p, v, retval)
+netbsd32_accept(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_accept_args /* {
+	struct netbsd32_accept_args /* {
 		syscallarg(int) s;
 		syscallarg(netbsd32_sockaddrp_t) name;
 		syscallarg(netbsd32_intp) anamelen;
@@ -1374,12 +1375,12 @@ compat_netbsd32_accept(p, v, retval)
 }
 
 int
-compat_netbsd32_getpeername(p, v, retval)
+netbsd32_getpeername(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getpeername_args /* {
+	struct netbsd32_getpeername_args /* {
 		syscallarg(int) fdes;
 		syscallarg(netbsd32_sockaddrp_t) asa;
 		syscallarg(netbsd32_intp) alen;
@@ -1394,12 +1395,12 @@ compat_netbsd32_getpeername(p, v, retval)
 }
 
 int
-compat_netbsd32_getsockname(p, v, retval)
+netbsd32_getsockname(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getsockname_args /* {
+	struct netbsd32_getsockname_args /* {
 		syscallarg(int) fdes;
 		syscallarg(netbsd32_sockaddrp_t) asa;
 		syscallarg(netbsd32_intp) alen;
@@ -1413,12 +1414,12 @@ compat_netbsd32_getsockname(p, v, retval)
 }
 
 int
-compat_netbsd32_access(p, v, retval)
+netbsd32_access(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_access_args /* {
+	struct netbsd32_access_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(int) flags;
 	} */ *uap = v;
@@ -1434,12 +1435,12 @@ compat_netbsd32_access(p, v, retval)
 }
 
 int
-compat_netbsd32_chflags(p, v, retval)
+netbsd32_chflags(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_chflags_args /* {
+	struct netbsd32_chflags_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_u_long) flags;
 	} */ *uap = v;
@@ -1452,12 +1453,12 @@ compat_netbsd32_chflags(p, v, retval)
 }
 
 int
-compat_netbsd32_fchflags(p, v, retval)
+netbsd32_fchflags(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_fchflags_args /* {
+	struct netbsd32_fchflags_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_u_long) flags;
 	} */ *uap = v;
@@ -1470,12 +1471,12 @@ compat_netbsd32_fchflags(p, v, retval)
 }
 
 int
-compat_netbsd32_kill(p, v, retval)
+netbsd32_kill(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_kill_args /* {
+	struct netbsd32_kill_args /* {
 		syscallarg(int) pid;
 		syscallarg(int) signum;
 	} */ *uap = v;
@@ -1488,12 +1489,12 @@ compat_netbsd32_kill(p, v, retval)
 }
 
 int
-compat_netbsd32_dup(p, v, retval)
+netbsd32_dup(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_dup_args /* {
+	struct netbsd32_dup_args /* {
 		syscallarg(int) fd;
 	} */ *uap = v;
 	struct sys_dup_args ua;
@@ -1504,12 +1505,12 @@ compat_netbsd32_dup(p, v, retval)
 }
 
 int
-compat_netbsd32_profil(p, v, retval)
+netbsd32_profil(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_profil_args /* {
+	struct netbsd32_profil_args /* {
 		syscallarg(netbsd32_caddr_t) samples;
 		syscallarg(netbsd32_size_t) size;
 		syscallarg(netbsd32_u_long) offset;
@@ -1525,12 +1526,12 @@ compat_netbsd32_profil(p, v, retval)
 }
 
 int
-compat_netbsd32_ktrace(p, v, retval)
+netbsd32_ktrace(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_ktrace_args /* {
+	struct netbsd32_ktrace_args /* {
 		syscallarg(const netbsd32_charp) fname;
 		syscallarg(int) ops;
 		syscallarg(int) facs;
@@ -1546,12 +1547,12 @@ compat_netbsd32_ktrace(p, v, retval)
 }
 
 int
-compat_netbsd32_sigaction(p, v, retval)
+netbsd32_sigaction(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_sigaction_args /* {
+	struct netbsd32_sigaction_args /* {
 		syscallarg(int) signum;
 		syscallarg(const netbsd32_sigactionp_t) nsa;
 		syscallarg(netbsd32_sigactionp_t) osa;
@@ -1588,12 +1589,12 @@ compat_netbsd32_sigaction(p, v, retval)
 }
 
 int
-compat_netbsd32___getlogin(p, v, retval)
+netbsd32___getlogin(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32___getlogin_args /* {
+	struct netbsd32___getlogin_args /* {
 		syscallarg(netbsd32_charp) namebuf;
 		syscallarg(u_int) namelen;
 	} */ *uap = v;
@@ -1605,12 +1606,12 @@ compat_netbsd32___getlogin(p, v, retval)
 }
 
 int
-compat_netbsd32_setlogin(p, v, retval)
+netbsd32_setlogin(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_setlogin_args /* {
+	struct netbsd32_setlogin_args /* {
 		syscallarg(const netbsd32_charp) namebuf;
 	} */ *uap = v;
 	struct sys_setlogin_args ua;
@@ -1620,12 +1621,12 @@ compat_netbsd32_setlogin(p, v, retval)
 }
 
 int
-compat_netbsd32_acct(p, v, retval)
+netbsd32_acct(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_acct_args /* {
+	struct netbsd32_acct_args /* {
 		syscallarg(const netbsd32_charp) path;
 	} */ *uap = v;
 	struct sys_acct_args ua;
@@ -1635,12 +1636,12 @@ compat_netbsd32_acct(p, v, retval)
 }
 
 int
-compat_netbsd32_revoke(p, v, retval)
+netbsd32_revoke(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_revoke_args /* {
+	struct netbsd32_revoke_args /* {
 		syscallarg(const netbsd32_charp) path;
 	} */ *uap = v;
 	struct sys_revoke_args ua;
@@ -1654,12 +1655,12 @@ compat_netbsd32_revoke(p, v, retval)
 }
 
 int
-compat_netbsd32_symlink(p, v, retval)
+netbsd32_symlink(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_symlink_args /* {
+	struct netbsd32_symlink_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(const netbsd32_charp) link;
 	} */ *uap = v;
@@ -1672,12 +1673,12 @@ compat_netbsd32_symlink(p, v, retval)
 }
 
 int
-compat_netbsd32_readlink(p, v, retval)
+netbsd32_readlink(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_readlink_args /* {
+	struct netbsd32_readlink_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_charp) buf;
 		syscallarg(netbsd32_size_t) count;
@@ -1695,12 +1696,12 @@ compat_netbsd32_readlink(p, v, retval)
 }
 
 int
-compat_netbsd32_execve(p, v, retval)
+netbsd32_execve(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_execve_args /* {
+	struct netbsd32_execve_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_charpp) argp;
 		syscallarg(netbsd32_charpp) envp;
@@ -1718,12 +1719,12 @@ compat_netbsd32_execve(p, v, retval)
 }
 
 int
-compat_netbsd32_umask(p, v, retval)
+netbsd32_umask(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_umask_args /* {
+	struct netbsd32_umask_args /* {
 		syscallarg(mode_t) newmask;
 	} */ *uap = v;
 	struct sys_umask_args ua;
@@ -1733,12 +1734,12 @@ compat_netbsd32_umask(p, v, retval)
 }
 
 int
-compat_netbsd32_chroot(p, v, retval)
+netbsd32_chroot(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_chroot_args /* {
+	struct netbsd32_chroot_args /* {
 		syscallarg(const netbsd32_charp) path;
 	} */ *uap = v;
 	struct sys_chroot_args ua;
@@ -1748,12 +1749,12 @@ compat_netbsd32_chroot(p, v, retval)
 }
 
 int
-compat_netbsd32_sbrk(p, v, retval)
+netbsd32_sbrk(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_sbrk_args /* {
+	struct netbsd32_sbrk_args /* {
 		syscallarg(int) incr;
 	} */ *uap = v;
 	struct sys_sbrk_args ua;
@@ -1763,12 +1764,12 @@ compat_netbsd32_sbrk(p, v, retval)
 }
 
 int
-compat_netbsd32_sstk(p, v, retval)
+netbsd32_sstk(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_sstk_args /* {
+	struct netbsd32_sstk_args /* {
 		syscallarg(int) incr;
 	} */ *uap = v;
 	struct sys_sstk_args ua;
@@ -1778,12 +1779,12 @@ compat_netbsd32_sstk(p, v, retval)
 }
 
 int
-compat_netbsd32_munmap(p, v, retval)
+netbsd32_munmap(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_munmap_args /* {
+	struct netbsd32_munmap_args /* {
 		syscallarg(netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 	} */ *uap = v;
@@ -1795,12 +1796,12 @@ compat_netbsd32_munmap(p, v, retval)
 }
 
 int
-compat_netbsd32_mprotect(p, v, retval)
+netbsd32_mprotect(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_mprotect_args /* {
+	struct netbsd32_mprotect_args /* {
 		syscallarg(netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 		syscallarg(int) prot;
@@ -1814,12 +1815,12 @@ compat_netbsd32_mprotect(p, v, retval)
 }
 
 int
-compat_netbsd32_madvise(p, v, retval)
+netbsd32_madvise(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_madvise_args /* {
+	struct netbsd32_madvise_args /* {
 		syscallarg(netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 		syscallarg(int) behav;
@@ -1833,12 +1834,12 @@ compat_netbsd32_madvise(p, v, retval)
 }
 
 int
-compat_netbsd32_mincore(p, v, retval)
+netbsd32_mincore(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_mincore_args /* {
+	struct netbsd32_mincore_args /* {
 		syscallarg(netbsd32_caddr_t) addr;
 		syscallarg(netbsd32_size_t) len;
 		syscallarg(netbsd32_charp) vec;
@@ -1852,12 +1853,12 @@ compat_netbsd32_mincore(p, v, retval)
 }
 
 int
-compat_netbsd32_getgroups(p, v, retval)
+netbsd32_getgroups(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getgroups_args /* {
+	struct netbsd32_getgroups_args /* {
 		syscallarg(int) gidsetsize;
 		syscallarg(netbsd32_gid_tp) gidset;
 	} */ *uap = v;
@@ -1884,12 +1885,12 @@ compat_netbsd32_getgroups(p, v, retval)
 }
 
 int
-compat_netbsd32_setgroups(p, v, retval)
+netbsd32_setgroups(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_setgroups_args /* {
+	struct netbsd32_setgroups_args /* {
 		syscallarg(int) gidsetsize;
 		syscallarg(const netbsd32_gid_tp) gidset;
 	} */ *uap = v;
@@ -1901,12 +1902,12 @@ compat_netbsd32_setgroups(p, v, retval)
 }
 
 int
-compat_netbsd32_setpgid(p, v, retval)
+netbsd32_setpgid(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_setpgid_args /* {
+	struct netbsd32_setpgid_args /* {
 		syscallarg(int) pid;
 		syscallarg(int) pgid;
 	} */ *uap = v;
@@ -1918,19 +1919,19 @@ compat_netbsd32_setpgid(p, v, retval)
 }
 
 int
-compat_netbsd32_setitimer(p, v, retval)
+netbsd32_setitimer(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_setitimer_args /* {
+	struct netbsd32_setitimer_args /* {
 		syscallarg(int) which;
 		syscallarg(const netbsd32_itimervalp_t) itv;
 		syscallarg(netbsd32_itimervalp_t) oitv;
 	} */ *uap = v;
 	struct netbsd32_itimerval s32it, *itvp;
 	int which = SCARG(uap, which);
-	struct compat_netbsd32_getitimer_args getargs;
+	struct netbsd32_getitimer_args getargs;
 	struct itimerval aitv;
 	int s, error;
 
@@ -1943,7 +1944,7 @@ compat_netbsd32_setitimer(p, v, retval)
 	if (SCARG(uap, oitv) != NULL) {
 		SCARG(&getargs, which) = which;
 		SCARG(&getargs, itv) = SCARG(uap, oitv);
-		if ((error = compat_netbsd32_getitimer(p, &getargs, retval)) != 0)
+		if ((error = netbsd32_getitimer(p, &getargs, retval)) != 0)
 			return (error);
 	}
 	if (itvp == 0)
@@ -1965,12 +1966,12 @@ compat_netbsd32_setitimer(p, v, retval)
 }
 
 int
-compat_netbsd32_getitimer(p, v, retval)
+netbsd32_getitimer(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getitimer_args /* {
+	struct netbsd32_getitimer_args /* {
 		syscallarg(int) which;
 		syscallarg(netbsd32_itimervalp_t) itv;
 	} */ *uap = v;
@@ -2004,12 +2005,12 @@ compat_netbsd32_getitimer(p, v, retval)
 }
 
 int
-compat_netbsd32_fcntl(p, v, retval)
+netbsd32_fcntl(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_fcntl_args /* {
+	struct netbsd32_fcntl_args /* {
 		syscallarg(int) fd;
 		syscallarg(int) cmd;
 		syscallarg(netbsd32_voidp) arg;
@@ -2024,12 +2025,12 @@ compat_netbsd32_fcntl(p, v, retval)
 }
 
 int
-compat_netbsd32_dup2(p, v, retval)
+netbsd32_dup2(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_dup2_args /* {
+	struct netbsd32_dup2_args /* {
 		syscallarg(int) from;
 		syscallarg(int) to;
 	} */ *uap = v;
@@ -2041,12 +2042,12 @@ compat_netbsd32_dup2(p, v, retval)
 }
 
 int
-compat_netbsd32_select(p, v, retval)
+netbsd32_select(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_select_args /* {
+	struct netbsd32_select_args /* {
 		syscallarg(int) nd;
 		syscallarg(netbsd32_fd_setp_t) in;
 		syscallarg(netbsd32_fd_setp_t) ou;
@@ -2155,12 +2156,12 @@ out:
 }
 
 int
-compat_netbsd32_fsync(p, v, retval)
+netbsd32_fsync(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_fsync_args /* {
+	struct netbsd32_fsync_args /* {
 		syscallarg(int) fd;
 	} */ *uap = v;
 	struct sys_fsync_args ua;
@@ -2170,12 +2171,12 @@ compat_netbsd32_fsync(p, v, retval)
 }
 
 int
-compat_netbsd32_setpriority(p, v, retval)
+netbsd32_setpriority(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_setpriority_args /* {
+	struct netbsd32_setpriority_args /* {
 		syscallarg(int) which;
 		syscallarg(int) who;
 		syscallarg(int) prio;
@@ -2189,12 +2190,12 @@ compat_netbsd32_setpriority(p, v, retval)
 }
 
 int
-compat_netbsd32_socket(p, v, retval)
+netbsd32_socket(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_socket_args /* {
+	struct netbsd32_socket_args /* {
 		syscallarg(int) domain;
 		syscallarg(int) type;
 		syscallarg(int) protocol;
@@ -2208,12 +2209,12 @@ compat_netbsd32_socket(p, v, retval)
 }
 
 int
-compat_netbsd32_connect(p, v, retval)
+netbsd32_connect(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_connect_args /* {
+	struct netbsd32_connect_args /* {
 		syscallarg(int) s;
 		syscallarg(const netbsd32_sockaddrp_t) name;
 		syscallarg(int) namelen;
@@ -2227,12 +2228,12 @@ compat_netbsd32_connect(p, v, retval)
 }
 
 int
-compat_netbsd32_getpriority(p, v, retval)
+netbsd32_getpriority(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getpriority_args /* {
+	struct netbsd32_getpriority_args /* {
 		syscallarg(int) which;
 		syscallarg(int) who;
 	} */ *uap = v;
@@ -2244,12 +2245,12 @@ compat_netbsd32_getpriority(p, v, retval)
 }
 
 int
-compat_netbsd32_bind(p, v, retval)
+netbsd32_bind(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_bind_args /* {
+	struct netbsd32_bind_args /* {
 		syscallarg(int) s;
 		syscallarg(const netbsd32_sockaddrp_t) name;
 		syscallarg(int) namelen;
@@ -2263,12 +2264,12 @@ compat_netbsd32_bind(p, v, retval)
 }
 
 int
-compat_netbsd32_setsockopt(p, v, retval)
+netbsd32_setsockopt(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_setsockopt_args /* {
+	struct netbsd32_setsockopt_args /* {
 		syscallarg(int) s;
 		syscallarg(int) level;
 		syscallarg(int) name;
@@ -2287,12 +2288,12 @@ compat_netbsd32_setsockopt(p, v, retval)
 }
 
 int
-compat_netbsd32_listen(p, v, retval)
+netbsd32_listen(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_listen_args /* {
+	struct netbsd32_listen_args /* {
 		syscallarg(int) s;
 		syscallarg(int) backlog;
 	} */ *uap = v;
@@ -2304,12 +2305,12 @@ compat_netbsd32_listen(p, v, retval)
 }
 
 int
-compat_netbsd32_gettimeofday(p, v, retval)
+netbsd32_gettimeofday(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_gettimeofday_args /* {
+	struct netbsd32_gettimeofday_args /* {
 		syscallarg(netbsd32_timevalp_t) tp;
 		syscallarg(netbsd32_timezonep_t) tzp;
 	} */ *uap = v;
@@ -2369,12 +2370,12 @@ settime(tv)
 
 
 int
-compat_netbsd32_settimeofday(p, v, retval)
+netbsd32_settimeofday(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_settimeofday_args /* {
+	struct netbsd32_settimeofday_args /* {
 		syscallarg(const netbsd32_timevalp_t) tv;
 		syscallarg(const netbsd32_timezonep_t) tzp;
 	} */ *uap = v;
@@ -2408,12 +2409,12 @@ compat_netbsd32_settimeofday(p, v, retval)
 }
 
 int
-compat_netbsd32_fchown(p, v, retval)
+netbsd32_fchown(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_fchown_args /* {
+	struct netbsd32_fchown_args /* {
 		syscallarg(int) fd;
 		syscallarg(uid_t) uid;
 		syscallarg(gid_t) gid;
@@ -2427,12 +2428,12 @@ compat_netbsd32_fchown(p, v, retval)
 }
 
 int
-compat_netbsd32_fchmod(p, v, retval)
+netbsd32_fchmod(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_fchmod_args /* {
+	struct netbsd32_fchmod_args /* {
 		syscallarg(int) fd;
 		syscallarg(mode_t) mode;
 	} */ *uap = v;
@@ -2444,12 +2445,12 @@ compat_netbsd32_fchmod(p, v, retval)
 }
 
 int
-compat_netbsd32_setreuid(p, v, retval)
+netbsd32_setreuid(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_setreuid_args /* {
+	struct netbsd32_setreuid_args /* {
 		syscallarg(uid_t) ruid;
 		syscallarg(uid_t) euid;
 	} */ *uap = v;
@@ -2461,12 +2462,12 @@ compat_netbsd32_setreuid(p, v, retval)
 }
 
 int
-compat_netbsd32_setregid(p, v, retval)
+netbsd32_setregid(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_setregid_args /* {
+	struct netbsd32_setregid_args /* {
 		syscallarg(gid_t) rgid;
 		syscallarg(gid_t) egid;
 	} */ *uap = v;
@@ -2478,12 +2479,12 @@ compat_netbsd32_setregid(p, v, retval)
 }
 
 int
-compat_netbsd32_getrusage(p, v, retval)
+netbsd32_getrusage(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getrusage_args /* {
+	struct netbsd32_getrusage_args /* {
 		syscallarg(int) who;
 		syscallarg(netbsd32_rusagep_t) rusage;
 	} */ *uap = v;
@@ -2509,12 +2510,12 @@ compat_netbsd32_getrusage(p, v, retval)
 }
 
 int
-compat_netbsd32_getsockopt(p, v, retval)
+netbsd32_getsockopt(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getsockopt_args /* {
+	struct netbsd32_getsockopt_args /* {
 		syscallarg(int) s;
 		syscallarg(int) level;
 		syscallarg(int) name;
@@ -2532,12 +2533,12 @@ compat_netbsd32_getsockopt(p, v, retval)
 }
 
 int
-compat_netbsd32_readv(p, v, retval)
+netbsd32_readv(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_readv_args /* {
+	struct netbsd32_readv_args /* {
 		syscallarg(int) fd;
 		syscallarg(const netbsd32_iovecp_t) iovp;
 		syscallarg(int) iovcnt;
@@ -2645,12 +2646,12 @@ done:
 
 
 int
-compat_netbsd32_writev(p, v, retval)
+netbsd32_writev(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_writev_args /* {
+	struct netbsd32_writev_args /* {
 		syscallarg(int) fd;
 		syscallarg(const netbsd32_iovecp_t) iovp;
 		syscallarg(int) iovcnt;
@@ -2760,12 +2761,12 @@ done:
 
 
 int
-compat_netbsd32_rename(p, v, retval)
+netbsd32_rename(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_rename_args /* {
+	struct netbsd32_rename_args /* {
 		syscallarg(const netbsd32_charp) from;
 		syscallarg(const netbsd32_charp) to;
 	} */ *uap = v;
@@ -2778,12 +2779,12 @@ compat_netbsd32_rename(p, v, retval)
 }
 
 int
-compat_netbsd32_flock(p, v, retval)
+netbsd32_flock(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_flock_args /* {
+	struct netbsd32_flock_args /* {
 		syscallarg(int) fd;
 		syscallarg(int) how;
 	} */ *uap = v;
@@ -2796,12 +2797,12 @@ compat_netbsd32_flock(p, v, retval)
 }
 
 int
-compat_netbsd32_mkfifo(p, v, retval)
+netbsd32_mkfifo(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_mkfifo_args /* {
+	struct netbsd32_mkfifo_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(mode_t) mode;
 	} */ *uap = v;
@@ -2813,12 +2814,12 @@ compat_netbsd32_mkfifo(p, v, retval)
 }
 
 int
-compat_netbsd32_shutdown(p, v, retval)
+netbsd32_shutdown(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_shutdown_args /* {
+	struct netbsd32_shutdown_args /* {
 		syscallarg(int) s;
 		syscallarg(int) how;
 	} */ *uap = v;
@@ -2830,12 +2831,12 @@ compat_netbsd32_shutdown(p, v, retval)
 }
 
 int
-compat_netbsd32_socketpair(p, v, retval)
+netbsd32_socketpair(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_socketpair_args /* {
+	struct netbsd32_socketpair_args /* {
 		syscallarg(int) domain;
 		syscallarg(int) type;
 		syscallarg(int) protocol;
@@ -2852,12 +2853,12 @@ compat_netbsd32_socketpair(p, v, retval)
 }
 
 int
-compat_netbsd32_mkdir(p, v, retval)
+netbsd32_mkdir(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_mkdir_args /* {
+	struct netbsd32_mkdir_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(mode_t) mode;
 	} */ *uap = v;
@@ -2869,12 +2870,12 @@ compat_netbsd32_mkdir(p, v, retval)
 }
 
 int
-compat_netbsd32_rmdir(p, v, retval)
+netbsd32_rmdir(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_rmdir_args /* {
+	struct netbsd32_rmdir_args /* {
 		syscallarg(const netbsd32_charp) path;
 	} */ *uap = v;
 	struct sys_rmdir_args ua;
@@ -2884,12 +2885,12 @@ compat_netbsd32_rmdir(p, v, retval)
 }
 
 int
-compat_netbsd32_utimes(p, v, retval)
+netbsd32_utimes(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_utimes_args /* {
+	struct netbsd32_utimes_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(const netbsd32_timevalp_t) tptr;
 	} */ *uap = v;
@@ -2944,12 +2945,12 @@ change_utimes32(vp, tptr, p)
 }
 
 int
-compat_netbsd32_adjtime(p, v, retval)
+netbsd32_adjtime(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_adjtime_args /* {
+	struct netbsd32_adjtime_args /* {
 		syscallarg(const netbsd32_timevalp_t) delta;
 		syscallarg(netbsd32_timevalp_t) olddelta;
 	} */ *uap = v;
@@ -3003,12 +3004,12 @@ compat_netbsd32_adjtime(p, v, retval)
 }
 
 int
-compat_netbsd32_quotactl(p, v, retval)
+netbsd32_quotactl(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_quotactl_args /* {
+	struct netbsd32_quotactl_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(int) cmd;
 		syscallarg(int) uid;
@@ -3025,13 +3026,13 @@ compat_netbsd32_quotactl(p, v, retval)
 
 #if defined(NFS) || defined(NFSSERVER)
 int
-compat_netbsd32_nfssvc(p, v, retval)
+netbsd32_nfssvc(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
 #if 0
-	struct compat_netbsd32_nfssvc_args /* {
+	struct netbsd32_nfssvc_args /* {
 		syscallarg(int) flag;
 		syscallarg(netbsd32_voidp) argp;
 	} */ *uap = v;
@@ -3048,12 +3049,12 @@ compat_netbsd32_nfssvc(p, v, retval)
 #endif
 
 int
-compat_netbsd32_statfs(p, v, retval)
+netbsd32_statfs(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_statfs_args /* {
+	struct netbsd32_statfs_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_statfsp_t) buf;
 	} */ *uap = v;
@@ -3077,12 +3078,12 @@ compat_netbsd32_statfs(p, v, retval)
 }
 
 int
-compat_netbsd32_fstatfs(p, v, retval)
+netbsd32_fstatfs(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_fstatfs_args /* {
+	struct netbsd32_fstatfs_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_statfsp_t) buf;
 	} */ *uap = v;
@@ -3103,18 +3104,18 @@ compat_netbsd32_fstatfs(p, v, retval)
 	netbsd32_from_statfs(sp, &s32);
 	error = copyout(&s32, (caddr_t)(u_long)SCARG(uap, buf), sizeof(s32));
  out:
-	FILE_UNUSE(fp);
+	FILE_UNUSE(fp, p);
 	return (error);
 }
 
 #if defined(NFS) || defined(NFSSERVER)
 int
-compat_netbsd32_getfh(p, v, retval)
+netbsd32_getfh(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getfh_args /* {
+	struct netbsd32_getfh_args /* {
 		syscallarg(const netbsd32_charp) fname;
 		syscallarg(netbsd32_fhandlep_t) fhp;
 	} */ *uap = v;
@@ -3128,30 +3129,30 @@ compat_netbsd32_getfh(p, v, retval)
 #endif
 
 int
-compat_netbsd32_sysarch(p, v, retval)
+netbsd32_sysarch(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_sysarch_args /* {
+	struct netbsd32_sysarch_args /* {
 		syscallarg(int) op;
 		syscallarg(netbsd32_voidp) parms;
 	} */ *uap = v;
 
 	switch (SCARG(uap, op)) {
 	default:
-		printf("(sparc64) compat_netbsd32_sysarch(%d)\n", SCARG(uap, op));
+		printf("(sparc64) netbsd32_sysarch(%d)\n", SCARG(uap, op));
 		return EINVAL;
 	}
 }
 
 int
-compat_netbsd32_pread(p, v, retval)
+netbsd32_pread(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_pread_args /* {
+	struct netbsd32_pread_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_voidp) buf;
 		syscallarg(netbsd32_size_t) nbyte;
@@ -3173,12 +3174,12 @@ compat_netbsd32_pread(p, v, retval)
 }
 
 int
-compat_netbsd32_pwrite(p, v, retval)
+netbsd32_pwrite(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_pwrite_args /* {
+	struct netbsd32_pwrite_args /* {
 		syscallarg(int) fd;
 		syscallarg(const netbsd32_voidp) buf;
 		syscallarg(netbsd32_size_t) nbyte;
@@ -3201,12 +3202,12 @@ compat_netbsd32_pwrite(p, v, retval)
 
 #ifdef NTP
 int
-compat_netbsd32_ntp_gettime(p, v, retval)
+netbsd32_ntp_gettime(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_ntp_gettime_args /* {
+	struct netbsd32_ntp_gettime_args /* {
 		syscallarg(netbsd32_ntptimevalp_t) ntvp;
 	} */ *uap = v;
 	struct netbsd32_ntptimeval ntv32;
@@ -3293,12 +3294,12 @@ compat_netbsd32_ntp_gettime(p, v, retval)
 }
 
 int
-compat_netbsd32_ntp_adjtime(p, v, retval)
+netbsd32_ntp_adjtime(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_ntp_adjtime_args /* {
+	struct netbsd32_ntp_adjtime_args /* {
 		syscallarg(netbsd32_timexp_t) tp;
 	} */ *uap = v;
 	struct netbsd32_timex ntv32;
@@ -3404,12 +3405,12 @@ compat_netbsd32_ntp_adjtime(p, v, retval)
 #endif
 
 int
-compat_netbsd32_setgid(p, v, retval)
+netbsd32_setgid(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_setgid_args /* {
+	struct netbsd32_setgid_args /* {
 		syscallarg(gid_t) gid;
 	} */ *uap = v;
 	struct sys_setgid_args ua;
@@ -3419,12 +3420,12 @@ compat_netbsd32_setgid(p, v, retval)
 }
 
 int
-compat_netbsd32_setegid(p, v, retval)
+netbsd32_setegid(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_setegid_args /* {
+	struct netbsd32_setegid_args /* {
 		syscallarg(gid_t) egid;
 	} */ *uap = v;
 	struct sys_setegid_args ua;
@@ -3434,12 +3435,12 @@ compat_netbsd32_setegid(p, v, retval)
 }
 
 int
-compat_netbsd32_seteuid(p, v, retval)
+netbsd32_seteuid(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_seteuid_args /* {
+	struct netbsd32_seteuid_args /* {
 		syscallarg(gid_t) euid;
 	} */ *uap = v;
 	struct sys_seteuid_args ua;
@@ -3450,13 +3451,13 @@ compat_netbsd32_seteuid(p, v, retval)
 
 #ifdef LFS
 int
-compat_netbsd32_lfs_bmapv(p, v, retval)
+netbsd32_lfs_bmapv(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
 #if 0
-	struct compat_netbsd32_lfs_bmapv_args /* {
+	struct netbsd32_lfs_bmapv_args /* {
 		syscallarg(netbsd32_fsid_tp_t) fsidp;
 		syscallarg(netbsd32_block_infop_t) blkiov;
 		syscallarg(int) blkcnt;
@@ -3473,12 +3474,12 @@ compat_netbsd32_lfs_bmapv(p, v, retval)
 }
 
 int
-compat_netbsd32_lfs_markv(p, v, retval)
+netbsd32_lfs_markv(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_lfs_markv_args /* {
+	struct netbsd32_lfs_markv_args /* {
 		syscallarg(netbsd32_fsid_tp_t) fsidp;
 		syscallarg(netbsd32_block_infop_t) blkiov;
 		syscallarg(int) blkcnt;
@@ -3488,12 +3489,12 @@ compat_netbsd32_lfs_markv(p, v, retval)
 }
 
 int
-compat_netbsd32_lfs_segclean(p, v, retval)
+netbsd32_lfs_segclean(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_lfs_segclean_args /* {
+	struct netbsd32_lfs_segclean_args /* {
 		syscallarg(netbsd32_fsid_tp_t) fsidp;
 		syscallarg(netbsd32_u_long) segment;
 	} */ *uap = v;
@@ -3501,12 +3502,12 @@ compat_netbsd32_lfs_segclean(p, v, retval)
 }
 
 int
-compat_netbsd32_lfs_segwait(p, v, retval)
+netbsd32_lfs_segwait(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_lfs_segwait_args /* {
+	struct netbsd32_lfs_segwait_args /* {
 		syscallarg(netbsd32_fsid_tp_t) fsidp;
 		syscallarg(netbsd32_timevalp_t) tv;
 	} */ *uap = v;
@@ -3515,12 +3516,12 @@ compat_netbsd32_lfs_segwait(p, v, retval)
 #endif
 
 int
-compat_netbsd32_pathconf(p, v, retval)
+netbsd32_pathconf(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_pathconf_args /* {
+	struct netbsd32_pathconf_args /* {
 		syscallarg(int) fd;
 		syscallarg(int) name;
 	} */ *uap = v;
@@ -3536,12 +3537,12 @@ compat_netbsd32_pathconf(p, v, retval)
 }
 
 int
-compat_netbsd32_fpathconf(p, v, retval)
+netbsd32_fpathconf(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_fpathconf_args /* {
+	struct netbsd32_fpathconf_args /* {
 		syscallarg(int) fd;
 		syscallarg(int) name;
 	} */ *uap = v;
@@ -3557,12 +3558,12 @@ compat_netbsd32_fpathconf(p, v, retval)
 }
 
 int
-compat_netbsd32_getrlimit(p, v, retval)
+netbsd32_getrlimit(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getrlimit_args /* {
+	struct netbsd32_getrlimit_args /* {
 		syscallarg(int) which;
 		syscallarg(netbsd32_rlimitp_t) rlp;
 	} */ *uap = v;
@@ -3575,12 +3576,12 @@ compat_netbsd32_getrlimit(p, v, retval)
 }
 
 int
-compat_netbsd32_setrlimit(p, v, retval)
+netbsd32_setrlimit(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_setrlimit_args /* {
+	struct netbsd32_setrlimit_args /* {
 		syscallarg(int) which;
 		syscallarg(const netbsd32_rlimitp_t) rlp;
 	} */ *uap = v;
@@ -3595,12 +3596,12 @@ compat_netbsd32_setrlimit(p, v, retval)
 }
 
 int
-compat_netbsd32_mmap(p, v, retval)
+netbsd32_mmap(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_mmap_args /* {
+	struct netbsd32_mmap_args /* {
 		syscallarg(netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 		syscallarg(int) prot;
@@ -3622,19 +3623,19 @@ compat_netbsd32_mmap(p, v, retval)
 	NETBSD32TOX_UAP(pos, off_t);
 	error = sys_mmap(p, &ua, (register_t *)&rt);
 	if ((long)rt > (long)UINT_MAX)
-		printf("compat_netbsd32_mmap: retval out of range: 0x%qx",
+		printf("netbsd32_mmap: retval out of range: 0x%qx",
 		    rt);
 	*retval = (netbsd32_voidp)(u_long)rt;
 	return (error);
 }
 
 int
-compat_netbsd32_lseek(p, v, retval)
+netbsd32_lseek(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_lseek_args /* {
+	struct netbsd32_lseek_args /* {
 		syscallarg(int) fd;
 		syscallarg(int) pad;
 		syscallarg(off_t) offset;
@@ -3650,12 +3651,12 @@ compat_netbsd32_lseek(p, v, retval)
 }
 
 int
-compat_netbsd32_truncate(p, v, retval)
+netbsd32_truncate(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_truncate_args /* {
+	struct netbsd32_truncate_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(int) pad;
 		syscallarg(off_t) length;
@@ -3669,12 +3670,12 @@ compat_netbsd32_truncate(p, v, retval)
 }
 
 int
-compat_netbsd32_ftruncate(p, v, retval)
+netbsd32_ftruncate(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_ftruncate_args /* {
+	struct netbsd32_ftruncate_args /* {
 		syscallarg(int) fd;
 		syscallarg(int) pad;
 		syscallarg(off_t) length;
@@ -3688,12 +3689,12 @@ compat_netbsd32_ftruncate(p, v, retval)
 }
 
 int
-compat_netbsd32___sysctl(p, v, retval)
+netbsd32___sysctl(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32___sysctl_args /* {
+	struct netbsd32___sysctl_args /* {
 		syscallarg(netbsd32_intp) name;
 		syscallarg(u_int) namelen;
 		syscallarg(netbsd32_voidp) old;
@@ -3816,12 +3817,12 @@ compat_netbsd32___sysctl(p, v, retval)
 }
 
 int
-compat_netbsd32_mlock(p, v, retval)
+netbsd32_mlock(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_mlock_args /* {
+	struct netbsd32_mlock_args /* {
 		syscallarg(const netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 	} */ *uap = v;
@@ -3833,12 +3834,12 @@ compat_netbsd32_mlock(p, v, retval)
 }
 
 int
-compat_netbsd32_munlock(p, v, retval)
+netbsd32_munlock(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_munlock_args /* {
+	struct netbsd32_munlock_args /* {
 		syscallarg(const netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 	} */ *uap = v;
@@ -3850,12 +3851,12 @@ compat_netbsd32_munlock(p, v, retval)
 }
 
 int
-compat_netbsd32_undelete(p, v, retval)
+netbsd32_undelete(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_undelete_args /* {
+	struct netbsd32_undelete_args /* {
 		syscallarg(const netbsd32_charp) path;
 	} */ *uap = v;
 	struct sys_undelete_args ua;
@@ -3865,12 +3866,12 @@ compat_netbsd32_undelete(p, v, retval)
 }
 
 int
-compat_netbsd32_futimes(p, v, retval)
+netbsd32_futimes(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_futimes_args /* {
+	struct netbsd32_futimes_args /* {
 		syscallarg(int) fd;
 		syscallarg(const netbsd32_timevalp_t) tptr;
 	} */ *uap = v;
@@ -3883,17 +3884,17 @@ compat_netbsd32_futimes(p, v, retval)
 
 	error = change_utimes32((struct vnode *)fp->f_data, 
 				(struct timeval *)(u_long)SCARG(uap, tptr), p);
-	FILE_UNUSE(fp);
+	FILE_UNUSE(fp, p);
 	return (error);
 }
 
 int
-compat_netbsd32_getpgid(p, v, retval)
+netbsd32_getpgid(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getpgid_args /* {
+	struct netbsd32_getpgid_args /* {
 		syscallarg(pid_t) pid;
 	} */ *uap = v;
 	struct sys_getpgid_args ua;
@@ -3903,12 +3904,12 @@ compat_netbsd32_getpgid(p, v, retval)
 }
 
 int
-compat_netbsd32_reboot(p, v, retval)
+netbsd32_reboot(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_reboot_args /* {
+	struct netbsd32_reboot_args /* {
 		syscallarg(int) opt;
 		syscallarg(netbsd32_charp) bootstr;
 	} */ *uap = v;
@@ -3920,12 +3921,12 @@ compat_netbsd32_reboot(p, v, retval)
 }
 
 int
-compat_netbsd32_poll(p, v, retval)
+netbsd32_poll(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_poll_args /* {
+	struct netbsd32_poll_args /* {
 		syscallarg(netbsd32_pollfdp_t) fds;
 		syscallarg(u_int) nfds;
 		syscallarg(int) timeout;
@@ -3947,13 +3948,13 @@ compat_netbsd32_poll(p, v, retval)
  * XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  */
 int
-compat_netbsd32___semctl(p, v, retval)
+netbsd32___semctl(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
 #if 0
-	struct compat_netbsd32___semctl_args /* {
+	struct netbsd32___semctl_args /* {
 		syscallarg(int) semid;
 		syscallarg(int) semnum;
 		syscallarg(int) cmd;
@@ -3991,12 +3992,12 @@ compat_netbsd32___semctl(p, v, retval)
 		semaptr->sem_perm.cuid = cred->cr_uid;
 		semaptr->sem_perm.uid = cred->cr_uid;
 		semtot -= semaptr->sem_nsems;
-		for (i = semaptr->sem_base - sem; i < semtot; i++)
+		for (i = semaptr->_sem_base - sem; i < semtot; i++)
 			sem[i] = sem[i + semaptr->sem_nsems];
 		for (i = 0; i < seminfo.semmni; i++) {
 			if ((sema[i].sem_perm.mode & SEM_ALLOC) &&
-			    sema[i].sem_base > semaptr->sem_base)
-				sema[i].sem_base -= semaptr->sem_nsems;
+			    sema[i]._sem_base > semaptr->_sem_base)
+				sema[i]._sem_base -= semaptr->sem_nsems;
 		}
 		semaptr->sem_perm.mode = 0;
 		semundo_clear(semid, -1);
@@ -4032,7 +4033,7 @@ compat_netbsd32___semctl(p, v, retval)
 			return(eval);
 		if (semnum < 0 || semnum >= semaptr->sem_nsems)
 			return(EINVAL);
-		rval = semaptr->sem_base[semnum].semncnt;
+		rval = semaptr->_sem_base[semnum].semncnt;
 		break;
 
 	case GETPID:
@@ -4040,7 +4041,7 @@ compat_netbsd32___semctl(p, v, retval)
 			return(eval);
 		if (semnum < 0 || semnum >= semaptr->sem_nsems)
 			return(EINVAL);
-		rval = semaptr->sem_base[semnum].sempid;
+		rval = semaptr->_sem_base[semnum].sempid;
 		break;
 
 	case GETVAL:
@@ -4048,7 +4049,7 @@ compat_netbsd32___semctl(p, v, retval)
 			return(eval);
 		if (semnum < 0 || semnum >= semaptr->sem_nsems)
 			return(EINVAL);
-		rval = semaptr->sem_base[semnum].semval;
+		rval = semaptr->_sem_base[semnum].semval;
 		break;
 
 	case GETALL:
@@ -4057,7 +4058,7 @@ compat_netbsd32___semctl(p, v, retval)
 		if ((eval = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
 			return(eval);
 		for (i = 0; i < semaptr->sem_nsems; i++) {
-			eval = copyout((caddr_t)&semaptr->sem_base[i].semval,
+			eval = copyout((caddr_t)&semaptr->_sem_base[i].semval,
 			    &real_arg.array[i], sizeof(real_arg.array[0]));
 			if (eval != 0)
 				break;
@@ -4069,7 +4070,7 @@ compat_netbsd32___semctl(p, v, retval)
 			return(eval);
 		if (semnum < 0 || semnum >= semaptr->sem_nsems)
 			return(EINVAL);
-		rval = semaptr->sem_base[semnum].semzcnt;
+		rval = semaptr->_sem_base[semnum].semzcnt;
 		break;
 
 	case SETVAL:
@@ -4079,7 +4080,7 @@ compat_netbsd32___semctl(p, v, retval)
 			return(EINVAL);
 		if ((eval = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
 			return(eval);
-		semaptr->sem_base[semnum].semval = real_arg.val;
+		semaptr->_sem_base[semnum].semval = real_arg.val;
 		semundo_clear(semid, semnum);
 		wakeup((caddr_t)semaptr);
 		break;
@@ -4091,7 +4092,7 @@ compat_netbsd32___semctl(p, v, retval)
 			return(eval);
 		for (i = 0; i < semaptr->sem_nsems; i++) {
 			eval = copyin(&real_arg.array[i],
-			    (caddr_t)&semaptr->sem_base[i].semval,
+			    (caddr_t)&semaptr->_sem_base[i].semval,
 			    sizeof(real_arg.array[0]));
 			if (eval != 0)
 				break;
@@ -4113,12 +4114,12 @@ compat_netbsd32___semctl(p, v, retval)
 }
 
 int
-compat_netbsd32_semget(p, v, retval)
+netbsd32_semget(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_semget_args /* {
+	struct netbsd32_semget_args /* {
 		syscallarg(netbsd32_key_t) key;
 		syscallarg(int) nsems;
 		syscallarg(int) semflg;
@@ -4132,12 +4133,12 @@ compat_netbsd32_semget(p, v, retval)
 }
 
 int
-compat_netbsd32_semop(p, v, retval)
+netbsd32_semop(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_semop_args /* {
+	struct netbsd32_semop_args /* {
 		syscallarg(int) semid;
 		syscallarg(netbsd32_sembufp_t) sops;
 		syscallarg(netbsd32_size_t) nsops;
@@ -4151,12 +4152,12 @@ compat_netbsd32_semop(p, v, retval)
 }
 
 int
-compat_netbsd32_semconfig(p, v, retval)
+netbsd32_semconfig(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_semconfig_args /* {
+	struct netbsd32_semconfig_args /* {
 		syscallarg(int) flag;
 	} */ *uap = v;
 	struct sys_semconfig_args ua;
@@ -4166,13 +4167,13 @@ compat_netbsd32_semconfig(p, v, retval)
 }
 
 int
-compat_netbsd32_msgctl(p, v, retval)
+netbsd32_msgctl(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
 #if 0
-	struct compat_netbsd32_msgctl_args /* {
+	struct netbsd32_msgctl_args /* {
 		syscallarg(int) msqid;
 		syscallarg(int) cmd;
 		syscallarg(netbsd32_msqid_dsp_t) buf;
@@ -4203,13 +4204,13 @@ compat_netbsd32_msgctl(p, v, retval)
 }
 
 int
-compat_netbsd32_msgget(p, v, retval)
+netbsd32_msgget(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
 #if 0
-	struct compat_netbsd32_msgget_args /* {
+	struct netbsd32_msgget_args /* {
 		syscallarg(netbsd32_key_t) key;
 		syscallarg(int) msgflg;
 	} */ *uap = v;
@@ -4224,13 +4225,13 @@ compat_netbsd32_msgget(p, v, retval)
 }
 
 int
-compat_netbsd32_msgsnd(p, v, retval)
+netbsd32_msgsnd(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
 #if 0
-	struct compat_netbsd32_msgsnd_args /* {
+	struct netbsd32_msgsnd_args /* {
 		syscallarg(int) msqid;
 		syscallarg(const netbsd32_voidp) msgp;
 		syscallarg(netbsd32_size_t) msgsz;
@@ -4249,13 +4250,13 @@ compat_netbsd32_msgsnd(p, v, retval)
 }
 
 int
-compat_netbsd32_msgrcv(p, v, retval)
+netbsd32_msgrcv(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
 #if 0
-	struct compat_netbsd32_msgrcv_args /* {
+	struct netbsd32_msgrcv_args /* {
 		syscallarg(int) msqid;
 		syscallarg(netbsd32_voidp) msgp;
 		syscallarg(netbsd32_size_t) msgsz;
@@ -4280,13 +4281,13 @@ compat_netbsd32_msgrcv(p, v, retval)
 }
 
 int
-compat_netbsd32_shmat(p, v, retval)
+netbsd32_shmat(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
 #if 0
-	struct compat_netbsd32_shmat_args /* {
+	struct netbsd32_shmat_args /* {
 		syscallarg(int) shmid;
 		syscallarg(const netbsd32_voidp) shmaddr;
 		syscallarg(int) shmflg;
@@ -4307,13 +4308,13 @@ compat_netbsd32_shmat(p, v, retval)
 }
 
 int
-compat_netbsd32_shmctl(p, v, retval)
+netbsd32_shmctl(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
 #if 0
-	struct compat_netbsd32_shmctl_args /* {
+	struct netbsd32_shmctl_args /* {
 		syscallarg(int) shmid;
 		syscallarg(int) cmd;
 		syscallarg(netbsd32_shmid_dsp_t) buf;
@@ -4344,13 +4345,13 @@ compat_netbsd32_shmctl(p, v, retval)
 }
 
 int
-compat_netbsd32_shmdt(p, v, retval)
+netbsd32_shmdt(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
 #if 0
-	struct compat_netbsd32_shmdt_args /* {
+	struct netbsd32_shmdt_args /* {
 		syscallarg(const netbsd32_voidp) shmaddr;
 	} */ *uap = v;
 	struct sys_shmdt_args ua;
@@ -4363,13 +4364,13 @@ compat_netbsd32_shmdt(p, v, retval)
 }
 
 int
-compat_netbsd32_shmget(p, v, retval)
+netbsd32_shmget(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
 #if 0
-	struct compat_netbsd32_shmget_args /* {
+	struct netbsd32_shmget_args /* {
 		syscallarg(netbsd32_key_t) key;
 		syscallarg(netbsd32_size_t) size;
 		syscallarg(int) shmflg;
@@ -4386,12 +4387,12 @@ compat_netbsd32_shmget(p, v, retval)
 }
 
 int
-compat_netbsd32_clock_gettime(p, v, retval)
+netbsd32_clock_gettime(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_clock_gettime_args /* {
+	struct netbsd32_clock_gettime_args /* {
 		syscallarg(netbsd32_clockid_t) clock_id;
 		syscallarg(netbsd32_timespecp_t) tp;
 	} */ *uap = v;
@@ -4412,12 +4413,12 @@ compat_netbsd32_clock_gettime(p, v, retval)
 }
 
 int
-compat_netbsd32_clock_settime(p, v, retval)
+netbsd32_clock_settime(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_clock_settime_args /* {
+	struct netbsd32_clock_settime_args /* {
 		syscallarg(netbsd32_clockid_t) clock_id;
 		syscallarg(const netbsd32_timespecp_t) tp;
 	} */ *uap = v;
@@ -4446,12 +4447,12 @@ compat_netbsd32_clock_settime(p, v, retval)
 }
 
 int
-compat_netbsd32_clock_getres(p, v, retval)
+netbsd32_clock_getres(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_clock_getres_args /* {
+	struct netbsd32_clock_getres_args /* {
 		syscallarg(netbsd32_clockid_t) clock_id;
 		syscallarg(netbsd32_timespecp_t) tp;
 	} */ *uap = v;
@@ -4476,12 +4477,12 @@ compat_netbsd32_clock_getres(p, v, retval)
 }
 
 int
-compat_netbsd32_nanosleep(p, v, retval)
+netbsd32_nanosleep(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_nanosleep_args /* {
+	struct netbsd32_nanosleep_args /* {
 		syscallarg(const netbsd32_timespecp_t) rqtp;
 		syscallarg(netbsd32_timespecp_t) rmtp;
 	} */ *uap = v;
@@ -4541,12 +4542,12 @@ compat_netbsd32_nanosleep(p, v, retval)
 }
 
 int
-compat_netbsd32_fdatasync(p, v, retval)
+netbsd32_fdatasync(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_fdatasync_args /* {
+	struct netbsd32_fdatasync_args /* {
 		syscallarg(int) fd;
 	} */ *uap = v;
 	struct sys_fdatasync_args ua;
@@ -4557,12 +4558,12 @@ compat_netbsd32_fdatasync(p, v, retval)
 }
 
 int
-compat_netbsd32___posix_rename(p, v, retval)
+netbsd32___posix_rename(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32___posix_rename_args /* {
+	struct netbsd32___posix_rename_args /* {
 		syscallarg(const netbsd32_charp) from;
 		syscallarg(const netbsd32_charp) to;
 	} */ *uap = v;
@@ -4575,12 +4576,12 @@ compat_netbsd32___posix_rename(p, v, retval)
 }
 
 int
-compat_netbsd32_swapctl(p, v, retval)
+netbsd32_swapctl(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_swapctl_args /* {
+	struct netbsd32_swapctl_args /* {
 		syscallarg(int) cmd;
 		syscallarg(const netbsd32_voidp) arg;
 		syscallarg(int) misc;
@@ -4594,12 +4595,12 @@ compat_netbsd32_swapctl(p, v, retval)
 }
 
 int
-compat_netbsd32_getdents(p, v, retval)
+netbsd32_getdents(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getdents_args /* {
+	struct netbsd32_getdents_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_charp) buf;
 		syscallarg(netbsd32_size_t) count;
@@ -4618,18 +4619,18 @@ compat_netbsd32_getdents(p, v, retval)
 			SCARG(uap, count), &done, p, 0, 0);
 	*retval = done;
  out:
-	FILE_UNUSE(fp);
+	FILE_UNUSE(fp, p);
 	return (error);
 }
 
 
 int
-compat_netbsd32_minherit(p, v, retval)
+netbsd32_minherit(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_minherit_args /* {
+	struct netbsd32_minherit_args /* {
 		syscallarg(netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 		syscallarg(int) inherit;
@@ -4643,12 +4644,12 @@ compat_netbsd32_minherit(p, v, retval)
 }
 
 int
-compat_netbsd32_lchmod(p, v, retval)
+netbsd32_lchmod(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_lchmod_args /* {
+	struct netbsd32_lchmod_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(mode_t) mode;
 	} */ *uap = v;
@@ -4660,12 +4661,12 @@ compat_netbsd32_lchmod(p, v, retval)
 }
 
 int
-compat_netbsd32_lchown(p, v, retval)
+netbsd32_lchown(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_lchown_args /* {
+	struct netbsd32_lchown_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(uid_t) uid;
 		syscallarg(gid_t) gid;
@@ -4679,12 +4680,12 @@ compat_netbsd32_lchown(p, v, retval)
 }
 
 int
-compat_netbsd32_lutimes(p, v, retval)
+netbsd32_lutimes(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_lutimes_args /* {
+	struct netbsd32_lutimes_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(const netbsd32_timevalp_t) tptr;
 	} */ *uap = v;
@@ -4703,12 +4704,12 @@ compat_netbsd32_lutimes(p, v, retval)
 
 
 int
-compat_netbsd32___msync13(p, v, retval)
+netbsd32___msync13(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32___msync13_args /* {
+	struct netbsd32___msync13_args /* {
 		syscallarg(netbsd32_voidp) addr;
 		syscallarg(netbsd32_size_t) len;
 		syscallarg(int) flags;
@@ -4722,12 +4723,12 @@ compat_netbsd32___msync13(p, v, retval)
 }
 
 int
-compat_netbsd32___stat13(p, v, retval)
+netbsd32___stat13(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32___stat13_args /* {
+	struct netbsd32___stat13_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_statp_t) ub;
 	} */ *uap = v;
@@ -4750,12 +4751,12 @@ compat_netbsd32___stat13(p, v, retval)
 }
 
 int
-compat_netbsd32___fstat13(p, v, retval)
+netbsd32___fstat13(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32___fstat13_args /* {
+	struct netbsd32___fstat13_args /* {
 		syscallarg(int) fd;
 		syscallarg(netbsd32_statp_t) sb;
 	} */ *uap = v;
@@ -4791,12 +4792,12 @@ compat_netbsd32___fstat13(p, v, retval)
 }
 
 int
-compat_netbsd32___lstat13(p, v, retval)
+netbsd32___lstat13(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32___lstat13_args /* {
+	struct netbsd32___lstat13_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(netbsd32_statp_t) ub;
 	} */ *uap = v;
@@ -4819,12 +4820,12 @@ compat_netbsd32___lstat13(p, v, retval)
 }
 
 int
-compat_netbsd32___sigaltstack14(p, v, retval)
+netbsd32___sigaltstack14(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32___sigaltstack14_args /* {
+	struct netbsd32___sigaltstack14_args /* {
 		syscallarg(const netbsd32_sigaltstackp_t) nss;
 		syscallarg(netbsd32_sigaltstackp_t) oss;
 	} */ *uap = v;
@@ -4856,12 +4857,12 @@ compat_netbsd32___sigaltstack14(p, v, retval)
 }
 
 int
-compat_netbsd32___posix_chown(p, v, retval)
+netbsd32___posix_chown(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32___posix_chown_args /* {
+	struct netbsd32___posix_chown_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(uid_t) uid;
 		syscallarg(gid_t) gid;
@@ -4875,12 +4876,12 @@ compat_netbsd32___posix_chown(p, v, retval)
 }
 
 int
-compat_netbsd32___posix_fchown(p, v, retval)
+netbsd32___posix_fchown(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32___posix_fchown_args /* {
+	struct netbsd32___posix_fchown_args /* {
 		syscallarg(int) fd;
 		syscallarg(uid_t) uid;
 		syscallarg(gid_t) gid;
@@ -4894,12 +4895,12 @@ compat_netbsd32___posix_fchown(p, v, retval)
 }
 
 int
-compat_netbsd32___posix_lchown(p, v, retval)
+netbsd32___posix_lchown(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32___posix_lchown_args /* {
+	struct netbsd32___posix_lchown_args /* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(uid_t) uid;
 		syscallarg(gid_t) gid;
@@ -4913,12 +4914,12 @@ compat_netbsd32___posix_lchown(p, v, retval)
 }
 
 int
-compat_netbsd32_getsid(p, v, retval)
+netbsd32_getsid(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_getsid_args /* {
+	struct netbsd32_getsid_args /* {
 		syscallarg(pid_t) pid;
 	} */ *uap = v;
 	struct sys_getsid_args ua;
@@ -4928,12 +4929,12 @@ compat_netbsd32_getsid(p, v, retval)
 }
 
 int
-compat_netbsd32_fktrace(p, v, retval)
+netbsd32_fktrace(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_fktrace_args /* {
+	struct netbsd32_fktrace_args /* {
 		syscallarg(const int) fd;
 		syscallarg(int) ops;
 		syscallarg(int) facs;
@@ -4949,12 +4950,12 @@ compat_netbsd32_fktrace(p, v, retval)
 }
 
 int
-compat_netbsd32_preadv(p, v, retval)
+netbsd32_preadv(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_preadv_args /* {
+	struct netbsd32_preadv_args /* {
 		syscallarg(int) fd;
 		syscallarg(const netbsd32_iovecp_t) iovp;
 		syscallarg(int) iovcnt;
@@ -4991,12 +4992,12 @@ compat_netbsd32_preadv(p, v, retval)
 }
 
 int
-compat_netbsd32_pwritev(p, v, retval)
+netbsd32_pwritev(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_netbsd32_pwritev_args /* {
+	struct netbsd32_pwritev_args /* {
 		syscallarg(int) fd;
 		syscallarg(const netbsd32_iovecp_t) iovp;
 		syscallarg(int) iovcnt;
@@ -5033,12 +5034,12 @@ compat_netbsd32_pwritev(p, v, retval)
 }
 
 int
-compat_13_compat_netbsd32_sigprocmask(p, v, retval)
+compat_13_netbsd32_sigprocmask(p, v, retval)
 	register struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_13_compat_netbsd32_sigprocmask_args /* {
+	struct compat_13_netbsd32_sigprocmask_args /* {
 		syscallarg(int) how;
 		syscallarg(int) mask;
 	} */ *uap = v;
@@ -5057,12 +5058,12 @@ compat_13_compat_netbsd32_sigprocmask(p, v, retval)
 }
 
 int
-compat_13_compat_netbsd32_sigsuspend(p, v, retval)
+compat_13_netbsd32_sigsuspend(p, v, retval)
 	register struct proc *p;
 	void *v;
 	register_t *retval;
 {
-	struct compat_13_compat_netbsd32_sigsuspend_args /* {
+	struct compat_13_netbsd32_sigsuspend_args /* {
 		syscallarg(sigset13_t) mask;
 	} */ *uap = v;
 	sigset13_t ess;
diff --git a/sys/compat/netbsd32/netbsd32_syscall.h b/sys/compat/netbsd32/netbsd32_syscall.h
index 5710c509f5ae..ce86958993dd 100644
--- a/sys/compat/netbsd32/netbsd32_syscall.h
+++ b/sys/compat/netbsd32/netbsd32_syscall.h
@@ -1,79 +1,79 @@
-/*	$NetBSD: netbsd32_syscall.h,v 1.10 1999/06/09 04:50:32 christos Exp $	*/
+/*	$NetBSD: netbsd32_syscall.h,v 1.11 1999/10/11 01:36:23 eeh Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.8 1999/06/09 04:50:11 christos Exp 
+ * created from	NetBSD: syscalls.master,v 1.9 1999/07/12 21:55:20 kleink Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
 #define	netbsd32_SYS_syscall	0
 
-/* syscall: "compat_netbsd32_exit" ret: "void" args: "int" */
-#define	netbsd32_SYS_compat_netbsd32_exit	1
+/* syscall: "netbsd32_exit" ret: "void" args: "int" */
+#define	netbsd32_SYS_netbsd32_exit	1
 
 /* syscall: "fork" ret: "int" args: */
 #define	netbsd32_SYS_fork	2
 
-/* syscall: "compat_netbsd32_read" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" */
-#define	netbsd32_SYS_compat_netbsd32_read	3
+/* syscall: "netbsd32_read" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" */
+#define	netbsd32_SYS_netbsd32_read	3
 
-/* syscall: "compat_netbsd32_write" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_voidp" "netbsd32_size_t" */
-#define	netbsd32_SYS_compat_netbsd32_write	4
+/* syscall: "netbsd32_write" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_voidp" "netbsd32_size_t" */
+#define	netbsd32_SYS_netbsd32_write	4
 
-/* syscall: "compat_netbsd32_open" ret: "int" args: "const netbsd32_charp" "int" "..." */
-#define	netbsd32_SYS_compat_netbsd32_open	5
+/* syscall: "netbsd32_open" ret: "int" args: "const netbsd32_charp" "int" "..." */
+#define	netbsd32_SYS_netbsd32_open	5
 
-/* syscall: "compat_netbsd32_close" ret: "int" args: "int" */
-#define	netbsd32_SYS_compat_netbsd32_close	6
+/* syscall: "netbsd32_close" ret: "int" args: "int" */
+#define	netbsd32_SYS_netbsd32_close	6
 
-/* syscall: "compat_netbsd32_wait4" ret: "int" args: "int" "netbsd32_intp" "int" "netbsd32_rusagep_t" */
-#define	netbsd32_SYS_compat_netbsd32_wait4	7
+/* syscall: "netbsd32_wait4" ret: "int" args: "int" "netbsd32_intp" "int" "netbsd32_rusagep_t" */
+#define	netbsd32_SYS_netbsd32_wait4	7
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_ocreat	8
+#define	netbsd32_SYS_compat_43_netbsd32_ocreat	8
 
-/* syscall: "compat_netbsd32_link" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_link	9
+/* syscall: "netbsd32_link" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_link	9
 
-/* syscall: "compat_netbsd32_unlink" ret: "int" args: "const netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_unlink	10
+/* syscall: "netbsd32_unlink" ret: "int" args: "const netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_unlink	10
 
 				/* 11 is obsolete execv */
-/* syscall: "compat_netbsd32_chdir" ret: "int" args: "const netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_chdir	12
+/* syscall: "netbsd32_chdir" ret: "int" args: "const netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_chdir	12
 
-/* syscall: "compat_netbsd32_fchdir" ret: "int" args: "int" */
-#define	netbsd32_SYS_compat_netbsd32_fchdir	13
+/* syscall: "netbsd32_fchdir" ret: "int" args: "int" */
+#define	netbsd32_SYS_netbsd32_fchdir	13
 
-/* syscall: "compat_netbsd32_mknod" ret: "int" args: "const netbsd32_charp" "mode_t" "dev_t" */
-#define	netbsd32_SYS_compat_netbsd32_mknod	14
+/* syscall: "netbsd32_mknod" ret: "int" args: "const netbsd32_charp" "mode_t" "dev_t" */
+#define	netbsd32_SYS_netbsd32_mknod	14
 
-/* syscall: "compat_netbsd32_chmod" ret: "int" args: "const netbsd32_charp" "mode_t" */
-#define	netbsd32_SYS_compat_netbsd32_chmod	15
+/* syscall: "netbsd32_chmod" ret: "int" args: "const netbsd32_charp" "mode_t" */
+#define	netbsd32_SYS_netbsd32_chmod	15
 
-/* syscall: "compat_netbsd32_chown" ret: "int" args: "const netbsd32_charp" "uid_t" "gid_t" */
-#define	netbsd32_SYS_compat_netbsd32_chown	16
+/* syscall: "netbsd32_chown" ret: "int" args: "const netbsd32_charp" "uid_t" "gid_t" */
+#define	netbsd32_SYS_netbsd32_chown	16
 
-/* syscall: "compat_netbsd32_break" ret: "int" args: "netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_break	17
+/* syscall: "netbsd32_break" ret: "int" args: "netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_break	17
 
-/* syscall: "compat_netbsd32_getfsstat" ret: "int" args: "netbsd32_statfsp_t" "netbsd32_long" "int" */
-#define	netbsd32_SYS_compat_netbsd32_getfsstat	18
+/* syscall: "netbsd32_getfsstat" ret: "int" args: "netbsd32_statfsp_t" "netbsd32_long" "int" */
+#define	netbsd32_SYS_netbsd32_getfsstat	18
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_olseek	19
+#define	netbsd32_SYS_compat_43_netbsd32_olseek	19
 
 /* syscall: "getpid" ret: "pid_t" args: */
 #define	netbsd32_SYS_getpid	20
 
-/* syscall: "compat_netbsd32_mount" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" "int" "netbsd32_voidp" */
-#define	netbsd32_SYS_compat_netbsd32_mount	21
+/* syscall: "netbsd32_mount" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" "int" "netbsd32_voidp" */
+#define	netbsd32_SYS_netbsd32_mount	21
 
-/* syscall: "compat_netbsd32_unmount" ret: "int" args: "const netbsd32_charp" "int" */
-#define	netbsd32_SYS_compat_netbsd32_unmount	22
+/* syscall: "netbsd32_unmount" ret: "int" args: "const netbsd32_charp" "int" */
+#define	netbsd32_SYS_netbsd32_unmount	22
 
-/* syscall: "compat_netbsd32_setuid" ret: "int" args: "uid_t" */
-#define	netbsd32_SYS_compat_netbsd32_setuid	23
+/* syscall: "netbsd32_setuid" ret: "int" args: "uid_t" */
+#define	netbsd32_SYS_netbsd32_setuid	23
 
 /* syscall: "getuid" ret: "uid_t" args: */
 #define	netbsd32_SYS_getuid	24
@@ -81,51 +81,51 @@
 /* syscall: "geteuid" ret: "uid_t" args: */
 #define	netbsd32_SYS_geteuid	25
 
-/* syscall: "compat_netbsd32_ptrace" ret: "int" args: "int" "pid_t" "netbsd32_caddr_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_ptrace	26
+/* syscall: "netbsd32_ptrace" ret: "int" args: "int" "pid_t" "netbsd32_caddr_t" "int" */
+#define	netbsd32_SYS_netbsd32_ptrace	26
 
-/* syscall: "compat_netbsd32_recvmsg" ret: "netbsd32_ssize_t" args: "int" "netbsd32_msghdrp_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_recvmsg	27
+/* syscall: "netbsd32_recvmsg" ret: "netbsd32_ssize_t" args: "int" "netbsd32_msghdrp_t" "int" */
+#define	netbsd32_SYS_netbsd32_recvmsg	27
 
-/* syscall: "compat_netbsd32_sendmsg" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_msghdrp_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_sendmsg	28
+/* syscall: "netbsd32_sendmsg" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_msghdrp_t" "int" */
+#define	netbsd32_SYS_netbsd32_sendmsg	28
 
-/* syscall: "compat_netbsd32_recvfrom" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "int" "netbsd32_sockaddrp_t" "netbsd32_intp" */
-#define	netbsd32_SYS_compat_netbsd32_recvfrom	29
+/* syscall: "netbsd32_recvfrom" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "int" "netbsd32_sockaddrp_t" "netbsd32_intp" */
+#define	netbsd32_SYS_netbsd32_recvfrom	29
 
-/* syscall: "compat_netbsd32_accept" ret: "int" args: "int" "netbsd32_sockaddrp_t" "netbsd32_intp" */
-#define	netbsd32_SYS_compat_netbsd32_accept	30
+/* syscall: "netbsd32_accept" ret: "int" args: "int" "netbsd32_sockaddrp_t" "netbsd32_intp" */
+#define	netbsd32_SYS_netbsd32_accept	30
 
-/* syscall: "compat_netbsd32_getpeername" ret: "int" args: "int" "netbsd32_sockaddrp_t" "netbsd32_intp" */
-#define	netbsd32_SYS_compat_netbsd32_getpeername	31
+/* syscall: "netbsd32_getpeername" ret: "int" args: "int" "netbsd32_sockaddrp_t" "netbsd32_intp" */
+#define	netbsd32_SYS_netbsd32_getpeername	31
 
-/* syscall: "compat_netbsd32_getsockname" ret: "int" args: "int" "netbsd32_sockaddrp_t" "netbsd32_intp" */
-#define	netbsd32_SYS_compat_netbsd32_getsockname	32
+/* syscall: "netbsd32_getsockname" ret: "int" args: "int" "netbsd32_sockaddrp_t" "netbsd32_intp" */
+#define	netbsd32_SYS_netbsd32_getsockname	32
 
-/* syscall: "compat_netbsd32_access" ret: "int" args: "const netbsd32_charp" "int" */
-#define	netbsd32_SYS_compat_netbsd32_access	33
+/* syscall: "netbsd32_access" ret: "int" args: "const netbsd32_charp" "int" */
+#define	netbsd32_SYS_netbsd32_access	33
 
-/* syscall: "compat_netbsd32_chflags" ret: "int" args: "const netbsd32_charp" "netbsd32_u_long" */
-#define	netbsd32_SYS_compat_netbsd32_chflags	34
+/* syscall: "netbsd32_chflags" ret: "int" args: "const netbsd32_charp" "netbsd32_u_long" */
+#define	netbsd32_SYS_netbsd32_chflags	34
 
-/* syscall: "compat_netbsd32_fchflags" ret: "int" args: "int" "netbsd32_u_long" */
-#define	netbsd32_SYS_compat_netbsd32_fchflags	35
+/* syscall: "netbsd32_fchflags" ret: "int" args: "int" "netbsd32_u_long" */
+#define	netbsd32_SYS_netbsd32_fchflags	35
 
 /* syscall: "sync" ret: "void" args: */
 #define	netbsd32_SYS_sync	36
 
-/* syscall: "compat_netbsd32_kill" ret: "int" args: "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_kill	37
+/* syscall: "netbsd32_kill" ret: "int" args: "int" "int" */
+#define	netbsd32_SYS_netbsd32_kill	37
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_stat43	38
+#define	netbsd32_SYS_compat_43_netbsd32_stat43	38
 
 /* syscall: "getppid" ret: "pid_t" args: */
 #define	netbsd32_SYS_getppid	39
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_lstat43	40
+#define	netbsd32_SYS_compat_43_netbsd32_lstat43	40
 
-/* syscall: "compat_netbsd32_dup" ret: "int" args: "int" */
-#define	netbsd32_SYS_compat_netbsd32_dup	41
+/* syscall: "netbsd32_dup" ret: "int" args: "int" */
+#define	netbsd32_SYS_netbsd32_dup	41
 
 /* syscall: "pipe" ret: "int" args: */
 #define	netbsd32_SYS_pipe	42
@@ -133,300 +133,300 @@
 /* syscall: "getegid" ret: "gid_t" args: */
 #define	netbsd32_SYS_getegid	43
 
-/* syscall: "compat_netbsd32_profil" ret: "int" args: "netbsd32_caddr_t" "netbsd32_size_t" "netbsd32_u_long" "u_int" */
-#define	netbsd32_SYS_compat_netbsd32_profil	44
+/* syscall: "netbsd32_profil" ret: "int" args: "netbsd32_caddr_t" "netbsd32_size_t" "netbsd32_u_long" "u_int" */
+#define	netbsd32_SYS_netbsd32_profil	44
 
-/* syscall: "compat_netbsd32_ktrace" ret: "int" args: "const netbsd32_charp" "int" "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_ktrace	45
+/* syscall: "netbsd32_ktrace" ret: "int" args: "const netbsd32_charp" "int" "int" "int" */
+#define	netbsd32_SYS_netbsd32_ktrace	45
 
-				/* 45 is excluded compat_netbsd32_ktrace */
-/* syscall: "compat_netbsd32_sigaction" ret: "int" args: "int" "const netbsd32_sigactionp_t" "netbsd32_sigactionp_t" */
-#define	netbsd32_SYS_compat_netbsd32_sigaction	46
+				/* 45 is excluded netbsd32_ktrace */
+/* syscall: "netbsd32_sigaction" ret: "int" args: "int" "const netbsd32_sigactionp_t" "netbsd32_sigactionp_t" */
+#define	netbsd32_SYS_netbsd32_sigaction	46
 
 /* syscall: "getgid" ret: "gid_t" args: */
 #define	netbsd32_SYS_getgid	47
 
 #define	netbsd32_SYS_compat_13_sigprocmask13	48
 
-/* syscall: "compat_netbsd32___getlogin" ret: "int" args: "netbsd32_charp" "u_int" */
-#define	netbsd32_SYS_compat_netbsd32___getlogin	49
+/* syscall: "netbsd32___getlogin" ret: "int" args: "netbsd32_charp" "u_int" */
+#define	netbsd32_SYS_netbsd32___getlogin	49
 
-/* syscall: "compat_netbsd32_setlogin" ret: "int" args: "const netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_setlogin	50
+/* syscall: "netbsd32_setlogin" ret: "int" args: "const netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_setlogin	50
 
-/* syscall: "compat_netbsd32_acct" ret: "int" args: "const netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_acct	51
+/* syscall: "netbsd32_acct" ret: "int" args: "const netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_acct	51
 
 #define	netbsd32_SYS_compat_13_sigpending13	52
 
-#define	netbsd32_SYS_compat_13_compat_netbsd32_sigaltstack13	53
+#define	netbsd32_SYS_compat_13_netbsd32_sigaltstack13	53
 
-/* syscall: "compat_netbsd32_ioctl" ret: "int" args: "int" "netbsd32_u_long" "..." */
-#define	netbsd32_SYS_compat_netbsd32_ioctl	54
+/* syscall: "netbsd32_ioctl" ret: "int" args: "int" "netbsd32_u_long" "..." */
+#define	netbsd32_SYS_netbsd32_ioctl	54
 
-#define	netbsd32_SYS_compat_12_compat_netbsd32_reboot	55
+#define	netbsd32_SYS_compat_12_netbsd32_reboot	55
 
 				/* 55 is obsolete oreboot */
-/* syscall: "compat_netbsd32_revoke" ret: "int" args: "const netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_revoke	56
+/* syscall: "netbsd32_revoke" ret: "int" args: "const netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_revoke	56
 
-/* syscall: "compat_netbsd32_symlink" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_symlink	57
+/* syscall: "netbsd32_symlink" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_symlink	57
 
-/* syscall: "compat_netbsd32_readlink" ret: "int" args: "const netbsd32_charp" "netbsd32_charp" "netbsd32_size_t" */
-#define	netbsd32_SYS_compat_netbsd32_readlink	58
+/* syscall: "netbsd32_readlink" ret: "int" args: "const netbsd32_charp" "netbsd32_charp" "netbsd32_size_t" */
+#define	netbsd32_SYS_netbsd32_readlink	58
 
-/* syscall: "compat_netbsd32_execve" ret: "int" args: "const netbsd32_charp" "netbsd32_charpp" "netbsd32_charpp" */
-#define	netbsd32_SYS_compat_netbsd32_execve	59
+/* syscall: "netbsd32_execve" ret: "int" args: "const netbsd32_charp" "netbsd32_charpp" "netbsd32_charpp" */
+#define	netbsd32_SYS_netbsd32_execve	59
 
-/* syscall: "compat_netbsd32_umask" ret: "mode_t" args: "mode_t" */
-#define	netbsd32_SYS_compat_netbsd32_umask	60
+/* syscall: "netbsd32_umask" ret: "mode_t" args: "mode_t" */
+#define	netbsd32_SYS_netbsd32_umask	60
 
-/* syscall: "compat_netbsd32_chroot" ret: "int" args: "const netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_chroot	61
+/* syscall: "netbsd32_chroot" ret: "int" args: "const netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_chroot	61
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_fstat43	62
+#define	netbsd32_SYS_compat_43_netbsd32_fstat43	62
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_ogetkerninfo	63
+#define	netbsd32_SYS_compat_43_netbsd32_ogetkerninfo	63
 
 #define	netbsd32_SYS_compat_43_ogetpagesize	64
 
-#define	netbsd32_SYS_compat_12_compat_netbsd32_msync	65
+#define	netbsd32_SYS_compat_12_netbsd32_msync	65
 
 /* syscall: "vfork" ret: "int" args: */
 #define	netbsd32_SYS_vfork	66
 
 				/* 67 is obsolete vread */
 				/* 68 is obsolete vwrite */
-/* syscall: "compat_netbsd32_sbrk" ret: "int" args: "int" */
-#define	netbsd32_SYS_compat_netbsd32_sbrk	69
+/* syscall: "netbsd32_sbrk" ret: "int" args: "netbsd32_intptr_t" */
+#define	netbsd32_SYS_netbsd32_sbrk	69
 
-/* syscall: "compat_netbsd32_sstk" ret: "int" args: "int" */
-#define	netbsd32_SYS_compat_netbsd32_sstk	70
+/* syscall: "netbsd32_sstk" ret: "int" args: "int" */
+#define	netbsd32_SYS_netbsd32_sstk	70
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_ommap	71
+#define	netbsd32_SYS_compat_43_netbsd32_ommap	71
 
 /* syscall: "vadvise" ret: "int" args: "int" */
 #define	netbsd32_SYS_vadvise	72
 
-/* syscall: "compat_netbsd32_munmap" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" */
-#define	netbsd32_SYS_compat_netbsd32_munmap	73
+/* syscall: "netbsd32_munmap" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" */
+#define	netbsd32_SYS_netbsd32_munmap	73
 
-/* syscall: "compat_netbsd32_mprotect" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_mprotect	74
+/* syscall: "netbsd32_mprotect" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" "int" */
+#define	netbsd32_SYS_netbsd32_mprotect	74
 
-/* syscall: "compat_netbsd32_madvise" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_madvise	75
+/* syscall: "netbsd32_madvise" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" "int" */
+#define	netbsd32_SYS_netbsd32_madvise	75
 
 				/* 76 is obsolete vhangup */
 				/* 77 is obsolete vlimit */
-/* syscall: "compat_netbsd32_mincore" ret: "int" args: "netbsd32_caddr_t" "netbsd32_size_t" "netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_mincore	78
+/* syscall: "netbsd32_mincore" ret: "int" args: "netbsd32_caddr_t" "netbsd32_size_t" "netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_mincore	78
 
-/* syscall: "compat_netbsd32_getgroups" ret: "int" args: "int" "netbsd32_gid_tp" */
-#define	netbsd32_SYS_compat_netbsd32_getgroups	79
+/* syscall: "netbsd32_getgroups" ret: "int" args: "int" "netbsd32_gid_tp" */
+#define	netbsd32_SYS_netbsd32_getgroups	79
 
-/* syscall: "compat_netbsd32_setgroups" ret: "int" args: "int" "const netbsd32_gid_tp" */
-#define	netbsd32_SYS_compat_netbsd32_setgroups	80
+/* syscall: "netbsd32_setgroups" ret: "int" args: "int" "const netbsd32_gid_tp" */
+#define	netbsd32_SYS_netbsd32_setgroups	80
 
 /* syscall: "getpgrp" ret: "int" args: */
 #define	netbsd32_SYS_getpgrp	81
 
-/* syscall: "compat_netbsd32_setpgid" ret: "int" args: "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_setpgid	82
+/* syscall: "netbsd32_setpgid" ret: "int" args: "int" "int" */
+#define	netbsd32_SYS_netbsd32_setpgid	82
 
-/* syscall: "compat_netbsd32_setitimer" ret: "int" args: "int" "const netbsd32_itimervalp_t" "netbsd32_itimervalp_t" */
-#define	netbsd32_SYS_compat_netbsd32_setitimer	83
+/* syscall: "netbsd32_setitimer" ret: "int" args: "int" "const netbsd32_itimervalp_t" "netbsd32_itimervalp_t" */
+#define	netbsd32_SYS_netbsd32_setitimer	83
 
 #define	netbsd32_SYS_compat_43_owait	84
 
-#define	netbsd32_SYS_compat_12_compat_netbsd32_oswapon	85
+#define	netbsd32_SYS_compat_12_netbsd32_oswapon	85
 
-/* syscall: "compat_netbsd32_getitimer" ret: "int" args: "int" "netbsd32_itimervalp_t" */
-#define	netbsd32_SYS_compat_netbsd32_getitimer	86
+/* syscall: "netbsd32_getitimer" ret: "int" args: "int" "netbsd32_itimervalp_t" */
+#define	netbsd32_SYS_netbsd32_getitimer	86
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_ogethostname	87
+#define	netbsd32_SYS_compat_43_netbsd32_ogethostname	87
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_osethostname	88
+#define	netbsd32_SYS_compat_43_netbsd32_osethostname	88
 
 #define	netbsd32_SYS_compat_43_ogetdtablesize	89
 
-/* syscall: "compat_netbsd32_dup2" ret: "int" args: "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_dup2	90
+/* syscall: "netbsd32_dup2" ret: "int" args: "int" "int" */
+#define	netbsd32_SYS_netbsd32_dup2	90
 
-/* syscall: "compat_netbsd32_fcntl" ret: "int" args: "int" "int" "..." */
-#define	netbsd32_SYS_compat_netbsd32_fcntl	92
+/* syscall: "netbsd32_fcntl" ret: "int" args: "int" "int" "..." */
+#define	netbsd32_SYS_netbsd32_fcntl	92
 
-/* syscall: "compat_netbsd32_select" ret: "int" args: "int" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_timevalp_t" */
-#define	netbsd32_SYS_compat_netbsd32_select	93
+/* syscall: "netbsd32_select" ret: "int" args: "int" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_timevalp_t" */
+#define	netbsd32_SYS_netbsd32_select	93
 
-/* syscall: "compat_netbsd32_fsync" ret: "int" args: "int" */
-#define	netbsd32_SYS_compat_netbsd32_fsync	95
+/* syscall: "netbsd32_fsync" ret: "int" args: "int" */
+#define	netbsd32_SYS_netbsd32_fsync	95
 
-/* syscall: "compat_netbsd32_setpriority" ret: "int" args: "int" "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_setpriority	96
+/* syscall: "netbsd32_setpriority" ret: "int" args: "int" "int" "int" */
+#define	netbsd32_SYS_netbsd32_setpriority	96
 
-/* syscall: "compat_netbsd32_socket" ret: "int" args: "int" "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_socket	97
+/* syscall: "netbsd32_socket" ret: "int" args: "int" "int" "int" */
+#define	netbsd32_SYS_netbsd32_socket	97
 
-/* syscall: "compat_netbsd32_connect" ret: "int" args: "int" "const netbsd32_sockaddrp_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_connect	98
+/* syscall: "netbsd32_connect" ret: "int" args: "int" "const netbsd32_sockaddrp_t" "int" */
+#define	netbsd32_SYS_netbsd32_connect	98
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_oaccept	99
+#define	netbsd32_SYS_compat_43_netbsd32_oaccept	99
 
-/* syscall: "compat_netbsd32_getpriority" ret: "int" args: "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_getpriority	100
+/* syscall: "netbsd32_getpriority" ret: "int" args: "int" "int" */
+#define	netbsd32_SYS_netbsd32_getpriority	100
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_osend	101
+#define	netbsd32_SYS_compat_43_netbsd32_osend	101
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_orecv	102
+#define	netbsd32_SYS_compat_43_netbsd32_orecv	102
 
-/* syscall: "compat_netbsd32_sigreturn" ret: "int" args: "netbsd32_sigcontextp_t" */
-#define	netbsd32_SYS_compat_netbsd32_sigreturn	103
+/* syscall: "netbsd32_sigreturn" ret: "int" args: "netbsd32_sigcontextp_t" */
+#define	netbsd32_SYS_netbsd32_sigreturn	103
 
-/* syscall: "compat_netbsd32_bind" ret: "int" args: "int" "const netbsd32_sockaddrp_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_bind	104
+/* syscall: "netbsd32_bind" ret: "int" args: "int" "const netbsd32_sockaddrp_t" "int" */
+#define	netbsd32_SYS_netbsd32_bind	104
 
-/* syscall: "compat_netbsd32_setsockopt" ret: "int" args: "int" "int" "int" "const netbsd32_voidp" "int" */
-#define	netbsd32_SYS_compat_netbsd32_setsockopt	105
+/* syscall: "netbsd32_setsockopt" ret: "int" args: "int" "int" "int" "const netbsd32_voidp" "int" */
+#define	netbsd32_SYS_netbsd32_setsockopt	105
 
-/* syscall: "compat_netbsd32_listen" ret: "int" args: "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_listen	106
+/* syscall: "netbsd32_listen" ret: "int" args: "int" "int" */
+#define	netbsd32_SYS_netbsd32_listen	106
 
 				/* 107 is obsolete vtimes */
-#define	netbsd32_SYS_compat_43_compat_netbsd32_osigvec	108
+#define	netbsd32_SYS_compat_43_netbsd32_osigvec	108
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_sigblock	109
+#define	netbsd32_SYS_compat_43_netbsd32_sigblock	109
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_sigsetmask	110
+#define	netbsd32_SYS_compat_43_netbsd32_sigsetmask	110
 
 				/* 109 is obsolete sigblock */
 				/* 110 is obsolete sigsetmask */
 #define	netbsd32_SYS_compat_13_sigsuspend13	111
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_osigstack	112
+#define	netbsd32_SYS_compat_43_netbsd32_osigstack	112
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_orecvmsg	113
+#define	netbsd32_SYS_compat_43_netbsd32_orecvmsg	113
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_osendmsg	114
+#define	netbsd32_SYS_compat_43_netbsd32_osendmsg	114
 
 				/* 115 is obsolete vtrace */
-/* syscall: "compat_netbsd32_gettimeofday" ret: "int" args: "netbsd32_timevalp_t" "netbsd32_timezonep_t" */
-#define	netbsd32_SYS_compat_netbsd32_gettimeofday	116
+/* syscall: "netbsd32_gettimeofday" ret: "int" args: "netbsd32_timevalp_t" "netbsd32_timezonep_t" */
+#define	netbsd32_SYS_netbsd32_gettimeofday	116
 
-/* syscall: "compat_netbsd32_getrusage" ret: "int" args: "int" "netbsd32_rusagep_t" */
-#define	netbsd32_SYS_compat_netbsd32_getrusage	117
+/* syscall: "netbsd32_getrusage" ret: "int" args: "int" "netbsd32_rusagep_t" */
+#define	netbsd32_SYS_netbsd32_getrusage	117
 
-/* syscall: "compat_netbsd32_getsockopt" ret: "int" args: "int" "int" "int" "netbsd32_voidp" "netbsd32_intp" */
-#define	netbsd32_SYS_compat_netbsd32_getsockopt	118
+/* syscall: "netbsd32_getsockopt" ret: "int" args: "int" "int" "int" "netbsd32_voidp" "netbsd32_intp" */
+#define	netbsd32_SYS_netbsd32_getsockopt	118
 
 				/* 119 is obsolete resuba */
-/* syscall: "compat_netbsd32_readv" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_iovecp_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_readv	120
+/* syscall: "netbsd32_readv" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_iovecp_t" "int" */
+#define	netbsd32_SYS_netbsd32_readv	120
 
-/* syscall: "compat_netbsd32_writev" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_iovecp_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_writev	121
+/* syscall: "netbsd32_writev" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_iovecp_t" "int" */
+#define	netbsd32_SYS_netbsd32_writev	121
 
-/* syscall: "compat_netbsd32_settimeofday" ret: "int" args: "const netbsd32_timevalp_t" "const netbsd32_timezonep_t" */
-#define	netbsd32_SYS_compat_netbsd32_settimeofday	122
+/* syscall: "netbsd32_settimeofday" ret: "int" args: "const netbsd32_timevalp_t" "const netbsd32_timezonep_t" */
+#define	netbsd32_SYS_netbsd32_settimeofday	122
 
-/* syscall: "compat_netbsd32_fchown" ret: "int" args: "int" "uid_t" "gid_t" */
-#define	netbsd32_SYS_compat_netbsd32_fchown	123
+/* syscall: "netbsd32_fchown" ret: "int" args: "int" "uid_t" "gid_t" */
+#define	netbsd32_SYS_netbsd32_fchown	123
 
-/* syscall: "compat_netbsd32_fchmod" ret: "int" args: "int" "mode_t" */
-#define	netbsd32_SYS_compat_netbsd32_fchmod	124
+/* syscall: "netbsd32_fchmod" ret: "int" args: "int" "mode_t" */
+#define	netbsd32_SYS_netbsd32_fchmod	124
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_orecvfrom	125
+#define	netbsd32_SYS_compat_43_netbsd32_orecvfrom	125
 
-/* syscall: "compat_netbsd32_setreuid" ret: "int" args: "uid_t" "uid_t" */
-#define	netbsd32_SYS_compat_netbsd32_setreuid	126
+/* syscall: "netbsd32_setreuid" ret: "int" args: "uid_t" "uid_t" */
+#define	netbsd32_SYS_netbsd32_setreuid	126
 
-/* syscall: "compat_netbsd32_setregid" ret: "int" args: "gid_t" "gid_t" */
-#define	netbsd32_SYS_compat_netbsd32_setregid	127
+/* syscall: "netbsd32_setregid" ret: "int" args: "gid_t" "gid_t" */
+#define	netbsd32_SYS_netbsd32_setregid	127
 
-/* syscall: "compat_netbsd32_rename" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_rename	128
+/* syscall: "netbsd32_rename" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_rename	128
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_otruncate	129
+#define	netbsd32_SYS_compat_43_netbsd32_otruncate	129
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_oftruncate	130
+#define	netbsd32_SYS_compat_43_netbsd32_oftruncate	130
 
-/* syscall: "compat_netbsd32_flock" ret: "int" args: "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_flock	131
+/* syscall: "netbsd32_flock" ret: "int" args: "int" "int" */
+#define	netbsd32_SYS_netbsd32_flock	131
 
-/* syscall: "compat_netbsd32_mkfifo" ret: "int" args: "const netbsd32_charp" "mode_t" */
-#define	netbsd32_SYS_compat_netbsd32_mkfifo	132
+/* syscall: "netbsd32_mkfifo" ret: "int" args: "const netbsd32_charp" "mode_t" */
+#define	netbsd32_SYS_netbsd32_mkfifo	132
 
-/* syscall: "compat_netbsd32_sendto" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_voidp" "netbsd32_size_t" "int" "const netbsd32_sockaddrp_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_sendto	133
+/* syscall: "netbsd32_sendto" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_voidp" "netbsd32_size_t" "int" "const netbsd32_sockaddrp_t" "int" */
+#define	netbsd32_SYS_netbsd32_sendto	133
 
-/* syscall: "compat_netbsd32_shutdown" ret: "int" args: "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_shutdown	134
+/* syscall: "netbsd32_shutdown" ret: "int" args: "int" "int" */
+#define	netbsd32_SYS_netbsd32_shutdown	134
 
-/* syscall: "compat_netbsd32_socketpair" ret: "int" args: "int" "int" "int" "netbsd32_intp" */
-#define	netbsd32_SYS_compat_netbsd32_socketpair	135
+/* syscall: "netbsd32_socketpair" ret: "int" args: "int" "int" "int" "netbsd32_intp" */
+#define	netbsd32_SYS_netbsd32_socketpair	135
 
-/* syscall: "compat_netbsd32_mkdir" ret: "int" args: "const netbsd32_charp" "mode_t" */
-#define	netbsd32_SYS_compat_netbsd32_mkdir	136
+/* syscall: "netbsd32_mkdir" ret: "int" args: "const netbsd32_charp" "mode_t" */
+#define	netbsd32_SYS_netbsd32_mkdir	136
 
-/* syscall: "compat_netbsd32_rmdir" ret: "int" args: "const netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_rmdir	137
+/* syscall: "netbsd32_rmdir" ret: "int" args: "const netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_rmdir	137
 
-/* syscall: "compat_netbsd32_utimes" ret: "int" args: "const netbsd32_charp" "const netbsd32_timevalp_t" */
-#define	netbsd32_SYS_compat_netbsd32_utimes	138
+/* syscall: "netbsd32_utimes" ret: "int" args: "const netbsd32_charp" "const netbsd32_timevalp_t" */
+#define	netbsd32_SYS_netbsd32_utimes	138
 
 				/* 139 is obsolete 4.2 sigreturn */
-/* syscall: "compat_netbsd32_adjtime" ret: "int" args: "const netbsd32_timevalp_t" "netbsd32_timevalp_t" */
-#define	netbsd32_SYS_compat_netbsd32_adjtime	140
+/* syscall: "netbsd32_adjtime" ret: "int" args: "const netbsd32_timevalp_t" "netbsd32_timevalp_t" */
+#define	netbsd32_SYS_netbsd32_adjtime	140
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_ogetpeername	141
+#define	netbsd32_SYS_compat_43_netbsd32_ogetpeername	141
 
 #define	netbsd32_SYS_compat_43_ogethostid	142
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_sethostid	143
+#define	netbsd32_SYS_compat_43_netbsd32_sethostid	143
 
 				/* 143 is obsolete sethostid */
-#define	netbsd32_SYS_compat_43_compat_netbsd32_ogetrlimit	144
+#define	netbsd32_SYS_compat_43_netbsd32_ogetrlimit	144
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_osetrlimit	145
+#define	netbsd32_SYS_compat_43_netbsd32_osetrlimit	145
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_killpg	146
+#define	netbsd32_SYS_compat_43_netbsd32_killpg	146
 
 				/* 146 is obsolete killpg */
 /* syscall: "setsid" ret: "int" args: */
 #define	netbsd32_SYS_setsid	147
 
-/* syscall: "compat_netbsd32_quotactl" ret: "int" args: "const netbsd32_charp" "int" "int" "netbsd32_caddr_t" */
-#define	netbsd32_SYS_compat_netbsd32_quotactl	148
+/* syscall: "netbsd32_quotactl" ret: "int" args: "const netbsd32_charp" "int" "int" "netbsd32_caddr_t" */
+#define	netbsd32_SYS_netbsd32_quotactl	148
 
 #define	netbsd32_SYS_compat_43_oquota	149
 
-#define	netbsd32_SYS_compat_43_compat_netbsd32_ogetsockname	150
+#define	netbsd32_SYS_compat_43_netbsd32_ogetsockname	150
 
-/* syscall: "compat_netbsd32_nfssvc" ret: "int" args: "int" "netbsd32_voidp" */
-#define	netbsd32_SYS_compat_netbsd32_nfssvc	155
+/* syscall: "netbsd32_nfssvc" ret: "int" args: "int" "netbsd32_voidp" */
+#define	netbsd32_SYS_netbsd32_nfssvc	155
 
-				/* 155 is excluded compat_netbsd32_nfssvc */
-#define	netbsd32_SYS_compat_43_compat_netbsd32_ogetdirentries	156
+				/* 155 is excluded netbsd32_nfssvc */
+#define	netbsd32_SYS_compat_43_netbsd32_ogetdirentries	156
 
-/* syscall: "compat_netbsd32_statfs" ret: "int" args: "const netbsd32_charp" "netbsd32_statfsp_t" */
-#define	netbsd32_SYS_compat_netbsd32_statfs	157
+/* syscall: "netbsd32_statfs" ret: "int" args: "const netbsd32_charp" "netbsd32_statfsp_t" */
+#define	netbsd32_SYS_netbsd32_statfs	157
 
-/* syscall: "compat_netbsd32_fstatfs" ret: "int" args: "int" "netbsd32_statfsp_t" */
-#define	netbsd32_SYS_compat_netbsd32_fstatfs	158
+/* syscall: "netbsd32_fstatfs" ret: "int" args: "int" "netbsd32_statfsp_t" */
+#define	netbsd32_SYS_netbsd32_fstatfs	158
 
-/* syscall: "compat_netbsd32_getfh" ret: "int" args: "const netbsd32_charp" "netbsd32_fhandlep_t" */
-#define	netbsd32_SYS_compat_netbsd32_getfh	161
+/* syscall: "netbsd32_getfh" ret: "int" args: "const netbsd32_charp" "netbsd32_fhandlep_t" */
+#define	netbsd32_SYS_netbsd32_getfh	161
 
-				/* 161 is excluded compat_netbsd32_getfh */
-#define	netbsd32_SYS_compat_09_compat_netbsd32_ogetdomainname	162
+				/* 161 is excluded netbsd32_getfh */
+#define	netbsd32_SYS_compat_09_netbsd32_ogetdomainname	162
 
-#define	netbsd32_SYS_compat_09_compat_netbsd32_osetdomainname	163
+#define	netbsd32_SYS_compat_09_netbsd32_osetdomainname	163
 
-#define	netbsd32_SYS_compat_09_compat_netbsd32_uname	164
+#define	netbsd32_SYS_compat_09_netbsd32_uname	164
 
-/* syscall: "compat_netbsd32_sysarch" ret: "int" args: "int" "netbsd32_voidp" */
-#define	netbsd32_SYS_compat_netbsd32_sysarch	165
+/* syscall: "netbsd32_sysarch" ret: "int" args: "int" "netbsd32_voidp" */
+#define	netbsd32_SYS_netbsd32_sysarch	165
 
 /* syscall: "osemsys" ret: "int" args: "int" "int" "int" "int" "int" */
 #define	netbsd32_SYS_osemsys	169
@@ -440,28 +440,28 @@
 #define	netbsd32_SYS_oshmsys	171
 
 				/* 171 is excluded 1.0 shmsys */
-/* syscall: "compat_netbsd32_pread" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "int" "off_t" */
-#define	netbsd32_SYS_compat_netbsd32_pread	173
+/* syscall: "netbsd32_pread" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "int" "off_t" */
+#define	netbsd32_SYS_netbsd32_pread	173
 
-/* syscall: "compat_netbsd32_pwrite" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_voidp" "netbsd32_size_t" "int" "off_t" */
-#define	netbsd32_SYS_compat_netbsd32_pwrite	174
+/* syscall: "netbsd32_pwrite" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_voidp" "netbsd32_size_t" "int" "off_t" */
+#define	netbsd32_SYS_netbsd32_pwrite	174
 
-/* syscall: "compat_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimevalp_t" */
-#define	netbsd32_SYS_compat_netbsd32_ntp_gettime	175
+/* syscall: "netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimevalp_t" */
+#define	netbsd32_SYS_netbsd32_ntp_gettime	175
 
-/* syscall: "compat_netbsd32_ntp_adjtime" ret: "int" args: "netbsd32_timexp_t" */
-#define	netbsd32_SYS_compat_netbsd32_ntp_adjtime	176
+/* syscall: "netbsd32_ntp_adjtime" ret: "int" args: "netbsd32_timexp_t" */
+#define	netbsd32_SYS_netbsd32_ntp_adjtime	176
 
-				/* 175 is excluded compat_netbsd32_ntp_gettime */
-				/* 176 is excluded compat_netbsd32_ntp_adjtime */
-/* syscall: "compat_netbsd32_setgid" ret: "int" args: "gid_t" */
-#define	netbsd32_SYS_compat_netbsd32_setgid	181
+				/* 175 is excluded netbsd32_ntp_gettime */
+				/* 176 is excluded netbsd32_ntp_adjtime */
+/* syscall: "netbsd32_setgid" ret: "int" args: "gid_t" */
+#define	netbsd32_SYS_netbsd32_setgid	181
 
-/* syscall: "compat_netbsd32_setegid" ret: "int" args: "gid_t" */
-#define	netbsd32_SYS_compat_netbsd32_setegid	182
+/* syscall: "netbsd32_setegid" ret: "int" args: "gid_t" */
+#define	netbsd32_SYS_netbsd32_setegid	182
 
-/* syscall: "compat_netbsd32_seteuid" ret: "int" args: "uid_t" */
-#define	netbsd32_SYS_compat_netbsd32_seteuid	183
+/* syscall: "netbsd32_seteuid" ret: "int" args: "uid_t" */
+#define	netbsd32_SYS_netbsd32_seteuid	183
 
 /* syscall: "lfs_bmapv" ret: "int" args: "netbsd32_fsid_tp_t" "netbsd32_block_infop_t" "int" */
 #define	netbsd32_SYS_lfs_bmapv	184
@@ -475,68 +475,68 @@
 /* syscall: "lfs_segwait" ret: "int" args: "netbsd32_fsid_tp_t" "netbsd32_timevalp_t" */
 #define	netbsd32_SYS_lfs_segwait	187
 
-				/* 184 is excluded compat_netbsd32_sys_lfs_bmapv */
-				/* 185 is excluded compat_netbsd32_sys_lfs_markv */
-				/* 186 is excluded compat_netbsd32_sys_lfs_segclean */
-				/* 187 is excluded compat_netbsd32_sys_lfs_segwait */
-#define	netbsd32_SYS_compat_12_compat_netbsd32_stat12	188
+				/* 184 is excluded netbsd32_sys_lfs_bmapv */
+				/* 185 is excluded netbsd32_sys_lfs_markv */
+				/* 186 is excluded netbsd32_sys_lfs_segclean */
+				/* 187 is excluded netbsd32_sys_lfs_segwait */
+#define	netbsd32_SYS_compat_12_netbsd32_stat12	188
 
-#define	netbsd32_SYS_compat_12_compat_netbsd32_fstat12	189
+#define	netbsd32_SYS_compat_12_netbsd32_fstat12	189
 
-#define	netbsd32_SYS_compat_12_compat_netbsd32_lstat12	190
+#define	netbsd32_SYS_compat_12_netbsd32_lstat12	190
 
-/* syscall: "compat_netbsd32_pathconf" ret: "netbsd32_long" args: "const netbsd32_charp" "int" */
-#define	netbsd32_SYS_compat_netbsd32_pathconf	191
+/* syscall: "netbsd32_pathconf" ret: "netbsd32_long" args: "const netbsd32_charp" "int" */
+#define	netbsd32_SYS_netbsd32_pathconf	191
 
-/* syscall: "compat_netbsd32_fpathconf" ret: "netbsd32_long" args: "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_fpathconf	192
+/* syscall: "netbsd32_fpathconf" ret: "netbsd32_long" args: "int" "int" */
+#define	netbsd32_SYS_netbsd32_fpathconf	192
 
-/* syscall: "compat_netbsd32_getrlimit" ret: "int" args: "int" "netbsd32_rlimitp_t" */
-#define	netbsd32_SYS_compat_netbsd32_getrlimit	194
+/* syscall: "netbsd32_getrlimit" ret: "int" args: "int" "netbsd32_rlimitp_t" */
+#define	netbsd32_SYS_netbsd32_getrlimit	194
 
-/* syscall: "compat_netbsd32_setrlimit" ret: "int" args: "int" "const netbsd32_rlimitp_t" */
-#define	netbsd32_SYS_compat_netbsd32_setrlimit	195
+/* syscall: "netbsd32_setrlimit" ret: "int" args: "int" "const netbsd32_rlimitp_t" */
+#define	netbsd32_SYS_netbsd32_setrlimit	195
 
-#define	netbsd32_SYS_compat_12_compat_netbsd32_getdirentries	196
+#define	netbsd32_SYS_compat_12_netbsd32_getdirentries	196
 
-/* syscall: "compat_netbsd32_mmap" ret: "netbsd32_voidp" args: "netbsd32_voidp" "netbsd32_size_t" "int" "int" "int" "netbsd32_long" "off_t" */
-#define	netbsd32_SYS_compat_netbsd32_mmap	197
+/* syscall: "netbsd32_mmap" ret: "netbsd32_voidp" args: "netbsd32_voidp" "netbsd32_size_t" "int" "int" "int" "netbsd32_long" "off_t" */
+#define	netbsd32_SYS_netbsd32_mmap	197
 
 /* syscall: "__syscall" ret: "quad_t" args: "quad_t" "..." */
 #define	netbsd32_SYS___syscall	198
 
-/* syscall: "compat_netbsd32_lseek" ret: "off_t" args: "int" "int" "off_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_lseek	199
+/* syscall: "netbsd32_lseek" ret: "off_t" args: "int" "int" "off_t" "int" */
+#define	netbsd32_SYS_netbsd32_lseek	199
 
-/* syscall: "compat_netbsd32_truncate" ret: "int" args: "const netbsd32_charp" "int" "off_t" */
-#define	netbsd32_SYS_compat_netbsd32_truncate	200
+/* syscall: "netbsd32_truncate" ret: "int" args: "const netbsd32_charp" "int" "off_t" */
+#define	netbsd32_SYS_netbsd32_truncate	200
 
-/* syscall: "compat_netbsd32_ftruncate" ret: "int" args: "int" "int" "off_t" */
-#define	netbsd32_SYS_compat_netbsd32_ftruncate	201
+/* syscall: "netbsd32_ftruncate" ret: "int" args: "int" "int" "off_t" */
+#define	netbsd32_SYS_netbsd32_ftruncate	201
 
-/* syscall: "compat_netbsd32___sysctl" ret: "int" args: "netbsd32_intp" "u_int" "netbsd32_voidp" "netbsd32_size_tp" "netbsd32_voidp" "netbsd32_size_t" */
-#define	netbsd32_SYS_compat_netbsd32___sysctl	202
+/* syscall: "netbsd32___sysctl" ret: "int" args: "netbsd32_intp" "u_int" "netbsd32_voidp" "netbsd32_size_tp" "netbsd32_voidp" "netbsd32_size_t" */
+#define	netbsd32_SYS_netbsd32___sysctl	202
 
-/* syscall: "compat_netbsd32_mlock" ret: "int" args: "const netbsd32_voidp" "netbsd32_size_t" */
-#define	netbsd32_SYS_compat_netbsd32_mlock	203
+/* syscall: "netbsd32_mlock" ret: "int" args: "const netbsd32_voidp" "netbsd32_size_t" */
+#define	netbsd32_SYS_netbsd32_mlock	203
 
-/* syscall: "compat_netbsd32_munlock" ret: "int" args: "const netbsd32_voidp" "netbsd32_size_t" */
-#define	netbsd32_SYS_compat_netbsd32_munlock	204
+/* syscall: "netbsd32_munlock" ret: "int" args: "const netbsd32_voidp" "netbsd32_size_t" */
+#define	netbsd32_SYS_netbsd32_munlock	204
 
-/* syscall: "compat_netbsd32_undelete" ret: "int" args: "const netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_undelete	205
+/* syscall: "netbsd32_undelete" ret: "int" args: "const netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_undelete	205
 
-/* syscall: "compat_netbsd32_futimes" ret: "int" args: "int" "const netbsd32_timevalp_t" */
-#define	netbsd32_SYS_compat_netbsd32_futimes	206
+/* syscall: "netbsd32_futimes" ret: "int" args: "int" "const netbsd32_timevalp_t" */
+#define	netbsd32_SYS_netbsd32_futimes	206
 
-/* syscall: "compat_netbsd32_getpgid" ret: "int" args: "pid_t" */
-#define	netbsd32_SYS_compat_netbsd32_getpgid	207
+/* syscall: "netbsd32_getpgid" ret: "int" args: "pid_t" */
+#define	netbsd32_SYS_netbsd32_getpgid	207
 
-/* syscall: "compat_netbsd32_reboot" ret: "int" args: "int" "netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32_reboot	208
+/* syscall: "netbsd32_reboot" ret: "int" args: "int" "netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32_reboot	208
 
-/* syscall: "compat_netbsd32_poll" ret: "int" args: "netbsd32_pollfdp_t" "u_int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_poll	209
+/* syscall: "netbsd32_poll" ret: "int" args: "netbsd32_pollfdp_t" "u_int" "int" */
+#define	netbsd32_SYS_netbsd32_poll	209
 
 				/* 210 is excluded lkmnosys */
 				/* 211 is excluded lkmnosys */
@@ -548,128 +548,125 @@
 				/* 217 is excluded lkmnosys */
 				/* 218 is excluded lkmnosys */
 				/* 219 is excluded lkmnosys */
-/* syscall: "compat_netbsd32___semctl" ret: "int" args: "int" "int" "int" "netbsd32_semunu_t" */
-#define	netbsd32_SYS_compat_netbsd32___semctl	220
+#define	netbsd32_SYS_compat_14_netbsd32___semctl	220
 
-/* syscall: "compat_netbsd32_semget" ret: "int" args: "netbsd32_key_t" "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_semget	221
+/* syscall: "netbsd32_semget" ret: "int" args: "netbsd32_key_t" "int" "int" */
+#define	netbsd32_SYS_netbsd32_semget	221
 
-/* syscall: "compat_netbsd32_semop" ret: "int" args: "int" "netbsd32_sembufp_t" "netbsd32_size_t" */
-#define	netbsd32_SYS_compat_netbsd32_semop	222
+/* syscall: "netbsd32_semop" ret: "int" args: "int" "netbsd32_sembufp_t" "netbsd32_size_t" */
+#define	netbsd32_SYS_netbsd32_semop	222
 
-/* syscall: "compat_netbsd32_semconfig" ret: "int" args: "int" */
-#define	netbsd32_SYS_compat_netbsd32_semconfig	223
+/* syscall: "netbsd32_semconfig" ret: "int" args: "int" */
+#define	netbsd32_SYS_netbsd32_semconfig	223
 
-				/* 220 is excluded compat_netbsd32_semctl */
-				/* 221 is excluded compat_netbsd32_semget */
-				/* 222 is excluded compat_netbsd32_semop */
-				/* 223 is excluded compat_netbsd32_semconfig */
-/* syscall: "compat_netbsd32_msgctl" ret: "int" args: "int" "int" "netbsd32_msqid_dsp_t" */
-#define	netbsd32_SYS_compat_netbsd32_msgctl	224
+				/* 220 is excluded netbsd32_semctl */
+				/* 221 is excluded netbsd32_semget */
+				/* 222 is excluded netbsd32_semop */
+				/* 223 is excluded netbsd32_semconfig */
+#define	netbsd32_SYS_compat_14_netbsd32_msgctl	224
 
-/* syscall: "compat_netbsd32_msgget" ret: "int" args: "netbsd32_key_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_msgget	225
+/* syscall: "netbsd32_msgget" ret: "int" args: "netbsd32_key_t" "int" */
+#define	netbsd32_SYS_netbsd32_msgget	225
 
-/* syscall: "compat_netbsd32_msgsnd" ret: "int" args: "int" "const netbsd32_voidp" "netbsd32_size_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_msgsnd	226
+/* syscall: "netbsd32_msgsnd" ret: "int" args: "int" "const netbsd32_voidp" "netbsd32_size_t" "int" */
+#define	netbsd32_SYS_netbsd32_msgsnd	226
 
-/* syscall: "compat_netbsd32_msgrcv" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "netbsd32_long" "int" */
-#define	netbsd32_SYS_compat_netbsd32_msgrcv	227
+/* syscall: "netbsd32_msgrcv" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "netbsd32_long" "int" */
+#define	netbsd32_SYS_netbsd32_msgrcv	227
 
-				/* 224 is excluded compat_netbsd32_msgctl */
-				/* 225 is excluded compat_netbsd32_msgget */
-				/* 226 is excluded compat_netbsd32_msgsnd */
-				/* 227 is excluded compat_netbsd32_msgrcv */
-/* syscall: "compat_netbsd32_shmat" ret: "netbsd32_voidp" args: "int" "const netbsd32_voidp" "int" */
-#define	netbsd32_SYS_compat_netbsd32_shmat	228
+				/* 224 is excluded netbsd32_msgctl */
+				/* 225 is excluded netbsd32_msgget */
+				/* 226 is excluded netbsd32_msgsnd */
+				/* 227 is excluded netbsd32_msgrcv */
+/* syscall: "netbsd32_shmat" ret: "netbsd32_voidp" args: "int" "const netbsd32_voidp" "int" */
+#define	netbsd32_SYS_netbsd32_shmat	228
 
-/* syscall: "compat_netbsd32_shmctl" ret: "int" args: "int" "int" "netbsd32_shmid_dsp_t" */
-#define	netbsd32_SYS_compat_netbsd32_shmctl	229
+#define	netbsd32_SYS_compat_14_netbsd32_shmctl	229
 
-/* syscall: "compat_netbsd32_shmdt" ret: "int" args: "const netbsd32_voidp" */
-#define	netbsd32_SYS_compat_netbsd32_shmdt	230
+/* syscall: "netbsd32_shmdt" ret: "int" args: "const netbsd32_voidp" */
+#define	netbsd32_SYS_netbsd32_shmdt	230
 
-/* syscall: "compat_netbsd32_shmget" ret: "int" args: "netbsd32_key_t" "netbsd32_size_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_shmget	231
+/* syscall: "netbsd32_shmget" ret: "int" args: "netbsd32_key_t" "netbsd32_size_t" "int" */
+#define	netbsd32_SYS_netbsd32_shmget	231
 
-				/* 228 is excluded compat_netbsd32_shmat */
-				/* 229 is excluded compat_netbsd32_shmctl */
-				/* 230 is excluded compat_netbsd32_shmdt */
-				/* 231 is excluded compat_netbsd32_shmget */
-/* syscall: "compat_netbsd32_clock_gettime" ret: "int" args: "netbsd32_clockid_t" "netbsd32_timespecp_t" */
-#define	netbsd32_SYS_compat_netbsd32_clock_gettime	232
+				/* 228 is excluded netbsd32_shmat */
+				/* 229 is excluded netbsd32_shmctl */
+				/* 230 is excluded netbsd32_shmdt */
+				/* 231 is excluded netbsd32_shmget */
+/* syscall: "netbsd32_clock_gettime" ret: "int" args: "netbsd32_clockid_t" "netbsd32_timespecp_t" */
+#define	netbsd32_SYS_netbsd32_clock_gettime	232
 
-/* syscall: "compat_netbsd32_clock_settime" ret: "int" args: "netbsd32_clockid_t" "const netbsd32_timespecp_t" */
-#define	netbsd32_SYS_compat_netbsd32_clock_settime	233
+/* syscall: "netbsd32_clock_settime" ret: "int" args: "netbsd32_clockid_t" "const netbsd32_timespecp_t" */
+#define	netbsd32_SYS_netbsd32_clock_settime	233
 
-/* syscall: "compat_netbsd32_clock_getres" ret: "int" args: "netbsd32_clockid_t" "netbsd32_timespecp_t" */
-#define	netbsd32_SYS_compat_netbsd32_clock_getres	234
+/* syscall: "netbsd32_clock_getres" ret: "int" args: "netbsd32_clockid_t" "netbsd32_timespecp_t" */
+#define	netbsd32_SYS_netbsd32_clock_getres	234
 
-/* syscall: "compat_netbsd32_nanosleep" ret: "int" args: "const netbsd32_timespecp_t" "netbsd32_timespecp_t" */
-#define	netbsd32_SYS_compat_netbsd32_nanosleep	240
+/* syscall: "netbsd32_nanosleep" ret: "int" args: "const netbsd32_timespecp_t" "netbsd32_timespecp_t" */
+#define	netbsd32_SYS_netbsd32_nanosleep	240
 
-/* syscall: "compat_netbsd32_fdatasync" ret: "int" args: "int" */
-#define	netbsd32_SYS_compat_netbsd32_fdatasync	241
+/* syscall: "netbsd32_fdatasync" ret: "int" args: "int" */
+#define	netbsd32_SYS_netbsd32_fdatasync	241
 
-/* syscall: "compat_netbsd32___posix_rename" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" */
-#define	netbsd32_SYS_compat_netbsd32___posix_rename	270
+/* syscall: "netbsd32___posix_rename" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" */
+#define	netbsd32_SYS_netbsd32___posix_rename	270
 
-/* syscall: "compat_netbsd32_swapctl" ret: "int" args: "int" "const netbsd32_voidp" "int" */
-#define	netbsd32_SYS_compat_netbsd32_swapctl	271
+/* syscall: "netbsd32_swapctl" ret: "int" args: "int" "const netbsd32_voidp" "int" */
+#define	netbsd32_SYS_netbsd32_swapctl	271
 
-/* syscall: "compat_netbsd32_getdents" ret: "int" args: "int" "netbsd32_charp" "netbsd32_size_t" */
-#define	netbsd32_SYS_compat_netbsd32_getdents	272
+/* syscall: "netbsd32_getdents" ret: "int" args: "int" "netbsd32_charp" "netbsd32_size_t" */
+#define	netbsd32_SYS_netbsd32_getdents	272
 
-/* syscall: "compat_netbsd32_minherit" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32_minherit	273
+/* syscall: "netbsd32_minherit" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" "int" */
+#define	netbsd32_SYS_netbsd32_minherit	273
 
-/* syscall: "compat_netbsd32_lchmod" ret: "int" args: "const netbsd32_charp" "mode_t" */
-#define	netbsd32_SYS_compat_netbsd32_lchmod	274
+/* syscall: "netbsd32_lchmod" ret: "int" args: "const netbsd32_charp" "mode_t" */
+#define	netbsd32_SYS_netbsd32_lchmod	274
 
-/* syscall: "compat_netbsd32_lchown" ret: "int" args: "const netbsd32_charp" "uid_t" "gid_t" */
-#define	netbsd32_SYS_compat_netbsd32_lchown	275
+/* syscall: "netbsd32_lchown" ret: "int" args: "const netbsd32_charp" "uid_t" "gid_t" */
+#define	netbsd32_SYS_netbsd32_lchown	275
 
-/* syscall: "compat_netbsd32_lutimes" ret: "int" args: "const netbsd32_charp" "const netbsd32_timevalp_t" */
-#define	netbsd32_SYS_compat_netbsd32_lutimes	276
+/* syscall: "netbsd32_lutimes" ret: "int" args: "const netbsd32_charp" "const netbsd32_timevalp_t" */
+#define	netbsd32_SYS_netbsd32_lutimes	276
 
-/* syscall: "compat_netbsd32___msync13" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" "int" */
-#define	netbsd32_SYS_compat_netbsd32___msync13	277
+/* syscall: "netbsd32___msync13" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" "int" */
+#define	netbsd32_SYS_netbsd32___msync13	277
 
-/* syscall: "compat_netbsd32___stat13" ret: "int" args: "const netbsd32_charp" "netbsd32_statp_t" */
-#define	netbsd32_SYS_compat_netbsd32___stat13	278
+/* syscall: "netbsd32___stat13" ret: "int" args: "const netbsd32_charp" "netbsd32_statp_t" */
+#define	netbsd32_SYS_netbsd32___stat13	278
 
-/* syscall: "compat_netbsd32___fstat13" ret: "int" args: "int" "netbsd32_statp_t" */
-#define	netbsd32_SYS_compat_netbsd32___fstat13	279
+/* syscall: "netbsd32___fstat13" ret: "int" args: "int" "netbsd32_statp_t" */
+#define	netbsd32_SYS_netbsd32___fstat13	279
 
-/* syscall: "compat_netbsd32___lstat13" ret: "int" args: "const netbsd32_charp" "netbsd32_statp_t" */
-#define	netbsd32_SYS_compat_netbsd32___lstat13	280
+/* syscall: "netbsd32___lstat13" ret: "int" args: "const netbsd32_charp" "netbsd32_statp_t" */
+#define	netbsd32_SYS_netbsd32___lstat13	280
 
-/* syscall: "compat_netbsd32___sigaltstack14" ret: "int" args: "const netbsd32_sigaltstackp_t" "netbsd32_sigaltstackp_t" */
-#define	netbsd32_SYS_compat_netbsd32___sigaltstack14	281
+/* syscall: "netbsd32___sigaltstack14" ret: "int" args: "const netbsd32_sigaltstackp_t" "netbsd32_sigaltstackp_t" */
+#define	netbsd32_SYS_netbsd32___sigaltstack14	281
 
 /* syscall: "__vfork14" ret: "int" args: */
 #define	netbsd32_SYS___vfork14	282
 
-/* syscall: "compat_netbsd32___posix_chown" ret: "int" args: "const netbsd32_charp" "uid_t" "gid_t" */
-#define	netbsd32_SYS_compat_netbsd32___posix_chown	283
+/* syscall: "netbsd32___posix_chown" ret: "int" args: "const netbsd32_charp" "uid_t" "gid_t" */
+#define	netbsd32_SYS_netbsd32___posix_chown	283
 
-/* syscall: "compat_netbsd32___posix_fchown" ret: "int" args: "int" "uid_t" "gid_t" */
-#define	netbsd32_SYS_compat_netbsd32___posix_fchown	284
+/* syscall: "netbsd32___posix_fchown" ret: "int" args: "int" "uid_t" "gid_t" */
+#define	netbsd32_SYS_netbsd32___posix_fchown	284
 
-/* syscall: "compat_netbsd32___posix_lchown" ret: "int" args: "const netbsd32_charp" "uid_t" "gid_t" */
-#define	netbsd32_SYS_compat_netbsd32___posix_lchown	285
+/* syscall: "netbsd32___posix_lchown" ret: "int" args: "const netbsd32_charp" "uid_t" "gid_t" */
+#define	netbsd32_SYS_netbsd32___posix_lchown	285
 
-/* syscall: "compat_netbsd32_getsid" ret: "pid_t" args: "pid_t" */
-#define	netbsd32_SYS_compat_netbsd32_getsid	286
+/* syscall: "netbsd32_getsid" ret: "pid_t" args: "pid_t" */
+#define	netbsd32_SYS_netbsd32_getsid	286
 
-/* syscall: "compat_netbsd32_fktrace" ret: "int" args: "const int" "int" "int" "int" */
-#define	netbsd32_SYS_compat_netbsd32_fktrace	288
+/* syscall: "netbsd32_fktrace" ret: "int" args: "const int" "int" "int" "int" */
+#define	netbsd32_SYS_netbsd32_fktrace	288
 
-				/* 288 is excluded compat_netbsd32_fktrace */
-/* syscall: "compat_netbsd32_preadv" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_iovecp_t" "int" "int" "off_t" */
-#define	netbsd32_SYS_compat_netbsd32_preadv	289
+				/* 288 is excluded netbsd32_fktrace */
+/* syscall: "netbsd32_preadv" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_iovecp_t" "int" "int" "off_t" */
+#define	netbsd32_SYS_netbsd32_preadv	289
 
-/* syscall: "compat_netbsd32_pwritev" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_iovecp_t" "int" "int" "off_t" */
-#define	netbsd32_SYS_compat_netbsd32_pwritev	290
+/* syscall: "netbsd32_pwritev" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_iovecp_t" "int" "int" "off_t" */
+#define	netbsd32_SYS_netbsd32_pwritev	290
 
 #define	netbsd32_SYS_MAXSYSCALL	291
diff --git a/sys/compat/netbsd32/netbsd32_syscallargs.h b/sys/compat/netbsd32/netbsd32_syscallargs.h
index 856060952c7b..ee4f6095e72e 100644
--- a/sys/compat/netbsd32/netbsd32_syscallargs.h
+++ b/sys/compat/netbsd32/netbsd32_syscallargs.h
@@ -1,10 +1,10 @@
-/*	$NetBSD: netbsd32_syscallargs.h,v 1.10 1999/06/09 04:50:32 christos Exp $	*/
+/*	$NetBSD: netbsd32_syscallargs.h,v 1.11 1999/10/11 01:36:24 eeh Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.8 1999/06/09 04:50:11 christos Exp 
+ * created from	NetBSD: syscalls.master,v 1.9 1999/07/12 21:55:20 kleink Exp 
  */
 
 #ifndef _netbsd32_SYS__SYSCALLARGS_H_
@@ -14,142 +14,142 @@
 #undef	syscallarg
 #endif
 
-#define	syscallarg(x)								\
-		union {								\
-			register32_t pad;						\
-			struct { x datum; } le;					\
-			struct {						\
-				int8_t pad[ (sizeof (register32_t) < sizeof (x))	\
-					? 0					\
-					: sizeof (register32_t) - sizeof (x)];	\
-				x datum;					\
-			} be;							\
-		}
+#define	syscallarg(x)							\
+	union {								\
+		register32_t pad;						\
+		struct { x datum; } le;					\
+		struct {						\
+			int8_t pad[ (sizeof (register32_t) < sizeof (x))	\
+				? 0					\
+				: sizeof (register32_t) - sizeof (x)];	\
+			x datum;					\
+		} be;							\
+	}
 
-struct compat_netbsd32_exit_args {
+struct netbsd32_exit_args {
 	syscallarg(int) rval;
 };
 
-struct compat_netbsd32_read_args {
+struct netbsd32_read_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_voidp) buf;
 	syscallarg(netbsd32_size_t) nbyte;
 };
 
-struct compat_netbsd32_write_args {
+struct netbsd32_write_args {
 	syscallarg(int) fd;
 	syscallarg(const netbsd32_voidp) buf;
 	syscallarg(netbsd32_size_t) nbyte;
 };
 
-struct compat_netbsd32_open_args {
+struct netbsd32_open_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(int) flags;
 	syscallarg(mode_t) mode;
 };
 
-struct compat_netbsd32_close_args {
+struct netbsd32_close_args {
 	syscallarg(int) fd;
 };
 
-struct compat_netbsd32_wait4_args {
+struct netbsd32_wait4_args {
 	syscallarg(int) pid;
 	syscallarg(netbsd32_intp) status;
 	syscallarg(int) options;
 	syscallarg(netbsd32_rusagep_t) rusage;
 };
 
-struct compat_43_compat_netbsd32_ocreat_args {
+struct compat_43_netbsd32_ocreat_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(mode_t) mode;
 };
 
-struct compat_netbsd32_link_args {
+struct netbsd32_link_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(const netbsd32_charp) link;
 };
 
-struct compat_netbsd32_unlink_args {
+struct netbsd32_unlink_args {
 	syscallarg(const netbsd32_charp) path;
 };
 
-struct compat_netbsd32_chdir_args {
+struct netbsd32_chdir_args {
 	syscallarg(const netbsd32_charp) path;
 };
 
-struct compat_netbsd32_fchdir_args {
+struct netbsd32_fchdir_args {
 	syscallarg(int) fd;
 };
 
-struct compat_netbsd32_mknod_args {
+struct netbsd32_mknod_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(mode_t) mode;
 	syscallarg(dev_t) dev;
 };
 
-struct compat_netbsd32_chmod_args {
+struct netbsd32_chmod_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(mode_t) mode;
 };
 
-struct compat_netbsd32_chown_args {
+struct netbsd32_chown_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(uid_t) uid;
 	syscallarg(gid_t) gid;
 };
 
-struct compat_netbsd32_break_args {
+struct netbsd32_break_args {
 	syscallarg(netbsd32_charp) nsize;
 };
 
-struct compat_netbsd32_getfsstat_args {
+struct netbsd32_getfsstat_args {
 	syscallarg(netbsd32_statfsp_t) buf;
 	syscallarg(netbsd32_long) bufsize;
 	syscallarg(int) flags;
 };
 
-struct compat_43_compat_netbsd32_olseek_args {
+struct compat_43_netbsd32_olseek_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_long) offset;
 	syscallarg(int) whence;
 };
 
-struct compat_netbsd32_mount_args {
+struct netbsd32_mount_args {
 	syscallarg(const netbsd32_charp) type;
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(int) flags;
 	syscallarg(netbsd32_voidp) data;
 };
 
-struct compat_netbsd32_unmount_args {
+struct netbsd32_unmount_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(int) flags;
 };
 
-struct compat_netbsd32_setuid_args {
+struct netbsd32_setuid_args {
 	syscallarg(uid_t) uid;
 };
 
-struct compat_netbsd32_ptrace_args {
+struct netbsd32_ptrace_args {
 	syscallarg(int) req;
 	syscallarg(pid_t) pid;
 	syscallarg(netbsd32_caddr_t) addr;
 	syscallarg(int) data;
 };
 
-struct compat_netbsd32_recvmsg_args {
+struct netbsd32_recvmsg_args {
 	syscallarg(int) s;
 	syscallarg(netbsd32_msghdrp_t) msg;
 	syscallarg(int) flags;
 };
 
-struct compat_netbsd32_sendmsg_args {
+struct netbsd32_sendmsg_args {
 	syscallarg(int) s;
 	syscallarg(const netbsd32_msghdrp_t) msg;
 	syscallarg(int) flags;
 };
 
-struct compat_netbsd32_recvfrom_args {
+struct netbsd32_recvfrom_args {
 	syscallarg(int) s;
 	syscallarg(netbsd32_voidp) buf;
 	syscallarg(netbsd32_size_t) len;
@@ -158,166 +158,166 @@ struct compat_netbsd32_recvfrom_args {
 	syscallarg(netbsd32_intp) fromlenaddr;
 };
 
-struct compat_netbsd32_accept_args {
+struct netbsd32_accept_args {
 	syscallarg(int) s;
 	syscallarg(netbsd32_sockaddrp_t) name;
 	syscallarg(netbsd32_intp) anamelen;
 };
 
-struct compat_netbsd32_getpeername_args {
+struct netbsd32_getpeername_args {
 	syscallarg(int) fdes;
 	syscallarg(netbsd32_sockaddrp_t) asa;
 	syscallarg(netbsd32_intp) alen;
 };
 
-struct compat_netbsd32_getsockname_args {
+struct netbsd32_getsockname_args {
 	syscallarg(int) fdes;
 	syscallarg(netbsd32_sockaddrp_t) asa;
 	syscallarg(netbsd32_intp) alen;
 };
 
-struct compat_netbsd32_access_args {
+struct netbsd32_access_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(int) flags;
 };
 
-struct compat_netbsd32_chflags_args {
+struct netbsd32_chflags_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(netbsd32_u_long) flags;
 };
 
-struct compat_netbsd32_fchflags_args {
+struct netbsd32_fchflags_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_u_long) flags;
 };
 
-struct compat_netbsd32_kill_args {
+struct netbsd32_kill_args {
 	syscallarg(int) pid;
 	syscallarg(int) signum;
 };
 
-struct compat_43_compat_netbsd32_stat43_args {
+struct compat_43_netbsd32_stat43_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(netbsd32_stat43p_t) ub;
 };
 
-struct compat_43_compat_netbsd32_lstat43_args {
+struct compat_43_netbsd32_lstat43_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(netbsd32_stat43p_t) ub;
 };
 
-struct compat_netbsd32_dup_args {
+struct netbsd32_dup_args {
 	syscallarg(int) fd;
 };
 
-struct compat_netbsd32_profil_args {
+struct netbsd32_profil_args {
 	syscallarg(netbsd32_caddr_t) samples;
 	syscallarg(netbsd32_size_t) size;
 	syscallarg(netbsd32_u_long) offset;
 	syscallarg(u_int) scale;
 };
 
-struct compat_netbsd32_ktrace_args {
+struct netbsd32_ktrace_args {
 	syscallarg(const netbsd32_charp) fname;
 	syscallarg(int) ops;
 	syscallarg(int) facs;
 	syscallarg(int) pid;
 };
 
-struct compat_netbsd32_sigaction_args {
+struct netbsd32_sigaction_args {
 	syscallarg(int) signum;
 	syscallarg(const netbsd32_sigactionp_t) nsa;
 	syscallarg(netbsd32_sigactionp_t) osa;
 };
 
-struct compat_13_compat_netbsd32_sigprocmask_args {
+struct compat_13_netbsd32_sigprocmask_args {
 	syscallarg(int) how;
 	syscallarg(int) mask;
 };
 
-struct compat_netbsd32___getlogin_args {
+struct netbsd32___getlogin_args {
 	syscallarg(netbsd32_charp) namebuf;
 	syscallarg(u_int) namelen;
 };
 
-struct compat_netbsd32_setlogin_args {
+struct netbsd32_setlogin_args {
 	syscallarg(const netbsd32_charp) namebuf;
 };
 
-struct compat_netbsd32_acct_args {
+struct netbsd32_acct_args {
 	syscallarg(const netbsd32_charp) path;
 };
 
-struct compat_13_compat_netbsd32_sigaltstack13_args {
+struct compat_13_netbsd32_sigaltstack13_args {
 	syscallarg(const netbsd32_sigaltstack13p_t) nss;
 	syscallarg(netbsd32_sigaltstack13p_t) oss;
 };
 
-struct compat_netbsd32_ioctl_args {
+struct netbsd32_ioctl_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_u_long) com;
 	syscallarg(netbsd32_voidp) data;
 };
 
-struct compat_12_compat_netbsd32_reboot_args {
+struct compat_12_netbsd32_reboot_args {
 	syscallarg(int) opt;
 };
 
-struct compat_netbsd32_revoke_args {
+struct netbsd32_revoke_args {
 	syscallarg(const netbsd32_charp) path;
 };
 
-struct compat_netbsd32_symlink_args {
+struct netbsd32_symlink_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(const netbsd32_charp) link;
 };
 
-struct compat_netbsd32_readlink_args {
+struct netbsd32_readlink_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(netbsd32_charp) buf;
 	syscallarg(netbsd32_size_t) count;
 };
 
-struct compat_netbsd32_execve_args {
+struct netbsd32_execve_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(netbsd32_charpp) argp;
 	syscallarg(netbsd32_charpp) envp;
 };
 
-struct compat_netbsd32_umask_args {
+struct netbsd32_umask_args {
 	syscallarg(mode_t) newmask;
 };
 
-struct compat_netbsd32_chroot_args {
+struct netbsd32_chroot_args {
 	syscallarg(const netbsd32_charp) path;
 };
 
-struct compat_43_compat_netbsd32_fstat43_args {
+struct compat_43_netbsd32_fstat43_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_stat43p_t) sb;
 };
 
-struct compat_43_compat_netbsd32_ogetkerninfo_args {
+struct compat_43_netbsd32_ogetkerninfo_args {
 	syscallarg(int) op;
 	syscallarg(netbsd32_charp) where;
 	syscallarg(netbsd32_intp) size;
 	syscallarg(int) arg;
 };
 
-struct compat_12_compat_netbsd32_msync_args {
+struct compat_12_netbsd32_msync_args {
 	syscallarg(netbsd32_caddr_t) addr;
 	syscallarg(netbsd32_size_t) len;
 };
 
-struct compat_netbsd32_sbrk_args {
+struct netbsd32_sbrk_args {
+	syscallarg(netbsd32_intptr_t) incr;
+};
+
+struct netbsd32_sstk_args {
 	syscallarg(int) incr;
 };
 
-struct compat_netbsd32_sstk_args {
-	syscallarg(int) incr;
-};
-
-struct compat_43_compat_netbsd32_ommap_args {
+struct compat_43_netbsd32_ommap_args {
 	syscallarg(netbsd32_caddr_t) addr;
 	syscallarg(netbsd32_size_t) len;
 	syscallarg(int) prot;
@@ -326,85 +326,85 @@ struct compat_43_compat_netbsd32_ommap_args {
 	syscallarg(netbsd32_long) pos;
 };
 
-struct compat_netbsd32_ovadvise_args {
+struct netbsd32_ovadvise_args {
 	syscallarg(int) anom;
 };
 
-struct compat_netbsd32_munmap_args {
+struct netbsd32_munmap_args {
 	syscallarg(netbsd32_voidp) addr;
 	syscallarg(netbsd32_size_t) len;
 };
 
-struct compat_netbsd32_mprotect_args {
+struct netbsd32_mprotect_args {
 	syscallarg(netbsd32_voidp) addr;
 	syscallarg(netbsd32_size_t) len;
 	syscallarg(int) prot;
 };
 
-struct compat_netbsd32_madvise_args {
+struct netbsd32_madvise_args {
 	syscallarg(netbsd32_voidp) addr;
 	syscallarg(netbsd32_size_t) len;
 	syscallarg(int) behav;
 };
 
-struct compat_netbsd32_mincore_args {
+struct netbsd32_mincore_args {
 	syscallarg(netbsd32_caddr_t) addr;
 	syscallarg(netbsd32_size_t) len;
 	syscallarg(netbsd32_charp) vec;
 };
 
-struct compat_netbsd32_getgroups_args {
+struct netbsd32_getgroups_args {
 	syscallarg(int) gidsetsize;
 	syscallarg(netbsd32_gid_tp) gidset;
 };
 
-struct compat_netbsd32_setgroups_args {
+struct netbsd32_setgroups_args {
 	syscallarg(int) gidsetsize;
 	syscallarg(const netbsd32_gid_tp) gidset;
 };
 
-struct compat_netbsd32_setpgid_args {
+struct netbsd32_setpgid_args {
 	syscallarg(int) pid;
 	syscallarg(int) pgid;
 };
 
-struct compat_netbsd32_setitimer_args {
+struct netbsd32_setitimer_args {
 	syscallarg(int) which;
 	syscallarg(const netbsd32_itimervalp_t) itv;
 	syscallarg(netbsd32_itimervalp_t) oitv;
 };
 
-struct compat_12_compat_netbsd32_oswapon_args {
+struct compat_12_netbsd32_oswapon_args {
 	syscallarg(const netbsd32_charp) name;
 };
 
-struct compat_netbsd32_getitimer_args {
+struct netbsd32_getitimer_args {
 	syscallarg(int) which;
 	syscallarg(netbsd32_itimervalp_t) itv;
 };
 
-struct compat_43_compat_netbsd32_ogethostname_args {
+struct compat_43_netbsd32_ogethostname_args {
 	syscallarg(netbsd32_charp) hostname;
 	syscallarg(u_int) len;
 };
 
-struct compat_43_compat_netbsd32_osethostname_args {
+struct compat_43_netbsd32_osethostname_args {
 	syscallarg(netbsd32_charp) hostname;
 	syscallarg(u_int) len;
 };
 
-struct compat_netbsd32_dup2_args {
+struct netbsd32_dup2_args {
 	syscallarg(int) from;
 	syscallarg(int) to;
 };
 
-struct compat_netbsd32_fcntl_args {
+struct netbsd32_fcntl_args {
 	syscallarg(int) fd;
 	syscallarg(int) cmd;
 	syscallarg(netbsd32_voidp) arg;
 };
 
-struct compat_netbsd32_select_args {
+struct netbsd32_select_args {
 	syscallarg(int) nd;
 	syscallarg(netbsd32_fd_setp_t) in;
 	syscallarg(netbsd32_fd_setp_t) ou;
@@ -412,64 +412,64 @@ struct compat_netbsd32_select_args {
 	syscallarg(netbsd32_timevalp_t) tv;
 };
 
-struct compat_netbsd32_fsync_args {
+struct netbsd32_fsync_args {
 	syscallarg(int) fd;
 };
 
-struct compat_netbsd32_setpriority_args {
+struct netbsd32_setpriority_args {
 	syscallarg(int) which;
 	syscallarg(int) who;
 	syscallarg(int) prio;
 };
 
-struct compat_netbsd32_socket_args {
+struct netbsd32_socket_args {
 	syscallarg(int) domain;
 	syscallarg(int) type;
 	syscallarg(int) protocol;
 };
 
-struct compat_netbsd32_connect_args {
+struct netbsd32_connect_args {
 	syscallarg(int) s;
 	syscallarg(const netbsd32_sockaddrp_t) name;
 	syscallarg(int) namelen;
 };
 
-struct compat_43_compat_netbsd32_oaccept_args {
+struct compat_43_netbsd32_oaccept_args {
 	syscallarg(int) s;
 	syscallarg(netbsd32_caddr_t) name;
 	syscallarg(netbsd32_intp) anamelen;
 };
 
-struct compat_netbsd32_getpriority_args {
+struct netbsd32_getpriority_args {
 	syscallarg(int) which;
 	syscallarg(int) who;
 };
 
-struct compat_43_compat_netbsd32_osend_args {
+struct compat_43_netbsd32_osend_args {
 	syscallarg(int) s;
 	syscallarg(netbsd32_caddr_t) buf;
 	syscallarg(int) len;
 	syscallarg(int) flags;
 };
 
-struct compat_43_compat_netbsd32_orecv_args {
+struct compat_43_netbsd32_orecv_args {
 	syscallarg(int) s;
 	syscallarg(netbsd32_caddr_t) buf;
 	syscallarg(int) len;
 	syscallarg(int) flags;
 };
 
-struct compat_netbsd32_sigreturn_args {
+struct netbsd32_sigreturn_args {
 	syscallarg(netbsd32_sigcontextp_t) sigcntxp;
 };
 
-struct compat_netbsd32_bind_args {
+struct netbsd32_bind_args {
 	syscallarg(int) s;
 	syscallarg(const netbsd32_sockaddrp_t) name;
 	syscallarg(int) namelen;
 };
 
-struct compat_netbsd32_setsockopt_args {
+struct netbsd32_setsockopt_args {
 	syscallarg(int) s;
 	syscallarg(int) level;
 	syscallarg(int) name;
@@ -477,57 +477,57 @@ struct compat_netbsd32_setsockopt_args {
 	syscallarg(int) valsize;
 };
 
-struct compat_netbsd32_listen_args {
+struct netbsd32_listen_args {
 	syscallarg(int) s;
 	syscallarg(int) backlog;
 };
 
-struct compat_43_compat_netbsd32_osigvec_args {
+struct compat_43_netbsd32_osigvec_args {
 	syscallarg(int) signum;
 	syscallarg(netbsd32_sigvecp_t) nsv;
 	syscallarg(netbsd32_sigvecp_t) osv;
 };
 
-struct compat_43_compat_netbsd32_sigblock_args {
+struct compat_43_netbsd32_sigblock_args {
 	syscallarg(int) mask;
 };
 
-struct compat_43_compat_netbsd32_sigsetmask_args {
+struct compat_43_netbsd32_sigsetmask_args {
 	syscallarg(int) mask;
 };
 
-struct compat_13_compat_netbsd32_sigsuspend_args {
+struct compat_13_netbsd32_sigsuspend_args {
 	syscallarg(int) mask;
 };
 
-struct compat_43_compat_netbsd32_osigstack_args {
+struct compat_43_netbsd32_osigstack_args {
 	syscallarg(netbsd32_sigstackp_t) nss;
 	syscallarg(netbsd32_sigstackp_t) oss;
 };
 
-struct compat_43_compat_netbsd32_orecvmsg_args {
+struct compat_43_netbsd32_orecvmsg_args {
 	syscallarg(int) s;
 	syscallarg(netbsd32_omsghdrp_t) msg;
 	syscallarg(int) flags;
 };
 
-struct compat_43_compat_netbsd32_osendmsg_args {
+struct compat_43_netbsd32_osendmsg_args {
 	syscallarg(int) s;
 	syscallarg(netbsd32_caddr_t) msg;
 	syscallarg(int) flags;
 };
 
-struct compat_netbsd32_gettimeofday_args {
+struct netbsd32_gettimeofday_args {
 	syscallarg(netbsd32_timevalp_t) tp;
 	syscallarg(netbsd32_timezonep_t) tzp;
 };
 
-struct compat_netbsd32_getrusage_args {
+struct netbsd32_getrusage_args {
 	syscallarg(int) who;
 	syscallarg(netbsd32_rusagep_t) rusage;
 };
 
-struct compat_netbsd32_getsockopt_args {
+struct netbsd32_getsockopt_args {
 	syscallarg(int) s;
 	syscallarg(int) level;
 	syscallarg(int) name;
@@ -535,35 +535,35 @@ struct compat_netbsd32_getsockopt_args {
 	syscallarg(netbsd32_intp) avalsize;
 };
 
-struct compat_netbsd32_readv_args {
+struct netbsd32_readv_args {
 	syscallarg(int) fd;
 	syscallarg(const netbsd32_iovecp_t) iovp;
 	syscallarg(int) iovcnt;
 };
 
-struct compat_netbsd32_writev_args {
+struct netbsd32_writev_args {
 	syscallarg(int) fd;
 	syscallarg(const netbsd32_iovecp_t) iovp;
 	syscallarg(int) iovcnt;
 };
 
-struct compat_netbsd32_settimeofday_args {
+struct netbsd32_settimeofday_args {
 	syscallarg(const netbsd32_timevalp_t) tv;
 	syscallarg(const netbsd32_timezonep_t) tzp;
 };
 
-struct compat_netbsd32_fchown_args {
+struct netbsd32_fchown_args {
 	syscallarg(int) fd;
 	syscallarg(uid_t) uid;
 	syscallarg(gid_t) gid;
 };
 
-struct compat_netbsd32_fchmod_args {
+struct netbsd32_fchmod_args {
 	syscallarg(int) fd;
 	syscallarg(mode_t) mode;
 };
 
-struct compat_43_compat_netbsd32_orecvfrom_args {
+struct compat_43_netbsd32_orecvfrom_args {
 	syscallarg(int) s;
 	syscallarg(netbsd32_caddr_t) buf;
 	syscallarg(netbsd32_size_t) len;
@@ -572,42 +572,42 @@ struct compat_43_compat_netbsd32_orecvfrom_args {
 	syscallarg(netbsd32_intp) fromlenaddr;
 };
 
-struct compat_netbsd32_setreuid_args {
+struct netbsd32_setreuid_args {
 	syscallarg(uid_t) ruid;
 	syscallarg(uid_t) euid;
 };
 
-struct compat_netbsd32_setregid_args {
+struct netbsd32_setregid_args {
 	syscallarg(gid_t) rgid;
 	syscallarg(gid_t) egid;
 };
 
-struct compat_netbsd32_rename_args {
+struct netbsd32_rename_args {
 	syscallarg(const netbsd32_charp) from;
 	syscallarg(const netbsd32_charp) to;
 };
 
-struct compat_43_compat_netbsd32_otruncate_args {
+struct compat_43_netbsd32_otruncate_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(netbsd32_long) length;
 };
 
-struct compat_43_compat_netbsd32_oftruncate_args {
+struct compat_43_netbsd32_oftruncate_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_long) length;
 };
 
-struct compat_netbsd32_flock_args {
+struct netbsd32_flock_args {
 	syscallarg(int) fd;
 	syscallarg(int) how;
 };
 
-struct compat_netbsd32_mkfifo_args {
+struct netbsd32_mkfifo_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(mode_t) mode;
 };
 
-struct compat_netbsd32_sendto_args {
+struct netbsd32_sendto_args {
 	syscallarg(int) s;
 	syscallarg(const netbsd32_voidp) buf;
 	syscallarg(netbsd32_size_t) len;
@@ -616,122 +616,122 @@ struct compat_netbsd32_sendto_args {
 	syscallarg(int) tolen;
 };
 
-struct compat_netbsd32_shutdown_args {
+struct netbsd32_shutdown_args {
 	syscallarg(int) s;
 	syscallarg(int) how;
 };
 
-struct compat_netbsd32_socketpair_args {
+struct netbsd32_socketpair_args {
 	syscallarg(int) domain;
 	syscallarg(int) type;
 	syscallarg(int) protocol;
 	syscallarg(netbsd32_intp) rsv;
 };
 
-struct compat_netbsd32_mkdir_args {
+struct netbsd32_mkdir_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(mode_t) mode;
 };
 
-struct compat_netbsd32_rmdir_args {
+struct netbsd32_rmdir_args {
 	syscallarg(const netbsd32_charp) path;
 };
 
-struct compat_netbsd32_utimes_args {
+struct netbsd32_utimes_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(const netbsd32_timevalp_t) tptr;
 };
 
-struct compat_netbsd32_adjtime_args {
+struct netbsd32_adjtime_args {
 	syscallarg(const netbsd32_timevalp_t) delta;
 	syscallarg(netbsd32_timevalp_t) olddelta;
 };
 
-struct compat_43_compat_netbsd32_ogetpeername_args {
+struct compat_43_netbsd32_ogetpeername_args {
 	syscallarg(int) fdes;
 	syscallarg(netbsd32_caddr_t) asa;
 	syscallarg(netbsd32_intp) alen;
 };
 
-struct compat_43_compat_netbsd32_sethostid_args {
+struct compat_43_netbsd32_sethostid_args {
 	syscallarg(int32_t) hostid;
 };
 
-struct compat_43_compat_netbsd32_ogetrlimit_args {
+struct compat_43_netbsd32_ogetrlimit_args {
 	syscallarg(int) which;
 	syscallarg(netbsd32_orlimitp_t) rlp;
 };
 
-struct compat_43_compat_netbsd32_osetrlimit_args {
+struct compat_43_netbsd32_osetrlimit_args {
 	syscallarg(int) which;
 	syscallarg(const netbsd32_orlimitp_t) rlp;
 };
 
-struct compat_43_compat_netbsd32_killpg_args {
+struct compat_43_netbsd32_killpg_args {
 	syscallarg(int) pgid;
 	syscallarg(int) signum;
 };
 
-struct compat_netbsd32_quotactl_args {
+struct netbsd32_quotactl_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(int) cmd;
 	syscallarg(int) uid;
 	syscallarg(netbsd32_caddr_t) arg;
 };
 
-struct compat_43_compat_netbsd32_ogetsockname_args {
+struct compat_43_netbsd32_ogetsockname_args {
 	syscallarg(int) fdec;
 	syscallarg(netbsd32_caddr_t) asa;
 	syscallarg(netbsd32_intp) alen;
 };
 
-struct compat_netbsd32_nfssvc_args {
+struct netbsd32_nfssvc_args {
 	syscallarg(int) flag;
 	syscallarg(netbsd32_voidp) argp;
 };
 
-struct compat_43_compat_netbsd32_ogetdirentries_args {
+struct compat_43_netbsd32_ogetdirentries_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_charp) buf;
 	syscallarg(u_int) count;
 	syscallarg(netbsd32_longp) basep;
 };
 
-struct compat_netbsd32_statfs_args {
+struct netbsd32_statfs_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(netbsd32_statfsp_t) buf;
 };
 
-struct compat_netbsd32_fstatfs_args {
+struct netbsd32_fstatfs_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_statfsp_t) buf;
 };
 
-struct compat_netbsd32_getfh_args {
+struct netbsd32_getfh_args {
 	syscallarg(const netbsd32_charp) fname;
 	syscallarg(netbsd32_fhandlep_t) fhp;
 };
 
-struct compat_09_compat_netbsd32_ogetdomainname_args {
+struct compat_09_netbsd32_ogetdomainname_args {
 	syscallarg(netbsd32_charp) domainname;
 	syscallarg(int) len;
 };
 
-struct compat_09_compat_netbsd32_osetdomainname_args {
+struct compat_09_netbsd32_osetdomainname_args {
 	syscallarg(netbsd32_charp) domainname;
 	syscallarg(int) len;
 };
 
-struct compat_09_compat_netbsd32_uname_args {
+struct compat_09_netbsd32_uname_args {
 	syscallarg(netbsd32_outsnamep_t) name;
 };
 
-struct compat_netbsd32_sysarch_args {
+struct netbsd32_sysarch_args {
 	syscallarg(int) op;
 	syscallarg(netbsd32_voidp) parms;
 };
 
-struct compat_netbsd32_compat_10_sys_semsys_args {
+struct netbsd32_compat_10_sys_semsys_args {
 	syscallarg(int) which;
 	syscallarg(int) a2;
 	syscallarg(int) a3;
@@ -739,7 +739,7 @@ struct compat_netbsd32_compat_10_sys_semsys_args {
 	syscallarg(int) a5;
 };
 
-struct compat_netbsd32_compat_10_sys_msgsys_args {
+struct netbsd32_compat_10_sys_msgsys_args {
 	syscallarg(int) which;
 	syscallarg(int) a2;
 	syscallarg(int) a3;
@@ -748,14 +748,14 @@ struct compat_netbsd32_compat_10_sys_msgsys_args {
 	syscallarg(int) a6;
 };
 
-struct compat_netbsd32_compat_10_sys_shmsys_args {
+struct netbsd32_compat_10_sys_shmsys_args {
 	syscallarg(int) which;
 	syscallarg(int) a2;
 	syscallarg(int) a3;
 	syscallarg(int) a4;
 };
 
-struct compat_netbsd32_pread_args {
+struct netbsd32_pread_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_voidp) buf;
 	syscallarg(netbsd32_size_t) nbyte;
@@ -763,7 +763,7 @@ struct compat_netbsd32_pread_args {
 	syscallarg(off_t) offset;
 };
 
-struct compat_netbsd32_pwrite_args {
+struct netbsd32_pwrite_args {
 	syscallarg(int) fd;
 	syscallarg(const netbsd32_voidp) buf;
 	syscallarg(netbsd32_size_t) nbyte;
@@ -771,91 +771,91 @@ struct compat_netbsd32_pwrite_args {
 	syscallarg(off_t) offset;
 };
 
-struct compat_netbsd32_ntp_gettime_args {
+struct netbsd32_ntp_gettime_args {
 	syscallarg(netbsd32_ntptimevalp_t) ntvp;
 };
 
-struct compat_netbsd32_ntp_adjtime_args {
+struct netbsd32_ntp_adjtime_args {
 	syscallarg(netbsd32_timexp_t) tp;
 };
 
-struct compat_netbsd32_setgid_args {
+struct netbsd32_setgid_args {
 	syscallarg(gid_t) gid;
 };
 
-struct compat_netbsd32_setegid_args {
+struct netbsd32_setegid_args {
 	syscallarg(gid_t) egid;
 };
 
-struct compat_netbsd32_seteuid_args {
+struct netbsd32_seteuid_args {
 	syscallarg(uid_t) euid;
 };
 
-struct compat_netbsd32_sys_lfs_bmapv_args {
+struct netbsd32_sys_lfs_bmapv_args {
 	syscallarg(netbsd32_fsid_tp_t) fsidp;
 	syscallarg(netbsd32_block_infop_t) blkiov;
 	syscallarg(int) blkcnt;
 };
 
-struct compat_netbsd32_sys_lfs_markv_args {
+struct netbsd32_sys_lfs_markv_args {
 	syscallarg(netbsd32_fsid_tp_t) fsidp;
 	syscallarg(netbsd32_block_infop_t) blkiov;
 	syscallarg(int) blkcnt;
 };
 
-struct compat_netbsd32_sys_lfs_segclean_args {
+struct netbsd32_sys_lfs_segclean_args {
 	syscallarg(netbsd32_fsid_tp_t) fsidp;
 	syscallarg(netbsd32_u_long) segment;
 };
 
-struct compat_netbsd32_sys_lfs_segwait_args {
+struct netbsd32_sys_lfs_segwait_args {
 	syscallarg(netbsd32_fsid_tp_t) fsidp;
 	syscallarg(netbsd32_timevalp_t) tv;
 };
 
-struct compat_12_compat_netbsd32_stat12_args {
+struct compat_12_netbsd32_stat12_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(netbsd32_stat12p_t) ub;
 };
 
-struct compat_12_compat_netbsd32_fstat12_args {
+struct compat_12_netbsd32_fstat12_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_stat12p_t) sb;
 };
 
-struct compat_12_compat_netbsd32_lstat12_args {
+struct compat_12_netbsd32_lstat12_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(netbsd32_stat12p_t) ub;
 };
 
-struct compat_netbsd32_pathconf_args {
+struct netbsd32_pathconf_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(int) name;
 };
 
-struct compat_netbsd32_fpathconf_args {
+struct netbsd32_fpathconf_args {
 	syscallarg(int) fd;
 	syscallarg(int) name;
 };
 
-struct compat_netbsd32_getrlimit_args {
+struct netbsd32_getrlimit_args {
 	syscallarg(int) which;
 	syscallarg(netbsd32_rlimitp_t) rlp;
 };
 
-struct compat_netbsd32_setrlimit_args {
+struct netbsd32_setrlimit_args {
 	syscallarg(int) which;
 	syscallarg(const netbsd32_rlimitp_t) rlp;
 };
 
-struct compat_12_compat_netbsd32_getdirentries_args {
+struct compat_12_netbsd32_getdirentries_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_charp) buf;
 	syscallarg(u_int) count;
 	syscallarg(netbsd32_longp) basep;
 };
 
-struct compat_netbsd32_mmap_args {
+struct netbsd32_mmap_args {
 	syscallarg(netbsd32_voidp) addr;
 	syscallarg(netbsd32_size_t) len;
 	syscallarg(int) prot;
@@ -865,26 +865,26 @@ struct compat_netbsd32_mmap_args {
 	syscallarg(off_t) pos;
 };
 
-struct compat_netbsd32_lseek_args {
+struct netbsd32_lseek_args {
 	syscallarg(int) fd;
 	syscallarg(int) pad;
 	syscallarg(off_t) offset;
 	syscallarg(int) whence;
 };
 
-struct compat_netbsd32_truncate_args {
+struct netbsd32_truncate_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(int) pad;
 	syscallarg(off_t) length;
 };
 
-struct compat_netbsd32_ftruncate_args {
+struct netbsd32_ftruncate_args {
 	syscallarg(int) fd;
 	syscallarg(int) pad;
 	syscallarg(off_t) length;
 };
 
-struct compat_netbsd32___sysctl_args {
+struct netbsd32___sysctl_args {
 	syscallarg(netbsd32_intp) name;
 	syscallarg(u_int) namelen;
 	syscallarg(netbsd32_voidp) old;
@@ -893,82 +893,82 @@ struct compat_netbsd32___sysctl_args {
 	syscallarg(netbsd32_size_t) newlen;
 };
 
-struct compat_netbsd32_mlock_args {
+struct netbsd32_mlock_args {
 	syscallarg(const netbsd32_voidp) addr;
 	syscallarg(netbsd32_size_t) len;
 };
 
-struct compat_netbsd32_munlock_args {
+struct netbsd32_munlock_args {
 	syscallarg(const netbsd32_voidp) addr;
 	syscallarg(netbsd32_size_t) len;
 };
 
-struct compat_netbsd32_undelete_args {
+struct netbsd32_undelete_args {
 	syscallarg(const netbsd32_charp) path;
 };
 
-struct compat_netbsd32_futimes_args {
+struct netbsd32_futimes_args {
 	syscallarg(int) fd;
 	syscallarg(const netbsd32_timevalp_t) tptr;
 };
 
-struct compat_netbsd32_getpgid_args {
+struct netbsd32_getpgid_args {
 	syscallarg(pid_t) pid;
 };
 
-struct compat_netbsd32_reboot_args {
+struct netbsd32_reboot_args {
 	syscallarg(int) opt;
 	syscallarg(netbsd32_charp) bootstr;
 };
 
-struct compat_netbsd32_poll_args {
+struct netbsd32_poll_args {
 	syscallarg(netbsd32_pollfdp_t) fds;
 	syscallarg(u_int) nfds;
 	syscallarg(int) timeout;
 };
 
-struct compat_netbsd32___semctl_args {
+struct compat_14_netbsd32___semctl_args {
 	syscallarg(int) semid;
 	syscallarg(int) semnum;
 	syscallarg(int) cmd;
 	syscallarg(netbsd32_semunu_t) arg;
 };
 
-struct compat_netbsd32_semget_args {
+struct netbsd32_semget_args {
 	syscallarg(netbsd32_key_t) key;
 	syscallarg(int) nsems;
 	syscallarg(int) semflg;
 };
 
-struct compat_netbsd32_semop_args {
+struct netbsd32_semop_args {
 	syscallarg(int) semid;
 	syscallarg(netbsd32_sembufp_t) sops;
 	syscallarg(netbsd32_size_t) nsops;
 };
 
-struct compat_netbsd32_semconfig_args {
+struct netbsd32_semconfig_args {
 	syscallarg(int) flag;
 };
 
-struct compat_netbsd32_msgctl_args {
+struct compat_14_netbsd32_msgctl_args {
 	syscallarg(int) msqid;
 	syscallarg(int) cmd;
 	syscallarg(netbsd32_msqid_dsp_t) buf;
 };
 
-struct compat_netbsd32_msgget_args {
+struct netbsd32_msgget_args {
 	syscallarg(netbsd32_key_t) key;
 	syscallarg(int) msgflg;
 };
 
-struct compat_netbsd32_msgsnd_args {
+struct netbsd32_msgsnd_args {
 	syscallarg(int) msqid;
 	syscallarg(const netbsd32_voidp) msgp;
 	syscallarg(netbsd32_size_t) msgsz;
 	syscallarg(int) msgflg;
 };
 
-struct compat_netbsd32_msgrcv_args {
+struct netbsd32_msgrcv_args {
 	syscallarg(int) msqid;
 	syscallarg(netbsd32_voidp) msgp;
 	syscallarg(netbsd32_size_t) msgsz;
@@ -976,147 +976,147 @@ struct compat_netbsd32_msgrcv_args {
 	syscallarg(int) msgflg;
 };
 
-struct compat_netbsd32_shmat_args {
+struct netbsd32_shmat_args {
 	syscallarg(int) shmid;
 	syscallarg(const netbsd32_voidp) shmaddr;
 	syscallarg(int) shmflg;
 };
 
-struct compat_netbsd32_shmctl_args {
+struct compat_14_netbsd32_shmctl_args {
 	syscallarg(int) shmid;
 	syscallarg(int) cmd;
 	syscallarg(netbsd32_shmid_dsp_t) buf;
 };
 
-struct compat_netbsd32_shmdt_args {
+struct netbsd32_shmdt_args {
 	syscallarg(const netbsd32_voidp) shmaddr;
 };
 
-struct compat_netbsd32_shmget_args {
+struct netbsd32_shmget_args {
 	syscallarg(netbsd32_key_t) key;
 	syscallarg(netbsd32_size_t) size;
 	syscallarg(int) shmflg;
 };
 
-struct compat_netbsd32_clock_gettime_args {
+struct netbsd32_clock_gettime_args {
 	syscallarg(netbsd32_clockid_t) clock_id;
 	syscallarg(netbsd32_timespecp_t) tp;
 };
 
-struct compat_netbsd32_clock_settime_args {
+struct netbsd32_clock_settime_args {
 	syscallarg(netbsd32_clockid_t) clock_id;
 	syscallarg(const netbsd32_timespecp_t) tp;
 };
 
-struct compat_netbsd32_clock_getres_args {
+struct netbsd32_clock_getres_args {
 	syscallarg(netbsd32_clockid_t) clock_id;
 	syscallarg(netbsd32_timespecp_t) tp;
 };
 
-struct compat_netbsd32_nanosleep_args {
+struct netbsd32_nanosleep_args {
 	syscallarg(const netbsd32_timespecp_t) rqtp;
 	syscallarg(netbsd32_timespecp_t) rmtp;
 };
 
-struct compat_netbsd32_fdatasync_args {
+struct netbsd32_fdatasync_args {
 	syscallarg(int) fd;
 };
 
-struct compat_netbsd32___posix_rename_args {
+struct netbsd32___posix_rename_args {
 	syscallarg(const netbsd32_charp) from;
 	syscallarg(const netbsd32_charp) to;
 };
 
-struct compat_netbsd32_swapctl_args {
+struct netbsd32_swapctl_args {
 	syscallarg(int) cmd;
 	syscallarg(const netbsd32_voidp) arg;
 	syscallarg(int) misc;
 };
 
-struct compat_netbsd32_getdents_args {
+struct netbsd32_getdents_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_charp) buf;
 	syscallarg(netbsd32_size_t) count;
 };
 
-struct compat_netbsd32_minherit_args {
+struct netbsd32_minherit_args {
 	syscallarg(netbsd32_voidp) addr;
 	syscallarg(netbsd32_size_t) len;
 	syscallarg(int) inherit;
 };
 
-struct compat_netbsd32_lchmod_args {
+struct netbsd32_lchmod_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(mode_t) mode;
 };
 
-struct compat_netbsd32_lchown_args {
+struct netbsd32_lchown_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(uid_t) uid;
 	syscallarg(gid_t) gid;
 };
 
-struct compat_netbsd32_lutimes_args {
+struct netbsd32_lutimes_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(const netbsd32_timevalp_t) tptr;
 };
 
-struct compat_netbsd32___msync13_args {
+struct netbsd32___msync13_args {
 	syscallarg(netbsd32_voidp) addr;
 	syscallarg(netbsd32_size_t) len;
 	syscallarg(int) flags;
 };
 
-struct compat_netbsd32___stat13_args {
+struct netbsd32___stat13_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(netbsd32_statp_t) ub;
 };
 
-struct compat_netbsd32___fstat13_args {
+struct netbsd32___fstat13_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_statp_t) sb;
 };
 
-struct compat_netbsd32___lstat13_args {
+struct netbsd32___lstat13_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(netbsd32_statp_t) ub;
 };
 
-struct compat_netbsd32___sigaltstack14_args {
+struct netbsd32___sigaltstack14_args {
 	syscallarg(const netbsd32_sigaltstackp_t) nss;
 	syscallarg(netbsd32_sigaltstackp_t) oss;
 };
 
-struct compat_netbsd32___posix_chown_args {
+struct netbsd32___posix_chown_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(uid_t) uid;
 	syscallarg(gid_t) gid;
 };
 
-struct compat_netbsd32___posix_fchown_args {
+struct netbsd32___posix_fchown_args {
 	syscallarg(int) fd;
 	syscallarg(uid_t) uid;
 	syscallarg(gid_t) gid;
 };
 
-struct compat_netbsd32___posix_lchown_args {
+struct netbsd32___posix_lchown_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(uid_t) uid;
 	syscallarg(gid_t) gid;
 };
 
-struct compat_netbsd32_getsid_args {
+struct netbsd32_getsid_args {
 	syscallarg(pid_t) pid;
 };
 
-struct compat_netbsd32_fktrace_args {
+struct netbsd32_fktrace_args {
 	syscallarg(const int) fd;
 	syscallarg(int) ops;
 	syscallarg(int) facs;
 	syscallarg(int) pid;
 };
 
-struct compat_netbsd32_preadv_args {
+struct netbsd32_preadv_args {
 	syscallarg(int) fd;
 	syscallarg(const netbsd32_iovecp_t) iovp;
 	syscallarg(int) iovcnt;
@@ -1124,7 +1124,7 @@ struct compat_netbsd32_preadv_args {
 	syscallarg(off_t) offset;
 };
 
-struct compat_netbsd32_pwritev_args {
+struct netbsd32_pwritev_args {
 	syscallarg(int) fd;
 	syscallarg(const netbsd32_iovecp_t) iovp;
 	syscallarg(int) iovcnt;
@@ -1136,224 +1136,224 @@ struct compat_netbsd32_pwritev_args {
  * System call prototypes.
  */
 
-int	compat_netbsd32_exit	__P((struct proc *, void *, register_t *));
+int	netbsd32_exit	__P((struct proc *, void *, register_t *));
 int	sys_fork	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_read	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_write	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_open	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_close	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_wait4	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_ocreat	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_link	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_unlink	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_chdir	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_fchdir	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_mknod	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_chmod	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_chown	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_break	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_getfsstat	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_olseek	__P((struct proc *, void *, register_t *));
+int	netbsd32_read	__P((struct proc *, void *, register_t *));
+int	netbsd32_write	__P((struct proc *, void *, register_t *));
+int	netbsd32_open	__P((struct proc *, void *, register_t *));
+int	netbsd32_close	__P((struct proc *, void *, register_t *));
+int	netbsd32_wait4	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_ocreat	__P((struct proc *, void *, register_t *));
+int	netbsd32_link	__P((struct proc *, void *, register_t *));
+int	netbsd32_unlink	__P((struct proc *, void *, register_t *));
+int	netbsd32_chdir	__P((struct proc *, void *, register_t *));
+int	netbsd32_fchdir	__P((struct proc *, void *, register_t *));
+int	netbsd32_mknod	__P((struct proc *, void *, register_t *));
+int	netbsd32_chmod	__P((struct proc *, void *, register_t *));
+int	netbsd32_chown	__P((struct proc *, void *, register_t *));
+int	netbsd32_break	__P((struct proc *, void *, register_t *));
+int	netbsd32_getfsstat	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_olseek	__P((struct proc *, void *, register_t *));
 int	sys_getpid	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_mount	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_unmount	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_setuid	__P((struct proc *, void *, register_t *));
+int	netbsd32_mount	__P((struct proc *, void *, register_t *));
+int	netbsd32_unmount	__P((struct proc *, void *, register_t *));
+int	netbsd32_setuid	__P((struct proc *, void *, register_t *));
 int	sys_getuid	__P((struct proc *, void *, register_t *));
 int	sys_geteuid	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_ptrace	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_recvmsg	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_sendmsg	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_recvfrom	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_accept	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_getpeername	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_getsockname	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_access	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_chflags	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_fchflags	__P((struct proc *, void *, register_t *));
+int	netbsd32_ptrace	__P((struct proc *, void *, register_t *));
+int	netbsd32_recvmsg	__P((struct proc *, void *, register_t *));
+int	netbsd32_sendmsg	__P((struct proc *, void *, register_t *));
+int	netbsd32_recvfrom	__P((struct proc *, void *, register_t *));
+int	netbsd32_accept	__P((struct proc *, void *, register_t *));
+int	netbsd32_getpeername	__P((struct proc *, void *, register_t *));
+int	netbsd32_getsockname	__P((struct proc *, void *, register_t *));
+int	netbsd32_access	__P((struct proc *, void *, register_t *));
+int	netbsd32_chflags	__P((struct proc *, void *, register_t *));
+int	netbsd32_fchflags	__P((struct proc *, void *, register_t *));
 int	sys_sync	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_kill	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_stat43	__P((struct proc *, void *, register_t *));
+int	netbsd32_kill	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_stat43	__P((struct proc *, void *, register_t *));
 int	sys_getppid	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_lstat43	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_dup	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_lstat43	__P((struct proc *, void *, register_t *));
+int	netbsd32_dup	__P((struct proc *, void *, register_t *));
 int	sys_pipe	__P((struct proc *, void *, register_t *));
 int	sys_getegid	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_profil	__P((struct proc *, void *, register_t *));
+int	netbsd32_profil	__P((struct proc *, void *, register_t *));
 #if defined(KTRACE) || !defined(_KERNEL)
-int	compat_netbsd32_ktrace	__P((struct proc *, void *, register_t *));
+int	netbsd32_ktrace	__P((struct proc *, void *, register_t *));
 #else
 #endif
-int	compat_netbsd32_sigaction	__P((struct proc *, void *, register_t *));
+int	netbsd32_sigaction	__P((struct proc *, void *, register_t *));
 int	sys_getgid	__P((struct proc *, void *, register_t *));
-int	compat_13_compat_netbsd32_sigprocmask	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32___getlogin	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_setlogin	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_acct	__P((struct proc *, void *, register_t *));
+int	compat_13_netbsd32_sigprocmask	__P((struct proc *, void *, register_t *));
+int	netbsd32___getlogin	__P((struct proc *, void *, register_t *));
+int	netbsd32_setlogin	__P((struct proc *, void *, register_t *));
+int	netbsd32_acct	__P((struct proc *, void *, register_t *));
 int	compat_13_sys_sigpending	__P((struct proc *, void *, register_t *));
-int	compat_13_compat_netbsd32_sigaltstack13	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_ioctl	__P((struct proc *, void *, register_t *));
+int	compat_13_netbsd32_sigaltstack13	__P((struct proc *, void *, register_t *));
+int	netbsd32_ioctl	__P((struct proc *, void *, register_t *));
 #ifdef COMPAT_12
-int	compat_12_compat_netbsd32_reboot	__P((struct proc *, void *, register_t *));
+int	compat_12_netbsd32_reboot	__P((struct proc *, void *, register_t *));
 #else
 #endif
-int	compat_netbsd32_revoke	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_symlink	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_readlink	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_execve	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_umask	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_chroot	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_fstat43	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_ogetkerninfo	__P((struct proc *, void *, register_t *));
+int	netbsd32_revoke	__P((struct proc *, void *, register_t *));
+int	netbsd32_symlink	__P((struct proc *, void *, register_t *));
+int	netbsd32_readlink	__P((struct proc *, void *, register_t *));
+int	netbsd32_execve	__P((struct proc *, void *, register_t *));
+int	netbsd32_umask	__P((struct proc *, void *, register_t *));
+int	netbsd32_chroot	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_fstat43	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_ogetkerninfo	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_getpagesize	__P((struct proc *, void *, register_t *));
-int	compat_12_compat_netbsd32_msync	__P((struct proc *, void *, register_t *));
+int	compat_12_netbsd32_msync	__P((struct proc *, void *, register_t *));
 int	sys_vfork	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_sbrk	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_sstk	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_ommap	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_ovadvise	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_munmap	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_mprotect	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_madvise	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_mincore	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_getgroups	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_setgroups	__P((struct proc *, void *, register_t *));
+int	netbsd32_sbrk	__P((struct proc *, void *, register_t *));
+int	netbsd32_sstk	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_ommap	__P((struct proc *, void *, register_t *));
+int	netbsd32_ovadvise	__P((struct proc *, void *, register_t *));
+int	netbsd32_munmap	__P((struct proc *, void *, register_t *));
+int	netbsd32_mprotect	__P((struct proc *, void *, register_t *));
+int	netbsd32_madvise	__P((struct proc *, void *, register_t *));
+int	netbsd32_mincore	__P((struct proc *, void *, register_t *));
+int	netbsd32_getgroups	__P((struct proc *, void *, register_t *));
+int	netbsd32_setgroups	__P((struct proc *, void *, register_t *));
 int	sys_getpgrp	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_setpgid	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_setitimer	__P((struct proc *, void *, register_t *));
+int	netbsd32_setpgid	__P((struct proc *, void *, register_t *));
+int	netbsd32_setitimer	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_wait	__P((struct proc *, void *, register_t *));
-int	compat_12_compat_netbsd32_oswapon	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_getitimer	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_ogethostname	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_osethostname	__P((struct proc *, void *, register_t *));
+int	compat_12_netbsd32_oswapon	__P((struct proc *, void *, register_t *));
+int	netbsd32_getitimer	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_ogethostname	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_osethostname	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_getdtablesize	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_dup2	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_fcntl	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_select	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_fsync	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_setpriority	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_socket	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_connect	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_oaccept	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_getpriority	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_osend	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_orecv	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_sigreturn	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_bind	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_setsockopt	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_listen	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_osigvec	__P((struct proc *, void *, register_t *));
+int	netbsd32_dup2	__P((struct proc *, void *, register_t *));
+int	netbsd32_fcntl	__P((struct proc *, void *, register_t *));
+int	netbsd32_select	__P((struct proc *, void *, register_t *));
+int	netbsd32_fsync	__P((struct proc *, void *, register_t *));
+int	netbsd32_setpriority	__P((struct proc *, void *, register_t *));
+int	netbsd32_socket	__P((struct proc *, void *, register_t *));
+int	netbsd32_connect	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_oaccept	__P((struct proc *, void *, register_t *));
+int	netbsd32_getpriority	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_osend	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_orecv	__P((struct proc *, void *, register_t *));
+int	netbsd32_sigreturn	__P((struct proc *, void *, register_t *));
+int	netbsd32_bind	__P((struct proc *, void *, register_t *));
+int	netbsd32_setsockopt	__P((struct proc *, void *, register_t *));
+int	netbsd32_listen	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_osigvec	__P((struct proc *, void *, register_t *));
 #ifdef COMPAT_43
-int	compat_43_compat_netbsd32_sigblock	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_sigsetmask	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_sigblock	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_sigsetmask	__P((struct proc *, void *, register_t *));
 #else
 #endif
-int	compat_13_compat_netbsd32_sigsuspend	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_osigstack	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_orecvmsg	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_osendmsg	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_gettimeofday	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_getrusage	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_getsockopt	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_readv	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_writev	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_settimeofday	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_fchown	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_fchmod	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_orecvfrom	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_setreuid	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_setregid	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_rename	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_otruncate	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_oftruncate	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_flock	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_mkfifo	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_sendto	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_shutdown	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_socketpair	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_mkdir	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_rmdir	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_utimes	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_adjtime	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_ogetpeername	__P((struct proc *, void *, register_t *));
+int	compat_13_netbsd32_sigsuspend	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_osigstack	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_orecvmsg	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_osendmsg	__P((struct proc *, void *, register_t *));
+int	netbsd32_gettimeofday	__P((struct proc *, void *, register_t *));
+int	netbsd32_getrusage	__P((struct proc *, void *, register_t *));
+int	netbsd32_getsockopt	__P((struct proc *, void *, register_t *));
+int	netbsd32_readv	__P((struct proc *, void *, register_t *));
+int	netbsd32_writev	__P((struct proc *, void *, register_t *));
+int	netbsd32_settimeofday	__P((struct proc *, void *, register_t *));
+int	netbsd32_fchown	__P((struct proc *, void *, register_t *));
+int	netbsd32_fchmod	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_orecvfrom	__P((struct proc *, void *, register_t *));
+int	netbsd32_setreuid	__P((struct proc *, void *, register_t *));
+int	netbsd32_setregid	__P((struct proc *, void *, register_t *));
+int	netbsd32_rename	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_otruncate	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_oftruncate	__P((struct proc *, void *, register_t *));
+int	netbsd32_flock	__P((struct proc *, void *, register_t *));
+int	netbsd32_mkfifo	__P((struct proc *, void *, register_t *));
+int	netbsd32_sendto	__P((struct proc *, void *, register_t *));
+int	netbsd32_shutdown	__P((struct proc *, void *, register_t *));
+int	netbsd32_socketpair	__P((struct proc *, void *, register_t *));
+int	netbsd32_mkdir	__P((struct proc *, void *, register_t *));
+int	netbsd32_rmdir	__P((struct proc *, void *, register_t *));
+int	netbsd32_utimes	__P((struct proc *, void *, register_t *));
+int	netbsd32_adjtime	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_ogetpeername	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_gethostid	__P((struct proc *, void *, register_t *));
 #ifdef COMPAT_43
-int	compat_43_compat_netbsd32_sethostid	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_sethostid	__P((struct proc *, void *, register_t *));
 #else
 #endif
-int	compat_43_compat_netbsd32_ogetrlimit	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_osetrlimit	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_ogetrlimit	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_osetrlimit	__P((struct proc *, void *, register_t *));
 #ifdef COMPAT_43
-int	compat_43_compat_netbsd32_killpg	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_killpg	__P((struct proc *, void *, register_t *));
 #else
 #endif
 int	sys_setsid	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_quotactl	__P((struct proc *, void *, register_t *));
+int	netbsd32_quotactl	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_quota	__P((struct proc *, void *, register_t *));
-int	compat_43_compat_netbsd32_ogetsockname	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_ogetsockname	__P((struct proc *, void *, register_t *));
 #if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
-int	compat_netbsd32_nfssvc	__P((struct proc *, void *, register_t *));
+int	netbsd32_nfssvc	__P((struct proc *, void *, register_t *));
 #else
 #endif
-int	compat_43_compat_netbsd32_ogetdirentries	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_statfs	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_fstatfs	__P((struct proc *, void *, register_t *));
+int	compat_43_netbsd32_ogetdirentries	__P((struct proc *, void *, register_t *));
+int	netbsd32_statfs	__P((struct proc *, void *, register_t *));
+int	netbsd32_fstatfs	__P((struct proc *, void *, register_t *));
 #if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
-int	compat_netbsd32_getfh	__P((struct proc *, void *, register_t *));
+int	netbsd32_getfh	__P((struct proc *, void *, register_t *));
 #else
 #endif
-int	compat_09_compat_netbsd32_ogetdomainname	__P((struct proc *, void *, register_t *));
-int	compat_09_compat_netbsd32_osetdomainname	__P((struct proc *, void *, register_t *));
-int	compat_09_compat_netbsd32_uname	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_sysarch	__P((struct proc *, void *, register_t *));
-#if (defined(SYSVSEM) || !defined(_KERNEL) && !defined(alpha) && defined(COMPAT_10)
-int	compat_netbsd32_compat_10_sys_semsys	__P((struct proc *, void *, register_t *));
+int	compat_09_netbsd32_ogetdomainname	__P((struct proc *, void *, register_t *));
+int	compat_09_netbsd32_osetdomainname	__P((struct proc *, void *, register_t *));
+int	compat_09_netbsd32_uname	__P((struct proc *, void *, register_t *));
+int	netbsd32_sysarch	__P((struct proc *, void *, register_t *));
+#if (defined(SYSVSEM) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
+int	netbsd32_compat_10_sys_semsys	__P((struct proc *, void *, register_t *));
 #else
 #endif
 #if (defined(SYSVMSG) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
-int	compat_netbsd32_compat_10_sys_msgsys	__P((struct proc *, void *, register_t *));
+int	netbsd32_compat_10_sys_msgsys	__P((struct proc *, void *, register_t *));
 #else
 #endif
 #if (defined(SYSVSHM) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
-int	compat_netbsd32_compat_10_sys_shmsys	__P((struct proc *, void *, register_t *));
+int	netbsd32_compat_10_sys_shmsys	__P((struct proc *, void *, register_t *));
 #else
 #endif
-int	compat_netbsd32_pread	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_pwrite	__P((struct proc *, void *, register_t *));
+int	netbsd32_pread	__P((struct proc *, void *, register_t *));
+int	netbsd32_pwrite	__P((struct proc *, void *, register_t *));
 #if defined(NTP) && !defined(_KERNEL)
-int	compat_netbsd32_ntp_gettime	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_ntp_adjtime	__P((struct proc *, void *, register_t *));
+int	netbsd32_ntp_gettime	__P((struct proc *, void *, register_t *));
+int	netbsd32_ntp_adjtime	__P((struct proc *, void *, register_t *));
 #else
 #endif
-int	compat_netbsd32_setgid	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_setegid	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_seteuid	__P((struct proc *, void *, register_t *));
+int	netbsd32_setgid	__P((struct proc *, void *, register_t *));
+int	netbsd32_setegid	__P((struct proc *, void *, register_t *));
+int	netbsd32_seteuid	__P((struct proc *, void *, register_t *));
 #if defined(LFS) || !defined(_KERNEL)
-int	compat_netbsd32_sys_lfs_bmapv	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_sys_lfs_markv	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_sys_lfs_segclean	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_sys_lfs_segwait	__P((struct proc *, void *, register_t *));
+int	netbsd32_sys_lfs_bmapv	__P((struct proc *, void *, register_t *));
+int	netbsd32_sys_lfs_markv	__P((struct proc *, void *, register_t *));
+int	netbsd32_sys_lfs_segclean	__P((struct proc *, void *, register_t *));
+int	netbsd32_sys_lfs_segwait	__P((struct proc *, void *, register_t *));
 #else
 #endif
-int	compat_12_compat_netbsd32_stat12	__P((struct proc *, void *, register_t *));
-int	compat_12_compat_netbsd32_fstat12	__P((struct proc *, void *, register_t *));
-int	compat_12_compat_netbsd32_lstat12	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_pathconf	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_fpathconf	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_getrlimit	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_setrlimit	__P((struct proc *, void *, register_t *));
-int	compat_12_compat_netbsd32_getdirentries	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_mmap	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_lseek	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_truncate	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_ftruncate	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32___sysctl	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_mlock	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_munlock	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_undelete	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_futimes	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_getpgid	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_reboot	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_poll	__P((struct proc *, void *, register_t *));
+int	compat_12_netbsd32_stat12	__P((struct proc *, void *, register_t *));
+int	compat_12_netbsd32_fstat12	__P((struct proc *, void *, register_t *));
+int	compat_12_netbsd32_lstat12	__P((struct proc *, void *, register_t *));
+int	netbsd32_pathconf	__P((struct proc *, void *, register_t *));
+int	netbsd32_fpathconf	__P((struct proc *, void *, register_t *));
+int	netbsd32_getrlimit	__P((struct proc *, void *, register_t *));
+int	netbsd32_setrlimit	__P((struct proc *, void *, register_t *));
+int	compat_12_netbsd32_getdirentries	__P((struct proc *, void *, register_t *));
+int	netbsd32_mmap	__P((struct proc *, void *, register_t *));
+int	netbsd32_lseek	__P((struct proc *, void *, register_t *));
+int	netbsd32_truncate	__P((struct proc *, void *, register_t *));
+int	netbsd32_ftruncate	__P((struct proc *, void *, register_t *));
+int	netbsd32___sysctl	__P((struct proc *, void *, register_t *));
+int	netbsd32_mlock	__P((struct proc *, void *, register_t *));
+int	netbsd32_munlock	__P((struct proc *, void *, register_t *));
+int	netbsd32_undelete	__P((struct proc *, void *, register_t *));
+int	netbsd32_futimes	__P((struct proc *, void *, register_t *));
+int	netbsd32_getpgid	__P((struct proc *, void *, register_t *));
+int	netbsd32_reboot	__P((struct proc *, void *, register_t *));
+int	netbsd32_poll	__P((struct proc *, void *, register_t *));
 #if defined(LKM) || !defined(_KERNEL)
 int	sys_lkmnosys	__P((struct proc *, void *, register_t *));
 int	sys_lkmnosys	__P((struct proc *, void *, register_t *));
@@ -1368,52 +1368,52 @@ int	sys_lkmnosys	__P((struct proc *, void *, register_t *));
 #else	/* !LKM || !_KERNEL */
 #endif	/* !LKM || !_KERNEL */
 #if defined(SYSVSEM) || !defined(_KERNEL)
-int	compat_netbsd32___semctl	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_semget	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_semop	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_semconfig	__P((struct proc *, void *, register_t *));
+int	compat_14_netbsd32___semctl	__P((struct proc *, void *, register_t *));
+int	netbsd32_semget	__P((struct proc *, void *, register_t *));
+int	netbsd32_semop	__P((struct proc *, void *, register_t *));
+int	netbsd32_semconfig	__P((struct proc *, void *, register_t *));
 #else
 #endif
 #if defined(SYSVMSG) || !defined(_KERNEL)
-int	compat_netbsd32_msgctl	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_msgget	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_msgsnd	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_msgrcv	__P((struct proc *, void *, register_t *));
+int	compat_14_netbsd32_msgctl	__P((struct proc *, void *, register_t *));
+int	netbsd32_msgget	__P((struct proc *, void *, register_t *));
+int	netbsd32_msgsnd	__P((struct proc *, void *, register_t *));
+int	netbsd32_msgrcv	__P((struct proc *, void *, register_t *));
 #else
 #endif
 #if defined(SYSVSHM) || !defined(_KERNEL)
-int	compat_netbsd32_shmat	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_shmctl	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_shmdt	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_shmget	__P((struct proc *, void *, register_t *));
+int	netbsd32_shmat	__P((struct proc *, void *, register_t *));
+int	compat_14_netbsd32_shmctl	__P((struct proc *, void *, register_t *));
+int	netbsd32_shmdt	__P((struct proc *, void *, register_t *));
+int	netbsd32_shmget	__P((struct proc *, void *, register_t *));
 #else
 #endif
-int	compat_netbsd32_clock_gettime	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_clock_settime	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_clock_getres	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_nanosleep	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_fdatasync	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32___posix_rename	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_swapctl	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_getdents	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_minherit	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_lchmod	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_lchown	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_lutimes	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32___msync13	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32___stat13	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32___fstat13	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32___lstat13	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32___sigaltstack14	__P((struct proc *, void *, register_t *));
+int	netbsd32_clock_gettime	__P((struct proc *, void *, register_t *));
+int	netbsd32_clock_settime	__P((struct proc *, void *, register_t *));
+int	netbsd32_clock_getres	__P((struct proc *, void *, register_t *));
+int	netbsd32_nanosleep	__P((struct proc *, void *, register_t *));
+int	netbsd32_fdatasync	__P((struct proc *, void *, register_t *));
+int	netbsd32___posix_rename	__P((struct proc *, void *, register_t *));
+int	netbsd32_swapctl	__P((struct proc *, void *, register_t *));
+int	netbsd32_getdents	__P((struct proc *, void *, register_t *));
+int	netbsd32_minherit	__P((struct proc *, void *, register_t *));
+int	netbsd32_lchmod	__P((struct proc *, void *, register_t *));
+int	netbsd32_lchown	__P((struct proc *, void *, register_t *));
+int	netbsd32_lutimes	__P((struct proc *, void *, register_t *));
+int	netbsd32___msync13	__P((struct proc *, void *, register_t *));
+int	netbsd32___stat13	__P((struct proc *, void *, register_t *));
+int	netbsd32___fstat13	__P((struct proc *, void *, register_t *));
+int	netbsd32___lstat13	__P((struct proc *, void *, register_t *));
+int	netbsd32___sigaltstack14	__P((struct proc *, void *, register_t *));
 int	sys___vfork14	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32___posix_chown	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32___posix_fchown	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32___posix_lchown	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_getsid	__P((struct proc *, void *, register_t *));
+int	netbsd32___posix_chown	__P((struct proc *, void *, register_t *));
+int	netbsd32___posix_fchown	__P((struct proc *, void *, register_t *));
+int	netbsd32___posix_lchown	__P((struct proc *, void *, register_t *));
+int	netbsd32_getsid	__P((struct proc *, void *, register_t *));
 #if defined(KTRACE) || !defined(_KERNEL)
-int	compat_netbsd32_fktrace	__P((struct proc *, void *, register_t *));
+int	netbsd32_fktrace	__P((struct proc *, void *, register_t *));
 #else
 #endif
-int	compat_netbsd32_preadv	__P((struct proc *, void *, register_t *));
-int	compat_netbsd32_pwritev	__P((struct proc *, void *, register_t *));
+int	netbsd32_preadv	__P((struct proc *, void *, register_t *));
+int	netbsd32_pwritev	__P((struct proc *, void *, register_t *));
 #endif /* _netbsd32_SYS__SYSCALLARGS_H_ */
diff --git a/sys/compat/netbsd32/netbsd32_syscalls.c b/sys/compat/netbsd32/netbsd32_syscalls.c
index 903cbc76e5b8..6456bd3bba7e 100644
--- a/sys/compat/netbsd32/netbsd32_syscalls.c
+++ b/sys/compat/netbsd32/netbsd32_syscalls.c
@@ -1,10 +1,10 @@
-/*	$NetBSD: netbsd32_syscalls.c,v 1.10 1999/06/09 04:50:32 christos Exp $	*/
+/*	$NetBSD: netbsd32_syscalls.c,v 1.11 1999/10/11 01:36:24 eeh Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.8 1999/06/09 04:50:11 christos Exp 
+ * created from	NetBSD: syscalls.master,v 1.9 1999/07/12 21:55:20 kleink Exp 
  */
 
 #if defined(_KERNEL) && !defined(_LKM)
@@ -27,204 +27,204 @@
 
 char *netbsd32_syscallnames[] = {
 	"syscall",			/* 0 = syscall */
-	"compat_netbsd32_exit",			/* 1 = compat_netbsd32_exit */
+	"netbsd32_exit",			/* 1 = netbsd32_exit */
 	"fork",			/* 2 = fork */
-	"compat_netbsd32_read",			/* 3 = compat_netbsd32_read */
-	"compat_netbsd32_write",			/* 4 = compat_netbsd32_write */
-	"compat_netbsd32_open",			/* 5 = compat_netbsd32_open */
-	"compat_netbsd32_close",			/* 6 = compat_netbsd32_close */
-	"compat_netbsd32_wait4",			/* 7 = compat_netbsd32_wait4 */
-	"compat_43_compat_netbsd32_ocreat",	/* 8 = compat_43 compat_netbsd32_ocreat */
-	"compat_netbsd32_link",			/* 9 = compat_netbsd32_link */
-	"compat_netbsd32_unlink",			/* 10 = compat_netbsd32_unlink */
+	"netbsd32_read",			/* 3 = netbsd32_read */
+	"netbsd32_write",			/* 4 = netbsd32_write */
+	"netbsd32_open",			/* 5 = netbsd32_open */
+	"netbsd32_close",			/* 6 = netbsd32_close */
+	"netbsd32_wait4",			/* 7 = netbsd32_wait4 */
+	"compat_43_netbsd32_ocreat",	/* 8 = compat_43 netbsd32_ocreat */
+	"netbsd32_link",			/* 9 = netbsd32_link */
+	"netbsd32_unlink",			/* 10 = netbsd32_unlink */
 	"#11 (obsolete execv)",		/* 11 = obsolete execv */
-	"compat_netbsd32_chdir",			/* 12 = compat_netbsd32_chdir */
-	"compat_netbsd32_fchdir",			/* 13 = compat_netbsd32_fchdir */
-	"compat_netbsd32_mknod",			/* 14 = compat_netbsd32_mknod */
-	"compat_netbsd32_chmod",			/* 15 = compat_netbsd32_chmod */
-	"compat_netbsd32_chown",			/* 16 = compat_netbsd32_chown */
-	"compat_netbsd32_break",			/* 17 = compat_netbsd32_break */
-	"compat_netbsd32_getfsstat",			/* 18 = compat_netbsd32_getfsstat */
-	"compat_43_compat_netbsd32_olseek",	/* 19 = compat_43 compat_netbsd32_olseek */
+	"netbsd32_chdir",			/* 12 = netbsd32_chdir */
+	"netbsd32_fchdir",			/* 13 = netbsd32_fchdir */
+	"netbsd32_mknod",			/* 14 = netbsd32_mknod */
+	"netbsd32_chmod",			/* 15 = netbsd32_chmod */
+	"netbsd32_chown",			/* 16 = netbsd32_chown */
+	"netbsd32_break",			/* 17 = netbsd32_break */
+	"netbsd32_getfsstat",			/* 18 = netbsd32_getfsstat */
+	"compat_43_netbsd32_olseek",	/* 19 = compat_43 netbsd32_olseek */
 	"getpid",			/* 20 = getpid */
-	"compat_netbsd32_mount",			/* 21 = compat_netbsd32_mount */
-	"compat_netbsd32_unmount",			/* 22 = compat_netbsd32_unmount */
-	"compat_netbsd32_setuid",			/* 23 = compat_netbsd32_setuid */
+	"netbsd32_mount",			/* 21 = netbsd32_mount */
+	"netbsd32_unmount",			/* 22 = netbsd32_unmount */
+	"netbsd32_setuid",			/* 23 = netbsd32_setuid */
 	"getuid",			/* 24 = getuid */
 	"geteuid",			/* 25 = geteuid */
-	"compat_netbsd32_ptrace",			/* 26 = compat_netbsd32_ptrace */
-	"compat_netbsd32_recvmsg",			/* 27 = compat_netbsd32_recvmsg */
-	"compat_netbsd32_sendmsg",			/* 28 = compat_netbsd32_sendmsg */
-	"compat_netbsd32_recvfrom",			/* 29 = compat_netbsd32_recvfrom */
-	"compat_netbsd32_accept",			/* 30 = compat_netbsd32_accept */
-	"compat_netbsd32_getpeername",			/* 31 = compat_netbsd32_getpeername */
-	"compat_netbsd32_getsockname",			/* 32 = compat_netbsd32_getsockname */
-	"compat_netbsd32_access",			/* 33 = compat_netbsd32_access */
-	"compat_netbsd32_chflags",			/* 34 = compat_netbsd32_chflags */
-	"compat_netbsd32_fchflags",			/* 35 = compat_netbsd32_fchflags */
+	"netbsd32_ptrace",			/* 26 = netbsd32_ptrace */
+	"netbsd32_recvmsg",			/* 27 = netbsd32_recvmsg */
+	"netbsd32_sendmsg",			/* 28 = netbsd32_sendmsg */
+	"netbsd32_recvfrom",			/* 29 = netbsd32_recvfrom */
+	"netbsd32_accept",			/* 30 = netbsd32_accept */
+	"netbsd32_getpeername",			/* 31 = netbsd32_getpeername */
+	"netbsd32_getsockname",			/* 32 = netbsd32_getsockname */
+	"netbsd32_access",			/* 33 = netbsd32_access */
+	"netbsd32_chflags",			/* 34 = netbsd32_chflags */
+	"netbsd32_fchflags",			/* 35 = netbsd32_fchflags */
 	"sync",			/* 36 = sync */
-	"compat_netbsd32_kill",			/* 37 = compat_netbsd32_kill */
-	"compat_43_compat_netbsd32_stat43",	/* 38 = compat_43 compat_netbsd32_stat43 */
+	"netbsd32_kill",			/* 37 = netbsd32_kill */
+	"compat_43_netbsd32_stat43",	/* 38 = compat_43 netbsd32_stat43 */
 	"getppid",			/* 39 = getppid */
-	"compat_43_compat_netbsd32_lstat43",	/* 40 = compat_43 compat_netbsd32_lstat43 */
-	"compat_netbsd32_dup",			/* 41 = compat_netbsd32_dup */
+	"compat_43_netbsd32_lstat43",	/* 40 = compat_43 netbsd32_lstat43 */
+	"netbsd32_dup",			/* 41 = netbsd32_dup */
 	"pipe",			/* 42 = pipe */
 	"getegid",			/* 43 = getegid */
-	"compat_netbsd32_profil",			/* 44 = compat_netbsd32_profil */
+	"netbsd32_profil",			/* 44 = netbsd32_profil */
 #if defined(KTRACE) || !defined(_KERNEL)
-	"compat_netbsd32_ktrace",			/* 45 = compat_netbsd32_ktrace */
+	"netbsd32_ktrace",			/* 45 = netbsd32_ktrace */
 #else
-	"#45 (excluded compat_netbsd32_ktrace)",		/* 45 = excluded compat_netbsd32_ktrace */
+	"#45 (excluded netbsd32_ktrace)",		/* 45 = excluded netbsd32_ktrace */
 #endif
-	"compat_netbsd32_sigaction",			/* 46 = compat_netbsd32_sigaction */
+	"netbsd32_sigaction",			/* 46 = netbsd32_sigaction */
 	"getgid",			/* 47 = getgid */
 	"compat_13_sigprocmask13",	/* 48 = compat_13 sigprocmask13 */
-	"compat_netbsd32___getlogin",			/* 49 = compat_netbsd32___getlogin */
-	"compat_netbsd32_setlogin",			/* 50 = compat_netbsd32_setlogin */
-	"compat_netbsd32_acct",			/* 51 = compat_netbsd32_acct */
+	"netbsd32___getlogin",			/* 49 = netbsd32___getlogin */
+	"netbsd32_setlogin",			/* 50 = netbsd32_setlogin */
+	"netbsd32_acct",			/* 51 = netbsd32_acct */
 	"compat_13_sigpending13",	/* 52 = compat_13 sigpending13 */
-	"compat_13_compat_netbsd32_sigaltstack13",	/* 53 = compat_13 compat_netbsd32_sigaltstack13 */
-	"compat_netbsd32_ioctl",			/* 54 = compat_netbsd32_ioctl */
+	"compat_13_netbsd32_sigaltstack13",	/* 53 = compat_13 netbsd32_sigaltstack13 */
+	"netbsd32_ioctl",			/* 54 = netbsd32_ioctl */
 #ifdef COMPAT_12
-	"compat_12_compat_netbsd32_reboot",	/* 55 = compat_12 compat_netbsd32_reboot */
+	"compat_12_netbsd32_reboot",	/* 55 = compat_12 netbsd32_reboot */
 #else
 	"#55 (obsolete oreboot)",		/* 55 = obsolete oreboot */
 #endif
-	"compat_netbsd32_revoke",			/* 56 = compat_netbsd32_revoke */
-	"compat_netbsd32_symlink",			/* 57 = compat_netbsd32_symlink */
-	"compat_netbsd32_readlink",			/* 58 = compat_netbsd32_readlink */
-	"compat_netbsd32_execve",			/* 59 = compat_netbsd32_execve */
-	"compat_netbsd32_umask",			/* 60 = compat_netbsd32_umask */
-	"compat_netbsd32_chroot",			/* 61 = compat_netbsd32_chroot */
-	"compat_43_compat_netbsd32_fstat43",	/* 62 = compat_43 compat_netbsd32_fstat43 */
-	"compat_43_compat_netbsd32_ogetkerninfo",	/* 63 = compat_43 compat_netbsd32_ogetkerninfo */
+	"netbsd32_revoke",			/* 56 = netbsd32_revoke */
+	"netbsd32_symlink",			/* 57 = netbsd32_symlink */
+	"netbsd32_readlink",			/* 58 = netbsd32_readlink */
+	"netbsd32_execve",			/* 59 = netbsd32_execve */
+	"netbsd32_umask",			/* 60 = netbsd32_umask */
+	"netbsd32_chroot",			/* 61 = netbsd32_chroot */
+	"compat_43_netbsd32_fstat43",	/* 62 = compat_43 netbsd32_fstat43 */
+	"compat_43_netbsd32_ogetkerninfo",	/* 63 = compat_43 netbsd32_ogetkerninfo */
 	"compat_43_ogetpagesize",	/* 64 = compat_43 ogetpagesize */
-	"compat_12_compat_netbsd32_msync",	/* 65 = compat_12 compat_netbsd32_msync */
+	"compat_12_netbsd32_msync",	/* 65 = compat_12 netbsd32_msync */
 	"vfork",			/* 66 = vfork */
 	"#67 (obsolete vread)",		/* 67 = obsolete vread */
 	"#68 (obsolete vwrite)",		/* 68 = obsolete vwrite */
-	"compat_netbsd32_sbrk",			/* 69 = compat_netbsd32_sbrk */
-	"compat_netbsd32_sstk",			/* 70 = compat_netbsd32_sstk */
-	"compat_43_compat_netbsd32_ommap",	/* 71 = compat_43 compat_netbsd32_ommap */
+	"netbsd32_sbrk",			/* 69 = netbsd32_sbrk */
+	"netbsd32_sstk",			/* 70 = netbsd32_sstk */
+	"compat_43_netbsd32_ommap",	/* 71 = compat_43 netbsd32_ommap */
 	"vadvise",			/* 72 = vadvise */
-	"compat_netbsd32_munmap",			/* 73 = compat_netbsd32_munmap */
-	"compat_netbsd32_mprotect",			/* 74 = compat_netbsd32_mprotect */
-	"compat_netbsd32_madvise",			/* 75 = compat_netbsd32_madvise */
+	"netbsd32_munmap",			/* 73 = netbsd32_munmap */
+	"netbsd32_mprotect",			/* 74 = netbsd32_mprotect */
+	"netbsd32_madvise",			/* 75 = netbsd32_madvise */
 	"#76 (obsolete vhangup)",		/* 76 = obsolete vhangup */
 	"#77 (obsolete vlimit)",		/* 77 = obsolete vlimit */
-	"compat_netbsd32_mincore",			/* 78 = compat_netbsd32_mincore */
-	"compat_netbsd32_getgroups",			/* 79 = compat_netbsd32_getgroups */
-	"compat_netbsd32_setgroups",			/* 80 = compat_netbsd32_setgroups */
+	"netbsd32_mincore",			/* 78 = netbsd32_mincore */
+	"netbsd32_getgroups",			/* 79 = netbsd32_getgroups */
+	"netbsd32_setgroups",			/* 80 = netbsd32_setgroups */
 	"getpgrp",			/* 81 = getpgrp */
-	"compat_netbsd32_setpgid",			/* 82 = compat_netbsd32_setpgid */
-	"compat_netbsd32_setitimer",			/* 83 = compat_netbsd32_setitimer */
+	"netbsd32_setpgid",			/* 82 = netbsd32_setpgid */
+	"netbsd32_setitimer",			/* 83 = netbsd32_setitimer */
 	"compat_43_owait",	/* 84 = compat_43 owait */
-	"compat_12_compat_netbsd32_oswapon",	/* 85 = compat_12 compat_netbsd32_oswapon */
-	"compat_netbsd32_getitimer",			/* 86 = compat_netbsd32_getitimer */
-	"compat_43_compat_netbsd32_ogethostname",	/* 87 = compat_43 compat_netbsd32_ogethostname */
-	"compat_43_compat_netbsd32_osethostname",	/* 88 = compat_43 compat_netbsd32_osethostname */
+	"compat_12_netbsd32_oswapon",	/* 85 = compat_12 netbsd32_oswapon */
+	"netbsd32_getitimer",			/* 86 = netbsd32_getitimer */
+	"compat_43_netbsd32_ogethostname",	/* 87 = compat_43 netbsd32_ogethostname */
+	"compat_43_netbsd32_osethostname",	/* 88 = compat_43 netbsd32_osethostname */
 	"compat_43_ogetdtablesize",	/* 89 = compat_43 ogetdtablesize */
-	"compat_netbsd32_dup2",			/* 90 = compat_netbsd32_dup2 */
+	"netbsd32_dup2",			/* 90 = netbsd32_dup2 */
 	"#91 (unimplemented getdopt)",		/* 91 = unimplemented getdopt */
-	"compat_netbsd32_fcntl",			/* 92 = compat_netbsd32_fcntl */
-	"compat_netbsd32_select",			/* 93 = compat_netbsd32_select */
+	"netbsd32_fcntl",			/* 92 = netbsd32_fcntl */
+	"netbsd32_select",			/* 93 = netbsd32_select */
 	"#94 (unimplemented setdopt)",		/* 94 = unimplemented setdopt */
-	"compat_netbsd32_fsync",			/* 95 = compat_netbsd32_fsync */
-	"compat_netbsd32_setpriority",			/* 96 = compat_netbsd32_setpriority */
-	"compat_netbsd32_socket",			/* 97 = compat_netbsd32_socket */
-	"compat_netbsd32_connect",			/* 98 = compat_netbsd32_connect */
-	"compat_43_compat_netbsd32_oaccept",	/* 99 = compat_43 compat_netbsd32_oaccept */
-	"compat_netbsd32_getpriority",			/* 100 = compat_netbsd32_getpriority */
-	"compat_43_compat_netbsd32_osend",	/* 101 = compat_43 compat_netbsd32_osend */
-	"compat_43_compat_netbsd32_orecv",	/* 102 = compat_43 compat_netbsd32_orecv */
-	"compat_netbsd32_sigreturn",			/* 103 = compat_netbsd32_sigreturn */
-	"compat_netbsd32_bind",			/* 104 = compat_netbsd32_bind */
-	"compat_netbsd32_setsockopt",			/* 105 = compat_netbsd32_setsockopt */
-	"compat_netbsd32_listen",			/* 106 = compat_netbsd32_listen */
+	"netbsd32_fsync",			/* 95 = netbsd32_fsync */
+	"netbsd32_setpriority",			/* 96 = netbsd32_setpriority */
+	"netbsd32_socket",			/* 97 = netbsd32_socket */
+	"netbsd32_connect",			/* 98 = netbsd32_connect */
+	"compat_43_netbsd32_oaccept",	/* 99 = compat_43 netbsd32_oaccept */
+	"netbsd32_getpriority",			/* 100 = netbsd32_getpriority */
+	"compat_43_netbsd32_osend",	/* 101 = compat_43 netbsd32_osend */
+	"compat_43_netbsd32_orecv",	/* 102 = compat_43 netbsd32_orecv */
+	"netbsd32_sigreturn",			/* 103 = netbsd32_sigreturn */
+	"netbsd32_bind",			/* 104 = netbsd32_bind */
+	"netbsd32_setsockopt",			/* 105 = netbsd32_setsockopt */
+	"netbsd32_listen",			/* 106 = netbsd32_listen */
 	"#107 (obsolete vtimes)",		/* 107 = obsolete vtimes */
-	"compat_43_compat_netbsd32_osigvec",	/* 108 = compat_43 compat_netbsd32_osigvec */
+	"compat_43_netbsd32_osigvec",	/* 108 = compat_43 netbsd32_osigvec */
 #ifdef COMPAT_43
-	"compat_43_compat_netbsd32_sigblock",	/* 109 = compat_43 compat_netbsd32_sigblock */
-	"compat_43_compat_netbsd32_sigsetmask",	/* 110 = compat_43 compat_netbsd32_sigsetmask */
+	"compat_43_netbsd32_sigblock",	/* 109 = compat_43 netbsd32_sigblock */
+	"compat_43_netbsd32_sigsetmask",	/* 110 = compat_43 netbsd32_sigsetmask */
 #else
 	"#109 (obsolete sigblock)",		/* 109 = obsolete sigblock */
 	"#110 (obsolete sigsetmask)",		/* 110 = obsolete sigsetmask */
 #endif
 	"compat_13_sigsuspend13",	/* 111 = compat_13 sigsuspend13 */
-	"compat_43_compat_netbsd32_osigstack",	/* 112 = compat_43 compat_netbsd32_osigstack */
-	"compat_43_compat_netbsd32_orecvmsg",	/* 113 = compat_43 compat_netbsd32_orecvmsg */
-	"compat_43_compat_netbsd32_osendmsg",	/* 114 = compat_43 compat_netbsd32_osendmsg */
+	"compat_43_netbsd32_osigstack",	/* 112 = compat_43 netbsd32_osigstack */
+	"compat_43_netbsd32_orecvmsg",	/* 113 = compat_43 netbsd32_orecvmsg */
+	"compat_43_netbsd32_osendmsg",	/* 114 = compat_43 netbsd32_osendmsg */
 	"#115 (obsolete vtrace)",		/* 115 = obsolete vtrace */
-	"compat_netbsd32_gettimeofday",			/* 116 = compat_netbsd32_gettimeofday */
-	"compat_netbsd32_getrusage",			/* 117 = compat_netbsd32_getrusage */
-	"compat_netbsd32_getsockopt",			/* 118 = compat_netbsd32_getsockopt */
+	"netbsd32_gettimeofday",			/* 116 = netbsd32_gettimeofday */
+	"netbsd32_getrusage",			/* 117 = netbsd32_getrusage */
+	"netbsd32_getsockopt",			/* 118 = netbsd32_getsockopt */
 	"#119 (obsolete resuba)",		/* 119 = obsolete resuba */
-	"compat_netbsd32_readv",			/* 120 = compat_netbsd32_readv */
-	"compat_netbsd32_writev",			/* 121 = compat_netbsd32_writev */
-	"compat_netbsd32_settimeofday",			/* 122 = compat_netbsd32_settimeofday */
-	"compat_netbsd32_fchown",			/* 123 = compat_netbsd32_fchown */
-	"compat_netbsd32_fchmod",			/* 124 = compat_netbsd32_fchmod */
-	"compat_43_compat_netbsd32_orecvfrom",	/* 125 = compat_43 compat_netbsd32_orecvfrom */
-	"compat_netbsd32_setreuid",			/* 126 = compat_netbsd32_setreuid */
-	"compat_netbsd32_setregid",			/* 127 = compat_netbsd32_setregid */
-	"compat_netbsd32_rename",			/* 128 = compat_netbsd32_rename */
-	"compat_43_compat_netbsd32_otruncate",	/* 129 = compat_43 compat_netbsd32_otruncate */
-	"compat_43_compat_netbsd32_oftruncate",	/* 130 = compat_43 compat_netbsd32_oftruncate */
-	"compat_netbsd32_flock",			/* 131 = compat_netbsd32_flock */
-	"compat_netbsd32_mkfifo",			/* 132 = compat_netbsd32_mkfifo */
-	"compat_netbsd32_sendto",			/* 133 = compat_netbsd32_sendto */
-	"compat_netbsd32_shutdown",			/* 134 = compat_netbsd32_shutdown */
-	"compat_netbsd32_socketpair",			/* 135 = compat_netbsd32_socketpair */
-	"compat_netbsd32_mkdir",			/* 136 = compat_netbsd32_mkdir */
-	"compat_netbsd32_rmdir",			/* 137 = compat_netbsd32_rmdir */
-	"compat_netbsd32_utimes",			/* 138 = compat_netbsd32_utimes */
+	"netbsd32_readv",			/* 120 = netbsd32_readv */
+	"netbsd32_writev",			/* 121 = netbsd32_writev */
+	"netbsd32_settimeofday",			/* 122 = netbsd32_settimeofday */
+	"netbsd32_fchown",			/* 123 = netbsd32_fchown */
+	"netbsd32_fchmod",			/* 124 = netbsd32_fchmod */
+	"compat_43_netbsd32_orecvfrom",	/* 125 = compat_43 netbsd32_orecvfrom */
+	"netbsd32_setreuid",			/* 126 = netbsd32_setreuid */
+	"netbsd32_setregid",			/* 127 = netbsd32_setregid */
+	"netbsd32_rename",			/* 128 = netbsd32_rename */
+	"compat_43_netbsd32_otruncate",	/* 129 = compat_43 netbsd32_otruncate */
+	"compat_43_netbsd32_oftruncate",	/* 130 = compat_43 netbsd32_oftruncate */
+	"netbsd32_flock",			/* 131 = netbsd32_flock */
+	"netbsd32_mkfifo",			/* 132 = netbsd32_mkfifo */
+	"netbsd32_sendto",			/* 133 = netbsd32_sendto */
+	"netbsd32_shutdown",			/* 134 = netbsd32_shutdown */
+	"netbsd32_socketpair",			/* 135 = netbsd32_socketpair */
+	"netbsd32_mkdir",			/* 136 = netbsd32_mkdir */
+	"netbsd32_rmdir",			/* 137 = netbsd32_rmdir */
+	"netbsd32_utimes",			/* 138 = netbsd32_utimes */
 	"#139 (obsolete 4.2 sigreturn)",		/* 139 = obsolete 4.2 sigreturn */
-	"compat_netbsd32_adjtime",			/* 140 = compat_netbsd32_adjtime */
-	"compat_43_compat_netbsd32_ogetpeername",	/* 141 = compat_43 compat_netbsd32_ogetpeername */
+	"netbsd32_adjtime",			/* 140 = netbsd32_adjtime */
+	"compat_43_netbsd32_ogetpeername",	/* 141 = compat_43 netbsd32_ogetpeername */
 	"compat_43_ogethostid",	/* 142 = compat_43 ogethostid */
 #ifdef COMPAT_43
-	"compat_43_compat_netbsd32_sethostid",	/* 143 = compat_43 compat_netbsd32_sethostid */
+	"compat_43_netbsd32_sethostid",	/* 143 = compat_43 netbsd32_sethostid */
 #else
 	"#143 (obsolete sethostid)",		/* 143 = obsolete sethostid */
 #endif
-	"compat_43_compat_netbsd32_ogetrlimit",	/* 144 = compat_43 compat_netbsd32_ogetrlimit */
-	"compat_43_compat_netbsd32_osetrlimit",	/* 145 = compat_43 compat_netbsd32_osetrlimit */
+	"compat_43_netbsd32_ogetrlimit",	/* 144 = compat_43 netbsd32_ogetrlimit */
+	"compat_43_netbsd32_osetrlimit",	/* 145 = compat_43 netbsd32_osetrlimit */
 #ifdef COMPAT_43
-	"compat_43_compat_netbsd32_killpg",	/* 146 = compat_43 compat_netbsd32_killpg */
+	"compat_43_netbsd32_killpg",	/* 146 = compat_43 netbsd32_killpg */
 #else
 	"#146 (obsolete killpg)",		/* 146 = obsolete killpg */
 #endif
 	"setsid",			/* 147 = setsid */
-	"compat_netbsd32_quotactl",			/* 148 = compat_netbsd32_quotactl */
+	"netbsd32_quotactl",			/* 148 = netbsd32_quotactl */
 	"compat_43_oquota",	/* 149 = compat_43 oquota */
-	"compat_43_compat_netbsd32_ogetsockname",	/* 150 = compat_43 compat_netbsd32_ogetsockname */
+	"compat_43_netbsd32_ogetsockname",	/* 150 = compat_43 netbsd32_ogetsockname */
 	"#151 (unimplemented)",		/* 151 = unimplemented */
 	"#152 (unimplemented)",		/* 152 = unimplemented */
 	"#153 (unimplemented)",		/* 153 = unimplemented */
 	"#154 (unimplemented)",		/* 154 = unimplemented */
 #if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
-	"compat_netbsd32_nfssvc",			/* 155 = compat_netbsd32_nfssvc */
+	"netbsd32_nfssvc",			/* 155 = netbsd32_nfssvc */
 #else
-	"#155 (excluded compat_netbsd32_nfssvc)",		/* 155 = excluded compat_netbsd32_nfssvc */
+	"#155 (excluded netbsd32_nfssvc)",		/* 155 = excluded netbsd32_nfssvc */
 #endif
-	"compat_43_compat_netbsd32_ogetdirentries",	/* 156 = compat_43 compat_netbsd32_ogetdirentries */
-	"compat_netbsd32_statfs",			/* 157 = compat_netbsd32_statfs */
-	"compat_netbsd32_fstatfs",			/* 158 = compat_netbsd32_fstatfs */
+	"compat_43_netbsd32_ogetdirentries",	/* 156 = compat_43 netbsd32_ogetdirentries */
+	"netbsd32_statfs",			/* 157 = netbsd32_statfs */
+	"netbsd32_fstatfs",			/* 158 = netbsd32_fstatfs */
 	"#159 (unimplemented)",		/* 159 = unimplemented */
 	"#160 (unimplemented)",		/* 160 = unimplemented */
 #if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
-	"compat_netbsd32_getfh",			/* 161 = compat_netbsd32_getfh */
+	"netbsd32_getfh",			/* 161 = netbsd32_getfh */
 #else
-	"#161 (excluded compat_netbsd32_getfh)",		/* 161 = excluded compat_netbsd32_getfh */
+	"#161 (excluded netbsd32_getfh)",		/* 161 = excluded netbsd32_getfh */
 #endif
-	"compat_09_compat_netbsd32_ogetdomainname",	/* 162 = compat_09 compat_netbsd32_ogetdomainname */
-	"compat_09_compat_netbsd32_osetdomainname",	/* 163 = compat_09 compat_netbsd32_osetdomainname */
-	"compat_09_compat_netbsd32_uname",	/* 164 = compat_09 compat_netbsd32_uname */
-	"compat_netbsd32_sysarch",			/* 165 = compat_netbsd32_sysarch */
+	"compat_09_netbsd32_ogetdomainname",	/* 162 = compat_09 netbsd32_ogetdomainname */
+	"compat_09_netbsd32_osetdomainname",	/* 163 = compat_09 netbsd32_osetdomainname */
+	"compat_09_netbsd32_uname",	/* 164 = compat_09 netbsd32_uname */
+	"netbsd32_sysarch",			/* 165 = netbsd32_sysarch */
 	"#166 (unimplemented)",		/* 166 = unimplemented */
 	"#167 (unimplemented)",		/* 167 = unimplemented */
 	"#168 (unimplemented)",		/* 168 = unimplemented */
-#if (defined(SYSVSEM) || !defined(_KERNEL) && !defined(alpha) && defined(COMPAT_10)
+#if (defined(SYSVSEM) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
 	"osemsys",			/* 169 = osemsys */
 #else
 	"#169 (excluded 1.0 semsys)",		/* 169 = excluded 1.0 semsys */
@@ -240,55 +240,55 @@ char *netbsd32_syscallnames[] = {
 	"#171 (excluded 1.0 shmsys)",		/* 171 = excluded 1.0 shmsys */
 #endif
 	"#172 (unimplemented)",		/* 172 = unimplemented */
-	"compat_netbsd32_pread",			/* 173 = compat_netbsd32_pread */
-	"compat_netbsd32_pwrite",			/* 174 = compat_netbsd32_pwrite */
+	"netbsd32_pread",			/* 173 = netbsd32_pread */
+	"netbsd32_pwrite",			/* 174 = netbsd32_pwrite */
 #if defined(NTP) && !defined(_KERNEL)
-	"compat_netbsd32_ntp_gettime",			/* 175 = compat_netbsd32_ntp_gettime */
-	"compat_netbsd32_ntp_adjtime",			/* 176 = compat_netbsd32_ntp_adjtime */
+	"netbsd32_ntp_gettime",			/* 175 = netbsd32_ntp_gettime */
+	"netbsd32_ntp_adjtime",			/* 176 = netbsd32_ntp_adjtime */
 #else
-	"#175 (excluded compat_netbsd32_ntp_gettime)",		/* 175 = excluded compat_netbsd32_ntp_gettime */
-	"#176 (excluded compat_netbsd32_ntp_adjtime)",		/* 176 = excluded compat_netbsd32_ntp_adjtime */
+	"#175 (excluded netbsd32_ntp_gettime)",		/* 175 = excluded netbsd32_ntp_gettime */
+	"#176 (excluded netbsd32_ntp_adjtime)",		/* 176 = excluded netbsd32_ntp_adjtime */
 #endif
 	"#177 (unimplemented)",		/* 177 = unimplemented */
 	"#178 (unimplemented)",		/* 178 = unimplemented */
 	"#179 (unimplemented)",		/* 179 = unimplemented */
 	"#180 (unimplemented)",		/* 180 = unimplemented */
-	"compat_netbsd32_setgid",			/* 181 = compat_netbsd32_setgid */
-	"compat_netbsd32_setegid",			/* 182 = compat_netbsd32_setegid */
-	"compat_netbsd32_seteuid",			/* 183 = compat_netbsd32_seteuid */
+	"netbsd32_setgid",			/* 181 = netbsd32_setgid */
+	"netbsd32_setegid",			/* 182 = netbsd32_setegid */
+	"netbsd32_seteuid",			/* 183 = netbsd32_seteuid */
 #if defined(LFS) || !defined(_KERNEL)
 	"lfs_bmapv",			/* 184 = lfs_bmapv */
 	"lfs_markv",			/* 185 = lfs_markv */
 	"lfs_segclean",			/* 186 = lfs_segclean */
 	"lfs_segwait",			/* 187 = lfs_segwait */
 #else
-	"#184 (excluded compat_netbsd32_sys_lfs_bmapv)",		/* 184 = excluded compat_netbsd32_sys_lfs_bmapv */
-	"#185 (excluded compat_netbsd32_sys_lfs_markv)",		/* 185 = excluded compat_netbsd32_sys_lfs_markv */
-	"#186 (excluded compat_netbsd32_sys_lfs_segclean)",		/* 186 = excluded compat_netbsd32_sys_lfs_segclean */
-	"#187 (excluded compat_netbsd32_sys_lfs_segwait)",		/* 187 = excluded compat_netbsd32_sys_lfs_segwait */
+	"#184 (excluded netbsd32_sys_lfs_bmapv)",		/* 184 = excluded netbsd32_sys_lfs_bmapv */
+	"#185 (excluded netbsd32_sys_lfs_markv)",		/* 185 = excluded netbsd32_sys_lfs_markv */
+	"#186 (excluded netbsd32_sys_lfs_segclean)",		/* 186 = excluded netbsd32_sys_lfs_segclean */
+	"#187 (excluded netbsd32_sys_lfs_segwait)",		/* 187 = excluded netbsd32_sys_lfs_segwait */
 #endif
-	"compat_12_compat_netbsd32_stat12",	/* 188 = compat_12 compat_netbsd32_stat12 */
-	"compat_12_compat_netbsd32_fstat12",	/* 189 = compat_12 compat_netbsd32_fstat12 */
-	"compat_12_compat_netbsd32_lstat12",	/* 190 = compat_12 compat_netbsd32_lstat12 */
-	"compat_netbsd32_pathconf",			/* 191 = compat_netbsd32_pathconf */
-	"compat_netbsd32_fpathconf",			/* 192 = compat_netbsd32_fpathconf */
+	"compat_12_netbsd32_stat12",	/* 188 = compat_12 netbsd32_stat12 */
+	"compat_12_netbsd32_fstat12",	/* 189 = compat_12 netbsd32_fstat12 */
+	"compat_12_netbsd32_lstat12",	/* 190 = compat_12 netbsd32_lstat12 */
+	"netbsd32_pathconf",			/* 191 = netbsd32_pathconf */
+	"netbsd32_fpathconf",			/* 192 = netbsd32_fpathconf */
 	"#193 (unimplemented)",		/* 193 = unimplemented */
-	"compat_netbsd32_getrlimit",			/* 194 = compat_netbsd32_getrlimit */
-	"compat_netbsd32_setrlimit",			/* 195 = compat_netbsd32_setrlimit */
-	"compat_12_compat_netbsd32_getdirentries",	/* 196 = compat_12 compat_netbsd32_getdirentries */
-	"compat_netbsd32_mmap",			/* 197 = compat_netbsd32_mmap */
+	"netbsd32_getrlimit",			/* 194 = netbsd32_getrlimit */
+	"netbsd32_setrlimit",			/* 195 = netbsd32_setrlimit */
+	"compat_12_netbsd32_getdirentries",	/* 196 = compat_12 netbsd32_getdirentries */
+	"netbsd32_mmap",			/* 197 = netbsd32_mmap */
 	"__syscall",			/* 198 = __syscall */
-	"compat_netbsd32_lseek",			/* 199 = compat_netbsd32_lseek */
-	"compat_netbsd32_truncate",			/* 200 = compat_netbsd32_truncate */
-	"compat_netbsd32_ftruncate",			/* 201 = compat_netbsd32_ftruncate */
-	"compat_netbsd32___sysctl",			/* 202 = compat_netbsd32___sysctl */
-	"compat_netbsd32_mlock",			/* 203 = compat_netbsd32_mlock */
-	"compat_netbsd32_munlock",			/* 204 = compat_netbsd32_munlock */
-	"compat_netbsd32_undelete",			/* 205 = compat_netbsd32_undelete */
-	"compat_netbsd32_futimes",			/* 206 = compat_netbsd32_futimes */
-	"compat_netbsd32_getpgid",			/* 207 = compat_netbsd32_getpgid */
-	"compat_netbsd32_reboot",			/* 208 = compat_netbsd32_reboot */
-	"compat_netbsd32_poll",			/* 209 = compat_netbsd32_poll */
+	"netbsd32_lseek",			/* 199 = netbsd32_lseek */
+	"netbsd32_truncate",			/* 200 = netbsd32_truncate */
+	"netbsd32_ftruncate",			/* 201 = netbsd32_ftruncate */
+	"netbsd32___sysctl",			/* 202 = netbsd32___sysctl */
+	"netbsd32_mlock",			/* 203 = netbsd32_mlock */
+	"netbsd32_munlock",			/* 204 = netbsd32_munlock */
+	"netbsd32_undelete",			/* 205 = netbsd32_undelete */
+	"netbsd32_futimes",			/* 206 = netbsd32_futimes */
+	"netbsd32_getpgid",			/* 207 = netbsd32_getpgid */
+	"netbsd32_reboot",			/* 208 = netbsd32_reboot */
+	"netbsd32_poll",			/* 209 = netbsd32_poll */
 #if defined(LKM) || !defined(_KERNEL)
 	"lkmnosys",			/* 210 = lkmnosys */
 	"lkmnosys",			/* 211 = lkmnosys */
@@ -313,48 +313,48 @@ char *netbsd32_syscallnames[] = {
 	"#219 (excluded lkmnosys)",		/* 219 = excluded lkmnosys */
 #endif	/* !LKM || !_KERNEL */
 #if defined(SYSVSEM) || !defined(_KERNEL)
-	"compat_netbsd32___semctl",			/* 220 = compat_netbsd32___semctl */
-	"compat_netbsd32_semget",			/* 221 = compat_netbsd32_semget */
-	"compat_netbsd32_semop",			/* 222 = compat_netbsd32_semop */
-	"compat_netbsd32_semconfig",			/* 223 = compat_netbsd32_semconfig */
+	"compat_14_netbsd32___semctl",	/* 220 = compat_14 netbsd32___semctl */
+	"netbsd32_semget",			/* 221 = netbsd32_semget */
+	"netbsd32_semop",			/* 222 = netbsd32_semop */
+	"netbsd32_semconfig",			/* 223 = netbsd32_semconfig */
 #else
-	"#220 (excluded compat_netbsd32_semctl)",		/* 220 = excluded compat_netbsd32_semctl */
-	"#221 (excluded compat_netbsd32_semget)",		/* 221 = excluded compat_netbsd32_semget */
-	"#222 (excluded compat_netbsd32_semop)",		/* 222 = excluded compat_netbsd32_semop */
-	"#223 (excluded compat_netbsd32_semconfig)",		/* 223 = excluded compat_netbsd32_semconfig */
+	"#220 (excluded netbsd32_semctl)",		/* 220 = excluded netbsd32_semctl */
+	"#221 (excluded netbsd32_semget)",		/* 221 = excluded netbsd32_semget */
+	"#222 (excluded netbsd32_semop)",		/* 222 = excluded netbsd32_semop */
+	"#223 (excluded netbsd32_semconfig)",		/* 223 = excluded netbsd32_semconfig */
 #endif
 #if defined(SYSVMSG) || !defined(_KERNEL)
-	"compat_netbsd32_msgctl",			/* 224 = compat_netbsd32_msgctl */
-	"compat_netbsd32_msgget",			/* 225 = compat_netbsd32_msgget */
-	"compat_netbsd32_msgsnd",			/* 226 = compat_netbsd32_msgsnd */
-	"compat_netbsd32_msgrcv",			/* 227 = compat_netbsd32_msgrcv */
+	"compat_14_netbsd32_msgctl",	/* 224 = compat_14 netbsd32_msgctl */
+	"netbsd32_msgget",			/* 225 = netbsd32_msgget */
+	"netbsd32_msgsnd",			/* 226 = netbsd32_msgsnd */
+	"netbsd32_msgrcv",			/* 227 = netbsd32_msgrcv */
 #else
-	"#224 (excluded compat_netbsd32_msgctl)",		/* 224 = excluded compat_netbsd32_msgctl */
-	"#225 (excluded compat_netbsd32_msgget)",		/* 225 = excluded compat_netbsd32_msgget */
-	"#226 (excluded compat_netbsd32_msgsnd)",		/* 226 = excluded compat_netbsd32_msgsnd */
-	"#227 (excluded compat_netbsd32_msgrcv)",		/* 227 = excluded compat_netbsd32_msgrcv */
+	"#224 (excluded netbsd32_msgctl)",		/* 224 = excluded netbsd32_msgctl */
+	"#225 (excluded netbsd32_msgget)",		/* 225 = excluded netbsd32_msgget */
+	"#226 (excluded netbsd32_msgsnd)",		/* 226 = excluded netbsd32_msgsnd */
+	"#227 (excluded netbsd32_msgrcv)",		/* 227 = excluded netbsd32_msgrcv */
 #endif
 #if defined(SYSVSHM) || !defined(_KERNEL)
-	"compat_netbsd32_shmat",			/* 228 = compat_netbsd32_shmat */
-	"compat_netbsd32_shmctl",			/* 229 = compat_netbsd32_shmctl */
-	"compat_netbsd32_shmdt",			/* 230 = compat_netbsd32_shmdt */
-	"compat_netbsd32_shmget",			/* 231 = compat_netbsd32_shmget */
+	"netbsd32_shmat",			/* 228 = netbsd32_shmat */
+	"compat_14_netbsd32_shmctl",	/* 229 = compat_14 netbsd32_shmctl */
+	"netbsd32_shmdt",			/* 230 = netbsd32_shmdt */
+	"netbsd32_shmget",			/* 231 = netbsd32_shmget */
 #else
-	"#228 (excluded compat_netbsd32_shmat)",		/* 228 = excluded compat_netbsd32_shmat */
-	"#229 (excluded compat_netbsd32_shmctl)",		/* 229 = excluded compat_netbsd32_shmctl */
-	"#230 (excluded compat_netbsd32_shmdt)",		/* 230 = excluded compat_netbsd32_shmdt */
-	"#231 (excluded compat_netbsd32_shmget)",		/* 231 = excluded compat_netbsd32_shmget */
+	"#228 (excluded netbsd32_shmat)",		/* 228 = excluded netbsd32_shmat */
+	"#229 (excluded netbsd32_shmctl)",		/* 229 = excluded netbsd32_shmctl */
+	"#230 (excluded netbsd32_shmdt)",		/* 230 = excluded netbsd32_shmdt */
+	"#231 (excluded netbsd32_shmget)",		/* 231 = excluded netbsd32_shmget */
 #endif
-	"compat_netbsd32_clock_gettime",			/* 232 = compat_netbsd32_clock_gettime */
-	"compat_netbsd32_clock_settime",			/* 233 = compat_netbsd32_clock_settime */
-	"compat_netbsd32_clock_getres",			/* 234 = compat_netbsd32_clock_getres */
+	"netbsd32_clock_gettime",			/* 232 = netbsd32_clock_gettime */
+	"netbsd32_clock_settime",			/* 233 = netbsd32_clock_settime */
+	"netbsd32_clock_getres",			/* 234 = netbsd32_clock_getres */
 	"#235 (unimplemented timer_create)",		/* 235 = unimplemented timer_create */
 	"#236 (unimplemented timer_delete)",		/* 236 = unimplemented timer_delete */
 	"#237 (unimplemented timer_settime)",		/* 237 = unimplemented timer_settime */
 	"#238 (unimplemented timer_gettime)",		/* 238 = unimplemented timer_gettime */
 	"#239 (unimplemented timer_getoverrun)",		/* 239 = unimplemented timer_getoverrun */
-	"compat_netbsd32_nanosleep",			/* 240 = compat_netbsd32_nanosleep */
-	"compat_netbsd32_fdatasync",			/* 241 = compat_netbsd32_fdatasync */
+	"netbsd32_nanosleep",			/* 240 = netbsd32_nanosleep */
+	"netbsd32_fdatasync",			/* 241 = netbsd32_fdatasync */
 	"#242 (unimplemented)",		/* 242 = unimplemented */
 	"#243 (unimplemented)",		/* 243 = unimplemented */
 	"#244 (unimplemented)",		/* 244 = unimplemented */
@@ -383,29 +383,29 @@ char *netbsd32_syscallnames[] = {
 	"#267 (unimplemented)",		/* 267 = unimplemented */
 	"#268 (unimplemented)",		/* 268 = unimplemented */
 	"#269 (unimplemented)",		/* 269 = unimplemented */
-	"compat_netbsd32___posix_rename",			/* 270 = compat_netbsd32___posix_rename */
-	"compat_netbsd32_swapctl",			/* 271 = compat_netbsd32_swapctl */
-	"compat_netbsd32_getdents",			/* 272 = compat_netbsd32_getdents */
-	"compat_netbsd32_minherit",			/* 273 = compat_netbsd32_minherit */
-	"compat_netbsd32_lchmod",			/* 274 = compat_netbsd32_lchmod */
-	"compat_netbsd32_lchown",			/* 275 = compat_netbsd32_lchown */
-	"compat_netbsd32_lutimes",			/* 276 = compat_netbsd32_lutimes */
-	"compat_netbsd32___msync13",			/* 277 = compat_netbsd32___msync13 */
-	"compat_netbsd32___stat13",			/* 278 = compat_netbsd32___stat13 */
-	"compat_netbsd32___fstat13",			/* 279 = compat_netbsd32___fstat13 */
-	"compat_netbsd32___lstat13",			/* 280 = compat_netbsd32___lstat13 */
-	"compat_netbsd32___sigaltstack14",			/* 281 = compat_netbsd32___sigaltstack14 */
+	"netbsd32___posix_rename",			/* 270 = netbsd32___posix_rename */
+	"netbsd32_swapctl",			/* 271 = netbsd32_swapctl */
+	"netbsd32_getdents",			/* 272 = netbsd32_getdents */
+	"netbsd32_minherit",			/* 273 = netbsd32_minherit */
+	"netbsd32_lchmod",			/* 274 = netbsd32_lchmod */
+	"netbsd32_lchown",			/* 275 = netbsd32_lchown */
+	"netbsd32_lutimes",			/* 276 = netbsd32_lutimes */
+	"netbsd32___msync13",			/* 277 = netbsd32___msync13 */
+	"netbsd32___stat13",			/* 278 = netbsd32___stat13 */
+	"netbsd32___fstat13",			/* 279 = netbsd32___fstat13 */
+	"netbsd32___lstat13",			/* 280 = netbsd32___lstat13 */
+	"netbsd32___sigaltstack14",			/* 281 = netbsd32___sigaltstack14 */
 	"__vfork14",			/* 282 = __vfork14 */
-	"compat_netbsd32___posix_chown",			/* 283 = compat_netbsd32___posix_chown */
-	"compat_netbsd32___posix_fchown",			/* 284 = compat_netbsd32___posix_fchown */
-	"compat_netbsd32___posix_lchown",			/* 285 = compat_netbsd32___posix_lchown */
-	"compat_netbsd32_getsid",			/* 286 = compat_netbsd32_getsid */
+	"netbsd32___posix_chown",			/* 283 = netbsd32___posix_chown */
+	"netbsd32___posix_fchown",			/* 284 = netbsd32___posix_fchown */
+	"netbsd32___posix_lchown",			/* 285 = netbsd32___posix_lchown */
+	"netbsd32_getsid",			/* 286 = netbsd32_getsid */
 	"#287 (unimplemented)",		/* 287 = unimplemented */
 #if defined(KTRACE) || !defined(_KERNEL)
-	"compat_netbsd32_fktrace",			/* 288 = compat_netbsd32_fktrace */
+	"netbsd32_fktrace",			/* 288 = netbsd32_fktrace */
 #else
-	"#288 (excluded compat_netbsd32_fktrace)",		/* 288 = excluded compat_netbsd32_fktrace */
+	"#288 (excluded netbsd32_fktrace)",		/* 288 = excluded netbsd32_fktrace */
 #endif
-	"compat_netbsd32_preadv",			/* 289 = compat_netbsd32_preadv */
-	"compat_netbsd32_pwritev",			/* 290 = compat_netbsd32_pwritev */
+	"netbsd32_preadv",			/* 289 = netbsd32_preadv */
+	"netbsd32_pwritev",			/* 290 = netbsd32_pwritev */
 };
diff --git a/sys/compat/netbsd32/netbsd32_sysent.c b/sys/compat/netbsd32/netbsd32_sysent.c
index 7b889e6744bc..533a3c0e66ec 100644
--- a/sys/compat/netbsd32/netbsd32_sysent.c
+++ b/sys/compat/netbsd32/netbsd32_sysent.c
@@ -1,10 +1,10 @@
-/*	$NetBSD: netbsd32_sysent.c,v 1.10 1999/06/09 04:50:32 christos Exp $	*/
+/*	$NetBSD: netbsd32_sysent.c,v 1.11 1999/10/11 01:36:24 eeh Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.8 1999/06/09 04:50:11 christos Exp 
+ * created from	NetBSD: syscalls.master,v 1.9 1999/07/12 21:55:20 kleink Exp 
  */
 
 #include "opt_ktrace.h"
@@ -59,338 +59,344 @@
 #define compat_13(func) sys_nosys
 #endif
 
+#ifdef COMPAT_14
+#define compat_14(func) __CONCAT(compat_14_,func)
+#else
+#define compat_14(func) sys_nosys
+#endif
+
 #define	s(type)	sizeof(type)
 
 struct sysent netbsd32_sysent[] = {
 	{ 0, 0,
 	    sys_nosys },			/* 0 = syscall (indir) */
-	{ 1, s(struct compat_netbsd32_exit_args),
-	    compat_netbsd32_exit },		/* 1 = compat_netbsd32_exit */
+	{ 1, s(struct netbsd32_exit_args),
+	    netbsd32_exit },			/* 1 = netbsd32_exit */
 	{ 0, 0,
 	    sys_fork },				/* 2 = fork */
-	{ 3, s(struct compat_netbsd32_read_args),
-	    compat_netbsd32_read },		/* 3 = compat_netbsd32_read */
-	{ 3, s(struct compat_netbsd32_write_args),
-	    compat_netbsd32_write },		/* 4 = compat_netbsd32_write */
-	{ 3, s(struct compat_netbsd32_open_args),
-	    compat_netbsd32_open },		/* 5 = compat_netbsd32_open */
-	{ 1, s(struct compat_netbsd32_close_args),
-	    compat_netbsd32_close },		/* 6 = compat_netbsd32_close */
-	{ 4, s(struct compat_netbsd32_wait4_args),
-	    compat_netbsd32_wait4 },		/* 7 = compat_netbsd32_wait4 */
-	{ 2, s(struct compat_43_compat_netbsd32_ocreat_args),
-	    compat_43(compat_netbsd32_ocreat) },/* 8 = compat_43 compat_netbsd32_ocreat */
-	{ 2, s(struct compat_netbsd32_link_args),
-	    compat_netbsd32_link },		/* 9 = compat_netbsd32_link */
-	{ 1, s(struct compat_netbsd32_unlink_args),
-	    compat_netbsd32_unlink },		/* 10 = compat_netbsd32_unlink */
+	{ 3, s(struct netbsd32_read_args),
+	    netbsd32_read },			/* 3 = netbsd32_read */
+	{ 3, s(struct netbsd32_write_args),
+	    netbsd32_write },			/* 4 = netbsd32_write */
+	{ 3, s(struct netbsd32_open_args),
+	    netbsd32_open },			/* 5 = netbsd32_open */
+	{ 1, s(struct netbsd32_close_args),
+	    netbsd32_close },			/* 6 = netbsd32_close */
+	{ 4, s(struct netbsd32_wait4_args),
+	    netbsd32_wait4 },			/* 7 = netbsd32_wait4 */
+	{ 2, s(struct compat_43_netbsd32_ocreat_args),
+	    compat_43(netbsd32_ocreat) },	/* 8 = compat_43 netbsd32_ocreat */
+	{ 2, s(struct netbsd32_link_args),
+	    netbsd32_link },			/* 9 = netbsd32_link */
+	{ 1, s(struct netbsd32_unlink_args),
+	    netbsd32_unlink },			/* 10 = netbsd32_unlink */
 	{ 0, 0,
 	    sys_nosys },			/* 11 = obsolete execv */
-	{ 1, s(struct compat_netbsd32_chdir_args),
-	    compat_netbsd32_chdir },		/* 12 = compat_netbsd32_chdir */
-	{ 1, s(struct compat_netbsd32_fchdir_args),
-	    compat_netbsd32_fchdir },		/* 13 = compat_netbsd32_fchdir */
-	{ 3, s(struct compat_netbsd32_mknod_args),
-	    compat_netbsd32_mknod },		/* 14 = compat_netbsd32_mknod */
-	{ 2, s(struct compat_netbsd32_chmod_args),
-	    compat_netbsd32_chmod },		/* 15 = compat_netbsd32_chmod */
-	{ 3, s(struct compat_netbsd32_chown_args),
-	    compat_netbsd32_chown },		/* 16 = compat_netbsd32_chown */
-	{ 1, s(struct compat_netbsd32_break_args),
-	    compat_netbsd32_break },		/* 17 = compat_netbsd32_break */
-	{ 3, s(struct compat_netbsd32_getfsstat_args),
-	    compat_netbsd32_getfsstat },	/* 18 = compat_netbsd32_getfsstat */
-	{ 3, s(struct compat_43_compat_netbsd32_olseek_args),
-	    compat_43(compat_netbsd32_olseek) },/* 19 = compat_43 compat_netbsd32_olseek */
+	{ 1, s(struct netbsd32_chdir_args),
+	    netbsd32_chdir },			/* 12 = netbsd32_chdir */
+	{ 1, s(struct netbsd32_fchdir_args),
+	    netbsd32_fchdir },			/* 13 = netbsd32_fchdir */
+	{ 3, s(struct netbsd32_mknod_args),
+	    netbsd32_mknod },			/* 14 = netbsd32_mknod */
+	{ 2, s(struct netbsd32_chmod_args),
+	    netbsd32_chmod },			/* 15 = netbsd32_chmod */
+	{ 3, s(struct netbsd32_chown_args),
+	    netbsd32_chown },			/* 16 = netbsd32_chown */
+	{ 1, s(struct netbsd32_break_args),
+	    netbsd32_break },			/* 17 = netbsd32_break */
+	{ 3, s(struct netbsd32_getfsstat_args),
+	    netbsd32_getfsstat },		/* 18 = netbsd32_getfsstat */
+	{ 3, s(struct compat_43_netbsd32_olseek_args),
+	    compat_43(netbsd32_olseek) },	/* 19 = compat_43 netbsd32_olseek */
 	{ 0, 0,
 	    sys_getpid },			/* 20 = getpid */
-	{ 4, s(struct compat_netbsd32_mount_args),
-	    compat_netbsd32_mount },		/* 21 = compat_netbsd32_mount */
-	{ 2, s(struct compat_netbsd32_unmount_args),
-	    compat_netbsd32_unmount },		/* 22 = compat_netbsd32_unmount */
-	{ 1, s(struct compat_netbsd32_setuid_args),
-	    compat_netbsd32_setuid },		/* 23 = compat_netbsd32_setuid */
+	{ 4, s(struct netbsd32_mount_args),
+	    netbsd32_mount },			/* 21 = netbsd32_mount */
+	{ 2, s(struct netbsd32_unmount_args),
+	    netbsd32_unmount },			/* 22 = netbsd32_unmount */
+	{ 1, s(struct netbsd32_setuid_args),
+	    netbsd32_setuid },			/* 23 = netbsd32_setuid */
 	{ 0, 0,
 	    sys_getuid },			/* 24 = getuid */
 	{ 0, 0,
 	    sys_geteuid },			/* 25 = geteuid */
-	{ 4, s(struct compat_netbsd32_ptrace_args),
-	    compat_netbsd32_ptrace },		/* 26 = compat_netbsd32_ptrace */
-	{ 3, s(struct compat_netbsd32_recvmsg_args),
-	    compat_netbsd32_recvmsg },		/* 27 = compat_netbsd32_recvmsg */
-	{ 3, s(struct compat_netbsd32_sendmsg_args),
-	    compat_netbsd32_sendmsg },		/* 28 = compat_netbsd32_sendmsg */
-	{ 6, s(struct compat_netbsd32_recvfrom_args),
-	    compat_netbsd32_recvfrom },		/* 29 = compat_netbsd32_recvfrom */
-	{ 3, s(struct compat_netbsd32_accept_args),
-	    compat_netbsd32_accept },		/* 30 = compat_netbsd32_accept */
-	{ 3, s(struct compat_netbsd32_getpeername_args),
-	    compat_netbsd32_getpeername },	/* 31 = compat_netbsd32_getpeername */
-	{ 3, s(struct compat_netbsd32_getsockname_args),
-	    compat_netbsd32_getsockname },	/* 32 = compat_netbsd32_getsockname */
-	{ 2, s(struct compat_netbsd32_access_args),
-	    compat_netbsd32_access },		/* 33 = compat_netbsd32_access */
-	{ 2, s(struct compat_netbsd32_chflags_args),
-	    compat_netbsd32_chflags },		/* 34 = compat_netbsd32_chflags */
-	{ 2, s(struct compat_netbsd32_fchflags_args),
-	    compat_netbsd32_fchflags },		/* 35 = compat_netbsd32_fchflags */
+	{ 4, s(struct netbsd32_ptrace_args),
+	    netbsd32_ptrace },			/* 26 = netbsd32_ptrace */
+	{ 3, s(struct netbsd32_recvmsg_args),
+	    netbsd32_recvmsg },			/* 27 = netbsd32_recvmsg */
+	{ 3, s(struct netbsd32_sendmsg_args),
+	    netbsd32_sendmsg },			/* 28 = netbsd32_sendmsg */
+	{ 6, s(struct netbsd32_recvfrom_args),
+	    netbsd32_recvfrom },		/* 29 = netbsd32_recvfrom */
+	{ 3, s(struct netbsd32_accept_args),
+	    netbsd32_accept },			/* 30 = netbsd32_accept */
+	{ 3, s(struct netbsd32_getpeername_args),
+	    netbsd32_getpeername },		/* 31 = netbsd32_getpeername */
+	{ 3, s(struct netbsd32_getsockname_args),
+	    netbsd32_getsockname },		/* 32 = netbsd32_getsockname */
+	{ 2, s(struct netbsd32_access_args),
+	    netbsd32_access },			/* 33 = netbsd32_access */
+	{ 2, s(struct netbsd32_chflags_args),
+	    netbsd32_chflags },			/* 34 = netbsd32_chflags */
+	{ 2, s(struct netbsd32_fchflags_args),
+	    netbsd32_fchflags },		/* 35 = netbsd32_fchflags */
 	{ 0, 0,
 	    sys_sync },				/* 36 = sync */
-	{ 2, s(struct compat_netbsd32_kill_args),
-	    compat_netbsd32_kill },		/* 37 = compat_netbsd32_kill */
-	{ 2, s(struct compat_43_compat_netbsd32_stat43_args),
-	    compat_43(compat_netbsd32_stat43) },/* 38 = compat_43 compat_netbsd32_stat43 */
+	{ 2, s(struct netbsd32_kill_args),
+	    netbsd32_kill },			/* 37 = netbsd32_kill */
+	{ 2, s(struct compat_43_netbsd32_stat43_args),
+	    compat_43(netbsd32_stat43) },	/* 38 = compat_43 netbsd32_stat43 */
 	{ 0, 0,
 	    sys_getppid },			/* 39 = getppid */
-	{ 2, s(struct compat_43_compat_netbsd32_lstat43_args),
-	    compat_43(compat_netbsd32_lstat43) },/* 40 = compat_43 compat_netbsd32_lstat43 */
-	{ 1, s(struct compat_netbsd32_dup_args),
-	    compat_netbsd32_dup },		/* 41 = compat_netbsd32_dup */
+	{ 2, s(struct compat_43_netbsd32_lstat43_args),
+	    compat_43(netbsd32_lstat43) },	/* 40 = compat_43 netbsd32_lstat43 */
+	{ 1, s(struct netbsd32_dup_args),
+	    netbsd32_dup },			/* 41 = netbsd32_dup */
 	{ 0, 0,
 	    sys_pipe },				/* 42 = pipe */
 	{ 0, 0,
 	    sys_getegid },			/* 43 = getegid */
-	{ 4, s(struct compat_netbsd32_profil_args),
-	    compat_netbsd32_profil },		/* 44 = compat_netbsd32_profil */
+	{ 4, s(struct netbsd32_profil_args),
+	    netbsd32_profil },			/* 44 = netbsd32_profil */
 #if defined(KTRACE) || !defined(_KERNEL)
-	{ 4, s(struct compat_netbsd32_ktrace_args),
-	    compat_netbsd32_ktrace },		/* 45 = compat_netbsd32_ktrace */
+	{ 4, s(struct netbsd32_ktrace_args),
+	    netbsd32_ktrace },			/* 45 = netbsd32_ktrace */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 45 = excluded compat_netbsd32_ktrace */
+	    sys_nosys },			/* 45 = excluded netbsd32_ktrace */
 #endif
-	{ 3, s(struct compat_netbsd32_sigaction_args),
-	    compat_netbsd32_sigaction },	/* 46 = compat_netbsd32_sigaction */
+	{ 3, s(struct netbsd32_sigaction_args),
+	    netbsd32_sigaction },		/* 46 = netbsd32_sigaction */
 	{ 0, 0,
 	    sys_getgid },			/* 47 = getgid */
-	{ 2, s(struct compat_13_compat_netbsd32_sigprocmask_args),
-	    compat_13(compat_netbsd32_sigprocmask) },/* 48 = compat_13 sigprocmask13 */
-	{ 2, s(struct compat_netbsd32___getlogin_args),
-	    compat_netbsd32___getlogin },	/* 49 = compat_netbsd32___getlogin */
-	{ 1, s(struct compat_netbsd32_setlogin_args),
-	    compat_netbsd32_setlogin },		/* 50 = compat_netbsd32_setlogin */
-	{ 1, s(struct compat_netbsd32_acct_args),
-	    compat_netbsd32_acct },		/* 51 = compat_netbsd32_acct */
+	{ 2, s(struct compat_13_netbsd32_sigprocmask_args),
+	    compat_13(netbsd32_sigprocmask) },	/* 48 = compat_13 sigprocmask13 */
+	{ 2, s(struct netbsd32___getlogin_args),
+	    netbsd32___getlogin },		/* 49 = netbsd32___getlogin */
+	{ 1, s(struct netbsd32_setlogin_args),
+	    netbsd32_setlogin },		/* 50 = netbsd32_setlogin */
+	{ 1, s(struct netbsd32_acct_args),
+	    netbsd32_acct },			/* 51 = netbsd32_acct */
 	{ 0, 0,
 	    compat_13(sys_sigpending) },	/* 52 = compat_13 sigpending13 */
-	{ 2, s(struct compat_13_compat_netbsd32_sigaltstack13_args),
-	    compat_13(compat_netbsd32_sigaltstack13) },/* 53 = compat_13 compat_netbsd32_sigaltstack13 */
-	{ 3, s(struct compat_netbsd32_ioctl_args),
-	    compat_netbsd32_ioctl },		/* 54 = compat_netbsd32_ioctl */
+	{ 2, s(struct compat_13_netbsd32_sigaltstack13_args),
+	    compat_13(netbsd32_sigaltstack13) },/* 53 = compat_13 netbsd32_sigaltstack13 */
+	{ 3, s(struct netbsd32_ioctl_args),
+	    netbsd32_ioctl },			/* 54 = netbsd32_ioctl */
 #ifdef COMPAT_12
-	{ 1, s(struct compat_12_compat_netbsd32_reboot_args),
-	    compat_12(compat_netbsd32_reboot) },/* 55 = compat_12 compat_netbsd32_reboot */
+	{ 1, s(struct compat_12_netbsd32_reboot_args),
+	    compat_12(netbsd32_reboot) },	/* 55 = compat_12 netbsd32_reboot */
 #else
 	{ 0, 0,
 	    sys_nosys },			/* 55 = obsolete oreboot */
 #endif
-	{ 1, s(struct compat_netbsd32_revoke_args),
-	    compat_netbsd32_revoke },		/* 56 = compat_netbsd32_revoke */
-	{ 2, s(struct compat_netbsd32_symlink_args),
-	    compat_netbsd32_symlink },		/* 57 = compat_netbsd32_symlink */
-	{ 3, s(struct compat_netbsd32_readlink_args),
-	    compat_netbsd32_readlink },		/* 58 = compat_netbsd32_readlink */
-	{ 3, s(struct compat_netbsd32_execve_args),
-	    compat_netbsd32_execve },		/* 59 = compat_netbsd32_execve */
-	{ 1, s(struct compat_netbsd32_umask_args),
-	    compat_netbsd32_umask },		/* 60 = compat_netbsd32_umask */
-	{ 1, s(struct compat_netbsd32_chroot_args),
-	    compat_netbsd32_chroot },		/* 61 = compat_netbsd32_chroot */
-	{ 2, s(struct compat_43_compat_netbsd32_fstat43_args),
-	    compat_43(compat_netbsd32_fstat43) },/* 62 = compat_43 compat_netbsd32_fstat43 */
-	{ 4, s(struct compat_43_compat_netbsd32_ogetkerninfo_args),
-	    compat_43(compat_netbsd32_ogetkerninfo) },/* 63 = compat_43 compat_netbsd32_ogetkerninfo */
+	{ 1, s(struct netbsd32_revoke_args),
+	    netbsd32_revoke },			/* 56 = netbsd32_revoke */
+	{ 2, s(struct netbsd32_symlink_args),
+	    netbsd32_symlink },			/* 57 = netbsd32_symlink */
+	{ 3, s(struct netbsd32_readlink_args),
+	    netbsd32_readlink },		/* 58 = netbsd32_readlink */
+	{ 3, s(struct netbsd32_execve_args),
+	    netbsd32_execve },			/* 59 = netbsd32_execve */
+	{ 1, s(struct netbsd32_umask_args),
+	    netbsd32_umask },			/* 60 = netbsd32_umask */
+	{ 1, s(struct netbsd32_chroot_args),
+	    netbsd32_chroot },			/* 61 = netbsd32_chroot */
+	{ 2, s(struct compat_43_netbsd32_fstat43_args),
+	    compat_43(netbsd32_fstat43) },	/* 62 = compat_43 netbsd32_fstat43 */
+	{ 4, s(struct compat_43_netbsd32_ogetkerninfo_args),
+	    compat_43(netbsd32_ogetkerninfo) },	/* 63 = compat_43 netbsd32_ogetkerninfo */
 	{ 0, 0,
 	    compat_43(sys_getpagesize) },	/* 64 = compat_43 ogetpagesize */
-	{ 2, s(struct compat_12_compat_netbsd32_msync_args),
-	    compat_12(compat_netbsd32_msync) },	/* 65 = compat_12 compat_netbsd32_msync */
+	{ 2, s(struct compat_12_netbsd32_msync_args),
+	    compat_12(netbsd32_msync) },	/* 65 = compat_12 netbsd32_msync */
 	{ 0, 0,
 	    sys_vfork },			/* 66 = vfork */
 	{ 0, 0,
 	    sys_nosys },			/* 67 = obsolete vread */
 	{ 0, 0,
 	    sys_nosys },			/* 68 = obsolete vwrite */
-	{ 1, s(struct compat_netbsd32_sbrk_args),
-	    compat_netbsd32_sbrk },		/* 69 = compat_netbsd32_sbrk */
-	{ 1, s(struct compat_netbsd32_sstk_args),
-	    compat_netbsd32_sstk },		/* 70 = compat_netbsd32_sstk */
-	{ 6, s(struct compat_43_compat_netbsd32_ommap_args),
-	    compat_43(compat_netbsd32_ommap) },	/* 71 = compat_43 compat_netbsd32_ommap */
-	{ 1, s(struct compat_netbsd32_ovadvise_args),
-	    compat_netbsd32_ovadvise },		/* 72 = vadvise */
-	{ 2, s(struct compat_netbsd32_munmap_args),
-	    compat_netbsd32_munmap },		/* 73 = compat_netbsd32_munmap */
-	{ 3, s(struct compat_netbsd32_mprotect_args),
-	    compat_netbsd32_mprotect },		/* 74 = compat_netbsd32_mprotect */
-	{ 3, s(struct compat_netbsd32_madvise_args),
-	    compat_netbsd32_madvise },		/* 75 = compat_netbsd32_madvise */
+	{ 1, s(struct netbsd32_sbrk_args),
+	    netbsd32_sbrk },			/* 69 = netbsd32_sbrk */
+	{ 1, s(struct netbsd32_sstk_args),
+	    netbsd32_sstk },			/* 70 = netbsd32_sstk */
+	{ 6, s(struct compat_43_netbsd32_ommap_args),
+	    compat_43(netbsd32_ommap) },	/* 71 = compat_43 netbsd32_ommap */
+	{ 1, s(struct netbsd32_ovadvise_args),
+	    netbsd32_ovadvise },		/* 72 = vadvise */
+	{ 2, s(struct netbsd32_munmap_args),
+	    netbsd32_munmap },			/* 73 = netbsd32_munmap */
+	{ 3, s(struct netbsd32_mprotect_args),
+	    netbsd32_mprotect },		/* 74 = netbsd32_mprotect */
+	{ 3, s(struct netbsd32_madvise_args),
+	    netbsd32_madvise },			/* 75 = netbsd32_madvise */
 	{ 0, 0,
 	    sys_nosys },			/* 76 = obsolete vhangup */
 	{ 0, 0,
 	    sys_nosys },			/* 77 = obsolete vlimit */
-	{ 3, s(struct compat_netbsd32_mincore_args),
-	    compat_netbsd32_mincore },		/* 78 = compat_netbsd32_mincore */
-	{ 2, s(struct compat_netbsd32_getgroups_args),
-	    compat_netbsd32_getgroups },	/* 79 = compat_netbsd32_getgroups */
-	{ 2, s(struct compat_netbsd32_setgroups_args),
-	    compat_netbsd32_setgroups },	/* 80 = compat_netbsd32_setgroups */
+	{ 3, s(struct netbsd32_mincore_args),
+	    netbsd32_mincore },			/* 78 = netbsd32_mincore */
+	{ 2, s(struct netbsd32_getgroups_args),
+	    netbsd32_getgroups },		/* 79 = netbsd32_getgroups */
+	{ 2, s(struct netbsd32_setgroups_args),
+	    netbsd32_setgroups },		/* 80 = netbsd32_setgroups */
 	{ 0, 0,
 	    sys_getpgrp },			/* 81 = getpgrp */
-	{ 2, s(struct compat_netbsd32_setpgid_args),
-	    compat_netbsd32_setpgid },		/* 82 = compat_netbsd32_setpgid */
-	{ 3, s(struct compat_netbsd32_setitimer_args),
-	    compat_netbsd32_setitimer },	/* 83 = compat_netbsd32_setitimer */
+	{ 2, s(struct netbsd32_setpgid_args),
+	    netbsd32_setpgid },			/* 82 = netbsd32_setpgid */
+	{ 3, s(struct netbsd32_setitimer_args),
+	    netbsd32_setitimer },		/* 83 = netbsd32_setitimer */
 	{ 0, 0,
 	    compat_43(sys_wait) },		/* 84 = compat_43 owait */
-	{ 1, s(struct compat_12_compat_netbsd32_oswapon_args),
-	    compat_12(compat_netbsd32_oswapon) },/* 85 = compat_12 compat_netbsd32_oswapon */
-	{ 2, s(struct compat_netbsd32_getitimer_args),
-	    compat_netbsd32_getitimer },	/* 86 = compat_netbsd32_getitimer */
-	{ 2, s(struct compat_43_compat_netbsd32_ogethostname_args),
-	    compat_43(compat_netbsd32_ogethostname) },/* 87 = compat_43 compat_netbsd32_ogethostname */
-	{ 2, s(struct compat_43_compat_netbsd32_osethostname_args),
-	    compat_43(compat_netbsd32_osethostname) },/* 88 = compat_43 compat_netbsd32_osethostname */
+	{ 1, s(struct compat_12_netbsd32_oswapon_args),
+	    compat_12(netbsd32_oswapon) },	/* 85 = compat_12 netbsd32_oswapon */
+	{ 2, s(struct netbsd32_getitimer_args),
+	    netbsd32_getitimer },		/* 86 = netbsd32_getitimer */
+	{ 2, s(struct compat_43_netbsd32_ogethostname_args),
+	    compat_43(netbsd32_ogethostname) },	/* 87 = compat_43 netbsd32_ogethostname */
+	{ 2, s(struct compat_43_netbsd32_osethostname_args),
+	    compat_43(netbsd32_osethostname) },	/* 88 = compat_43 netbsd32_osethostname */
 	{ 0, 0,
 	    compat_43(sys_getdtablesize) },	/* 89 = compat_43 ogetdtablesize */
-	{ 2, s(struct compat_netbsd32_dup2_args),
-	    compat_netbsd32_dup2 },		/* 90 = compat_netbsd32_dup2 */
+	{ 2, s(struct netbsd32_dup2_args),
+	    netbsd32_dup2 },			/* 90 = netbsd32_dup2 */
 	{ 0, 0,
 	    sys_nosys },			/* 91 = unimplemented getdopt */
-	{ 3, s(struct compat_netbsd32_fcntl_args),
-	    compat_netbsd32_fcntl },		/* 92 = compat_netbsd32_fcntl */
-	{ 5, s(struct compat_netbsd32_select_args),
-	    compat_netbsd32_select },		/* 93 = compat_netbsd32_select */
+	{ 3, s(struct netbsd32_fcntl_args),
+	    netbsd32_fcntl },			/* 92 = netbsd32_fcntl */
+	{ 5, s(struct netbsd32_select_args),
+	    netbsd32_select },			/* 93 = netbsd32_select */
 	{ 0, 0,
 	    sys_nosys },			/* 94 = unimplemented setdopt */
-	{ 1, s(struct compat_netbsd32_fsync_args),
-	    compat_netbsd32_fsync },		/* 95 = compat_netbsd32_fsync */
-	{ 3, s(struct compat_netbsd32_setpriority_args),
-	    compat_netbsd32_setpriority },	/* 96 = compat_netbsd32_setpriority */
-	{ 3, s(struct compat_netbsd32_socket_args),
-	    compat_netbsd32_socket },		/* 97 = compat_netbsd32_socket */
-	{ 3, s(struct compat_netbsd32_connect_args),
-	    compat_netbsd32_connect },		/* 98 = compat_netbsd32_connect */
-	{ 3, s(struct compat_43_compat_netbsd32_oaccept_args),
-	    compat_43(compat_netbsd32_oaccept) },/* 99 = compat_43 compat_netbsd32_oaccept */
-	{ 2, s(struct compat_netbsd32_getpriority_args),
-	    compat_netbsd32_getpriority },	/* 100 = compat_netbsd32_getpriority */
-	{ 4, s(struct compat_43_compat_netbsd32_osend_args),
-	    compat_43(compat_netbsd32_osend) },	/* 101 = compat_43 compat_netbsd32_osend */
-	{ 4, s(struct compat_43_compat_netbsd32_orecv_args),
-	    compat_43(compat_netbsd32_orecv) },	/* 102 = compat_43 compat_netbsd32_orecv */
-	{ 1, s(struct compat_netbsd32_sigreturn_args),
-	    compat_netbsd32_sigreturn },	/* 103 = compat_netbsd32_sigreturn */
-	{ 3, s(struct compat_netbsd32_bind_args),
-	    compat_netbsd32_bind },		/* 104 = compat_netbsd32_bind */
-	{ 5, s(struct compat_netbsd32_setsockopt_args),
-	    compat_netbsd32_setsockopt },	/* 105 = compat_netbsd32_setsockopt */
-	{ 2, s(struct compat_netbsd32_listen_args),
-	    compat_netbsd32_listen },		/* 106 = compat_netbsd32_listen */
+	{ 1, s(struct netbsd32_fsync_args),
+	    netbsd32_fsync },			/* 95 = netbsd32_fsync */
+	{ 3, s(struct netbsd32_setpriority_args),
+	    netbsd32_setpriority },		/* 96 = netbsd32_setpriority */
+	{ 3, s(struct netbsd32_socket_args),
+	    netbsd32_socket },			/* 97 = netbsd32_socket */
+	{ 3, s(struct netbsd32_connect_args),
+	    netbsd32_connect },			/* 98 = netbsd32_connect */
+	{ 3, s(struct compat_43_netbsd32_oaccept_args),
+	    compat_43(netbsd32_oaccept) },	/* 99 = compat_43 netbsd32_oaccept */
+	{ 2, s(struct netbsd32_getpriority_args),
+	    netbsd32_getpriority },		/* 100 = netbsd32_getpriority */
+	{ 4, s(struct compat_43_netbsd32_osend_args),
+	    compat_43(netbsd32_osend) },	/* 101 = compat_43 netbsd32_osend */
+	{ 4, s(struct compat_43_netbsd32_orecv_args),
+	    compat_43(netbsd32_orecv) },	/* 102 = compat_43 netbsd32_orecv */
+	{ 1, s(struct netbsd32_sigreturn_args),
+	    netbsd32_sigreturn },		/* 103 = netbsd32_sigreturn */
+	{ 3, s(struct netbsd32_bind_args),
+	    netbsd32_bind },			/* 104 = netbsd32_bind */
+	{ 5, s(struct netbsd32_setsockopt_args),
+	    netbsd32_setsockopt },		/* 105 = netbsd32_setsockopt */
+	{ 2, s(struct netbsd32_listen_args),
+	    netbsd32_listen },			/* 106 = netbsd32_listen */
 	{ 0, 0,
 	    sys_nosys },			/* 107 = obsolete vtimes */
-	{ 3, s(struct compat_43_compat_netbsd32_osigvec_args),
-	    compat_43(compat_netbsd32_osigvec) },/* 108 = compat_43 compat_netbsd32_osigvec */
+	{ 3, s(struct compat_43_netbsd32_osigvec_args),
+	    compat_43(netbsd32_osigvec) },	/* 108 = compat_43 netbsd32_osigvec */
 #ifdef COMPAT_43
-	{ 1, s(struct compat_43_compat_netbsd32_sigblock_args),
-	    compat_43(compat_netbsd32_sigblock) },/* 109 = compat_43 compat_netbsd32_sigblock */
-	{ 1, s(struct compat_43_compat_netbsd32_sigsetmask_args),
-	    compat_43(compat_netbsd32_sigsetmask) },/* 110 = compat_43 compat_netbsd32_sigsetmask */
+	{ 1, s(struct compat_43_netbsd32_sigblock_args),
+	    compat_43(netbsd32_sigblock) },	/* 109 = compat_43 netbsd32_sigblock */
+	{ 1, s(struct compat_43_netbsd32_sigsetmask_args),
+	    compat_43(netbsd32_sigsetmask) },	/* 110 = compat_43 netbsd32_sigsetmask */
 #else
 	{ 0, 0,
 	    sys_nosys },			/* 109 = obsolete sigblock */
 	{ 0, 0,
 	    sys_nosys },			/* 110 = obsolete sigsetmask */
 #endif
-	{ 1, s(struct compat_13_compat_netbsd32_sigsuspend_args),
-	    compat_13(compat_netbsd32_sigsuspend) },/* 111 = compat_13 sigsuspend13 */
-	{ 2, s(struct compat_43_compat_netbsd32_osigstack_args),
-	    compat_43(compat_netbsd32_osigstack) },/* 112 = compat_43 compat_netbsd32_osigstack */
-	{ 3, s(struct compat_43_compat_netbsd32_orecvmsg_args),
-	    compat_43(compat_netbsd32_orecvmsg) },/* 113 = compat_43 compat_netbsd32_orecvmsg */
-	{ 3, s(struct compat_43_compat_netbsd32_osendmsg_args),
-	    compat_43(compat_netbsd32_osendmsg) },/* 114 = compat_43 compat_netbsd32_osendmsg */
+	{ 1, s(struct compat_13_netbsd32_sigsuspend_args),
+	    compat_13(netbsd32_sigsuspend) },	/* 111 = compat_13 sigsuspend13 */
+	{ 2, s(struct compat_43_netbsd32_osigstack_args),
+	    compat_43(netbsd32_osigstack) },	/* 112 = compat_43 netbsd32_osigstack */
+	{ 3, s(struct compat_43_netbsd32_orecvmsg_args),
+	    compat_43(netbsd32_orecvmsg) },	/* 113 = compat_43 netbsd32_orecvmsg */
+	{ 3, s(struct compat_43_netbsd32_osendmsg_args),
+	    compat_43(netbsd32_osendmsg) },	/* 114 = compat_43 netbsd32_osendmsg */
 	{ 0, 0,
 	    sys_nosys },			/* 115 = obsolete vtrace */
-	{ 2, s(struct compat_netbsd32_gettimeofday_args),
-	    compat_netbsd32_gettimeofday },	/* 116 = compat_netbsd32_gettimeofday */
-	{ 2, s(struct compat_netbsd32_getrusage_args),
-	    compat_netbsd32_getrusage },	/* 117 = compat_netbsd32_getrusage */
-	{ 5, s(struct compat_netbsd32_getsockopt_args),
-	    compat_netbsd32_getsockopt },	/* 118 = compat_netbsd32_getsockopt */
+	{ 2, s(struct netbsd32_gettimeofday_args),
+	    netbsd32_gettimeofday },		/* 116 = netbsd32_gettimeofday */
+	{ 2, s(struct netbsd32_getrusage_args),
+	    netbsd32_getrusage },		/* 117 = netbsd32_getrusage */
+	{ 5, s(struct netbsd32_getsockopt_args),
+	    netbsd32_getsockopt },		/* 118 = netbsd32_getsockopt */
 	{ 0, 0,
 	    sys_nosys },			/* 119 = obsolete resuba */
-	{ 3, s(struct compat_netbsd32_readv_args),
-	    compat_netbsd32_readv },		/* 120 = compat_netbsd32_readv */
-	{ 3, s(struct compat_netbsd32_writev_args),
-	    compat_netbsd32_writev },		/* 121 = compat_netbsd32_writev */
-	{ 2, s(struct compat_netbsd32_settimeofday_args),
-	    compat_netbsd32_settimeofday },	/* 122 = compat_netbsd32_settimeofday */
-	{ 3, s(struct compat_netbsd32_fchown_args),
-	    compat_netbsd32_fchown },		/* 123 = compat_netbsd32_fchown */
-	{ 2, s(struct compat_netbsd32_fchmod_args),
-	    compat_netbsd32_fchmod },		/* 124 = compat_netbsd32_fchmod */
-	{ 6, s(struct compat_43_compat_netbsd32_orecvfrom_args),
-	    compat_43(compat_netbsd32_orecvfrom) },/* 125 = compat_43 compat_netbsd32_orecvfrom */
-	{ 2, s(struct compat_netbsd32_setreuid_args),
-	    compat_netbsd32_setreuid },		/* 126 = compat_netbsd32_setreuid */
-	{ 2, s(struct compat_netbsd32_setregid_args),
-	    compat_netbsd32_setregid },		/* 127 = compat_netbsd32_setregid */
-	{ 2, s(struct compat_netbsd32_rename_args),
-	    compat_netbsd32_rename },		/* 128 = compat_netbsd32_rename */
-	{ 2, s(struct compat_43_compat_netbsd32_otruncate_args),
-	    compat_43(compat_netbsd32_otruncate) },/* 129 = compat_43 compat_netbsd32_otruncate */
-	{ 2, s(struct compat_43_compat_netbsd32_oftruncate_args),
-	    compat_43(compat_netbsd32_oftruncate) },/* 130 = compat_43 compat_netbsd32_oftruncate */
-	{ 2, s(struct compat_netbsd32_flock_args),
-	    compat_netbsd32_flock },		/* 131 = compat_netbsd32_flock */
-	{ 2, s(struct compat_netbsd32_mkfifo_args),
-	    compat_netbsd32_mkfifo },		/* 132 = compat_netbsd32_mkfifo */
-	{ 6, s(struct compat_netbsd32_sendto_args),
-	    compat_netbsd32_sendto },		/* 133 = compat_netbsd32_sendto */
-	{ 2, s(struct compat_netbsd32_shutdown_args),
-	    compat_netbsd32_shutdown },		/* 134 = compat_netbsd32_shutdown */
-	{ 4, s(struct compat_netbsd32_socketpair_args),
-	    compat_netbsd32_socketpair },	/* 135 = compat_netbsd32_socketpair */
-	{ 2, s(struct compat_netbsd32_mkdir_args),
-	    compat_netbsd32_mkdir },		/* 136 = compat_netbsd32_mkdir */
-	{ 1, s(struct compat_netbsd32_rmdir_args),
-	    compat_netbsd32_rmdir },		/* 137 = compat_netbsd32_rmdir */
-	{ 2, s(struct compat_netbsd32_utimes_args),
-	    compat_netbsd32_utimes },		/* 138 = compat_netbsd32_utimes */
+	{ 3, s(struct netbsd32_readv_args),
+	    netbsd32_readv },			/* 120 = netbsd32_readv */
+	{ 3, s(struct netbsd32_writev_args),
+	    netbsd32_writev },			/* 121 = netbsd32_writev */
+	{ 2, s(struct netbsd32_settimeofday_args),
+	    netbsd32_settimeofday },		/* 122 = netbsd32_settimeofday */
+	{ 3, s(struct netbsd32_fchown_args),
+	    netbsd32_fchown },			/* 123 = netbsd32_fchown */
+	{ 2, s(struct netbsd32_fchmod_args),
+	    netbsd32_fchmod },			/* 124 = netbsd32_fchmod */
+	{ 6, s(struct compat_43_netbsd32_orecvfrom_args),
+	    compat_43(netbsd32_orecvfrom) },	/* 125 = compat_43 netbsd32_orecvfrom */
+	{ 2, s(struct netbsd32_setreuid_args),
+	    netbsd32_setreuid },		/* 126 = netbsd32_setreuid */
+	{ 2, s(struct netbsd32_setregid_args),
+	    netbsd32_setregid },		/* 127 = netbsd32_setregid */
+	{ 2, s(struct netbsd32_rename_args),
+	    netbsd32_rename },			/* 128 = netbsd32_rename */
+	{ 2, s(struct compat_43_netbsd32_otruncate_args),
+	    compat_43(netbsd32_otruncate) },	/* 129 = compat_43 netbsd32_otruncate */
+	{ 2, s(struct compat_43_netbsd32_oftruncate_args),
+	    compat_43(netbsd32_oftruncate) },	/* 130 = compat_43 netbsd32_oftruncate */
+	{ 2, s(struct netbsd32_flock_args),
+	    netbsd32_flock },			/* 131 = netbsd32_flock */
+	{ 2, s(struct netbsd32_mkfifo_args),
+	    netbsd32_mkfifo },			/* 132 = netbsd32_mkfifo */
+	{ 6, s(struct netbsd32_sendto_args),
+	    netbsd32_sendto },			/* 133 = netbsd32_sendto */
+	{ 2, s(struct netbsd32_shutdown_args),
+	    netbsd32_shutdown },		/* 134 = netbsd32_shutdown */
+	{ 4, s(struct netbsd32_socketpair_args),
+	    netbsd32_socketpair },		/* 135 = netbsd32_socketpair */
+	{ 2, s(struct netbsd32_mkdir_args),
+	    netbsd32_mkdir },			/* 136 = netbsd32_mkdir */
+	{ 1, s(struct netbsd32_rmdir_args),
+	    netbsd32_rmdir },			/* 137 = netbsd32_rmdir */
+	{ 2, s(struct netbsd32_utimes_args),
+	    netbsd32_utimes },			/* 138 = netbsd32_utimes */
 	{ 0, 0,
 	    sys_nosys },			/* 139 = obsolete 4.2 sigreturn */
-	{ 2, s(struct compat_netbsd32_adjtime_args),
-	    compat_netbsd32_adjtime },		/* 140 = compat_netbsd32_adjtime */
-	{ 3, s(struct compat_43_compat_netbsd32_ogetpeername_args),
-	    compat_43(compat_netbsd32_ogetpeername) },/* 141 = compat_43 compat_netbsd32_ogetpeername */
+	{ 2, s(struct netbsd32_adjtime_args),
+	    netbsd32_adjtime },			/* 140 = netbsd32_adjtime */
+	{ 3, s(struct compat_43_netbsd32_ogetpeername_args),
+	    compat_43(netbsd32_ogetpeername) },	/* 141 = compat_43 netbsd32_ogetpeername */
 	{ 0, 0,
 	    compat_43(sys_gethostid) },		/* 142 = compat_43 ogethostid */
 #ifdef COMPAT_43
-	{ 1, s(struct compat_43_compat_netbsd32_sethostid_args),
-	    compat_43(compat_netbsd32_sethostid) },/* 143 = compat_43 compat_netbsd32_sethostid */
+	{ 1, s(struct compat_43_netbsd32_sethostid_args),
+	    compat_43(netbsd32_sethostid) },	/* 143 = compat_43 netbsd32_sethostid */
 #else
 	{ 0, 0,
 	    sys_nosys },			/* 143 = obsolete sethostid */
 #endif
-	{ 2, s(struct compat_43_compat_netbsd32_ogetrlimit_args),
-	    compat_43(compat_netbsd32_ogetrlimit) },/* 144 = compat_43 compat_netbsd32_ogetrlimit */
-	{ 2, s(struct compat_43_compat_netbsd32_osetrlimit_args),
-	    compat_43(compat_netbsd32_osetrlimit) },/* 145 = compat_43 compat_netbsd32_osetrlimit */
+	{ 2, s(struct compat_43_netbsd32_ogetrlimit_args),
+	    compat_43(netbsd32_ogetrlimit) },	/* 144 = compat_43 netbsd32_ogetrlimit */
+	{ 2, s(struct compat_43_netbsd32_osetrlimit_args),
+	    compat_43(netbsd32_osetrlimit) },	/* 145 = compat_43 netbsd32_osetrlimit */
 #ifdef COMPAT_43
-	{ 2, s(struct compat_43_compat_netbsd32_killpg_args),
-	    compat_43(compat_netbsd32_killpg) },/* 146 = compat_43 compat_netbsd32_killpg */
+	{ 2, s(struct compat_43_netbsd32_killpg_args),
+	    compat_43(netbsd32_killpg) },	/* 146 = compat_43 netbsd32_killpg */
 #else
 	{ 0, 0,
 	    sys_nosys },			/* 146 = obsolete killpg */
 #endif
 	{ 0, 0,
 	    sys_setsid },			/* 147 = setsid */
-	{ 4, s(struct compat_netbsd32_quotactl_args),
-	    compat_netbsd32_quotactl },		/* 148 = compat_netbsd32_quotactl */
+	{ 4, s(struct netbsd32_quotactl_args),
+	    netbsd32_quotactl },		/* 148 = netbsd32_quotactl */
 	{ 0, 0,
 	    compat_43(sys_quota) },		/* 149 = compat_43 oquota */
-	{ 3, s(struct compat_43_compat_netbsd32_ogetsockname_args),
-	    compat_43(compat_netbsd32_ogetsockname) },/* 150 = compat_43 compat_netbsd32_ogetsockname */
+	{ 3, s(struct compat_43_netbsd32_ogetsockname_args),
+	    compat_43(netbsd32_ogetsockname) },	/* 150 = compat_43 netbsd32_ogetsockname */
 	{ 0, 0,
 	    sys_nosys },			/* 151 = unimplemented */
 	{ 0, 0,
@@ -400,80 +406,80 @@ struct sysent netbsd32_sysent[] = {
 	{ 0, 0,
 	    sys_nosys },			/* 154 = unimplemented */
 #if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
-	{ 2, s(struct compat_netbsd32_nfssvc_args),
-	    compat_netbsd32_nfssvc },		/* 155 = compat_netbsd32_nfssvc */
+	{ 2, s(struct netbsd32_nfssvc_args),
+	    netbsd32_nfssvc },			/* 155 = netbsd32_nfssvc */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 155 = excluded compat_netbsd32_nfssvc */
+	    sys_nosys },			/* 155 = excluded netbsd32_nfssvc */
 #endif
-	{ 4, s(struct compat_43_compat_netbsd32_ogetdirentries_args),
-	    compat_43(compat_netbsd32_ogetdirentries) },/* 156 = compat_43 compat_netbsd32_ogetdirentries */
-	{ 2, s(struct compat_netbsd32_statfs_args),
-	    compat_netbsd32_statfs },		/* 157 = compat_netbsd32_statfs */
-	{ 2, s(struct compat_netbsd32_fstatfs_args),
-	    compat_netbsd32_fstatfs },		/* 158 = compat_netbsd32_fstatfs */
+	{ 4, s(struct compat_43_netbsd32_ogetdirentries_args),
+	    compat_43(netbsd32_ogetdirentries) },/* 156 = compat_43 netbsd32_ogetdirentries */
+	{ 2, s(struct netbsd32_statfs_args),
+	    netbsd32_statfs },			/* 157 = netbsd32_statfs */
+	{ 2, s(struct netbsd32_fstatfs_args),
+	    netbsd32_fstatfs },			/* 158 = netbsd32_fstatfs */
 	{ 0, 0,
 	    sys_nosys },			/* 159 = unimplemented */
 	{ 0, 0,
 	    sys_nosys },			/* 160 = unimplemented */
 #if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
-	{ 2, s(struct compat_netbsd32_getfh_args),
-	    compat_netbsd32_getfh },		/* 161 = compat_netbsd32_getfh */
+	{ 2, s(struct netbsd32_getfh_args),
+	    netbsd32_getfh },			/* 161 = netbsd32_getfh */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 161 = excluded compat_netbsd32_getfh */
+	    sys_nosys },			/* 161 = excluded netbsd32_getfh */
 #endif
-	{ 2, s(struct compat_09_compat_netbsd32_ogetdomainname_args),
-	    compat_09(compat_netbsd32_ogetdomainname) },/* 162 = compat_09 compat_netbsd32_ogetdomainname */
-	{ 2, s(struct compat_09_compat_netbsd32_osetdomainname_args),
-	    compat_09(compat_netbsd32_osetdomainname) },/* 163 = compat_09 compat_netbsd32_osetdomainname */
-	{ 1, s(struct compat_09_compat_netbsd32_uname_args),
-	    compat_09(compat_netbsd32_uname) },	/* 164 = compat_09 compat_netbsd32_uname */
-	{ 2, s(struct compat_netbsd32_sysarch_args),
-	    compat_netbsd32_sysarch },		/* 165 = compat_netbsd32_sysarch */
+	{ 2, s(struct compat_09_netbsd32_ogetdomainname_args),
+	    compat_09(netbsd32_ogetdomainname) },/* 162 = compat_09 netbsd32_ogetdomainname */
+	{ 2, s(struct compat_09_netbsd32_osetdomainname_args),
+	    compat_09(netbsd32_osetdomainname) },/* 163 = compat_09 netbsd32_osetdomainname */
+	{ 1, s(struct compat_09_netbsd32_uname_args),
+	    compat_09(netbsd32_uname) },	/* 164 = compat_09 netbsd32_uname */
+	{ 2, s(struct netbsd32_sysarch_args),
+	    netbsd32_sysarch },			/* 165 = netbsd32_sysarch */
 	{ 0, 0,
 	    sys_nosys },			/* 166 = unimplemented */
 	{ 0, 0,
 	    sys_nosys },			/* 167 = unimplemented */
 	{ 0, 0,
 	    sys_nosys },			/* 168 = unimplemented */
-#if (defined(SYSVSEM) || !defined(_KERNEL) && !defined(alpha) && defined(COMPAT_10)
-	{ 5, s(struct compat_netbsd32_compat_10_sys_semsys_args),
-	    compat_netbsd32_compat_10_sys_semsys },/* 169 = osemsys */
+#if (defined(SYSVSEM) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
+	{ 5, s(struct netbsd32_compat_10_sys_semsys_args),
+	    netbsd32_compat_10_sys_semsys },	/* 169 = osemsys */
 #else
 	{ 0, 0,
 	    sys_nosys },			/* 169 = excluded 1.0 semsys */
 #endif
 #if (defined(SYSVMSG) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
-	{ 6, s(struct compat_netbsd32_compat_10_sys_msgsys_args),
-	    compat_netbsd32_compat_10_sys_msgsys },/* 170 = omsgsys */
+	{ 6, s(struct netbsd32_compat_10_sys_msgsys_args),
+	    netbsd32_compat_10_sys_msgsys },	/* 170 = omsgsys */
 #else
 	{ 0, 0,
 	    sys_nosys },			/* 170 = excluded 1.0 msgsys */
 #endif
 #if (defined(SYSVSHM) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
-	{ 4, s(struct compat_netbsd32_compat_10_sys_shmsys_args),
-	    compat_netbsd32_compat_10_sys_shmsys },/* 171 = oshmsys */
+	{ 4, s(struct netbsd32_compat_10_sys_shmsys_args),
+	    netbsd32_compat_10_sys_shmsys },	/* 171 = oshmsys */
 #else
 	{ 0, 0,
 	    sys_nosys },			/* 171 = excluded 1.0 shmsys */
 #endif
 	{ 0, 0,
 	    sys_nosys },			/* 172 = unimplemented */
-	{ 5, s(struct compat_netbsd32_pread_args),
-	    compat_netbsd32_pread },		/* 173 = compat_netbsd32_pread */
-	{ 5, s(struct compat_netbsd32_pwrite_args),
-	    compat_netbsd32_pwrite },		/* 174 = compat_netbsd32_pwrite */
+	{ 5, s(struct netbsd32_pread_args),
+	    netbsd32_pread },			/* 173 = netbsd32_pread */
+	{ 5, s(struct netbsd32_pwrite_args),
+	    netbsd32_pwrite },			/* 174 = netbsd32_pwrite */
 #if defined(NTP) && !defined(_KERNEL)
-	{ 1, s(struct compat_netbsd32_ntp_gettime_args),
-	    compat_netbsd32_ntp_gettime },	/* 175 = compat_netbsd32_ntp_gettime */
-	{ 1, s(struct compat_netbsd32_ntp_adjtime_args),
-	    compat_netbsd32_ntp_adjtime },	/* 176 = compat_netbsd32_ntp_adjtime */
+	{ 1, s(struct netbsd32_ntp_gettime_args),
+	    netbsd32_ntp_gettime },		/* 175 = netbsd32_ntp_gettime */
+	{ 1, s(struct netbsd32_ntp_adjtime_args),
+	    netbsd32_ntp_adjtime },		/* 176 = netbsd32_ntp_adjtime */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 175 = excluded compat_netbsd32_ntp_gettime */
+	    sys_nosys },			/* 175 = excluded netbsd32_ntp_gettime */
 	{ 0, 0,
-	    sys_nosys },			/* 176 = excluded compat_netbsd32_ntp_adjtime */
+	    sys_nosys },			/* 176 = excluded netbsd32_ntp_adjtime */
 #endif
 	{ 0, 0,
 	    sys_nosys },			/* 177 = unimplemented */
@@ -483,75 +489,75 @@ struct sysent netbsd32_sysent[] = {
 	    sys_nosys },			/* 179 = unimplemented */
 	{ 0, 0,
 	    sys_nosys },			/* 180 = unimplemented */
-	{ 1, s(struct compat_netbsd32_setgid_args),
-	    compat_netbsd32_setgid },		/* 181 = compat_netbsd32_setgid */
-	{ 1, s(struct compat_netbsd32_setegid_args),
-	    compat_netbsd32_setegid },		/* 182 = compat_netbsd32_setegid */
-	{ 1, s(struct compat_netbsd32_seteuid_args),
-	    compat_netbsd32_seteuid },		/* 183 = compat_netbsd32_seteuid */
+	{ 1, s(struct netbsd32_setgid_args),
+	    netbsd32_setgid },			/* 181 = netbsd32_setgid */
+	{ 1, s(struct netbsd32_setegid_args),
+	    netbsd32_setegid },			/* 182 = netbsd32_setegid */
+	{ 1, s(struct netbsd32_seteuid_args),
+	    netbsd32_seteuid },			/* 183 = netbsd32_seteuid */
 #if defined(LFS) || !defined(_KERNEL)
-	{ 3, s(struct compat_netbsd32_sys_lfs_bmapv_args),
-	    compat_netbsd32_sys_lfs_bmapv },	/* 184 = lfs_bmapv */
-	{ 3, s(struct compat_netbsd32_sys_lfs_markv_args),
-	    compat_netbsd32_sys_lfs_markv },	/* 185 = lfs_markv */
-	{ 2, s(struct compat_netbsd32_sys_lfs_segclean_args),
-	    compat_netbsd32_sys_lfs_segclean },	/* 186 = lfs_segclean */
-	{ 2, s(struct compat_netbsd32_sys_lfs_segwait_args),
-	    compat_netbsd32_sys_lfs_segwait },	/* 187 = lfs_segwait */
+	{ 3, s(struct netbsd32_sys_lfs_bmapv_args),
+	    netbsd32_sys_lfs_bmapv },		/* 184 = lfs_bmapv */
+	{ 3, s(struct netbsd32_sys_lfs_markv_args),
+	    netbsd32_sys_lfs_markv },		/* 185 = lfs_markv */
+	{ 2, s(struct netbsd32_sys_lfs_segclean_args),
+	    netbsd32_sys_lfs_segclean },	/* 186 = lfs_segclean */
+	{ 2, s(struct netbsd32_sys_lfs_segwait_args),
+	    netbsd32_sys_lfs_segwait },		/* 187 = lfs_segwait */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 184 = excluded compat_netbsd32_sys_lfs_bmapv */
+	    sys_nosys },			/* 184 = excluded netbsd32_sys_lfs_bmapv */
 	{ 0, 0,
-	    sys_nosys },			/* 185 = excluded compat_netbsd32_sys_lfs_markv */
+	    sys_nosys },			/* 185 = excluded netbsd32_sys_lfs_markv */
 	{ 0, 0,
-	    sys_nosys },			/* 186 = excluded compat_netbsd32_sys_lfs_segclean */
+	    sys_nosys },			/* 186 = excluded netbsd32_sys_lfs_segclean */
 	{ 0, 0,
-	    sys_nosys },			/* 187 = excluded compat_netbsd32_sys_lfs_segwait */
+	    sys_nosys },			/* 187 = excluded netbsd32_sys_lfs_segwait */
 #endif
-	{ 2, s(struct compat_12_compat_netbsd32_stat12_args),
-	    compat_12(compat_netbsd32_stat12) },/* 188 = compat_12 compat_netbsd32_stat12 */
-	{ 2, s(struct compat_12_compat_netbsd32_fstat12_args),
-	    compat_12(compat_netbsd32_fstat12) },/* 189 = compat_12 compat_netbsd32_fstat12 */
-	{ 2, s(struct compat_12_compat_netbsd32_lstat12_args),
-	    compat_12(compat_netbsd32_lstat12) },/* 190 = compat_12 compat_netbsd32_lstat12 */
-	{ 2, s(struct compat_netbsd32_pathconf_args),
-	    compat_netbsd32_pathconf },		/* 191 = compat_netbsd32_pathconf */
-	{ 2, s(struct compat_netbsd32_fpathconf_args),
-	    compat_netbsd32_fpathconf },	/* 192 = compat_netbsd32_fpathconf */
+	{ 2, s(struct compat_12_netbsd32_stat12_args),
+	    compat_12(netbsd32_stat12) },	/* 188 = compat_12 netbsd32_stat12 */
+	{ 2, s(struct compat_12_netbsd32_fstat12_args),
+	    compat_12(netbsd32_fstat12) },	/* 189 = compat_12 netbsd32_fstat12 */
+	{ 2, s(struct compat_12_netbsd32_lstat12_args),
+	    compat_12(netbsd32_lstat12) },	/* 190 = compat_12 netbsd32_lstat12 */
+	{ 2, s(struct netbsd32_pathconf_args),
+	    netbsd32_pathconf },		/* 191 = netbsd32_pathconf */
+	{ 2, s(struct netbsd32_fpathconf_args),
+	    netbsd32_fpathconf },		/* 192 = netbsd32_fpathconf */
 	{ 0, 0,
 	    sys_nosys },			/* 193 = unimplemented */
-	{ 2, s(struct compat_netbsd32_getrlimit_args),
-	    compat_netbsd32_getrlimit },	/* 194 = compat_netbsd32_getrlimit */
-	{ 2, s(struct compat_netbsd32_setrlimit_args),
-	    compat_netbsd32_setrlimit },	/* 195 = compat_netbsd32_setrlimit */
-	{ 4, s(struct compat_12_compat_netbsd32_getdirentries_args),
-	    compat_12(compat_netbsd32_getdirentries) },/* 196 = compat_12 compat_netbsd32_getdirentries */
-	{ 7, s(struct compat_netbsd32_mmap_args),
-	    compat_netbsd32_mmap },		/* 197 = compat_netbsd32_mmap */
+	{ 2, s(struct netbsd32_getrlimit_args),
+	    netbsd32_getrlimit },		/* 194 = netbsd32_getrlimit */
+	{ 2, s(struct netbsd32_setrlimit_args),
+	    netbsd32_setrlimit },		/* 195 = netbsd32_setrlimit */
+	{ 4, s(struct compat_12_netbsd32_getdirentries_args),
+	    compat_12(netbsd32_getdirentries) },/* 196 = compat_12 netbsd32_getdirentries */
+	{ 7, s(struct netbsd32_mmap_args),
+	    netbsd32_mmap },			/* 197 = netbsd32_mmap */
 	{ 0, 0,
 	    sys_nosys },			/* 198 = __syscall (indir) */
-	{ 4, s(struct compat_netbsd32_lseek_args),
-	    compat_netbsd32_lseek },		/* 199 = compat_netbsd32_lseek */
-	{ 3, s(struct compat_netbsd32_truncate_args),
-	    compat_netbsd32_truncate },		/* 200 = compat_netbsd32_truncate */
-	{ 3, s(struct compat_netbsd32_ftruncate_args),
-	    compat_netbsd32_ftruncate },	/* 201 = compat_netbsd32_ftruncate */
-	{ 6, s(struct compat_netbsd32___sysctl_args),
-	    compat_netbsd32___sysctl },		/* 202 = compat_netbsd32___sysctl */
-	{ 2, s(struct compat_netbsd32_mlock_args),
-	    compat_netbsd32_mlock },		/* 203 = compat_netbsd32_mlock */
-	{ 2, s(struct compat_netbsd32_munlock_args),
-	    compat_netbsd32_munlock },		/* 204 = compat_netbsd32_munlock */
-	{ 1, s(struct compat_netbsd32_undelete_args),
-	    compat_netbsd32_undelete },		/* 205 = compat_netbsd32_undelete */
-	{ 2, s(struct compat_netbsd32_futimes_args),
-	    compat_netbsd32_futimes },		/* 206 = compat_netbsd32_futimes */
-	{ 1, s(struct compat_netbsd32_getpgid_args),
-	    compat_netbsd32_getpgid },		/* 207 = compat_netbsd32_getpgid */
-	{ 2, s(struct compat_netbsd32_reboot_args),
-	    compat_netbsd32_reboot },		/* 208 = compat_netbsd32_reboot */
-	{ 3, s(struct compat_netbsd32_poll_args),
-	    compat_netbsd32_poll },		/* 209 = compat_netbsd32_poll */
+	{ 4, s(struct netbsd32_lseek_args),
+	    netbsd32_lseek },			/* 199 = netbsd32_lseek */
+	{ 3, s(struct netbsd32_truncate_args),
+	    netbsd32_truncate },		/* 200 = netbsd32_truncate */
+	{ 3, s(struct netbsd32_ftruncate_args),
+	    netbsd32_ftruncate },		/* 201 = netbsd32_ftruncate */
+	{ 6, s(struct netbsd32___sysctl_args),
+	    netbsd32___sysctl },		/* 202 = netbsd32___sysctl */
+	{ 2, s(struct netbsd32_mlock_args),
+	    netbsd32_mlock },			/* 203 = netbsd32_mlock */
+	{ 2, s(struct netbsd32_munlock_args),
+	    netbsd32_munlock },			/* 204 = netbsd32_munlock */
+	{ 1, s(struct netbsd32_undelete_args),
+	    netbsd32_undelete },		/* 205 = netbsd32_undelete */
+	{ 2, s(struct netbsd32_futimes_args),
+	    netbsd32_futimes },			/* 206 = netbsd32_futimes */
+	{ 1, s(struct netbsd32_getpgid_args),
+	    netbsd32_getpgid },			/* 207 = netbsd32_getpgid */
+	{ 2, s(struct netbsd32_reboot_args),
+	    netbsd32_reboot },			/* 208 = netbsd32_reboot */
+	{ 3, s(struct netbsd32_poll_args),
+	    netbsd32_poll },			/* 209 = netbsd32_poll */
 #if defined(LKM) || !defined(_KERNEL)
 	{ 0, 0,
 	    sys_lkmnosys },			/* 210 = lkmnosys */
@@ -596,68 +602,68 @@ struct sysent netbsd32_sysent[] = {
 	    sys_nosys },			/* 219 = excluded lkmnosys */
 #endif	/* !LKM || !_KERNEL */
 #if defined(SYSVSEM) || !defined(_KERNEL)
-	{ 4, s(struct compat_netbsd32___semctl_args),
-	    compat_netbsd32___semctl },		/* 220 = compat_netbsd32___semctl */
-	{ 3, s(struct compat_netbsd32_semget_args),
-	    compat_netbsd32_semget },		/* 221 = compat_netbsd32_semget */
-	{ 3, s(struct compat_netbsd32_semop_args),
-	    compat_netbsd32_semop },		/* 222 = compat_netbsd32_semop */
-	{ 1, s(struct compat_netbsd32_semconfig_args),
-	    compat_netbsd32_semconfig },	/* 223 = compat_netbsd32_semconfig */
+	{ 4, s(struct compat_14_netbsd32___semctl_args),
+	    compat_14(netbsd32___semctl) },	/* 220 = compat_14 netbsd32___semctl */
+	{ 3, s(struct netbsd32_semget_args),
+	    netbsd32_semget },			/* 221 = netbsd32_semget */
+	{ 3, s(struct netbsd32_semop_args),
+	    netbsd32_semop },			/* 222 = netbsd32_semop */
+	{ 1, s(struct netbsd32_semconfig_args),
+	    netbsd32_semconfig },		/* 223 = netbsd32_semconfig */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 220 = excluded compat_netbsd32_semctl */
+	    sys_nosys },			/* 220 = excluded netbsd32_semctl */
 	{ 0, 0,
-	    sys_nosys },			/* 221 = excluded compat_netbsd32_semget */
+	    sys_nosys },			/* 221 = excluded netbsd32_semget */
 	{ 0, 0,
-	    sys_nosys },			/* 222 = excluded compat_netbsd32_semop */
+	    sys_nosys },			/* 222 = excluded netbsd32_semop */
 	{ 0, 0,
-	    sys_nosys },			/* 223 = excluded compat_netbsd32_semconfig */
+	    sys_nosys },			/* 223 = excluded netbsd32_semconfig */
 #endif
 #if defined(SYSVMSG) || !defined(_KERNEL)
-	{ 3, s(struct compat_netbsd32_msgctl_args),
-	    compat_netbsd32_msgctl },		/* 224 = compat_netbsd32_msgctl */
-	{ 2, s(struct compat_netbsd32_msgget_args),
-	    compat_netbsd32_msgget },		/* 225 = compat_netbsd32_msgget */
-	{ 4, s(struct compat_netbsd32_msgsnd_args),
-	    compat_netbsd32_msgsnd },		/* 226 = compat_netbsd32_msgsnd */
-	{ 5, s(struct compat_netbsd32_msgrcv_args),
-	    compat_netbsd32_msgrcv },		/* 227 = compat_netbsd32_msgrcv */
+	{ 3, s(struct compat_14_netbsd32_msgctl_args),
+	    compat_14(netbsd32_msgctl) },	/* 224 = compat_14 netbsd32_msgctl */
+	{ 2, s(struct netbsd32_msgget_args),
+	    netbsd32_msgget },			/* 225 = netbsd32_msgget */
+	{ 4, s(struct netbsd32_msgsnd_args),
+	    netbsd32_msgsnd },			/* 226 = netbsd32_msgsnd */
+	{ 5, s(struct netbsd32_msgrcv_args),
+	    netbsd32_msgrcv },			/* 227 = netbsd32_msgrcv */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 224 = excluded compat_netbsd32_msgctl */
+	    sys_nosys },			/* 224 = excluded netbsd32_msgctl */
 	{ 0, 0,
-	    sys_nosys },			/* 225 = excluded compat_netbsd32_msgget */
+	    sys_nosys },			/* 225 = excluded netbsd32_msgget */
 	{ 0, 0,
-	    sys_nosys },			/* 226 = excluded compat_netbsd32_msgsnd */
+	    sys_nosys },			/* 226 = excluded netbsd32_msgsnd */
 	{ 0, 0,
-	    sys_nosys },			/* 227 = excluded compat_netbsd32_msgrcv */
+	    sys_nosys },			/* 227 = excluded netbsd32_msgrcv */
 #endif
 #if defined(SYSVSHM) || !defined(_KERNEL)
-	{ 3, s(struct compat_netbsd32_shmat_args),
-	    compat_netbsd32_shmat },		/* 228 = compat_netbsd32_shmat */
-	{ 3, s(struct compat_netbsd32_shmctl_args),
-	    compat_netbsd32_shmctl },		/* 229 = compat_netbsd32_shmctl */
-	{ 1, s(struct compat_netbsd32_shmdt_args),
-	    compat_netbsd32_shmdt },		/* 230 = compat_netbsd32_shmdt */
-	{ 3, s(struct compat_netbsd32_shmget_args),
-	    compat_netbsd32_shmget },		/* 231 = compat_netbsd32_shmget */
+	{ 3, s(struct netbsd32_shmat_args),
+	    netbsd32_shmat },			/* 228 = netbsd32_shmat */
+	{ 3, s(struct compat_14_netbsd32_shmctl_args),
+	    compat_14(netbsd32_shmctl) },	/* 229 = compat_14 netbsd32_shmctl */
+	{ 1, s(struct netbsd32_shmdt_args),
+	    netbsd32_shmdt },			/* 230 = netbsd32_shmdt */
+	{ 3, s(struct netbsd32_shmget_args),
+	    netbsd32_shmget },			/* 231 = netbsd32_shmget */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 228 = excluded compat_netbsd32_shmat */
+	    sys_nosys },			/* 228 = excluded netbsd32_shmat */
 	{ 0, 0,
-	    sys_nosys },			/* 229 = excluded compat_netbsd32_shmctl */
+	    sys_nosys },			/* 229 = excluded netbsd32_shmctl */
 	{ 0, 0,
-	    sys_nosys },			/* 230 = excluded compat_netbsd32_shmdt */
+	    sys_nosys },			/* 230 = excluded netbsd32_shmdt */
 	{ 0, 0,
-	    sys_nosys },			/* 231 = excluded compat_netbsd32_shmget */
+	    sys_nosys },			/* 231 = excluded netbsd32_shmget */
 #endif
-	{ 2, s(struct compat_netbsd32_clock_gettime_args),
-	    compat_netbsd32_clock_gettime },	/* 232 = compat_netbsd32_clock_gettime */
-	{ 2, s(struct compat_netbsd32_clock_settime_args),
-	    compat_netbsd32_clock_settime },	/* 233 = compat_netbsd32_clock_settime */
-	{ 2, s(struct compat_netbsd32_clock_getres_args),
-	    compat_netbsd32_clock_getres },	/* 234 = compat_netbsd32_clock_getres */
+	{ 2, s(struct netbsd32_clock_gettime_args),
+	    netbsd32_clock_gettime },		/* 232 = netbsd32_clock_gettime */
+	{ 2, s(struct netbsd32_clock_settime_args),
+	    netbsd32_clock_settime },		/* 233 = netbsd32_clock_settime */
+	{ 2, s(struct netbsd32_clock_getres_args),
+	    netbsd32_clock_getres },		/* 234 = netbsd32_clock_getres */
 	{ 0, 0,
 	    sys_nosys },			/* 235 = unimplemented timer_create */
 	{ 0, 0,
@@ -668,10 +674,10 @@ struct sysent netbsd32_sysent[] = {
 	    sys_nosys },			/* 238 = unimplemented timer_gettime */
 	{ 0, 0,
 	    sys_nosys },			/* 239 = unimplemented timer_getoverrun */
-	{ 2, s(struct compat_netbsd32_nanosleep_args),
-	    compat_netbsd32_nanosleep },	/* 240 = compat_netbsd32_nanosleep */
-	{ 1, s(struct compat_netbsd32_fdatasync_args),
-	    compat_netbsd32_fdatasync },	/* 241 = compat_netbsd32_fdatasync */
+	{ 2, s(struct netbsd32_nanosleep_args),
+	    netbsd32_nanosleep },		/* 240 = netbsd32_nanosleep */
+	{ 1, s(struct netbsd32_fdatasync_args),
+	    netbsd32_fdatasync },		/* 241 = netbsd32_fdatasync */
 	{ 0, 0,
 	    sys_nosys },			/* 242 = unimplemented */
 	{ 0, 0,
@@ -728,52 +734,52 @@ struct sysent netbsd32_sysent[] = {
 	    sys_nosys },			/* 268 = unimplemented */
 	{ 0, 0,
 	    sys_nosys },			/* 269 = unimplemented */
-	{ 2, s(struct compat_netbsd32___posix_rename_args),
-	    compat_netbsd32___posix_rename },	/* 270 = compat_netbsd32___posix_rename */
-	{ 3, s(struct compat_netbsd32_swapctl_args),
-	    compat_netbsd32_swapctl },		/* 271 = compat_netbsd32_swapctl */
-	{ 3, s(struct compat_netbsd32_getdents_args),
-	    compat_netbsd32_getdents },		/* 272 = compat_netbsd32_getdents */
-	{ 3, s(struct compat_netbsd32_minherit_args),
-	    compat_netbsd32_minherit },		/* 273 = compat_netbsd32_minherit */
-	{ 2, s(struct compat_netbsd32_lchmod_args),
-	    compat_netbsd32_lchmod },		/* 274 = compat_netbsd32_lchmod */
-	{ 3, s(struct compat_netbsd32_lchown_args),
-	    compat_netbsd32_lchown },		/* 275 = compat_netbsd32_lchown */
-	{ 2, s(struct compat_netbsd32_lutimes_args),
-	    compat_netbsd32_lutimes },		/* 276 = compat_netbsd32_lutimes */
-	{ 3, s(struct compat_netbsd32___msync13_args),
-	    compat_netbsd32___msync13 },	/* 277 = compat_netbsd32___msync13 */
-	{ 2, s(struct compat_netbsd32___stat13_args),
-	    compat_netbsd32___stat13 },		/* 278 = compat_netbsd32___stat13 */
-	{ 2, s(struct compat_netbsd32___fstat13_args),
-	    compat_netbsd32___fstat13 },	/* 279 = compat_netbsd32___fstat13 */
-	{ 2, s(struct compat_netbsd32___lstat13_args),
-	    compat_netbsd32___lstat13 },	/* 280 = compat_netbsd32___lstat13 */
-	{ 2, s(struct compat_netbsd32___sigaltstack14_args),
-	    compat_netbsd32___sigaltstack14 },	/* 281 = compat_netbsd32___sigaltstack14 */
+	{ 2, s(struct netbsd32___posix_rename_args),
+	    netbsd32___posix_rename },		/* 270 = netbsd32___posix_rename */
+	{ 3, s(struct netbsd32_swapctl_args),
+	    netbsd32_swapctl },			/* 271 = netbsd32_swapctl */
+	{ 3, s(struct netbsd32_getdents_args),
+	    netbsd32_getdents },		/* 272 = netbsd32_getdents */
+	{ 3, s(struct netbsd32_minherit_args),
+	    netbsd32_minherit },		/* 273 = netbsd32_minherit */
+	{ 2, s(struct netbsd32_lchmod_args),
+	    netbsd32_lchmod },			/* 274 = netbsd32_lchmod */
+	{ 3, s(struct netbsd32_lchown_args),
+	    netbsd32_lchown },			/* 275 = netbsd32_lchown */
+	{ 2, s(struct netbsd32_lutimes_args),
+	    netbsd32_lutimes },			/* 276 = netbsd32_lutimes */
+	{ 3, s(struct netbsd32___msync13_args),
+	    netbsd32___msync13 },		/* 277 = netbsd32___msync13 */
+	{ 2, s(struct netbsd32___stat13_args),
+	    netbsd32___stat13 },		/* 278 = netbsd32___stat13 */
+	{ 2, s(struct netbsd32___fstat13_args),
+	    netbsd32___fstat13 },		/* 279 = netbsd32___fstat13 */
+	{ 2, s(struct netbsd32___lstat13_args),
+	    netbsd32___lstat13 },		/* 280 = netbsd32___lstat13 */
+	{ 2, s(struct netbsd32___sigaltstack14_args),
+	    netbsd32___sigaltstack14 },		/* 281 = netbsd32___sigaltstack14 */
 	{ 0, 0,
 	    sys___vfork14 },			/* 282 = __vfork14 */
-	{ 3, s(struct compat_netbsd32___posix_chown_args),
-	    compat_netbsd32___posix_chown },	/* 283 = compat_netbsd32___posix_chown */
-	{ 3, s(struct compat_netbsd32___posix_fchown_args),
-	    compat_netbsd32___posix_fchown },	/* 284 = compat_netbsd32___posix_fchown */
-	{ 3, s(struct compat_netbsd32___posix_lchown_args),
-	    compat_netbsd32___posix_lchown },	/* 285 = compat_netbsd32___posix_lchown */
-	{ 1, s(struct compat_netbsd32_getsid_args),
-	    compat_netbsd32_getsid },		/* 286 = compat_netbsd32_getsid */
+	{ 3, s(struct netbsd32___posix_chown_args),
+	    netbsd32___posix_chown },		/* 283 = netbsd32___posix_chown */
+	{ 3, s(struct netbsd32___posix_fchown_args),
+	    netbsd32___posix_fchown },		/* 284 = netbsd32___posix_fchown */
+	{ 3, s(struct netbsd32___posix_lchown_args),
+	    netbsd32___posix_lchown },		/* 285 = netbsd32___posix_lchown */
+	{ 1, s(struct netbsd32_getsid_args),
+	    netbsd32_getsid },			/* 286 = netbsd32_getsid */
 	{ 0, 0,
 	    sys_nosys },			/* 287 = unimplemented */
 #if defined(KTRACE) || !defined(_KERNEL)
-	{ 4, s(struct compat_netbsd32_fktrace_args),
-	    compat_netbsd32_fktrace },		/* 288 = compat_netbsd32_fktrace */
+	{ 4, s(struct netbsd32_fktrace_args),
+	    netbsd32_fktrace },			/* 288 = netbsd32_fktrace */
 #else
 	{ 0, 0,
-	    sys_nosys },			/* 288 = excluded compat_netbsd32_fktrace */
+	    sys_nosys },			/* 288 = excluded netbsd32_fktrace */
 #endif
-	{ 5, s(struct compat_netbsd32_preadv_args),
-	    compat_netbsd32_preadv },		/* 289 = compat_netbsd32_preadv */
-	{ 5, s(struct compat_netbsd32_pwritev_args),
-	    compat_netbsd32_pwritev },		/* 290 = compat_netbsd32_pwritev */
+	{ 5, s(struct netbsd32_preadv_args),
+	    netbsd32_preadv },			/* 289 = netbsd32_preadv */
+	{ 5, s(struct netbsd32_pwritev_args),
+	    netbsd32_pwritev },			/* 290 = netbsd32_pwritev */
 };
 
diff --git a/sys/compat/netbsd32/syscalls.conf b/sys/compat/netbsd32/syscalls.conf
index 5027841d6c7e..b2562b3a16aa 100644
--- a/sys/compat/netbsd32/syscalls.conf
+++ b/sys/compat/netbsd32/syscalls.conf
@@ -1,10 +1,10 @@
-#	$NetBSD: syscalls.conf,v 1.3 1999/03/25 16:22:50 mrg Exp $
+#	$NetBSD: syscalls.conf,v 1.4 1999/10/11 01:36:24 eeh Exp $
 
 sysnames="netbsd32_syscalls.c"
 sysnumhdr="netbsd32_syscall.h"
 syssw="netbsd32_sysent.c"
 sysarghdr="netbsd32_syscallargs.h"
-compatopts="compat_43 compat_09 compat_10 compat_11 compat_12 compat_13"
+compatopts="compat_43 compat_09 compat_10 compat_11 compat_12 compat_13 compat_14"
 libcompatopts=""
 
 switchname="netbsd32_sysent"
diff --git a/sys/compat/netbsd32/syscalls.master b/sys/compat/netbsd32/syscalls.master
index d4a7fa5ef8ac..927029206f8b 100644
--- a/sys/compat/netbsd32/syscalls.master
+++ b/sys/compat/netbsd32/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.9 1999/07/12 21:55:20 kleink Exp $
+	$NetBSD: syscalls.master,v 1.10 1999/10/11 01:36:24 eeh Exp $
 
 ;	from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -61,179 +61,179 @@
 ; of the current calls.
 
 0	INDIR		{ int sys_syscall(int number, ...); }
-1	STD		{ void compat_netbsd32_exit(int rval); }
+1	STD		{ void netbsd32_exit(int rval); }
 2	NOARGS		{ int sys_fork(void); }
-3	STD		{ netbsd32_ssize_t compat_netbsd32_read(int fd, netbsd32_voidp buf, netbsd32_size_t nbyte); }
-4	STD		{ netbsd32_ssize_t compat_netbsd32_write(int fd, const netbsd32_voidp buf, netbsd32_size_t nbyte); }
-5	STD		{ int compat_netbsd32_open(const netbsd32_charp path, int flags, ... mode_t mode); }
-6	STD		{ int compat_netbsd32_close(int fd); }
-7	STD		{ int compat_netbsd32_wait4(int pid, netbsd32_intp status, int options, netbsd32_rusagep_t rusage); }
-8	COMPAT_43	{ int compat_netbsd32_ocreat(const netbsd32_charp path, mode_t mode); }
-9	STD		{ int compat_netbsd32_link(const netbsd32_charp path, const netbsd32_charp link); }
-10	STD		{ int compat_netbsd32_unlink(const netbsd32_charp path); }
+3	STD		{ netbsd32_ssize_t netbsd32_read(int fd, netbsd32_voidp buf, netbsd32_size_t nbyte); }
+4	STD		{ netbsd32_ssize_t netbsd32_write(int fd, const netbsd32_voidp buf, netbsd32_size_t nbyte); }
+5	STD		{ int netbsd32_open(const netbsd32_charp path, int flags, ... mode_t mode); }
+6	STD		{ int netbsd32_close(int fd); }
+7	STD		{ int netbsd32_wait4(int pid, netbsd32_intp status, int options, netbsd32_rusagep_t rusage); }
+8	COMPAT_43	{ int netbsd32_ocreat(const netbsd32_charp path, mode_t mode); }
+9	STD		{ int netbsd32_link(const netbsd32_charp path, const netbsd32_charp link); }
+10	STD		{ int netbsd32_unlink(const netbsd32_charp path); }
 11	OBSOL		execv
-12	STD		{ int compat_netbsd32_chdir(const netbsd32_charp path); }
-13	STD		{ int compat_netbsd32_fchdir(int fd); }
-14	STD		{ int compat_netbsd32_mknod(const netbsd32_charp path, mode_t mode, dev_t dev); }
-15	STD		{ int compat_netbsd32_chmod(const netbsd32_charp path, mode_t mode); }
-16	STD		{ int compat_netbsd32_chown(const netbsd32_charp path, uid_t uid, gid_t gid); }
-17	STD		{ int compat_netbsd32_break(netbsd32_charp nsize); }
-18	STD		{ int compat_netbsd32_getfsstat(netbsd32_statfsp_t buf, netbsd32_long bufsize, int flags); }
-19	COMPAT_43	{ netbsd32_long compat_netbsd32_olseek(int fd, netbsd32_long offset, int whence); }
+12	STD		{ int netbsd32_chdir(const netbsd32_charp path); }
+13	STD		{ int netbsd32_fchdir(int fd); }
+14	STD		{ int netbsd32_mknod(const netbsd32_charp path, mode_t mode, dev_t dev); }
+15	STD		{ int netbsd32_chmod(const netbsd32_charp path, mode_t mode); }
+16	STD		{ int netbsd32_chown(const netbsd32_charp path, uid_t uid, gid_t gid); }
+17	STD		{ int netbsd32_break(netbsd32_charp nsize); }
+18	STD		{ int netbsd32_getfsstat(netbsd32_statfsp_t buf, netbsd32_long bufsize, int flags); }
+19	COMPAT_43	{ netbsd32_long netbsd32_olseek(int fd, netbsd32_long offset, int whence); }
 20	NOARGS		{ pid_t sys_getpid(void); }
-21	STD		{ int compat_netbsd32_mount(const netbsd32_charp type, const netbsd32_charp path, int flags, netbsd32_voidp data); }
-22	STD		{ int compat_netbsd32_unmount(const netbsd32_charp path, int flags); }
-23	STD		{ int compat_netbsd32_setuid(uid_t uid); }
+21	STD		{ int netbsd32_mount(const netbsd32_charp type, const netbsd32_charp path, int flags, netbsd32_voidp data); }
+22	STD		{ int netbsd32_unmount(const netbsd32_charp path, int flags); }
+23	STD		{ int netbsd32_setuid(uid_t uid); }
 24	NOARGS		{ uid_t sys_getuid(void); }
 25	NOARGS		{ uid_t sys_geteuid(void); }
-26	STD		{ int compat_netbsd32_ptrace(int req, pid_t pid, netbsd32_caddr_t addr, int data); }
-27	STD		{ netbsd32_ssize_t compat_netbsd32_recvmsg(int s, netbsd32_msghdrp_t msg, int flags); }
-28	STD		{ netbsd32_ssize_t compat_netbsd32_sendmsg(int s, const netbsd32_msghdrp_t msg, int flags); }
-29	STD		{ netbsd32_ssize_t compat_netbsd32_recvfrom(int s, netbsd32_voidp buf, netbsd32_size_t len, int flags, netbsd32_sockaddrp_t from, netbsd32_intp fromlenaddr); }
-30	STD		{ int compat_netbsd32_accept(int s, netbsd32_sockaddrp_t name, netbsd32_intp anamelen); }
-31	STD		{ int compat_netbsd32_getpeername(int fdes, netbsd32_sockaddrp_t asa, netbsd32_intp alen); }
-32	STD		{ int compat_netbsd32_getsockname(int fdes, netbsd32_sockaddrp_t asa, netbsd32_intp alen); }
-33	STD		{ int compat_netbsd32_access(const netbsd32_charp path, int flags); }
-34	STD		{ int compat_netbsd32_chflags(const netbsd32_charp path, netbsd32_u_long flags); }
-35	STD		{ int compat_netbsd32_fchflags(int fd, netbsd32_u_long flags); }
+26	STD		{ int netbsd32_ptrace(int req, pid_t pid, netbsd32_caddr_t addr, int data); }
+27	STD		{ netbsd32_ssize_t netbsd32_recvmsg(int s, netbsd32_msghdrp_t msg, int flags); }
+28	STD		{ netbsd32_ssize_t netbsd32_sendmsg(int s, const netbsd32_msghdrp_t msg, int flags); }
+29	STD		{ netbsd32_ssize_t netbsd32_recvfrom(int s, netbsd32_voidp buf, netbsd32_size_t len, int flags, netbsd32_sockaddrp_t from, netbsd32_intp fromlenaddr); }
+30	STD		{ int netbsd32_accept(int s, netbsd32_sockaddrp_t name, netbsd32_intp anamelen); }
+31	STD		{ int netbsd32_getpeername(int fdes, netbsd32_sockaddrp_t asa, netbsd32_intp alen); }
+32	STD		{ int netbsd32_getsockname(int fdes, netbsd32_sockaddrp_t asa, netbsd32_intp alen); }
+33	STD		{ int netbsd32_access(const netbsd32_charp path, int flags); }
+34	STD		{ int netbsd32_chflags(const netbsd32_charp path, netbsd32_u_long flags); }
+35	STD		{ int netbsd32_fchflags(int fd, netbsd32_u_long flags); }
 36	NOARGS		{ void sys_sync(void); }
-37	STD		{ int compat_netbsd32_kill(int pid, int signum); }
-38	COMPAT_43	{ int compat_netbsd32_stat43(const netbsd32_charp path, netbsd32_stat43p_t ub); }
+37	STD		{ int netbsd32_kill(int pid, int signum); }
+38	COMPAT_43	{ int netbsd32_stat43(const netbsd32_charp path, netbsd32_stat43p_t ub); }
 39	NOARGS		{ pid_t sys_getppid(void); }
-40	COMPAT_43	{ int compat_netbsd32_lstat43(const netbsd32_charp path, netbsd32_stat43p_t ub); }
-41	STD		{ int compat_netbsd32_dup(int fd); }
+40	COMPAT_43	{ int netbsd32_lstat43(const netbsd32_charp path, netbsd32_stat43p_t ub); }
+41	STD		{ int netbsd32_dup(int fd); }
 42	NOARGS		{ int sys_pipe(void); }
 43	NOARGS		{ gid_t sys_getegid(void); }
-44	STD		{ int compat_netbsd32_profil(netbsd32_caddr_t samples, netbsd32_size_t size, netbsd32_u_long offset, u_int scale); }
+44	STD		{ int netbsd32_profil(netbsd32_caddr_t samples, netbsd32_size_t size, netbsd32_u_long offset, u_int scale); }
 #if defined(KTRACE) || !defined(_KERNEL)
-45	STD		{ int compat_netbsd32_ktrace(const netbsd32_charp fname, int ops, int facs, int pid); }
+45	STD		{ int netbsd32_ktrace(const netbsd32_charp fname, int ops, int facs, int pid); }
 #else
-45	EXCL		compat_netbsd32_ktrace
+45	EXCL		netbsd32_ktrace
 #endif
-46	STD		{ int compat_netbsd32_sigaction(int signum, const netbsd32_sigactionp_t nsa, netbsd32_sigactionp_t osa); }
+46	STD		{ int netbsd32_sigaction(int signum, const netbsd32_sigactionp_t nsa, netbsd32_sigactionp_t osa); }
 47	NOARGS		{ gid_t sys_getgid(void); }
-48	COMPAT_13	{ int compat_netbsd32_sigprocmask(int how, \
+48	COMPAT_13	{ int netbsd32_sigprocmask(int how, \
 			    int mask); } sigprocmask13
-49	STD		{ int compat_netbsd32___getlogin(netbsd32_charp namebuf, u_int namelen); }
-50	STD		{ int compat_netbsd32_setlogin(const netbsd32_charp namebuf); }
-51	STD		{ int compat_netbsd32_acct(const netbsd32_charp path); }
+49	STD		{ int netbsd32___getlogin(netbsd32_charp namebuf, u_int namelen); }
+50	STD		{ int netbsd32_setlogin(const netbsd32_charp namebuf); }
+51	STD		{ int netbsd32_acct(const netbsd32_charp path); }
 52	COMPAT_13	{ int sys_sigpending(void); } sigpending13
-53	COMPAT_13	{ int compat_netbsd32_sigaltstack13(const netbsd32_sigaltstack13p_t nss, netbsd32_sigaltstack13p_t oss); }
-54	STD		{ int compat_netbsd32_ioctl(int fd, netbsd32_u_long com, ... netbsd32_voidp data); }
+53	COMPAT_13	{ int netbsd32_sigaltstack13(const netbsd32_sigaltstack13p_t nss, netbsd32_sigaltstack13p_t oss); }
+54	STD		{ int netbsd32_ioctl(int fd, netbsd32_u_long com, ... netbsd32_voidp data); }
 #ifdef COMPAT_12
-55	COMPAT_12	{ int compat_netbsd32_reboot(int opt); }
+55	COMPAT_12	{ int netbsd32_reboot(int opt); }
 #else
 55	OBSOL		oreboot
 #endif
-56	STD		{ int compat_netbsd32_revoke(const netbsd32_charp path); }
-57	STD		{ int compat_netbsd32_symlink(const netbsd32_charp path, const netbsd32_charp link); }
-58	STD		{ int compat_netbsd32_readlink(const netbsd32_charp path, netbsd32_charp buf, netbsd32_size_t count); }
-59	STD		{ int compat_netbsd32_execve(const netbsd32_charp path, netbsd32_charpp argp, netbsd32_charpp envp); }
-60	STD		{ mode_t compat_netbsd32_umask(mode_t newmask); }
-61	STD		{ int compat_netbsd32_chroot(const netbsd32_charp path); }
-62	COMPAT_43	{ int compat_netbsd32_fstat43(int fd, netbsd32_stat43p_t sb); }
-63	COMPAT_43	{ int compat_netbsd32_ogetkerninfo(int op, netbsd32_charp where, netbsd32_intp size, int arg); }
+56	STD		{ int netbsd32_revoke(const netbsd32_charp path); }
+57	STD		{ int netbsd32_symlink(const netbsd32_charp path, const netbsd32_charp link); }
+58	STD		{ int netbsd32_readlink(const netbsd32_charp path, netbsd32_charp buf, netbsd32_size_t count); }
+59	STD		{ int netbsd32_execve(const netbsd32_charp path, netbsd32_charpp argp, netbsd32_charpp envp); }
+60	STD		{ mode_t netbsd32_umask(mode_t newmask); }
+61	STD		{ int netbsd32_chroot(const netbsd32_charp path); }
+62	COMPAT_43	{ int netbsd32_fstat43(int fd, netbsd32_stat43p_t sb); }
+63	COMPAT_43	{ int netbsd32_ogetkerninfo(int op, netbsd32_charp where, netbsd32_intp size, int arg); }
 64	COMPAT_43	{ int sys_getpagesize(void); } ogetpagesize
-65	COMPAT_12	{ int compat_netbsd32_msync(netbsd32_caddr_t addr, netbsd32_size_t len); }
+65	COMPAT_12	{ int netbsd32_msync(netbsd32_caddr_t addr, netbsd32_size_t len); }
 ; XXX COMPAT_??? for 4.4BSD-compatible vfork(2)?
 66	NOARGS		{ int sys_vfork(void); }
 67	OBSOL		vread
 68	OBSOL		vwrite
-69	STD		{ int compat_netbsd32_sbrk(netbsd32_intptr_t incr); }
-70	STD		{ int compat_netbsd32_sstk(int incr); }
-71	COMPAT_43	{ int compat_netbsd32_ommap(netbsd32_caddr_t addr, netbsd32_size_t len, int prot, int flags, int fd, netbsd32_long pos); }
-72	STD		{ int compat_netbsd32_ovadvise(int anom); } vadvise
-73	STD		{ int compat_netbsd32_munmap(netbsd32_voidp addr, netbsd32_size_t len); }
-74	STD		{ int compat_netbsd32_mprotect(netbsd32_voidp addr, netbsd32_size_t len, int prot); }
-75	STD		{ int compat_netbsd32_madvise(netbsd32_voidp addr, netbsd32_size_t len, int behav); }
+69	STD		{ int netbsd32_sbrk(netbsd32_intptr_t incr); }
+70	STD		{ int netbsd32_sstk(int incr); }
+71	COMPAT_43	{ int netbsd32_ommap(netbsd32_caddr_t addr, netbsd32_size_t len, int prot, int flags, int fd, netbsd32_long pos); }
+72	STD		{ int netbsd32_ovadvise(int anom); } vadvise
+73	STD		{ int netbsd32_munmap(netbsd32_voidp addr, netbsd32_size_t len); }
+74	STD		{ int netbsd32_mprotect(netbsd32_voidp addr, netbsd32_size_t len, int prot); }
+75	STD		{ int netbsd32_madvise(netbsd32_voidp addr, netbsd32_size_t len, int behav); }
 76	OBSOL		vhangup
 77	OBSOL		vlimit
-78	STD		{ int compat_netbsd32_mincore(netbsd32_caddr_t addr, netbsd32_size_t len, netbsd32_charp vec); }
-79	STD		{ int compat_netbsd32_getgroups(int gidsetsize, netbsd32_gid_tp gidset); }
-80	STD		{ int compat_netbsd32_setgroups(int gidsetsize, const netbsd32_gid_tp gidset); }
+78	STD		{ int netbsd32_mincore(netbsd32_caddr_t addr, netbsd32_size_t len, netbsd32_charp vec); }
+79	STD		{ int netbsd32_getgroups(int gidsetsize, netbsd32_gid_tp gidset); }
+80	STD		{ int netbsd32_setgroups(int gidsetsize, const netbsd32_gid_tp gidset); }
 81	NOARGS		{ int sys_getpgrp(void); }
-82	STD		{ int compat_netbsd32_setpgid(int pid, int pgid); }
-83	STD		{ int compat_netbsd32_setitimer(int which, const netbsd32_itimervalp_t itv, netbsd32_itimervalp_t oitv); }
+82	STD		{ int netbsd32_setpgid(int pid, int pgid); }
+83	STD		{ int netbsd32_setitimer(int which, const netbsd32_itimervalp_t itv, netbsd32_itimervalp_t oitv); }
 84	COMPAT_43	{ int sys_wait(void); } owait
-85	COMPAT_12	{ int compat_netbsd32_oswapon(const netbsd32_charp name); }
-86	STD		{ int compat_netbsd32_getitimer(int which, netbsd32_itimervalp_t itv); }
-87	COMPAT_43	{ int compat_netbsd32_ogethostname(netbsd32_charp hostname, u_int len); }
-88	COMPAT_43	{ int compat_netbsd32_osethostname(netbsd32_charp hostname, u_int len); }
+85	COMPAT_12	{ int netbsd32_oswapon(const netbsd32_charp name); }
+86	STD		{ int netbsd32_getitimer(int which, netbsd32_itimervalp_t itv); }
+87	COMPAT_43	{ int netbsd32_ogethostname(netbsd32_charp hostname, u_int len); }
+88	COMPAT_43	{ int netbsd32_osethostname(netbsd32_charp hostname, u_int len); }
 89	COMPAT_43	{ int sys_getdtablesize(void); } ogetdtablesize
-90	STD		{ int compat_netbsd32_dup2(int from, int to); }
+90	STD		{ int netbsd32_dup2(int from, int to); }
 91	UNIMPL		getdopt
-92	STD		{ int compat_netbsd32_fcntl(int fd, int cmd, ... netbsd32_voidp arg); }
-93	STD		{ int compat_netbsd32_select(int nd, netbsd32_fd_setp_t in, netbsd32_fd_setp_t ou, netbsd32_fd_setp_t ex, netbsd32_timevalp_t tv); }
+92	STD		{ int netbsd32_fcntl(int fd, int cmd, ... netbsd32_voidp arg); }
+93	STD		{ int netbsd32_select(int nd, netbsd32_fd_setp_t in, netbsd32_fd_setp_t ou, netbsd32_fd_setp_t ex, netbsd32_timevalp_t tv); }
 94	UNIMPL		setdopt
-95	STD		{ int compat_netbsd32_fsync(int fd); }
-96	STD		{ int compat_netbsd32_setpriority(int which, int who, int prio); }
-97	STD		{ int compat_netbsd32_socket(int domain, int type, int protocol); }
-98	STD		{ int compat_netbsd32_connect(int s, const netbsd32_sockaddrp_t name, int namelen); }
-99	COMPAT_43	{ int compat_netbsd32_oaccept(int s, netbsd32_caddr_t name, netbsd32_intp anamelen); }
-100	STD		{ int compat_netbsd32_getpriority(int which, int who); }
-101	COMPAT_43	{ int compat_netbsd32_osend(int s, netbsd32_caddr_t buf, int len, int flags); }
-102	COMPAT_43	{ int compat_netbsd32_orecv(int s, netbsd32_caddr_t buf, int len, int flags); }
-103	STD		{ int compat_netbsd32_sigreturn(netbsd32_sigcontextp_t sigcntxp); }
-104	STD		{ int compat_netbsd32_bind(int s, const netbsd32_sockaddrp_t name, int namelen); }
-105	STD		{ int compat_netbsd32_setsockopt(int s, int level, int name, const netbsd32_voidp val, int valsize); }
-106	STD		{ int compat_netbsd32_listen(int s, int backlog); }
+95	STD		{ int netbsd32_fsync(int fd); }
+96	STD		{ int netbsd32_setpriority(int which, int who, int prio); }
+97	STD		{ int netbsd32_socket(int domain, int type, int protocol); }
+98	STD		{ int netbsd32_connect(int s, const netbsd32_sockaddrp_t name, int namelen); }
+99	COMPAT_43	{ int netbsd32_oaccept(int s, netbsd32_caddr_t name, netbsd32_intp anamelen); }
+100	STD		{ int netbsd32_getpriority(int which, int who); }
+101	COMPAT_43	{ int netbsd32_osend(int s, netbsd32_caddr_t buf, int len, int flags); }
+102	COMPAT_43	{ int netbsd32_orecv(int s, netbsd32_caddr_t buf, int len, int flags); }
+103	STD		{ int netbsd32_sigreturn(netbsd32_sigcontextp_t sigcntxp); }
+104	STD		{ int netbsd32_bind(int s, const netbsd32_sockaddrp_t name, int namelen); }
+105	STD		{ int netbsd32_setsockopt(int s, int level, int name, const netbsd32_voidp val, int valsize); }
+106	STD		{ int netbsd32_listen(int s, int backlog); }
 107	OBSOL		vtimes
-108	COMPAT_43	{ int compat_netbsd32_osigvec(int signum, netbsd32_sigvecp_t nsv, netbsd32_sigvecp_t osv); }
+108	COMPAT_43	{ int netbsd32_osigvec(int signum, netbsd32_sigvecp_t nsv, netbsd32_sigvecp_t osv); }
 #ifdef COMPAT_43
-109	COMPAT_43	{ int compat_netbsd32_sigblock(int mask); }
-110	COMPAT_43	{ int compat_netbsd32_sigsetmask(int mask); }
+109	COMPAT_43	{ int netbsd32_sigblock(int mask); }
+110	COMPAT_43	{ int netbsd32_sigsetmask(int mask); }
 #else
 109	OBSOL		sigblock
 110	OBSOL		sigsetmask
 #endif
-111	COMPAT_13	{ int compat_netbsd32_sigsuspend(int mask); } sigsuspend13
-112	COMPAT_43	{ int compat_netbsd32_osigstack(netbsd32_sigstackp_t nss, netbsd32_sigstackp_t oss); }
-113	COMPAT_43	{ int compat_netbsd32_orecvmsg(int s, netbsd32_omsghdrp_t msg, int flags); }
-114	COMPAT_43	{ int compat_netbsd32_osendmsg(int s, netbsd32_caddr_t msg, int flags); }
+111	COMPAT_13	{ int netbsd32_sigsuspend(int mask); } sigsuspend13
+112	COMPAT_43	{ int netbsd32_osigstack(netbsd32_sigstackp_t nss, netbsd32_sigstackp_t oss); }
+113	COMPAT_43	{ int netbsd32_orecvmsg(int s, netbsd32_omsghdrp_t msg, int flags); }
+114	COMPAT_43	{ int netbsd32_osendmsg(int s, netbsd32_caddr_t msg, int flags); }
 115	OBSOL		vtrace
-116	STD		{ int compat_netbsd32_gettimeofday(netbsd32_timevalp_t tp, netbsd32_timezonep_t tzp); }
-117	STD		{ int compat_netbsd32_getrusage(int who, netbsd32_rusagep_t rusage); }
-118	STD		{ int compat_netbsd32_getsockopt(int s, int level, int name, netbsd32_voidp val, netbsd32_intp avalsize); }
+116	STD		{ int netbsd32_gettimeofday(netbsd32_timevalp_t tp, netbsd32_timezonep_t tzp); }
+117	STD		{ int netbsd32_getrusage(int who, netbsd32_rusagep_t rusage); }
+118	STD		{ int netbsd32_getsockopt(int s, int level, int name, netbsd32_voidp val, netbsd32_intp avalsize); }
 119	OBSOL		resuba
-120	STD		{ netbsd32_ssize_t compat_netbsd32_readv(int fd, const netbsd32_iovecp_t iovp, int iovcnt); }
-121	STD		{ netbsd32_ssize_t compat_netbsd32_writev(int fd, const netbsd32_iovecp_t iovp, int iovcnt); }
-122	STD		{ int compat_netbsd32_settimeofday(const netbsd32_timevalp_t tv, const netbsd32_timezonep_t tzp); }
-123	STD		{ int compat_netbsd32_fchown(int fd, uid_t uid, gid_t gid); }
-124	STD		{ int compat_netbsd32_fchmod(int fd, mode_t mode); }
-125	COMPAT_43	{ int compat_netbsd32_orecvfrom(int s, netbsd32_caddr_t buf, netbsd32_size_t len, int flags, netbsd32_caddr_t from, netbsd32_intp fromlenaddr); }
-126	STD		{ int compat_netbsd32_setreuid(uid_t ruid, uid_t euid); }
-127	STD		{ int compat_netbsd32_setregid(gid_t rgid, gid_t egid); }
-128	STD		{ int compat_netbsd32_rename(const netbsd32_charp from, const netbsd32_charp to); }
-129	COMPAT_43	{ int compat_netbsd32_otruncate(const netbsd32_charp path, netbsd32_long length); }
-130	COMPAT_43	{ int compat_netbsd32_oftruncate(int fd, netbsd32_long length); }
-131	STD		{ int compat_netbsd32_flock(int fd, int how); }
-132	STD		{ int compat_netbsd32_mkfifo(const netbsd32_charp path, mode_t mode); }
-133	STD		{ netbsd32_ssize_t compat_netbsd32_sendto(int s, const netbsd32_voidp buf, netbsd32_size_t len, int flags, const netbsd32_sockaddrp_t to, int tolen); }
-134	STD		{ int compat_netbsd32_shutdown(int s, int how); }
-135	STD		{ int compat_netbsd32_socketpair(int domain, int type, int protocol, netbsd32_intp rsv); }
-136	STD		{ int compat_netbsd32_mkdir(const netbsd32_charp path, mode_t mode); }
-137	STD		{ int compat_netbsd32_rmdir(const netbsd32_charp path); }
-138	STD		{ int compat_netbsd32_utimes(const netbsd32_charp path, const netbsd32_timevalp_t tptr); }
+120	STD		{ netbsd32_ssize_t netbsd32_readv(int fd, const netbsd32_iovecp_t iovp, int iovcnt); }
+121	STD		{ netbsd32_ssize_t netbsd32_writev(int fd, const netbsd32_iovecp_t iovp, int iovcnt); }
+122	STD		{ int netbsd32_settimeofday(const netbsd32_timevalp_t tv, const netbsd32_timezonep_t tzp); }
+123	STD		{ int netbsd32_fchown(int fd, uid_t uid, gid_t gid); }
+124	STD		{ int netbsd32_fchmod(int fd, mode_t mode); }
+125	COMPAT_43	{ int netbsd32_orecvfrom(int s, netbsd32_caddr_t buf, netbsd32_size_t len, int flags, netbsd32_caddr_t from, netbsd32_intp fromlenaddr); }
+126	STD		{ int netbsd32_setreuid(uid_t ruid, uid_t euid); }
+127	STD		{ int netbsd32_setregid(gid_t rgid, gid_t egid); }
+128	STD		{ int netbsd32_rename(const netbsd32_charp from, const netbsd32_charp to); }
+129	COMPAT_43	{ int netbsd32_otruncate(const netbsd32_charp path, netbsd32_long length); }
+130	COMPAT_43	{ int netbsd32_oftruncate(int fd, netbsd32_long length); }
+131	STD		{ int netbsd32_flock(int fd, int how); }
+132	STD		{ int netbsd32_mkfifo(const netbsd32_charp path, mode_t mode); }
+133	STD		{ netbsd32_ssize_t netbsd32_sendto(int s, const netbsd32_voidp buf, netbsd32_size_t len, int flags, const netbsd32_sockaddrp_t to, int tolen); }
+134	STD		{ int netbsd32_shutdown(int s, int how); }
+135	STD		{ int netbsd32_socketpair(int domain, int type, int protocol, netbsd32_intp rsv); }
+136	STD		{ int netbsd32_mkdir(const netbsd32_charp path, mode_t mode); }
+137	STD		{ int netbsd32_rmdir(const netbsd32_charp path); }
+138	STD		{ int netbsd32_utimes(const netbsd32_charp path, const netbsd32_timevalp_t tptr); }
 139	OBSOL		4.2 sigreturn
-140	STD		{ int compat_netbsd32_adjtime(const netbsd32_timevalp_t delta, netbsd32_timevalp_t olddelta); }
-141	COMPAT_43	{ int compat_netbsd32_ogetpeername(int fdes, netbsd32_caddr_t asa, netbsd32_intp alen); }
+140	STD		{ int netbsd32_adjtime(const netbsd32_timevalp_t delta, netbsd32_timevalp_t olddelta); }
+141	COMPAT_43	{ int netbsd32_ogetpeername(int fdes, netbsd32_caddr_t asa, netbsd32_intp alen); }
 142	COMPAT_43	{ int32_t sys_gethostid(void); } ogethostid
 #ifdef COMPAT_43
-143	COMPAT_43	{ int compat_netbsd32_sethostid(int32_t hostid); }
+143	COMPAT_43	{ int netbsd32_sethostid(int32_t hostid); }
 #else
 143	OBSOL		sethostid
 #endif
-144	COMPAT_43	{ int compat_netbsd32_ogetrlimit(int which, netbsd32_orlimitp_t rlp); }
-145	COMPAT_43	{ int compat_netbsd32_osetrlimit(int which, const netbsd32_orlimitp_t rlp); }
+144	COMPAT_43	{ int netbsd32_ogetrlimit(int which, netbsd32_orlimitp_t rlp); }
+145	COMPAT_43	{ int netbsd32_osetrlimit(int which, const netbsd32_orlimitp_t rlp); }
 #ifdef COMPAT_43
-146	COMPAT_43	{ int compat_netbsd32_killpg(int pgid, int signum); }
+146	COMPAT_43	{ int netbsd32_killpg(int pgid, int signum); }
 #else
 146	OBSOL		killpg
 #endif
 147	NOARGS		{ int sys_setsid(void); }
-148	STD		{ int compat_netbsd32_quotactl(const netbsd32_charp path, int cmd, int uid, netbsd32_caddr_t arg); }
+148	STD		{ int netbsd32_quotactl(const netbsd32_charp path, int cmd, int uid, netbsd32_caddr_t arg); }
 149	COMPAT_43	{ int sys_quota(void); } oquota
-150	COMPAT_43	{ int compat_netbsd32_ogetsockname(int fdec, netbsd32_caddr_t asa, netbsd32_intp alen); }
+150	COMPAT_43	{ int netbsd32_ogetsockname(int fdec, netbsd32_caddr_t asa, netbsd32_intp alen); }
 
 ; Syscalls 151-180 inclusive are reserved for vendor-specific
 ; system calls.  (This includes various calls added for compatibity
@@ -244,54 +244,54 @@
 153	UNIMPL
 154	UNIMPL
 #if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
-155	STD		{ int compat_netbsd32_nfssvc(int flag, netbsd32_voidp argp); }
+155	STD		{ int netbsd32_nfssvc(int flag, netbsd32_voidp argp); }
 #else
-155	EXCL		compat_netbsd32_nfssvc
+155	EXCL		netbsd32_nfssvc
 #endif
-156	COMPAT_43	{ int compat_netbsd32_ogetdirentries(int fd, netbsd32_charp buf, u_int count, netbsd32_longp basep); }
-157	STD		{ int compat_netbsd32_statfs(const netbsd32_charp path, netbsd32_statfsp_t buf); }
-158	STD		{ int compat_netbsd32_fstatfs(int fd, netbsd32_statfsp_t buf); }
+156	COMPAT_43	{ int netbsd32_ogetdirentries(int fd, netbsd32_charp buf, u_int count, netbsd32_longp basep); }
+157	STD		{ int netbsd32_statfs(const netbsd32_charp path, netbsd32_statfsp_t buf); }
+158	STD		{ int netbsd32_fstatfs(int fd, netbsd32_statfsp_t buf); }
 159	UNIMPL
 160	UNIMPL
 #if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
-161	STD		{ int compat_netbsd32_getfh(const netbsd32_charp fname, netbsd32_fhandlep_t fhp); }
+161	STD		{ int netbsd32_getfh(const netbsd32_charp fname, netbsd32_fhandlep_t fhp); }
 #else
-161	EXCL		compat_netbsd32_getfh
+161	EXCL		netbsd32_getfh
 #endif
-162	COMPAT_09	{ int compat_netbsd32_ogetdomainname(netbsd32_charp domainname, int len); }
-163	COMPAT_09	{ int compat_netbsd32_osetdomainname(netbsd32_charp domainname, int len); }
-164	COMPAT_09	{ int compat_netbsd32_uname(netbsd32_outsnamep_t name); }
-165	STD		{ int compat_netbsd32_sysarch(int op, netbsd32_voidp parms); }
+162	COMPAT_09	{ int netbsd32_ogetdomainname(netbsd32_charp domainname, int len); }
+163	COMPAT_09	{ int netbsd32_osetdomainname(netbsd32_charp domainname, int len); }
+164	COMPAT_09	{ int netbsd32_uname(netbsd32_outsnamep_t name); }
+165	STD		{ int netbsd32_sysarch(int op, netbsd32_voidp parms); }
 166	UNIMPL
 167	UNIMPL
 168	UNIMPL
 ; XXX more generally, never on machines where sizeof(netbsd32_voidp ) != sizeof(int)
-#if (defined(SYSVSEM) || !defined(_KERNEL) && !defined(alpha) && defined(COMPAT_10)
-169	STD		{ int compat_netbsd32_compat_10_sys_semsys(int which, int a2, int a3, int a4, int a5); } osemsys
+#if (defined(SYSVSEM) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
+169	STD		{ int netbsd32_compat_10_sys_semsys(int which, int a2, int a3, int a4, int a5); } osemsys
 #else
 169	EXCL		1.0 semsys
 #endif
 ; XXX more generally, never on machines where sizeof(netbsd32_voidp ) != sizeof(int)
 #if (defined(SYSVMSG) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
-170	STD		{ int compat_netbsd32_compat_10_sys_msgsys(int which, int a2, int a3, int a4, int a5, int a6); } omsgsys
+170	STD		{ int netbsd32_compat_10_sys_msgsys(int which, int a2, int a3, int a4, int a5, int a6); } omsgsys
 #else
 170	EXCL		1.0 msgsys
 #endif
 ; XXX more generally, never on machines where sizeof(netbsd32_voidp ) != sizeof(int)
 #if (defined(SYSVSHM) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
-171	STD		{ int compat_netbsd32_compat_10_sys_shmsys(int which, int a2, int a3, int a4); } oshmsys
+171	STD		{ int netbsd32_compat_10_sys_shmsys(int which, int a2, int a3, int a4); } oshmsys
 #else
 171	EXCL		1.0 shmsys
 #endif
 172	UNIMPL
-173	STD		{ netbsd32_ssize_t compat_netbsd32_pread(int fd, netbsd32_voidp buf, netbsd32_size_t nbyte, int pad, off_t offset); }
-174	STD		{ netbsd32_ssize_t compat_netbsd32_pwrite(int fd, const netbsd32_voidp buf, netbsd32_size_t nbyte, int pad, off_t offset); }
+173	STD		{ netbsd32_ssize_t netbsd32_pread(int fd, netbsd32_voidp buf, netbsd32_size_t nbyte, int pad, off_t offset); }
+174	STD		{ netbsd32_ssize_t netbsd32_pwrite(int fd, const netbsd32_voidp buf, netbsd32_size_t nbyte, int pad, off_t offset); }
 #if defined(NTP) && !defined(_KERNEL)
-175	STD		{ int compat_netbsd32_ntp_gettime(netbsd32_ntptimevalp_t ntvp); }
-176	STD		{ int compat_netbsd32_ntp_adjtime(netbsd32_timexp_t tp); }
+175	STD		{ int netbsd32_ntp_gettime(netbsd32_ntptimevalp_t ntvp); }
+176	STD		{ int netbsd32_ntp_adjtime(netbsd32_timexp_t tp); }
 #else
-175	EXCL		compat_netbsd32_ntp_gettime
-176	EXCL		compat_netbsd32_ntp_adjtime
+175	EXCL		netbsd32_ntp_gettime
+176	EXCL		netbsd32_ntp_adjtime
 #endif
 177	UNIMPL
 178	UNIMPL
@@ -299,42 +299,42 @@
 180	UNIMPL
 
 ; Syscalls 180-199 are used by/reserved for BSD
-181	STD		{ int compat_netbsd32_setgid(gid_t gid); }
-182	STD		{ int compat_netbsd32_setegid(gid_t egid); }
-183	STD		{ int compat_netbsd32_seteuid(uid_t euid); }
+181	STD		{ int netbsd32_setgid(gid_t gid); }
+182	STD		{ int netbsd32_setegid(gid_t egid); }
+183	STD		{ int netbsd32_seteuid(uid_t euid); }
 #if defined(LFS) || !defined(_KERNEL)
-184	STD		{ int compat_netbsd32_sys_lfs_bmapv(netbsd32_fsid_tp_t fsidp, netbsd32_block_infop_t blkiov, int blkcnt); }
-185	STD		{ int compat_netbsd32_sys_lfs_markv(netbsd32_fsid_tp_t fsidp, netbsd32_block_infop_t blkiov, int blkcnt); }
-186	STD		{ int compat_netbsd32_sys_lfs_segclean(netbsd32_fsid_tp_t fsidp, netbsd32_u_long segment); }
-187	STD		{ int compat_netbsd32_sys_lfs_segwait(netbsd32_fsid_tp_t fsidp, netbsd32_timevalp_t tv); }
+184	STD		{ int netbsd32_sys_lfs_bmapv(netbsd32_fsid_tp_t fsidp, netbsd32_block_infop_t blkiov, int blkcnt); }
+185	STD		{ int netbsd32_sys_lfs_markv(netbsd32_fsid_tp_t fsidp, netbsd32_block_infop_t blkiov, int blkcnt); }
+186	STD		{ int netbsd32_sys_lfs_segclean(netbsd32_fsid_tp_t fsidp, netbsd32_u_long segment); }
+187	STD		{ int netbsd32_sys_lfs_segwait(netbsd32_fsid_tp_t fsidp, netbsd32_timevalp_t tv); }
 #else
-184	EXCL		compat_netbsd32_sys_lfs_bmapv
-185	EXCL		compat_netbsd32_sys_lfs_markv
-186	EXCL		compat_netbsd32_sys_lfs_segclean
-187	EXCL		compat_netbsd32_sys_lfs_segwait
+184	EXCL		netbsd32_sys_lfs_bmapv
+185	EXCL		netbsd32_sys_lfs_markv
+186	EXCL		netbsd32_sys_lfs_segclean
+187	EXCL		netbsd32_sys_lfs_segwait
 #endif
-188	COMPAT_12	{ int compat_netbsd32_stat12(const netbsd32_charp path, netbsd32_stat12p_t ub); }
-189	COMPAT_12	{ int compat_netbsd32_fstat12(int fd, netbsd32_stat12p_t sb); }
-190	COMPAT_12	{ int compat_netbsd32_lstat12(const netbsd32_charp path, netbsd32_stat12p_t ub); }
-191	STD		{ netbsd32_long compat_netbsd32_pathconf(const netbsd32_charp path, int name); }
-192	STD		{ netbsd32_long compat_netbsd32_fpathconf(int fd, int name); }
+188	COMPAT_12	{ int netbsd32_stat12(const netbsd32_charp path, netbsd32_stat12p_t ub); }
+189	COMPAT_12	{ int netbsd32_fstat12(int fd, netbsd32_stat12p_t sb); }
+190	COMPAT_12	{ int netbsd32_lstat12(const netbsd32_charp path, netbsd32_stat12p_t ub); }
+191	STD		{ netbsd32_long netbsd32_pathconf(const netbsd32_charp path, int name); }
+192	STD		{ netbsd32_long netbsd32_fpathconf(int fd, int name); }
 193	UNIMPL
-194	STD		{ int compat_netbsd32_getrlimit(int which, netbsd32_rlimitp_t rlp); }
-195	STD		{ int compat_netbsd32_setrlimit(int which, const netbsd32_rlimitp_t rlp); }
-196	COMPAT_12	{ int compat_netbsd32_getdirentries(int fd, netbsd32_charp buf, u_int count, netbsd32_longp basep); }
-197	STD		{ netbsd32_voidp compat_netbsd32_mmap(netbsd32_voidp addr, netbsd32_size_t len, int prot, int flags, int fd, netbsd32_long pad, off_t pos); }
+194	STD		{ int netbsd32_getrlimit(int which, netbsd32_rlimitp_t rlp); }
+195	STD		{ int netbsd32_setrlimit(int which, const netbsd32_rlimitp_t rlp); }
+196	COMPAT_12	{ int netbsd32_getdirentries(int fd, netbsd32_charp buf, u_int count, netbsd32_longp basep); }
+197	STD		{ netbsd32_voidp netbsd32_mmap(netbsd32_voidp addr, netbsd32_size_t len, int prot, int flags, int fd, netbsd32_long pad, off_t pos); }
 198	INDIR		{ quad_t sys___syscall(quad_t num, ...); }
-199	STD		{ off_t compat_netbsd32_lseek(int fd, int pad, off_t offset, int whence); }
-200	STD		{ int compat_netbsd32_truncate(const netbsd32_charp path, int pad, off_t length); }
-201	STD		{ int compat_netbsd32_ftruncate(int fd, int pad, off_t length); }
-202	STD		{ int compat_netbsd32___sysctl(netbsd32_intp name, u_int namelen, netbsd32_voidp old, netbsd32_size_tp oldlenp, netbsd32_voidp new, netbsd32_size_t newlen); }
-203	STD		{ int compat_netbsd32_mlock(const netbsd32_voidp addr, netbsd32_size_t len); }
-204	STD		{ int compat_netbsd32_munlock(const netbsd32_voidp addr, netbsd32_size_t len); }
-205	STD		{ int compat_netbsd32_undelete(const netbsd32_charp path); }
-206	STD		{ int compat_netbsd32_futimes(int fd, const netbsd32_timevalp_t tptr); }
-207	STD		{ int compat_netbsd32_getpgid(pid_t pid); }
-208	STD		{ int compat_netbsd32_reboot(int opt, netbsd32_charp bootstr); }
-209	STD		{ int compat_netbsd32_poll(netbsd32_pollfdp_t fds, u_int nfds, int timeout); }
+199	STD		{ off_t netbsd32_lseek(int fd, int pad, off_t offset, int whence); }
+200	STD		{ int netbsd32_truncate(const netbsd32_charp path, int pad, off_t length); }
+201	STD		{ int netbsd32_ftruncate(int fd, int pad, off_t length); }
+202	STD		{ int netbsd32___sysctl(netbsd32_intp name, u_int namelen, netbsd32_voidp old, netbsd32_size_tp oldlenp, netbsd32_voidp new, netbsd32_size_t newlen); }
+203	STD		{ int netbsd32_mlock(const netbsd32_voidp addr, netbsd32_size_t len); }
+204	STD		{ int netbsd32_munlock(const netbsd32_voidp addr, netbsd32_size_t len); }
+205	STD		{ int netbsd32_undelete(const netbsd32_charp path); }
+206	STD		{ int netbsd32_futimes(int fd, const netbsd32_timevalp_t tptr); }
+207	STD		{ int netbsd32_getpgid(pid_t pid); }
+208	STD		{ int netbsd32_reboot(int opt, netbsd32_charp bootstr); }
+209	STD		{ int netbsd32_poll(netbsd32_pollfdp_t fds, u_int nfds, int timeout); }
 ;
 ; Syscalls 210-219 are reserved for dynamically loaded syscalls
 ;
@@ -363,41 +363,41 @@
 #endif	/* !LKM || !_KERNEL */
 ; System calls 220-300 are reserved for use by NetBSD
 #if defined(SYSVSEM) || !defined(_KERNEL)
-220	STD		{ int compat_netbsd32___semctl(int semid, int semnum, int cmd, netbsd32_semunu_t arg); }
-221	STD		{ int compat_netbsd32_semget(netbsd32_key_t key, int nsems, int semflg); }
-222	STD		{ int compat_netbsd32_semop(int semid, netbsd32_sembufp_t sops, netbsd32_size_t nsops); }
-223	STD		{ int compat_netbsd32_semconfig(int flag); }
+220	COMPAT_14	{ int netbsd32___semctl(int semid, int semnum, int cmd, netbsd32_semunu_t arg); }
+221	STD		{ int netbsd32_semget(netbsd32_key_t key, int nsems, int semflg); }
+222	STD		{ int netbsd32_semop(int semid, netbsd32_sembufp_t sops, netbsd32_size_t nsops); }
+223	STD		{ int netbsd32_semconfig(int flag); }
 #else
-220	EXCL		compat_netbsd32_semctl
-221	EXCL		compat_netbsd32_semget
-222	EXCL		compat_netbsd32_semop
-223	EXCL		compat_netbsd32_semconfig
+220	EXCL		netbsd32_semctl
+221	EXCL		netbsd32_semget
+222	EXCL		netbsd32_semop
+223	EXCL		netbsd32_semconfig
 #endif
 #if defined(SYSVMSG) || !defined(_KERNEL)
-224	STD		{ int compat_netbsd32_msgctl(int msqid, int cmd, netbsd32_msqid_dsp_t buf); }
-225	STD		{ int compat_netbsd32_msgget(netbsd32_key_t key, int msgflg); }
-226	STD		{ int compat_netbsd32_msgsnd(int msqid, const netbsd32_voidp msgp, netbsd32_size_t msgsz, int msgflg); }
-227	STD		{ netbsd32_ssize_t compat_netbsd32_msgrcv(int msqid, netbsd32_voidp msgp, netbsd32_size_t msgsz, netbsd32_long msgtyp, int msgflg); }
+224	COMPAT_14	{ int netbsd32_msgctl(int msqid, int cmd, netbsd32_msqid_dsp_t buf); }
+225	STD		{ int netbsd32_msgget(netbsd32_key_t key, int msgflg); }
+226	STD		{ int netbsd32_msgsnd(int msqid, const netbsd32_voidp msgp, netbsd32_size_t msgsz, int msgflg); }
+227	STD		{ netbsd32_ssize_t netbsd32_msgrcv(int msqid, netbsd32_voidp msgp, netbsd32_size_t msgsz, netbsd32_long msgtyp, int msgflg); }
 #else
-224	EXCL		compat_netbsd32_msgctl
-225	EXCL		compat_netbsd32_msgget
-226	EXCL		compat_netbsd32_msgsnd
-227	EXCL		compat_netbsd32_msgrcv
+224	EXCL		netbsd32_msgctl
+225	EXCL		netbsd32_msgget
+226	EXCL		netbsd32_msgsnd
+227	EXCL		netbsd32_msgrcv
 #endif
 #if defined(SYSVSHM) || !defined(_KERNEL)
-228	STD		{ netbsd32_voidp compat_netbsd32_shmat(int shmid, const netbsd32_voidp shmaddr, int shmflg); }
-229	STD		{ int compat_netbsd32_shmctl(int shmid, int cmd, netbsd32_shmid_dsp_t buf); }
-230	STD		{ int compat_netbsd32_shmdt(const netbsd32_voidp shmaddr); }
-231	STD		{ int compat_netbsd32_shmget(netbsd32_key_t key, netbsd32_size_t size, int shmflg); }
+228	STD		{ netbsd32_voidp netbsd32_shmat(int shmid, const netbsd32_voidp shmaddr, int shmflg); }
+229	COMPAT_14		{ int netbsd32_shmctl(int shmid, int cmd, netbsd32_shmid_dsp_t buf); }
+230	STD		{ int netbsd32_shmdt(const netbsd32_voidp shmaddr); }
+231	STD		{ int netbsd32_shmget(netbsd32_key_t key, netbsd32_size_t size, int shmflg); }
 #else
-228	EXCL		compat_netbsd32_shmat
-229	EXCL		compat_netbsd32_shmctl
-230	EXCL		compat_netbsd32_shmdt
-231	EXCL		compat_netbsd32_shmget
+228	EXCL		netbsd32_shmat
+229	EXCL		netbsd32_shmctl
+230	EXCL		netbsd32_shmdt
+231	EXCL		netbsd32_shmget
 #endif
-232	STD		{ int compat_netbsd32_clock_gettime(netbsd32_clockid_t clock_id, netbsd32_timespecp_t tp); }
-233	STD		{ int compat_netbsd32_clock_settime(netbsd32_clockid_t clock_id, const netbsd32_timespecp_t tp); }
-234	STD		{ int compat_netbsd32_clock_getres(netbsd32_clockid_t clock_id, netbsd32_timespecp_t tp); }
+232	STD		{ int netbsd32_clock_gettime(netbsd32_clockid_t clock_id, netbsd32_timespecp_t tp); }
+233	STD		{ int netbsd32_clock_settime(netbsd32_clockid_t clock_id, const netbsd32_timespecp_t tp); }
+234	STD		{ int netbsd32_clock_getres(netbsd32_clockid_t clock_id, netbsd32_timespecp_t tp); }
 235	UNIMPL		timer_create
 236	UNIMPL		timer_delete
 237	UNIMPL		timer_settime
@@ -406,8 +406,8 @@
 ;
 ; Syscalls 240-269 are reserved for other IEEE Std1003.1b syscalls
 ;
-240	STD		{ int compat_netbsd32_nanosleep(const netbsd32_timespecp_t rqtp, netbsd32_timespecp_t rmtp); }
-241	STD		{ int compat_netbsd32_fdatasync(int fd); }
+240	STD		{ int netbsd32_nanosleep(const netbsd32_timespecp_t rqtp, netbsd32_timespecp_t rmtp); }
+241	STD		{ int netbsd32_fdatasync(int fd); }
 242	UNIMPL
 243	UNIMPL
 244	UNIMPL
@@ -436,28 +436,28 @@
 267	UNIMPL
 268	UNIMPL
 269	UNIMPL
-270	STD		{ int compat_netbsd32___posix_rename(const netbsd32_charp from, const netbsd32_charp to); }
-271	STD		{ int compat_netbsd32_swapctl(int cmd, const netbsd32_voidp arg, int misc); }
-272	STD		{ int compat_netbsd32_getdents(int fd, netbsd32_charp buf, netbsd32_size_t count); }
-273	STD		{ int compat_netbsd32_minherit(netbsd32_voidp addr, netbsd32_size_t len, int inherit); }
-274	STD		{ int compat_netbsd32_lchmod(const netbsd32_charp path, mode_t mode); }
-275	STD		{ int compat_netbsd32_lchown(const netbsd32_charp path, uid_t uid, gid_t gid); }
-276	STD		{ int compat_netbsd32_lutimes(const netbsd32_charp path, const netbsd32_timevalp_t tptr); }
-277	STD		{ int compat_netbsd32___msync13(netbsd32_voidp addr, netbsd32_size_t len, int flags); }
-278	STD		{ int compat_netbsd32___stat13(const netbsd32_charp path, netbsd32_statp_t ub); }
-279	STD		{ int compat_netbsd32___fstat13(int fd, netbsd32_statp_t sb); }
-280	STD		{ int compat_netbsd32___lstat13(const netbsd32_charp path, netbsd32_statp_t ub); }
-281	STD		{ int compat_netbsd32___sigaltstack14(const netbsd32_sigaltstackp_t nss, netbsd32_sigaltstackp_t oss); }
+270	STD		{ int netbsd32___posix_rename(const netbsd32_charp from, const netbsd32_charp to); }
+271	STD		{ int netbsd32_swapctl(int cmd, const netbsd32_voidp arg, int misc); }
+272	STD		{ int netbsd32_getdents(int fd, netbsd32_charp buf, netbsd32_size_t count); }
+273	STD		{ int netbsd32_minherit(netbsd32_voidp addr, netbsd32_size_t len, int inherit); }
+274	STD		{ int netbsd32_lchmod(const netbsd32_charp path, mode_t mode); }
+275	STD		{ int netbsd32_lchown(const netbsd32_charp path, uid_t uid, gid_t gid); }
+276	STD		{ int netbsd32_lutimes(const netbsd32_charp path, const netbsd32_timevalp_t tptr); }
+277	STD		{ int netbsd32___msync13(netbsd32_voidp addr, netbsd32_size_t len, int flags); }
+278	STD		{ int netbsd32___stat13(const netbsd32_charp path, netbsd32_statp_t ub); }
+279	STD		{ int netbsd32___fstat13(int fd, netbsd32_statp_t sb); }
+280	STD		{ int netbsd32___lstat13(const netbsd32_charp path, netbsd32_statp_t ub); }
+281	STD		{ int netbsd32___sigaltstack14(const netbsd32_sigaltstackp_t nss, netbsd32_sigaltstackp_t oss); }
 282	NOARGS		{ int sys___vfork14(void); }
-283	STD		{ int compat_netbsd32___posix_chown(const netbsd32_charp path, uid_t uid, gid_t gid); }
-284	STD		{ int compat_netbsd32___posix_fchown(int fd, uid_t uid, gid_t gid); }
-285	STD		{ int compat_netbsd32___posix_lchown(const netbsd32_charp path, uid_t uid, gid_t gid); }
-286	STD		{ pid_t compat_netbsd32_getsid(pid_t pid); }
+283	STD		{ int netbsd32___posix_chown(const netbsd32_charp path, uid_t uid, gid_t gid); }
+284	STD		{ int netbsd32___posix_fchown(int fd, uid_t uid, gid_t gid); }
+285	STD		{ int netbsd32___posix_lchown(const netbsd32_charp path, uid_t uid, gid_t gid); }
+286	STD		{ pid_t netbsd32_getsid(pid_t pid); }
 287	UNIMPL
 #if defined(KTRACE) || !defined(_KERNEL)
-288	STD		{ int compat_netbsd32_fktrace(const int fd, int ops, int facs, int pid); }
+288	STD		{ int netbsd32_fktrace(const int fd, int ops, int facs, int pid); }
 #else
-288	EXCL		compat_netbsd32_fktrace
+288	EXCL		netbsd32_fktrace
 #endif
-289	STD		{ netbsd32_ssize_t compat_netbsd32_preadv(int fd, const netbsd32_iovecp_t iovp, int iovcnt, int pad, off_t offset); }
-290	STD		{ netbsd32_ssize_t compat_netbsd32_pwritev(int fd, const netbsd32_iovecp_t iovp, int iovcnt, int pad, off_t offset); }
+289	STD		{ netbsd32_ssize_t netbsd32_preadv(int fd, const netbsd32_iovecp_t iovp, int iovcnt, int pad, off_t offset); }
+290	STD		{ netbsd32_ssize_t netbsd32_pwritev(int fd, const netbsd32_iovecp_t iovp, int iovcnt, int pad, off_t offset); }