diff --git a/sys/compat/osf1/osf1_syscallargs.h b/sys/compat/osf1/osf1_syscallargs.h
index d6b5bd9ca2b4..d3475d727eb4 100644
--- a/sys/compat/osf1/osf1_syscallargs.h
+++ b/sys/compat/osf1/osf1_syscallargs.h
@@ -174,3 +174,112 @@ struct osf1_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	close	__P((struct proc *, void *, register_t *));
+int	wait4	__P((struct proc *, void *, register_t *));
+int	link	__P((struct proc *, void *, register_t *));
+int	unlink	__P((struct proc *, void *, register_t *));
+int	chdir	__P((struct proc *, void *, register_t *));
+int	fchdir	__P((struct proc *, void *, register_t *));
+int	osf1_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	osf1_getfsstat	__P((struct proc *, void *, register_t *));
+int	osf1_lseek	__P((struct proc *, void *, register_t *));
+int	getpid	__P((struct proc *, void *, register_t *));
+int	osf1_mount	__P((struct proc *, void *, register_t *));
+int	osf1_unmount	__P((struct proc *, void *, register_t *));
+int	osf1_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	setpgid	__P((struct proc *, void *, register_t *));
+int	dup	__P((struct proc *, void *, register_t *));
+int	pipe	__P((struct proc *, void *, register_t *));
+int	osf1_open	__P((struct proc *, void *, register_t *));
+int	getgid	__P((struct proc *, void *, register_t *));
+int	sigprocmask	__P((struct proc *, void *, register_t *));
+int	getlogin	__P((struct proc *, void *, register_t *));
+int	setlogin	__P((struct proc *, void *, register_t *));
+int	acct	__P((struct proc *, void *, register_t *));
+int	osf1_ioctl	__P((struct proc *, void *, register_t *));
+int	osf1_reboot	__P((struct proc *, void *, register_t *));
+int	revoke	__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	getpgrp	__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	osf1_stat	__P((struct proc *, void *, register_t *));
+int	osf1_lstat	__P((struct proc *, void *, register_t *));
+int	osf1_mmap	__P((struct proc *, void *, register_t *));
+int	munmap	__P((struct proc *, void *, register_t *));
+int	osf1_madvise	__P((struct proc *, void *, register_t *));
+int	getgroups	__P((struct proc *, void *, register_t *));
+int	setgroups	__P((struct proc *, void *, register_t *));
+int	setpgid	__P((struct proc *, void *, register_t *));
+int	setitimer	__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	osf1_fstat	__P((struct proc *, void *, register_t *));
+int	osf1_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	osf1_socket	__P((struct proc *, void *, register_t *));
+int	connect	__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	setsockopt	__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	gettimeofday	__P((struct proc *, void *, register_t *));
+int	osf1_getrusage	__P((struct proc *, void *, register_t *));
+int	getsockopt	__P((struct proc *, void *, register_t *));
+int	osf1_readv	__P((struct proc *, void *, register_t *));
+int	osf1_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	rename	__P((struct proc *, void *, register_t *));
+int	osf1_truncate	__P((struct proc *, void *, register_t *));
+int	osf1_ftruncate	__P((struct proc *, void *, register_t *));
+int	osf1_setgid	__P((struct proc *, void *, register_t *));
+int	osf1_sendto	__P((struct proc *, void *, register_t *));
+int	shutdown	__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	compat_43_gethostid	__P((struct proc *, void *, register_t *));
+int	compat_43_sethostid	__P((struct proc *, void *, register_t *));
+int	osf1_getrlimit	__P((struct proc *, void *, register_t *));
+int	osf1_setrlimit	__P((struct proc *, void *, register_t *));
+int	setsid	__P((struct proc *, void *, register_t *));
+int	compat_43_quota	__P((struct proc *, void *, register_t *));
+int	osf1_sigaction	__P((struct proc *, void *, register_t *));
+int	compat_43_getdirentries	__P((struct proc *, void *, register_t *));
+int	osf1_statfs	__P((struct proc *, void *, register_t *));
+int	osf1_fstatfs	__P((struct proc *, void *, register_t *));
+int	osf1_getsid	__P((struct proc *, void *, register_t *));
+int	osf1_usleep_thread	__P((struct proc *, void *, register_t *));
+int	osf1_setsysinfo	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/osf1/osf1_sysent.c b/sys/compat/osf1/osf1_sysent.c
index c1a8525e3a84..e1afdec57097 100644
--- a/sys/compat/osf1/osf1_sysent.c
+++ b/sys/compat/osf1/osf1_sysent.c
@@ -11,110 +11,6 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <compat/osf1/osf1_syscallargs.h>
-int	nosys();
-int	exit();
-int	fork();
-int	read();
-int	write();
-int	close();
-int	wait4();
-int	link();
-int	unlink();
-int	chdir();
-int	fchdir();
-int	osf1_mknod();
-int	chmod();
-int	chown();
-int	obreak();
-int	osf1_getfsstat();
-int	osf1_lseek();
-int	getpid();
-int	osf1_mount();
-int	osf1_unmount();
-int	osf1_setuid();
-int	getuid();
-int	access();
-int	sync();
-int	kill();
-int	setpgid();
-int	dup();
-int	pipe();
-int	osf1_open();
-int	getgid();
-int	sigprocmask();
-int	getlogin();
-int	setlogin();
-int	acct();
-int	osf1_ioctl();
-int	osf1_reboot();
-int	revoke();
-int	symlink();
-int	readlink();
-int	execve();
-int	umask();
-int	chroot();
-int	getpgrp();
-int	compat_43_getpagesize();
-int	vfork();
-int	osf1_stat();
-int	osf1_lstat();
-int	osf1_mmap();
-int	munmap();
-int	osf1_madvise();
-int	getgroups();
-int	setgroups();
-int	setpgid();
-int	setitimer();
-int	compat_43_gethostname();
-int	compat_43_sethostname();
-int	compat_43_getdtablesize();
-int	dup2();
-int	osf1_fstat();
-int	osf1_fcntl();
-int	select();
-int	fsync();
-int	setpriority();
-int	osf1_socket();
-int	connect();
-int	getpriority();
-int	compat_43_send();
-int	compat_43_recv();
-int	sigreturn();
-int	bind();
-int	setsockopt();
-int	sigsuspend();
-int	compat_43_sigstack();
-int	gettimeofday();
-int	osf1_getrusage();
-int	getsockopt();
-int	osf1_readv();
-int	osf1_writev();
-int	settimeofday();
-int	fchown();
-int	fchmod();
-int	compat_43_recvfrom();
-int	rename();
-int	osf1_truncate();
-int	osf1_ftruncate();
-int	osf1_setgid();
-int	osf1_sendto();
-int	shutdown();
-int	mkdir();
-int	rmdir();
-int	utimes();
-int	compat_43_gethostid();
-int	compat_43_sethostid();
-int	osf1_getrlimit();
-int	osf1_setrlimit();
-int	setsid();
-int	compat_43_quota();
-int	osf1_sigaction();
-int	compat_43_getdirentries();
-int	osf1_statfs();
-int	osf1_fstatfs();
-int	osf1_getsid();
-int	osf1_usleep_thread();
-int	osf1_setsysinfo();
 #define	s(type)	sizeof(type)
 
 struct sysent osf1_sysent[] = {