diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 0bd62906ae9a..9f41c00d856e 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -2,12 +2,10 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.28 1996/08/20 07:17:49 smpatel Exp 
+ * created from	FreeBSD
  */
 
-#include <sys/types.h>
 #include <sys/param.h>
-#include <sys/mount.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index fd06481974bb..e0c707dabd6a 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.28 1996/08/20 07:17:49 smpatel Exp 
+ * created from	FreeBSD
  */
 
 char *syscallnames[] = {
diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h
index cb41f53c0a1d..d24e98edcb44 100644
--- a/sys/sys/syscall-hide.h
+++ b/sys/sys/syscall-hide.h
@@ -2,7 +2,7 @@
  * System call hiders.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.28 1996/08/20 07:17:49 smpatel Exp 
+ * created from	FreeBSD
  */
 
 HIDE_POSIX(fork)
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 2ee6553d302d..b5571872c3a7 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.28 1996/08/20 07:17:49 smpatel Exp 
+ * created from	FreeBSD
  */
 
 #define	SYS_syscall	0
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index bb7f136b83cb..973c12accca0 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -2,15 +2,13 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.28 1996/08/20 07:17:49 smpatel Exp 
+ * created from	FreeBSD
  */
 
 #ifndef _SYS_SYSPROTO_H_
 #define	_SYS_SYSPROTO_H_
 
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/mount.h>
+#include <sys/signal.h>
 
 struct	nosys_args {
 	int dummy;
@@ -374,7 +372,7 @@ struct	listen_args {
 	int backlog;
 };
 struct	sigsuspend_args {
-	int mask;
+	sigset_t mask;
 };
 struct	gettimeofday_args {
 	struct timeval * tp;
@@ -500,7 +498,7 @@ struct	fstatfs_args {
 #if defined(NFS) && !defined (NFS_NOSERVER)
 struct	getfh_args {
 	char * fname;
-	fhandle_t * fhp;
+	struct fhandle * fhp;
 };
 #else
 #endif
@@ -559,21 +557,21 @@ struct	seteuid_args {
 };
 #ifdef LFS
 struct	lfs_bmapv_args {
-	fsid_t * fsidp;
+	struct fsid ** fsidp;
 	struct block_info * blkiov;
 	int blkcnt;
 };
 struct	lfs_markv_args {
-	fsid_t * fsidp;
+	struct fsid ** fsidp;
 	struct block_info * blkiov;
 	int blkcnt;
 };
 struct	lfs_segclean_args {
-	fsid_t * fsidp;
+	struct fsid ** fsidp;
 	u_long segment;
 };
 struct	lfs_segwait_args {
-	fsid_t * fsidp;
+	struct fsid ** fsidp;
 	struct timeval * tv;
 };
 #else