diff --git a/sys/compat/ultrix/ultrix_syscall.h b/sys/compat/ultrix/ultrix_syscall.h
index 8d8eb0fc9479..1c2982889093 100644
--- a/sys/compat/ultrix/ultrix_syscall.h
+++ b/sys/compat/ultrix/ultrix_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.9 1995/02/01 05:09:14 mellon Exp 
+ * created from	NetBSD: syscalls.master,v 1.10 1995/06/01 16:38:15 mellon Exp 
  */
 
 #define	ULTRIX_SYS_syscall	0
diff --git a/sys/compat/ultrix/ultrix_syscallargs.h b/sys/compat/ultrix/ultrix_syscallargs.h
index 44425bda281c..1823e50d0db5 100644
--- a/sys/compat/ultrix/ultrix_syscallargs.h
+++ b/sys/compat/ultrix/ultrix_syscallargs.h
@@ -2,7 +2,7 @@
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.9 1995/02/01 05:09:14 mellon Exp 
+ * created from	NetBSD: syscalls.master,v 1.10 1995/06/01 16:38:15 mellon Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -117,3 +117,225 @@ struct ultrix_setsysinfo_args {
 };
 
 #undef	syscallarg
+
+/*
+ * System call prototypes.
+ */
+
+int	nosys	__P((struct proc *, void *, register_t *));
+int	exit	__P((struct proc *, void *, register_t *));
+int	fork	__P((struct proc *, void *, register_t *));
+int	read	__P((struct proc *, void *, register_t *));
+int	write	__P((struct proc *, void *, register_t *));
+int	sun_open	__P((struct proc *, void *, register_t *));
+int	close	__P((struct proc *, void *, register_t *));
+int	compat_43_creat	__P((struct proc *, void *, register_t *));
+int	link	__P((struct proc *, void *, register_t *));
+int	unlink	__P((struct proc *, void *, register_t *));
+int	sun_execv	__P((struct proc *, void *, register_t *));
+int	chdir	__P((struct proc *, void *, register_t *));
+int	sun_mknod	__P((struct proc *, void *, register_t *));
+int	chmod	__P((struct proc *, void *, register_t *));
+int	chown	__P((struct proc *, void *, register_t *));
+int	obreak	__P((struct proc *, void *, register_t *));
+int	compat_43_lseek	__P((struct proc *, void *, register_t *));
+int	getpid	__P((struct proc *, void *, register_t *));
+int	setuid	__P((struct proc *, void *, register_t *));
+int	getuid	__P((struct proc *, void *, register_t *));
+int	access	__P((struct proc *, void *, register_t *));
+int	sync	__P((struct proc *, void *, register_t *));
+int	kill	__P((struct proc *, void *, register_t *));
+int	compat_43_stat	__P((struct proc *, void *, register_t *));
+int	compat_43_lstat	__P((struct proc *, void *, register_t *));
+int	dup	__P((struct proc *, void *, register_t *));
+int	pipe	__P((struct proc *, void *, register_t *));
+int	profil	__P((struct proc *, void *, register_t *));
+int	getgid	__P((struct proc *, void *, register_t *));
+int	acct	__P((struct proc *, void *, register_t *));
+int	ioctl	__P((struct proc *, void *, register_t *));
+int	reboot	__P((struct proc *, void *, register_t *));
+int	symlink	__P((struct proc *, void *, register_t *));
+int	readlink	__P((struct proc *, void *, register_t *));
+int	execve	__P((struct proc *, void *, register_t *));
+int	umask	__P((struct proc *, void *, register_t *));
+int	chroot	__P((struct proc *, void *, register_t *));
+int	compat_43_fstat	__P((struct proc *, void *, register_t *));
+int	compat_43_getpagesize	__P((struct proc *, void *, register_t *));
+int	vfork	__P((struct proc *, void *, register_t *));
+int	sbrk	__P((struct proc *, void *, register_t *));
+int	sstk	__P((struct proc *, void *, register_t *));
+int	sun_mmap	__P((struct proc *, void *, register_t *));
+int	ovadvise	__P((struct proc *, void *, register_t *));
+int	munmap	__P((struct proc *, void *, register_t *));
+int	mprotect	__P((struct proc *, void *, register_t *));
+int	madvise	__P((struct proc *, void *, register_t *));
+int	sun_vhangup	__P((struct proc *, void *, register_t *));
+int	mincore	__P((struct proc *, void *, register_t *));
+int	getgroups	__P((struct proc *, void *, register_t *));
+int	setgroups	__P((struct proc *, void *, register_t *));
+int	getpgrp	__P((struct proc *, void *, register_t *));
+int	sun_setpgid	__P((struct proc *, void *, register_t *));
+int	setitimer	__P((struct proc *, void *, register_t *));
+int	sun_wait3	__P((struct proc *, void *, register_t *));
+int	swapon	__P((struct proc *, void *, register_t *));
+int	getitimer	__P((struct proc *, void *, register_t *));
+int	compat_43_gethostname	__P((struct proc *, void *, register_t *));
+int	compat_43_sethostname	__P((struct proc *, void *, register_t *));
+int	compat_43_getdtablesize	__P((struct proc *, void *, register_t *));
+int	dup2	__P((struct proc *, void *, register_t *));
+int	fcntl	__P((struct proc *, void *, register_t *));
+int	select	__P((struct proc *, void *, register_t *));
+int	fsync	__P((struct proc *, void *, register_t *));
+int	setpriority	__P((struct proc *, void *, register_t *));
+int	socket	__P((struct proc *, void *, register_t *));
+int	connect	__P((struct proc *, void *, register_t *));
+int	compat_43_accept	__P((struct proc *, void *, register_t *));
+int	getpriority	__P((struct proc *, void *, register_t *));
+int	compat_43_send	__P((struct proc *, void *, register_t *));
+int	compat_43_recv	__P((struct proc *, void *, register_t *));
+int	sigreturn	__P((struct proc *, void *, register_t *));
+int	bind	__P((struct proc *, void *, register_t *));
+int	sun_setsockopt	__P((struct proc *, void *, register_t *));
+int	listen	__P((struct proc *, void *, register_t *));
+int	compat_43_sigvec	__P((struct proc *, void *, register_t *));
+int	compat_43_sigblock	__P((struct proc *, void *, register_t *));
+int	compat_43_sigsetmask	__P((struct proc *, void *, register_t *));
+int	sigsuspend	__P((struct proc *, void *, register_t *));
+int	compat_43_sigstack	__P((struct proc *, void *, register_t *));
+int	compat_43_recvmsg	__P((struct proc *, void *, register_t *));
+int	compat_43_sendmsg	__P((struct proc *, void *, register_t *));
+int	gettimeofday	__P((struct proc *, void *, register_t *));
+int	getrusage	__P((struct proc *, void *, register_t *));
+int	getsockopt	__P((struct proc *, void *, register_t *));
+int	readv	__P((struct proc *, void *, register_t *));
+int	writev	__P((struct proc *, void *, register_t *));
+int	settimeofday	__P((struct proc *, void *, register_t *));
+int	fchown	__P((struct proc *, void *, register_t *));
+int	fchmod	__P((struct proc *, void *, register_t *));
+int	compat_43_recvfrom	__P((struct proc *, void *, register_t *));
+int	compat_43_setreuid	__P((struct proc *, void *, register_t *));
+int	compat_43_setregid	__P((struct proc *, void *, register_t *));
+int	rename	__P((struct proc *, void *, register_t *));
+int	compat_43_truncate	__P((struct proc *, void *, register_t *));
+int	compat_43_ftruncate	__P((struct proc *, void *, register_t *));
+int	flock	__P((struct proc *, void *, register_t *));
+int	sendto	__P((struct proc *, void *, register_t *));
+int	shutdown	__P((struct proc *, void *, register_t *));
+int	socketpair	__P((struct proc *, void *, register_t *));
+int	mkdir	__P((struct proc *, void *, register_t *));
+int	rmdir	__P((struct proc *, void *, register_t *));
+int	utimes	__P((struct proc *, void *, register_t *));
+int	ultrix_sigcleanup	__P((struct proc *, void *, register_t *));
+int	adjtime	__P((struct proc *, void *, register_t *));
+int	compat_43_getpeername	__P((struct proc *, void *, register_t *));
+int	compat_43_gethostid	__P((struct proc *, void *, register_t *));
+int	compat_43_getrlimit	__P((struct proc *, void *, register_t *));
+int	compat_43_setrlimit	__P((struct proc *, void *, register_t *));
+int	compat_43_killpg	__P((struct proc *, void *, register_t *));
+int	compat_43_getsockname	__P((struct proc *, void *, register_t *));
+#ifdef NFSSERVER
+int	sun_nfssvc	__P((struct proc *, void *, register_t *));
+#else
+#endif
+int	compat_43_getdirentries	__P((struct proc *, void *, register_t *));
+int	sun_statfs	__P((struct proc *, void *, register_t *));
+int	sun_fstatfs	__P((struct proc *, void *, register_t *));
+int	sun_unmount	__P((struct proc *, void *, register_t *));
+#ifdef NFSCLIENT
+int	async_daemon	__P((struct proc *, void *, register_t *));
+int	getfh	__P((struct proc *, void *, register_t *));
+#else
+#endif
+int	compat_09_getdomainname	__P((struct proc *, void *, register_t *));
+int	compat_09_setdomainname	__P((struct proc *, void *, register_t *));
+int	sun_quotactl	__P((struct proc *, void *, register_t *));
+int	sun_exportfs	__P((struct proc *, void *, register_t *));
+#ifdef SYSVMSG
+#else
+#endif
+#ifdef SYSVSEM
+#else
+#endif
+int	sun_uname	__P((struct proc *, void *, register_t *));
+#ifdef SYSVSHM
+int	shmsys	__P((struct proc *, void *, register_t *));
+#else
+#endif
+int	sun_ustat	__P((struct proc *, void *, register_t *));
+int	sun_sigpending	__P((struct proc *, void *, register_t *));
+int	setsid	__P((struct proc *, void *, register_t *));
+int	ultrix_waitpid	__P((struct proc *, void *, register_t *));
+int	ultrix_getsysinfo	__P((struct proc *, void *, register_t *));
+int	ultrix_setsysinfo	__P((struct proc *, void *, register_t *));
+
+#ifdef COMPAT_43
+#define compat_43(func) __CONCAT(compat_43_,func)
+
+#ifdef NFSSERVER
+#else
+#endif
+#ifdef NFSCLIENT
+#else
+#endif
+#ifdef SYSVMSG
+#else
+#endif
+#ifdef SYSVSEM
+#else
+#endif
+#ifdef SYSVSHM
+#else
+#endif
+
+#else /* COMPAT_43 */
+#define compat_43(func) nosys
+#endif /* COMPAT_43 */
+
+
+#ifdef COMPAT_09
+#define compat_09(func) __CONCAT(compat_09_,func)
+
+#ifdef NFSSERVER
+#else
+#endif
+#ifdef NFSCLIENT
+#else
+#endif
+#ifdef SYSVMSG
+#else
+#endif
+#ifdef SYSVSEM
+#else
+#endif
+#ifdef SYSVSHM
+#else
+#endif
+
+#else /* COMPAT_09 */
+#define compat_09(func) nosys
+#endif /* COMPAT_09 */
+
+
+#ifdef COMPAT_10
+#define compat_10(func) __CONCAT(compat_10_,func)
+
+#ifdef NFSSERVER
+#else
+#endif
+#ifdef NFSCLIENT
+#else
+#endif
+#ifdef SYSVMSG
+#else
+#endif
+#ifdef SYSVSEM
+#else
+#endif
+#ifdef SYSVSHM
+#else
+#endif
+
+#else /* COMPAT_10 */
+#define compat_10(func) nosys
+#endif /* COMPAT_10 */
+
diff --git a/sys/compat/ultrix/ultrix_syscalls.c b/sys/compat/ultrix/ultrix_syscalls.c
index 806e8fe8caff..b141e13fb4a4 100644
--- a/sys/compat/ultrix/ultrix_syscalls.c
+++ b/sys/compat/ultrix/ultrix_syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.9 1995/02/01 05:09:14 mellon Exp 
+ * created from	NetBSD: syscalls.master,v 1.10 1995/06/01 16:38:15 mellon Exp 
  */
 
 char *ultrix_syscallnames[] = {
diff --git a/sys/compat/ultrix/ultrix_sysent.c b/sys/compat/ultrix/ultrix_sysent.c
index 6eaad43af777..b70ac8aeabe7 100644
--- a/sys/compat/ultrix/ultrix_sysent.c
+++ b/sys/compat/ultrix/ultrix_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.9 1995/02/01 05:09:14 mellon Exp 
+ * created from	NetBSD: syscalls.master,v 1.10 1995/06/01 16:38:15 mellon Exp 
  */
 
 #include <sys/param.h>
@@ -11,223 +11,6 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <compat/ultrix/ultrix_syscallargs.h>
-int	nosys();
-int	exit();
-int	fork();
-int	read();
-int	write();
-int	sun_open();
-int	close();
-int	compat_43_creat();
-int	link();
-int	unlink();
-int	sun_execv();
-int	chdir();
-int	sun_mknod();
-int	chmod();
-int	chown();
-int	obreak();
-int	compat_43_lseek();
-int	getpid();
-int	setuid();
-int	getuid();
-int	access();
-int	sync();
-int	kill();
-int	compat_43_stat();
-int	compat_43_lstat();
-int	dup();
-int	pipe();
-int	profil();
-int	getgid();
-int	acct();
-int	ioctl();
-int	reboot();
-int	symlink();
-int	readlink();
-int	execve();
-int	umask();
-int	chroot();
-int	compat_43_fstat();
-int	compat_43_getpagesize();
-int	vfork();
-int	sbrk();
-int	sstk();
-int	sun_mmap();
-int	ovadvise();
-int	munmap();
-int	mprotect();
-int	madvise();
-int	sun_vhangup();
-int	mincore();
-int	getgroups();
-int	setgroups();
-int	getpgrp();
-int	sun_setpgid();
-int	setitimer();
-int	sun_wait3();
-int	swapon();
-int	getitimer();
-int	compat_43_gethostname();
-int	compat_43_sethostname();
-int	compat_43_getdtablesize();
-int	dup2();
-int	fcntl();
-int	select();
-int	fsync();
-int	setpriority();
-int	socket();
-int	connect();
-int	compat_43_accept();
-int	getpriority();
-int	compat_43_send();
-int	compat_43_recv();
-int	sigreturn();
-int	bind();
-int	sun_setsockopt();
-int	listen();
-int	compat_43_sigvec();
-int	compat_43_sigblock();
-int	compat_43_sigsetmask();
-int	sigsuspend();
-int	compat_43_sigstack();
-int	compat_43_recvmsg();
-int	compat_43_sendmsg();
-int	gettimeofday();
-int	getrusage();
-int	getsockopt();
-int	readv();
-int	writev();
-int	settimeofday();
-int	fchown();
-int	fchmod();
-int	compat_43_recvfrom();
-int	compat_43_setreuid();
-int	compat_43_setregid();
-int	rename();
-int	compat_43_truncate();
-int	compat_43_ftruncate();
-int	flock();
-int	sendto();
-int	shutdown();
-int	socketpair();
-int	mkdir();
-int	rmdir();
-int	utimes();
-int	ultrix_sigcleanup();
-int	adjtime();
-int	compat_43_getpeername();
-int	compat_43_gethostid();
-int	compat_43_getrlimit();
-int	compat_43_setrlimit();
-int	compat_43_killpg();
-int	compat_43_getsockname();
-#ifdef NFSSERVER
-int	sun_nfssvc();
-#else
-#endif
-int	compat_43_getdirentries();
-int	sun_statfs();
-int	sun_fstatfs();
-int	sun_unmount();
-#ifdef NFSCLIENT
-int	async_daemon();
-int	getfh();
-#else
-#endif
-int	compat_09_getdomainname();
-int	compat_09_setdomainname();
-int	sun_quotactl();
-int	sun_exportfs();
-#ifdef SYSVMSG
-#else
-#endif
-#ifdef SYSVSEM
-#else
-#endif
-int	sun_uname();
-#ifdef SYSVSHM
-int	shmsys();
-#else
-#endif
-int	sun_ustat();
-int	sun_sigpending();
-int	setsid();
-int	ultrix_waitpid();
-int	ultrix_getsysinfo();
-int	ultrix_setsysinfo();
-
-#ifdef COMPAT_43
-#define compat_43(func) __CONCAT(compat_43_,func)
-
-#ifdef NFSSERVER
-#else
-#endif
-#ifdef NFSCLIENT
-#else
-#endif
-#ifdef SYSVMSG
-#else
-#endif
-#ifdef SYSVSEM
-#else
-#endif
-#ifdef SYSVSHM
-#else
-#endif
-
-#else /* COMPAT_43 */
-#define compat_43(func) nosys
-#endif /* COMPAT_43 */
-
-
-#ifdef COMPAT_09
-#define compat_09(func) __CONCAT(compat_09_,func)
-
-#ifdef NFSSERVER
-#else
-#endif
-#ifdef NFSCLIENT
-#else
-#endif
-#ifdef SYSVMSG
-#else
-#endif
-#ifdef SYSVSEM
-#else
-#endif
-#ifdef SYSVSHM
-#else
-#endif
-
-#else /* COMPAT_09 */
-#define compat_09(func) nosys
-#endif /* COMPAT_09 */
-
-
-#ifdef COMPAT_10
-#define compat_10(func) __CONCAT(compat_10_,func)
-
-#ifdef NFSSERVER
-#else
-#endif
-#ifdef NFSCLIENT
-#else
-#endif
-#ifdef SYSVMSG
-#else
-#endif
-#ifdef SYSVSEM
-#else
-#endif
-#ifdef SYSVSHM
-#else
-#endif
-
-#else /* COMPAT_10 */
-#define compat_10(func) nosys
-#endif /* COMPAT_10 */
-
 #define	s(type)	sizeof(type)
 
 struct sysent ultrix_sysent[] = {