Index: sys/kern/vfs_extattr.c
===================================================================
--- sys/kern/vfs_extattr.c
+++ sys/kern/vfs_extattr.c
@@ -56,16 +56,17 @@
  *
  * Currently this is used only by UFS1 extended attributes.
  */
+#ifndef _SYS_SYSPROTO_H_
+struct extattrctl_args {
+	const char *path;
+	int cmd;
+	const char *filename;
+	int attrnamespace;
+	const char *attrname;
+};
+#endif
 int
-sys_extattrctl(td, uap)
-	struct thread *td;
-	struct extattrctl_args /* {
-		const char *path;
-		int cmd;
-		const char *filename;
-		int attrnamespace;
-		const char *attrname;
-	} */ *uap;
+sys_extattrctl(struct thread *td, struct extattrctl_args *uap)
 {
 	struct vnode *filename_vp;
 	struct nameidata nd;
@@ -206,16 +207,17 @@
 	return (error);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct extattr_set_fd_args {
+	int fd;
+	int attrnamespace;
+	const char *attrname;
+	void *data;
+	size_t nbytes;
+};
+#endif
 int
-sys_extattr_set_fd(td, uap)
-	struct thread *td;
-	struct extattr_set_fd_args /* {
-		int fd;
-		int attrnamespace;
-		const char *attrname;
-		void *data;
-		size_t nbytes;
-	} */ *uap;
+sys_extattr_set_fd(struct thread *td, struct extattr_set_fd_args *uap)
 {
 	struct file *fp;
 	char attrname[EXTATTR_MAXNAMELEN];
@@ -241,16 +243,17 @@
 	return (error);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct extattr_set_file_args {
+	const char *path;
+	int attrnamespace;
+	const char *attrname;
+	void *data;
+	size_t nbytes;
+};
+#endif
 int
-sys_extattr_set_file(td, uap)
-	struct thread *td;
-	struct extattr_set_file_args /* {
-		const char *path;
-		int attrnamespace;
-		const char *attrname;
-		void *data;
-		size_t nbytes;
-	} */ *uap;
+sys_extattr_set_file(struct thread *td, struct extattr_set_file_args *uap)
 {
 	struct nameidata nd;
 	char attrname[EXTATTR_MAXNAMELEN];
@@ -276,16 +279,17 @@
 	return (error);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct extattr_set_link_args {
+	const char *path;
+	int attrnamespace;
+	const char *attrname;
+	void *data;
+	size_t nbytes;
+};
+#endif
 int
-sys_extattr_set_link(td, uap)
-	struct thread *td;
-	struct extattr_set_link_args /* {
-		const char *path;
-		int attrnamespace;
-		const char *attrname;
-		void *data;
-		size_t nbytes;
-	} */ *uap;
+sys_extattr_set_link(struct thread *td, struct extattr_set_link_args *uap)
 {
 	struct nameidata nd;
 	char attrname[EXTATTR_MAXNAMELEN];
@@ -381,16 +385,17 @@
 	return (error);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct extattr_get_fd_args {
+	int fd;
+	int attrnamespace;
+	const char *attrname;
+	void *data;
+	size_t nbytes;
+};
+#endif
 int
-sys_extattr_get_fd(td, uap)
-	struct thread *td;
-	struct extattr_get_fd_args /* {
-		int fd;
-		int attrnamespace;
-		const char *attrname;
-		void *data;
-		size_t nbytes;
-	} */ *uap;
+sys_extattr_get_fd(struct thread *td, struct extattr_get_fd_args *uap)
 {
 	struct file *fp;
 	char attrname[EXTATTR_MAXNAMELEN];
@@ -416,16 +421,17 @@
 	return (error);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct extattr_get_file_args {
+	const char *path;
+	int attrnamespace;
+	const char *attrname;
+	void *data;
+	size_t nbytes;
+};
+#endif
 int
-sys_extattr_get_file(td, uap)
-	struct thread *td;
-	struct extattr_get_file_args /* {
-		const char *path;
-		int attrnamespace;
-		const char *attrname;
-		void *data;
-		size_t nbytes;
-	} */ *uap;
+sys_extattr_get_file(struct thread *td, struct extattr_get_file_args *uap)
 {
 	struct nameidata nd;
 	char attrname[EXTATTR_MAXNAMELEN];
@@ -450,16 +456,17 @@
 	return (error);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct extattr_get_link_args {
+	const char *path;
+	int attrnamespace;
+	const char *attrname;
+	void *data;
+	size_t nbytes;
+};
+#endif
 int
-sys_extattr_get_link(td, uap)
-	struct thread *td;
-	struct extattr_get_link_args /* {
-		const char *path;
-		int attrnamespace;
-		const char *attrname;
-		void *data;
-		size_t nbytes;
-	} */ *uap;
+sys_extattr_get_link(struct thread *td, struct extattr_get_link_args *uap)
 {
 	struct nameidata nd;
 	char attrname[EXTATTR_MAXNAMELEN];
@@ -527,14 +534,15 @@
 	return (error);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct extattr_delete_fd_args {
+	int fd;
+	int attrnamespace;
+	const char *attrname;
+};
+#endif
 int
-sys_extattr_delete_fd(td, uap)
-	struct thread *td;
-	struct extattr_delete_fd_args /* {
-		int fd;
-		int attrnamespace;
-		const char *attrname;
-	} */ *uap;
+sys_extattr_delete_fd(struct thread *td, struct extattr_delete_fd_args *uap)
 {
 	struct file *fp;
 	char attrname[EXTATTR_MAXNAMELEN];
@@ -559,14 +567,15 @@
 	return (error);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct extattr_delete_file_args {
+	const char *path;
+	int attrnamespace;
+	const char *attrname;
+};
+#endif
 int
-sys_extattr_delete_file(td, uap)
-	struct thread *td;
-	struct extattr_delete_file_args /* {
-		const char *path;
-		int attrnamespace;
-		const char *attrname;
-	} */ *uap;
+sys_extattr_delete_file(struct thread *td, struct extattr_delete_file_args *uap)
 {
 	struct nameidata nd;
 	char attrname[EXTATTR_MAXNAMELEN];
@@ -589,14 +598,15 @@
 	return(error);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct extattr_delete_link_args {
+	const char *path;
+	int attrnamespace;
+	const char *attrname;
+};
+#endif
 int
-sys_extattr_delete_link(td, uap)
-	struct thread *td;
-	struct extattr_delete_link_args /* {
-		const char *path;
-		int attrnamespace;
-		const char *attrname;
-	} */ *uap;
+sys_extattr_delete_link(struct thread *td, struct extattr_delete_link_args *uap)
 {
 	struct nameidata nd;
 	char attrname[EXTATTR_MAXNAMELEN];
@@ -684,15 +694,16 @@
 }
 
 
+#ifndef _SYS_SYSPROTO_H_
+struct extattr_list_fd_args {
+	int fd;
+	int attrnamespace;
+	void *data;
+	size_t nbytes;
+};
+#endif
 int
-sys_extattr_list_fd(td, uap)
-	struct thread *td;
-	struct extattr_list_fd_args /* {
-		int fd;
-		int attrnamespace;
-		void *data;
-		size_t nbytes;
-	} */ *uap;
+sys_extattr_list_fd(struct thread *td, struct extattr_list_fd_args *uap)
 {
 	struct file *fp;
 	cap_rights_t rights;
@@ -712,15 +723,16 @@
 	return (error);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct extattr_list_file_args {
+	const char *path;
+	int attrnamespace;
+	void *data;
+	size_t nbytes;
+}
+#endif
 int
-sys_extattr_list_file(td, uap)
-	struct thread*td;
-	struct extattr_list_file_args /* {
-		const char *path;
-		int attrnamespace;
-		void *data;
-		size_t nbytes;
-	} */ *uap;
+sys_extattr_list_file(struct thread *td, struct extattr_list_file_args *uap)
 {
 	struct nameidata nd;
 	int error;
@@ -739,15 +751,16 @@
 	return (error);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct extattr_list_link_args {
+	const char *path;
+	int attrnamespace;
+	void *data;
+	size_t nbytes;
+};
+#endif
 int
-sys_extattr_list_link(td, uap)
-	struct thread*td;
-	struct extattr_list_link_args /* {
-		const char *path;
-		int attrnamespace;
-		void *data;
-		size_t nbytes;
-	} */ *uap;
+sys_extattr_list_link(struct thread *td, struct extattr_list_link_args *uap)
 {
 	struct nameidata nd;
 	int error;