diff --git a/sys/rump/include/rump/rumpkern_if_pub.h b/sys/rump/include/rump/rumpkern_if_pub.h
index c601375a8d15..c5c78423538d 100644
--- a/sys/rump/include/rump/rumpkern_if_pub.h
+++ b/sys/rump/include/rump/rumpkern_if_pub.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpkern_if_pub.h,v 1.6 2010/03/05 18:43:58 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_pub.h,v 1.7 2010/04/14 14:14:53 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
@@ -15,9 +15,9 @@ struct uio * rump_pub_uio_setup(void *, size_t, off_t, enum rump_uiorw);
 size_t rump_pub_uio_getresid(struct uio *);
 off_t rump_pub_uio_getoff(struct uio *);
 size_t rump_pub_uio_free(struct uio *);
-kauth_cred_t rump_pub_cred_create(uid_t, gid_t, size_t, gid_t *);
-kauth_cred_t rump_pub_cred_suserget(void);
-void rump_pub_cred_put(kauth_cred_t);
+struct kauth_cred* rump_pub_cred_create(uid_t, gid_t, size_t, gid_t *);
+struct kauth_cred* rump_pub_cred_suserget(void);
+void rump_pub_cred_put(struct kauth_cred *);
 struct lwp * rump_pub_newproc_switch(void);
 struct lwp * rump_pub_lwp_alloc(pid_t, lwpid_t);
 struct lwp * rump_pub_lwp_alloc_and_switch(pid_t, lwpid_t);
diff --git a/sys/rump/include/rump/rumpvfs_if_pub.h b/sys/rump/include/rump/rumpvfs_if_pub.h
index 2e0eaede3951..bb6b9e0c4a10 100644
--- a/sys/rump/include/rump/rumpvfs_if_pub.h
+++ b/sys/rump/include/rump/rumpvfs_if_pub.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpvfs_if_pub.h,v 1.3 2009/10/15 00:31:25 pooka Exp $	*/
+/*	$NetBSD: rumpvfs_if_pub.h,v 1.4 2010/04/14 14:14:53 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
@@ -24,11 +24,11 @@ int rump_pub_etfs_remove(const char *);
 void rump_pub_freecn(struct componentname *, int);
 int rump_pub_checksavecn(struct componentname *);
 int rump_pub_namei(uint32_t, uint32_t, const char *, struct vnode **, struct vnode **, struct componentname **);
-struct componentname * rump_pub_makecn(u_long, u_long, const char *, size_t, kauth_cred_t, struct lwp *);
+struct componentname * rump_pub_makecn(u_long, u_long, const char *, size_t, struct kauth_cred *, struct lwp *);
 int rump_pub_vfs_unmount(struct mount *, int);
 int rump_pub_vfs_root(struct mount *, struct vnode **, int);
 int rump_pub_vfs_statvfs(struct mount *, struct statvfs *);
-int rump_pub_vfs_sync(struct mount *, int, kauth_cred_t);
+int rump_pub_vfs_sync(struct mount *, int, struct kauth_cred *);
 int rump_pub_vfs_fhtovp(struct mount *, struct fid *, struct vnode **);
 int rump_pub_vfs_vptofh(struct vnode *, struct fid *, size_t *);
 void rump_pub_vfs_syncwait(struct mount *);
diff --git a/sys/rump/librump/rumpkern/rumpkern_if_priv.h b/sys/rump/librump/rumpkern/rumpkern_if_priv.h
index 4c4eb845fe7d..e434a3235a43 100644
--- a/sys/rump/librump/rumpkern/rumpkern_if_priv.h
+++ b/sys/rump/librump/rumpkern/rumpkern_if_priv.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpkern_if_priv.h,v 1.6 2010/03/05 18:43:59 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_priv.h,v 1.7 2010/04/14 14:14:52 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
@@ -15,9 +15,9 @@ struct uio * rump_uio_setup(void *, size_t, off_t, enum rump_uiorw);
 size_t rump_uio_getresid(struct uio *);
 off_t rump_uio_getoff(struct uio *);
 size_t rump_uio_free(struct uio *);
-kauth_cred_t rump_cred_create(uid_t, gid_t, size_t, gid_t *);
-kauth_cred_t rump_cred_suserget(void);
-void rump_cred_put(kauth_cred_t);
+struct kauth_cred* rump_cred_create(uid_t, gid_t, size_t, gid_t *);
+struct kauth_cred* rump_cred_suserget(void);
+void rump_cred_put(struct kauth_cred *);
 struct lwp * rump_newproc_switch(void);
 struct lwp * rump_lwp_alloc(pid_t, lwpid_t);
 struct lwp * rump_lwp_alloc_and_switch(pid_t, lwpid_t);
diff --git a/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c b/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
index ab380b67a197..9931e1c86a58 100644
--- a/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
+++ b/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpkern_if_wrappers.c,v 1.6 2010/03/05 18:43:59 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_wrappers.c,v 1.7 2010/04/14 14:14:52 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
@@ -128,10 +128,10 @@ rump_pub_uio_free(struct uio *arg1)
 	return rv;
 }
 
-kauth_cred_t
+struct kauth_cred*
 rump_pub_cred_create(uid_t arg1, gid_t arg2, size_t arg3, gid_t *arg4)
 {
-	kauth_cred_t rv;
+	struct kauth_cred* rv;
 
 	rump_schedule();
 	rv = rump_cred_create(arg1, arg2, arg3, arg4);
@@ -140,10 +140,10 @@ rump_pub_cred_create(uid_t arg1, gid_t arg2, size_t arg3, gid_t *arg4)
 	return rv;
 }
 
-kauth_cred_t
+struct kauth_cred*
 rump_pub_cred_suserget(void)
 {
-	kauth_cred_t rv;
+	struct kauth_cred* rv;
 
 	rump_schedule();
 	rv = rump_cred_suserget();
@@ -153,7 +153,7 @@ rump_pub_cred_suserget(void)
 }
 
 void
-rump_pub_cred_put(kauth_cred_t arg1)
+rump_pub_cred_put(struct kauth_cred *arg1)
 {
 
 	rump_schedule();
diff --git a/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h b/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h
index 1ef53d09d77a..aad531b25f6b 100644
--- a/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h
+++ b/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpvfs_if_priv.h,v 1.3 2009/10/15 00:31:25 pooka Exp $	*/
+/*	$NetBSD: rumpvfs_if_priv.h,v 1.4 2010/04/14 14:14:53 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
@@ -24,11 +24,11 @@ int rump_etfs_remove(const char *);
 void rump_freecn(struct componentname *, int);
 int rump_checksavecn(struct componentname *);
 int rump_namei(uint32_t, uint32_t, const char *, struct vnode **, struct vnode **, struct componentname **);
-struct componentname * rump_makecn(u_long, u_long, const char *, size_t, kauth_cred_t, struct lwp *);
+struct componentname * rump_makecn(u_long, u_long, const char *, size_t, struct kauth_cred *, struct lwp *);
 int rump_vfs_unmount(struct mount *, int);
 int rump_vfs_root(struct mount *, struct vnode **, int);
 int rump_vfs_statvfs(struct mount *, struct statvfs *);
-int rump_vfs_sync(struct mount *, int, kauth_cred_t);
+int rump_vfs_sync(struct mount *, int, struct kauth_cred *);
 int rump_vfs_fhtovp(struct mount *, struct fid *, struct vnode **);
 int rump_vfs_vptofh(struct vnode *, struct fid *, size_t *);
 void rump_vfs_syncwait(struct mount *);
diff --git a/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c b/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c
index 0be7e46ec63a..329c5009ce75 100644
--- a/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c
+++ b/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpvfs_if_wrappers.c,v 1.3 2009/10/15 00:31:25 pooka Exp $	*/
+/*	$NetBSD: rumpvfs_if_wrappers.c,v 1.4 2010/04/14 14:14:53 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
@@ -213,7 +213,7 @@ rump_pub_namei(uint32_t arg1, uint32_t arg2, const char *arg3, struct vnode **ar
 }
 
 struct componentname *
-rump_pub_makecn(u_long arg1, u_long arg2, const char *arg3, size_t arg4, kauth_cred_t arg5, struct lwp *arg6)
+rump_pub_makecn(u_long arg1, u_long arg2, const char *arg3, size_t arg4, struct kauth_cred *arg5, struct lwp *arg6)
 {
 	struct componentname * rv;
 
@@ -261,7 +261,7 @@ rump_pub_vfs_statvfs(struct mount *arg1, struct statvfs *arg2)
 }
 
 int
-rump_pub_vfs_sync(struct mount *arg1, int arg2, kauth_cred_t arg3)
+rump_pub_vfs_sync(struct mount *arg1, int arg2, struct kauth_cred *arg3)
 {
 	int rv;