diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 89eb179f5e35..05de442441e3 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.71 2000/01/16 16:30:50 peter Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.72 2000/01/19 06:01:07 rwatson Exp 
  */
 
 #include "opt_compat.h"
@@ -367,14 +367,14 @@ struct sysent sysent[] = {
 	{ 1, (sy_call_t *)sigreturn },			/* 344 = sigreturn */
 	{ 0, (sy_call_t *)nosys },			/* 345 = sigtimedwait */
 	{ 0, (sy_call_t *)nosys },			/* 346 = sigwaitinfo */
-	{ 3, (sy_call_t *)acl_syscall_get_file },		/* 347 = acl_syscall_get_file */
-	{ 3, (sy_call_t *)acl_syscall_set_file },		/* 348 = acl_syscall_set_file */
-	{ 3, (sy_call_t *)acl_syscall_get_fd },		/* 349 = acl_syscall_get_fd */
-	{ 3, (sy_call_t *)acl_syscall_set_fd },		/* 350 = acl_syscall_set_fd */
-	{ 2, (sy_call_t *)acl_syscall_delete_file },		/* 351 = acl_syscall_delete_file */
-	{ 2, (sy_call_t *)acl_syscall_delete_fd },		/* 352 = acl_syscall_delete_fd */
-	{ 3, (sy_call_t *)acl_syscall_aclcheck_file },		/* 353 = acl_syscall_aclcheck_file */
-	{ 3, (sy_call_t *)acl_syscall_aclcheck_fd },		/* 354 = acl_syscall_aclcheck_fd */
+	{ 3, (sy_call_t *)__acl_get_file },		/* 347 = __acl_get_file */
+	{ 3, (sy_call_t *)__acl_set_file },		/* 348 = __acl_set_file */
+	{ 3, (sy_call_t *)__acl_get_fd },		/* 349 = __acl_get_fd */
+	{ 3, (sy_call_t *)__acl_set_fd },		/* 350 = __acl_set_fd */
+	{ 2, (sy_call_t *)__acl_delete_file },		/* 351 = __acl_delete_file */
+	{ 2, (sy_call_t *)__acl_delete_fd },		/* 352 = __acl_delete_fd */
+	{ 3, (sy_call_t *)__acl_aclcheck_file },		/* 353 = __acl_aclcheck_file */
+	{ 3, (sy_call_t *)__acl_aclcheck_fd },		/* 354 = __acl_aclcheck_fd */
 	{ 4, (sy_call_t *)extattrctl },			/* 355 = extattrctl */
 	{ 4, (sy_call_t *)extattr_set_file },		/* 356 = extattr_set_file */
 	{ 4, (sy_call_t *)extattr_get_file },		/* 357 = extattr_get_file */
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 0f3fa4c493cf..f4afc988455a 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.71 2000/01/16 16:30:50 peter Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.72 2000/01/19 06:01:07 rwatson Exp 
  */
 
 char *syscallnames[] = {
@@ -354,14 +354,14 @@ char *syscallnames[] = {
 	"sigreturn",			/* 344 = sigreturn */
 	"#345",			/* 345 = sigtimedwait */
 	"#346",			/* 346 = sigwaitinfo */
-	"acl_syscall_get_file",			/* 347 = acl_syscall_get_file */
-	"acl_syscall_set_file",			/* 348 = acl_syscall_set_file */
-	"acl_syscall_get_fd",			/* 349 = acl_syscall_get_fd */
-	"acl_syscall_set_fd",			/* 350 = acl_syscall_set_fd */
-	"acl_syscall_delete_file",			/* 351 = acl_syscall_delete_file */
-	"acl_syscall_delete_fd",			/* 352 = acl_syscall_delete_fd */
-	"acl_syscall_aclcheck_file",			/* 353 = acl_syscall_aclcheck_file */
-	"acl_syscall_aclcheck_fd",			/* 354 = acl_syscall_aclcheck_fd */
+	"__acl_get_file",			/* 347 = __acl_get_file */
+	"__acl_set_file",			/* 348 = __acl_set_file */
+	"__acl_get_fd",			/* 349 = __acl_get_fd */
+	"__acl_set_fd",			/* 350 = __acl_set_fd */
+	"__acl_delete_file",			/* 351 = __acl_delete_file */
+	"__acl_delete_fd",			/* 352 = __acl_delete_fd */
+	"__acl_aclcheck_file",			/* 353 = __acl_aclcheck_file */
+	"__acl_aclcheck_fd",			/* 354 = __acl_aclcheck_fd */
 	"extattrctl",			/* 355 = extattrctl */
 	"extattr_set_file",			/* 356 = extattr_set_file */
 	"extattr_get_file",			/* 357 = extattr_get_file */
diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h
index 1732da7ac8c7..29b849f71dd0 100644
--- a/sys/sys/syscall-hide.h
+++ b/sys/sys/syscall-hide.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.71 2000/01/16 16:30:50 peter Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.72 2000/01/19 06:01:07 rwatson Exp 
  */
 
 HIDE_POSIX(fork)
@@ -264,14 +264,14 @@ HIDE_POSIX(sigsuspend)
 HIDE_POSIX(sigaction)
 HIDE_POSIX(sigpending)
 HIDE_BSD(sigreturn)
-HIDE_BSD(acl_syscall_get_file)
-HIDE_BSD(acl_syscall_set_file)
-HIDE_BSD(acl_syscall_get_fd)
-HIDE_BSD(acl_syscall_set_fd)
-HIDE_BSD(acl_syscall_delete_file)
-HIDE_BSD(acl_syscall_delete_fd)
-HIDE_BSD(acl_syscall_aclcheck_file)
-HIDE_BSD(acl_syscall_aclcheck_fd)
+HIDE_BSD(__acl_get_file)
+HIDE_BSD(__acl_set_file)
+HIDE_BSD(__acl_get_fd)
+HIDE_BSD(__acl_set_fd)
+HIDE_BSD(__acl_delete_file)
+HIDE_BSD(__acl_delete_fd)
+HIDE_BSD(__acl_aclcheck_file)
+HIDE_BSD(__acl_aclcheck_fd)
 HIDE_BSD(extattrctl)
 HIDE_BSD(extattr_set_file)
 HIDE_BSD(extattr_get_file)
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index eee91cb05b1e..fb2a49a16983 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.71 2000/01/16 16:30:50 peter Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.72 2000/01/19 06:01:07 rwatson Exp 
  */
 
 #define	SYS_syscall	0
@@ -269,14 +269,14 @@
 #define	SYS_sigaction	342
 #define	SYS_sigpending	343
 #define	SYS_sigreturn	344
-#define	SYS_acl_syscall_get_file	347
-#define	SYS_acl_syscall_set_file	348
-#define	SYS_acl_syscall_get_fd	349
-#define	SYS_acl_syscall_set_fd	350
-#define	SYS_acl_syscall_delete_file	351
-#define	SYS_acl_syscall_delete_fd	352
-#define	SYS_acl_syscall_aclcheck_file	353
-#define	SYS_acl_syscall_aclcheck_fd	354
+#define	SYS___acl_get_file	347
+#define	SYS___acl_set_file	348
+#define	SYS___acl_get_fd	349
+#define	SYS___acl_set_fd	350
+#define	SYS___acl_delete_file	351
+#define	SYS___acl_delete_fd	352
+#define	SYS___acl_aclcheck_file	353
+#define	SYS___acl_aclcheck_fd	354
 #define	SYS_extattrctl	355
 #define	SYS_extattr_set_file	356
 #define	SYS_extattr_get_file	357
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 4de03ca9c7c3..cbe86deff1a8 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.71 2000/01/16 16:30:50 peter Exp 
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.72 2000/01/19 06:01:07 rwatson Exp 
  */
 
 #ifndef _SYS_SYSPROTO_H_
@@ -939,65 +939,65 @@ struct	sigpending_args {
 struct	sigreturn_args {
 	ucontext_t *	sigcntxp;	char sigcntxp_[PAD_(ucontext_t *)];
 };
-struct	acl_syscall_get_file_args {
-	char *	path;	char path_[PAD_(char *)];
+struct	__acl_get_file_args {
+	const char *	path;	char path_[PAD_(const char *)];
 	acl_type_t	type;	char type_[PAD_(acl_type_t)];
 	struct acl *	aclp;	char aclp_[PAD_(struct acl *)];
 };
-struct	acl_syscall_set_file_args {
-	char *	path;	char path_[PAD_(char *)];
+struct	__acl_set_file_args {
+	const char *	path;	char path_[PAD_(const char *)];
 	acl_type_t	type;	char type_[PAD_(acl_type_t)];
 	struct acl *	aclp;	char aclp_[PAD_(struct acl *)];
 };
-struct	acl_syscall_get_fd_args {
+struct	__acl_get_fd_args {
 	int	filedes;	char filedes_[PAD_(int)];
 	acl_type_t	type;	char type_[PAD_(acl_type_t)];
 	struct acl *	aclp;	char aclp_[PAD_(struct acl *)];
 };
-struct	acl_syscall_set_fd_args {
+struct	__acl_set_fd_args {
 	int	filedes;	char filedes_[PAD_(int)];
 	acl_type_t	type;	char type_[PAD_(acl_type_t)];
 	struct acl *	aclp;	char aclp_[PAD_(struct acl *)];
 };
-struct	acl_syscall_delete_file_args {
-	char *	path;	char path_[PAD_(char *)];
+struct	__acl_delete_file_args {
+	const char *	path;	char path_[PAD_(const char *)];
 	acl_type_t	type;	char type_[PAD_(acl_type_t)];
 };
-struct	acl_syscall_delete_fd_args {
+struct	__acl_delete_fd_args {
 	int	filedes;	char filedes_[PAD_(int)];
 	acl_type_t	type;	char type_[PAD_(acl_type_t)];
 };
-struct	acl_syscall_aclcheck_file_args {
-	char *	path;	char path_[PAD_(char *)];
+struct	__acl_aclcheck_file_args {
+	const char *	path;	char path_[PAD_(const char *)];
 	acl_type_t	type;	char type_[PAD_(acl_type_t)];
 	struct acl *	aclp;	char aclp_[PAD_(struct acl *)];
 };
-struct	acl_syscall_aclcheck_fd_args {
+struct	__acl_aclcheck_fd_args {
 	int	filedes;	char filedes_[PAD_(int)];
 	acl_type_t	type;	char type_[PAD_(acl_type_t)];
 	struct acl *	aclp;	char aclp_[PAD_(struct acl *)];
 };
 struct	extattrctl_args {
-	char *	path;	char path_[PAD_(char *)];
+	const char *	path;	char path_[PAD_(const char *)];
 	int	cmd;	char cmd_[PAD_(int)];
-	char *	attrname;	char attrname_[PAD_(char *)];
-	caddr_t	arg;	char arg_[PAD_(caddr_t)];
+	const char *	attrname;	char attrname_[PAD_(const char *)];
+	char *	arg;	char arg_[PAD_(char *)];
 };
 struct	extattr_set_file_args {
-	char *	path;	char path_[PAD_(char *)];
-	char *	attrname;	char attrname_[PAD_(char *)];
+	const char *	path;	char path_[PAD_(const char *)];
+	const char *	attrname;	char attrname_[PAD_(const char *)];
 	struct iovec *	iovp;	char iovp_[PAD_(struct iovec *)];
-	u_int	iovcnt;	char iovcnt_[PAD_(u_int)];
+	unsigned	iovcnt;	char iovcnt_[PAD_(unsigned)];
 };
 struct	extattr_get_file_args {
-	char *	path;	char path_[PAD_(char *)];
-	char *	attrname;	char attrname_[PAD_(char *)];
+	const char *	path;	char path_[PAD_(const char *)];
+	const char *	attrname;	char attrname_[PAD_(const char *)];
 	struct iovec *	iovp;	char iovp_[PAD_(struct iovec *)];
-	u_int	iovcnt;	char iovcnt_[PAD_(u_int)];
+	unsigned	iovcnt;	char iovcnt_[PAD_(unsigned)];
 };
 struct	extattr_delete_file_args {
-	char *	path;	char path_[PAD_(char *)];
-	char *	attrname;	char attrname_[PAD_(char *)];
+	const char *	path;	char path_[PAD_(const char *)];
+	const char *	attrname;	char attrname_[PAD_(const char *)];
 };
 struct	aio_waitcomplete_args {
 	struct aiocb **	aiocbp;	char aiocbp_[PAD_(struct aiocb **)];
@@ -1228,14 +1228,14 @@ int	sigsuspend __P((struct proc *, struct sigsuspend_args *));
 int	sigaction __P((struct proc *, struct sigaction_args *));
 int	sigpending __P((struct proc *, struct sigpending_args *));
 int	sigreturn __P((struct proc *, struct sigreturn_args *));
-int	acl_syscall_get_file __P((struct proc *, struct acl_syscall_get_file_args *));
-int	acl_syscall_set_file __P((struct proc *, struct acl_syscall_set_file_args *));
-int	acl_syscall_get_fd __P((struct proc *, struct acl_syscall_get_fd_args *));
-int	acl_syscall_set_fd __P((struct proc *, struct acl_syscall_set_fd_args *));
-int	acl_syscall_delete_file __P((struct proc *, struct acl_syscall_delete_file_args *));
-int	acl_syscall_delete_fd __P((struct proc *, struct acl_syscall_delete_fd_args *));
-int	acl_syscall_aclcheck_file __P((struct proc *, struct acl_syscall_aclcheck_file_args *));
-int	acl_syscall_aclcheck_fd __P((struct proc *, struct acl_syscall_aclcheck_fd_args *));
+int	__acl_get_file __P((struct proc *, struct __acl_get_file_args *));
+int	__acl_set_file __P((struct proc *, struct __acl_set_file_args *));
+int	__acl_get_fd __P((struct proc *, struct __acl_get_fd_args *));
+int	__acl_set_fd __P((struct proc *, struct __acl_set_fd_args *));
+int	__acl_delete_file __P((struct proc *, struct __acl_delete_file_args *));
+int	__acl_delete_fd __P((struct proc *, struct __acl_delete_fd_args *));
+int	__acl_aclcheck_file __P((struct proc *, struct __acl_aclcheck_file_args *));
+int	__acl_aclcheck_fd __P((struct proc *, struct __acl_aclcheck_fd_args *));
 int	extattrctl __P((struct proc *, struct extattrctl_args *));
 int	extattr_set_file __P((struct proc *, struct extattr_set_file_args *));
 int	extattr_get_file __P((struct proc *, struct extattr_get_file_args *));