diff --git a/sys/rump/include/rump/rumpkern_if_pub.h b/sys/rump/include/rump/rumpkern_if_pub.h
index f791a54488f9..ed93e4798034 100644
--- a/sys/rump/include/rump/rumpkern_if_pub.h
+++ b/sys/rump/include/rump/rumpkern_if_pub.h
@@ -1,9 +1,9 @@
-/*	$NetBSD: rumpkern_if_pub.h,v 1.15 2014/03/10 22:44:10 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_pub.h,v 1.16 2014/04/25 13:11:47 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.11 2013/03/07 18:49:13 pooka Exp 
- * by:   NetBSD: makerumpif.sh,v 1.6 2013/02/14 10:54:54 pooka Exp 
+ * from: NetBSD: rumpkern.ifspec,v 1.13 2014/04/25 13:10:42 pooka Exp 
+ * by:   NetBSD: makerumpif.sh,v 1.7 2014/04/25 13:07:31 pooka Exp 
  */
 
 int rump_pub_module_init(const struct modinfo * const *, size_t);
@@ -22,3 +22,6 @@ void rump_pub_lwproc_releaselwp(void);
 struct lwp * rump_pub_lwproc_curlwp(void);
 void rump_pub_lwproc_sysent_usenative(void);
 void rump_pub_allbetsareoff_setid(pid_t, int);
+int rump_pub_etfs_register(const char *, const char *, enum rump_etfs_type);
+int rump_pub_etfs_register_withsize(const char *, const char *, enum rump_etfs_type, uint64_t, uint64_t);
+int rump_pub_etfs_remove(const char *);
diff --git a/sys/rump/include/rump/rumpvfs_if_pub.h b/sys/rump/include/rump/rumpvfs_if_pub.h
index ed77e311eb6e..eb81996935d7 100644
--- a/sys/rump/include/rump/rumpvfs_if_pub.h
+++ b/sys/rump/include/rump/rumpvfs_if_pub.h
@@ -1,9 +1,9 @@
-/*	$NetBSD: rumpvfs_if_pub.h,v 1.10 2012/11/18 18:40:45 pooka Exp $	*/
+/*	$NetBSD: rumpvfs_if_pub.h,v 1.11 2014/04/25 13:11:47 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpvfs.ifspec,v 1.8 2012/11/18 18:39:23 pooka Exp 
- * by:   NetBSD: makerumpif.sh,v 1.5 2010/09/01 19:32:11 pooka Exp 
+ * from: NetBSD: rumpvfs.ifspec,v 1.9 2014/04/25 13:10:42 pooka Exp 
+ * by:   NetBSD: makerumpif.sh,v 1.7 2014/04/25 13:07:31 pooka Exp 
  */
 
 void rump_pub_getvninfo(struct vnode *, enum rump_vtype *, off_t *, dev_t *);
@@ -18,9 +18,6 @@ void rump_pub_vp_incref(struct vnode *);
 int rump_pub_vp_getref(struct vnode *);
 void rump_pub_vp_rele(struct vnode *);
 void rump_pub_vp_interlock(struct vnode *);
-int rump_pub_etfs_register(const char *, const char *, enum rump_etfs_type);
-int rump_pub_etfs_register_withsize(const char *, const char *, enum rump_etfs_type, uint64_t, uint64_t);
-int rump_pub_etfs_remove(const char *);
 void rump_pub_freecn(struct componentname *, int);
 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, struct kauth_cred *, struct lwp *);
diff --git a/sys/rump/librump/rumpkern/rumpkern_if_priv.h b/sys/rump/librump/rumpkern/rumpkern_if_priv.h
index ed95c1e18b53..1c11e7e56634 100644
--- a/sys/rump/librump/rumpkern/rumpkern_if_priv.h
+++ b/sys/rump/librump/rumpkern/rumpkern_if_priv.h
@@ -1,24 +1,46 @@
-/*	$NetBSD: rumpkern_if_priv.h,v 1.14 2014/03/10 22:44:11 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_priv.h,v 1.15 2014/04/25 13:11:47 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.11 2013/03/07 18:49:13 pooka Exp 
- * by:   NetBSD: makerumpif.sh,v 1.6 2013/02/14 10:54:54 pooka Exp 
+ * from: NetBSD: rumpkern.ifspec,v 1.13 2014/04/25 13:10:42 pooka Exp 
+ * by:   NetBSD: makerumpif.sh,v 1.7 2014/04/25 13:07:31 pooka Exp 
  */
 
 int rump_module_init(const struct modinfo * const *, size_t);
+typedef int (*rump_module_init_fn)(const struct modinfo * const *, size_t);
 int rump_module_fini(const struct modinfo *);
+typedef int (*rump_module_fini_fn)(const struct modinfo *);
 int rump_kernelfsym_load(void *, uint64_t, char *, uint64_t);
+typedef int (*rump_kernelfsym_load_fn)(void *, uint64_t, char *, uint64_t);
 struct uio * rump_uio_setup(void *, size_t, off_t, enum rump_uiorw);
+typedef struct uio * (*rump_uio_setup_fn)(void *, size_t, off_t, enum rump_uiorw);
 size_t rump_uio_getresid(struct uio *);
+typedef size_t (*rump_uio_getresid_fn)(struct uio *);
 off_t rump_uio_getoff(struct uio *);
+typedef off_t (*rump_uio_getoff_fn)(struct uio *);
 size_t rump_uio_free(struct uio *);
+typedef size_t (*rump_uio_free_fn)(struct uio *);
 struct kauth_cred* rump_cred_create(uid_t, gid_t, size_t, gid_t *);
+typedef struct kauth_cred* (*rump_cred_create_fn)(uid_t, gid_t, size_t, gid_t *);
 void rump_cred_put(struct kauth_cred *);
+typedef void (*rump_cred_put_fn)(struct kauth_cred *);
 int rump_lwproc_rfork(int);
+typedef int (*rump_lwproc_rfork_fn)(int);
 int rump_lwproc_newlwp(pid_t);
+typedef int (*rump_lwproc_newlwp_fn)(pid_t);
 void rump_lwproc_switch(struct lwp *);
+typedef void (*rump_lwproc_switch_fn)(struct lwp *);
 void rump_lwproc_releaselwp(void);
+typedef void (*rump_lwproc_releaselwp_fn)(void);
 struct lwp * rump_lwproc_curlwp(void);
+typedef struct lwp * (*rump_lwproc_curlwp_fn)(void);
 void rump_lwproc_sysent_usenative(void);
+typedef void (*rump_lwproc_sysent_usenative_fn)(void);
 void rump_allbetsareoff_setid(pid_t, int);
+typedef void (*rump_allbetsareoff_setid_fn)(pid_t, int);
+int rump_etfs_register(const char *, const char *, enum rump_etfs_type);
+typedef int (*rump_etfs_register_fn)(const char *, const char *, enum rump_etfs_type);
+int rump_etfs_register_withsize(const char *, const char *, enum rump_etfs_type, uint64_t, uint64_t);
+typedef int (*rump_etfs_register_withsize_fn)(const char *, const char *, enum rump_etfs_type, uint64_t, uint64_t);
+int rump_etfs_remove(const char *);
+typedef int (*rump_etfs_remove_fn)(const char *);
diff --git a/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c b/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
index 6e7eb75b7c3c..775cffabcf98 100644
--- a/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
+++ b/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
@@ -1,9 +1,9 @@
-/*	$NetBSD: rumpkern_if_wrappers.c,v 1.14 2014/03/10 22:44:11 pooka Exp $	*/
+/*	$NetBSD: rumpkern_if_wrappers.c,v 1.15 2014/04/25 13:11:47 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.11 2013/03/07 18:49:13 pooka Exp 
- * by:   NetBSD: makerumpif.sh,v 1.6 2013/02/14 10:54:54 pooka Exp 
+ * from: NetBSD: rumpkern.ifspec,v 1.13 2014/04/25 13:10:42 pooka Exp 
+ * by:   NetBSD: makerumpif.sh,v 1.7 2014/04/25 13:07:31 pooka Exp 
  */
 
 #include <sys/cdefs.h>
@@ -199,3 +199,39 @@ rump_pub_allbetsareoff_setid(pid_t arg1, int arg2)
 	rump_allbetsareoff_setid(arg1, arg2);
 	rump_unschedule();
 }
+
+int
+rump_pub_etfs_register(const char *arg1, const char *arg2, enum rump_etfs_type arg3)
+{
+	int rv;
+
+	rump_schedule();
+	rv = rump_etfs_register(arg1, arg2, arg3);
+	rump_unschedule();
+
+	return rv;
+}
+
+int
+rump_pub_etfs_register_withsize(const char *arg1, const char *arg2, enum rump_etfs_type arg3, uint64_t arg4, uint64_t arg5)
+{
+	int rv;
+
+	rump_schedule();
+	rv = rump_etfs_register_withsize(arg1, arg2, arg3, arg4, arg5);
+	rump_unschedule();
+
+	return rv;
+}
+
+int
+rump_pub_etfs_remove(const char *arg1)
+{
+	int rv;
+
+	rump_schedule();
+	rv = rump_etfs_remove(arg1);
+	rump_unschedule();
+
+	return rv;
+}
diff --git a/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h b/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h
index 41f181b25f34..4541338b987e 100644
--- a/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h
+++ b/sys/rump/librump/rumpvfs/rumpvfs_if_priv.h
@@ -1,39 +1,64 @@
-/*	$NetBSD: rumpvfs_if_priv.h,v 1.10 2012/11/18 18:40:45 pooka Exp $	*/
+/*	$NetBSD: rumpvfs_if_priv.h,v 1.11 2014/04/25 13:11:47 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpvfs.ifspec,v 1.8 2012/11/18 18:39:23 pooka Exp 
- * by:   NetBSD: makerumpif.sh,v 1.5 2010/09/01 19:32:11 pooka Exp 
+ * from: NetBSD: rumpvfs.ifspec,v 1.9 2014/04/25 13:10:42 pooka Exp 
+ * by:   NetBSD: makerumpif.sh,v 1.7 2014/04/25 13:07:31 pooka Exp 
  */
 
 void rump_getvninfo(struct vnode *, enum rump_vtype *, off_t *, dev_t *);
+typedef void (*rump_getvninfo_fn)(struct vnode *, enum rump_vtype *, off_t *, dev_t *);
 struct vfsops * rump_vfslist_iterate(struct vfsops *);
+typedef struct vfsops * (*rump_vfslist_iterate_fn)(struct vfsops *);
 struct vfsops * rump_vfs_getopsbyname(const char *);
+typedef struct vfsops * (*rump_vfs_getopsbyname_fn)(const char *);
 struct vattr * rump_vattr_init(void);
+typedef struct vattr * (*rump_vattr_init_fn)(void);
 void rump_vattr_settype(struct vattr *, enum rump_vtype);
+typedef void (*rump_vattr_settype_fn)(struct vattr *, enum rump_vtype);
 void rump_vattr_setmode(struct vattr *, mode_t);
+typedef void (*rump_vattr_setmode_fn)(struct vattr *, mode_t);
 void rump_vattr_setrdev(struct vattr *, dev_t);
+typedef void (*rump_vattr_setrdev_fn)(struct vattr *, dev_t);
 void rump_vattr_free(struct vattr *);
+typedef void (*rump_vattr_free_fn)(struct vattr *);
 void rump_vp_incref(struct vnode *);
+typedef void (*rump_vp_incref_fn)(struct vnode *);
 int rump_vp_getref(struct vnode *);
+typedef int (*rump_vp_getref_fn)(struct vnode *);
 void rump_vp_rele(struct vnode *);
+typedef void (*rump_vp_rele_fn)(struct vnode *);
 void rump_vp_interlock(struct vnode *);
-int rump_etfs_register(const char *, const char *, enum rump_etfs_type);
-int rump_etfs_register_withsize(const char *, const char *, enum rump_etfs_type, uint64_t, uint64_t);
-int rump_etfs_remove(const char *);
+typedef void (*rump_vp_interlock_fn)(struct vnode *);
 void rump_freecn(struct componentname *, int);
+typedef void (*rump_freecn_fn)(struct componentname *, int);
 int rump_namei(uint32_t, uint32_t, const char *, struct vnode **, struct vnode **, struct componentname **);
+typedef int (*rump_namei_fn)(uint32_t, uint32_t, const char *, struct vnode **, struct vnode **, struct componentname **);
 struct componentname * rump_makecn(u_long, u_long, const char *, size_t, struct kauth_cred *, struct lwp *);
+typedef struct componentname * (*rump_makecn_fn)(u_long, u_long, const char *, size_t, struct kauth_cred *, struct lwp *);
 int rump_vfs_unmount(struct mount *, int);
+typedef int (*rump_vfs_unmount_fn)(struct mount *, int);
 int rump_vfs_root(struct mount *, struct vnode **, int);
+typedef int (*rump_vfs_root_fn)(struct mount *, struct vnode **, int);
 int rump_vfs_statvfs(struct mount *, struct statvfs *);
+typedef int (*rump_vfs_statvfs_fn)(struct mount *, struct statvfs *);
 int rump_vfs_sync(struct mount *, int, struct kauth_cred *);
+typedef int (*rump_vfs_sync_fn)(struct mount *, int, struct kauth_cred *);
 int rump_vfs_fhtovp(struct mount *, struct fid *, struct vnode **);
+typedef int (*rump_vfs_fhtovp_fn)(struct mount *, struct fid *, struct vnode **);
 int rump_vfs_vptofh(struct vnode *, struct fid *, size_t *);
+typedef int (*rump_vfs_vptofh_fn)(struct vnode *, struct fid *, size_t *);
 int rump_vfs_extattrctl(struct mount *, int, struct vnode *, int, const char *);
+typedef int (*rump_vfs_extattrctl_fn)(struct mount *, int, struct vnode *, int, const char *);
 void rump_vfs_syncwait(struct mount *);
+typedef void (*rump_vfs_syncwait_fn)(struct mount *);
 int rump_vfs_getmp(const char *, struct mount **);
+typedef int (*rump_vfs_getmp_fn)(const char *, struct mount **);
 void rump_vfs_mount_print(const char *, int);
+typedef void (*rump_vfs_mount_print_fn)(const char *, int);
 int rump_syspuffs_glueinit(int, int *);
+typedef int (*rump_syspuffs_glueinit_fn)(int, int *);
 void rump_vattr50_to_vattr(const struct vattr *, struct vattr *);
+typedef void (*rump_vattr50_to_vattr_fn)(const struct vattr *, struct vattr *);
 void rump_vattr_to_vattr50(const struct vattr *, struct vattr *);
+typedef void (*rump_vattr_to_vattr50_fn)(const struct vattr *, struct vattr *);
diff --git a/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c b/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c
index d09482d093f4..3a8cca3d3c2f 100644
--- a/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c
+++ b/sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c
@@ -1,9 +1,9 @@
-/*	$NetBSD: rumpvfs_if_wrappers.c,v 1.10 2012/11/18 18:40:45 pooka Exp $	*/
+/*	$NetBSD: rumpvfs_if_wrappers.c,v 1.11 2014/04/25 13:11:47 pooka Exp $	*/
 
 /*
  * Automatically generated.  DO NOT EDIT.
- * from: NetBSD: rumpvfs.ifspec,v 1.8 2012/11/18 18:39:23 pooka Exp 
- * by:   NetBSD: makerumpif.sh,v 1.5 2010/09/01 19:32:11 pooka Exp 
+ * from: NetBSD: rumpvfs.ifspec,v 1.9 2014/04/25 13:10:42 pooka Exp 
+ * by:   NetBSD: makerumpif.sh,v 1.7 2014/04/25 13:07:31 pooka Exp 
  */
 
 #include <sys/cdefs.h>
@@ -143,42 +143,6 @@ rump_pub_vp_interlock(struct vnode *arg1)
 	rump_unschedule();
 }
 
-int
-rump_pub_etfs_register(const char *arg1, const char *arg2, enum rump_etfs_type arg3)
-{
-	int rv;
-
-	rump_schedule();
-	rv = rump_etfs_register(arg1, arg2, arg3);
-	rump_unschedule();
-
-	return rv;
-}
-
-int
-rump_pub_etfs_register_withsize(const char *arg1, const char *arg2, enum rump_etfs_type arg3, uint64_t arg4, uint64_t arg5)
-{
-	int rv;
-
-	rump_schedule();
-	rv = rump_etfs_register_withsize(arg1, arg2, arg3, arg4, arg5);
-	rump_unschedule();
-
-	return rv;
-}
-
-int
-rump_pub_etfs_remove(const char *arg1)
-{
-	int rv;
-
-	rump_schedule();
-	rv = rump_etfs_remove(arg1);
-	rump_unschedule();
-
-	return rv;
-}
-
 void
 rump_pub_freecn(struct componentname *arg1, int arg2)
 {