diff --git a/sys/fs/cd9660/cd9660_extern.h b/sys/fs/cd9660/cd9660_extern.h
index c1dcc51792dd..eedfa3a91834 100644
--- a/sys/fs/cd9660/cd9660_extern.h
+++ b/sys/fs/cd9660/cd9660_extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_extern.h,v 1.13 2005/02/26 22:58:54 perry Exp $	*/
+/*	$NetBSD: cd9660_extern.h,v 1.14 2005/08/30 18:47:19 xtraeme Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -95,34 +95,34 @@ struct iso_mnt {
 extern struct pool cd9660_node_pool;
 extern int cd9660_utf8_joliet;
 
-int cd9660_mount __P((struct mount *,
-	    const char *, void *, struct nameidata *, struct proc *));
-int cd9660_start __P((struct mount *, int, struct proc *));
-int cd9660_unmount __P((struct mount *, int, struct proc *));
-int cd9660_root __P((struct mount *, struct vnode **));
-int cd9660_quotactl __P((struct mount *, int, uid_t, void *, struct proc *));
-int cd9660_statvfs __P((struct mount *, struct statvfs *, struct proc *));
-int cd9660_sync __P((struct mount *, int, struct ucred *, struct proc *));
-int cd9660_vget __P((struct mount *, ino_t, struct vnode **));
-int cd9660_fhtovp __P((struct mount *, struct fid *, struct vnode **));
-int cd9660_check_export __P((struct mount *, struct mbuf *, int *,
-	    struct ucred **));
-int cd9660_vptofh __P((struct vnode *, struct fid *));
-void cd9660_init __P((void));
-void cd9660_reinit __P((void));
-void cd9660_done __P((void));
+int cd9660_mount(struct mount *,
+	    const char *, void *, struct nameidata *, struct proc *);
+int cd9660_start(struct mount *, int, struct proc *);
+int cd9660_unmount(struct mount *, int, struct proc *);
+int cd9660_root(struct mount *, struct vnode **);
+int cd9660_quotactl(struct mount *, int, uid_t, void *, struct proc *);
+int cd9660_statvfs(struct mount *, struct statvfs *, struct proc *);
+int cd9660_sync(struct mount *, int, struct ucred *, struct proc *);
+int cd9660_vget(struct mount *, ino_t, struct vnode **);
+int cd9660_fhtovp(struct mount *, struct fid *, struct vnode **);
+int cd9660_check_export(struct mount *, struct mbuf *, int *,
+	    struct ucred **);
+int cd9660_vptofh(struct vnode *, struct fid *);
+void cd9660_init(void);
+void cd9660_reinit(void);
+void cd9660_done(void);
 
 #ifdef SYSCTL_SETUP_PROTO
 SYSCTL_SETUP_PROTO(sysctl_vfs_cd9660_setup);
 #endif /* SYSCTL_SETUP_PROTO */
 
-int cd9660_mountroot __P((void));
+int cd9660_mountroot(void);
 
-extern int (**cd9660_vnodeop_p) __P((void *));
-extern int (**cd9660_specop_p) __P((void *));
-extern int (**cd9660_fifoop_p) __P((void *));
+extern int (**cd9660_vnodeop_p)(void *);
+extern int (**cd9660_specop_p)(void *);
+extern int (**cd9660_fifoop_p)(void *);
 
-int isochar __P((const u_char *, const u_char *, int, u_int16_t *));
-int isofncmp __P((const u_char *, size_t, const u_char *, size_t, int));
-void isofntrans __P((u_char *, int, u_char *, u_short *, int, int, int, int));
-ino_t isodirino __P((struct iso_directory_record *, struct iso_mnt *));
+int isochar(const u_char *, const u_char *, int, u_int16_t *);
+int isofncmp(const u_char *, size_t, const u_char *, size_t, int);
+void isofntrans(u_char *, int, u_char *, u_short *, int, int, int, int);
+ino_t isodirino(struct iso_directory_record *, struct iso_mnt *);
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 796922cc9093..b3a832d1b7e8 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_node.c,v 1.10 2005/05/29 21:00:29 christos Exp $	*/
+/*	$NetBSD: cd9660_node.c,v 1.11 2005/08/30 18:47:19 xtraeme Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1994
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.10 2005/05/29 21:00:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.11 2005/08/30 18:47:19 xtraeme Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -77,7 +77,7 @@ extern int prtactive;	/* 1 => print out reclaim of active vnodes */
 POOL_INIT(cd9660_node_pool, sizeof(struct iso_node), 0, 0, 0, "cd9660nopl",
     &pool_allocator_nointr);
 
-static u_int cd9660_chars2ui __P((u_char *, int));
+static u_int cd9660_chars2ui(u_char *, int);
 
 /*
  * Initialize hash links for inodes and dnodes.
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 488f8eec7892..2a55d143bb1d 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_node.h,v 1.6 2004/06/20 20:44:06 dillo Exp $	*/
+/*	$NetBSD: cd9660_node.h,v 1.7 2005/08/30 18:47:19 xtraeme Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -105,45 +105,45 @@ struct iso_node {
 /*
  * Prototypes for ISOFS vnode operations
  */
-int	cd9660_lookup	__P((void *));
+int	cd9660_lookup(void *);
 #define	cd9660_open	genfs_nullop
 #define	cd9660_close	genfs_nullop
-int	cd9660_access	__P((void *));
-int	cd9660_getattr	__P((void *));
-int	cd9660_read	__P((void *));
+int	cd9660_access(void *);
+int	cd9660_getattr(void *);
+int	cd9660_read(void *);
 #define	cd9660_ioctl	genfs_enoioctl
 #define	cd9660_poll	genfs_poll
 #define	cd9660_mmap	genfs_mmap
 #define	cd9660_seek	genfs_seek
-int	cd9660_readdir	__P((void *));
-int	cd9660_readlink	__P((void *));
+int	cd9660_readdir(void *);
+int	cd9660_readlink(void *);
 #define	cd9660_abortop	genfs_abortop
-int	cd9660_inactive	__P((void *));
-int	cd9660_reclaim	__P((void *));
-int	cd9660_link	__P((void *));
-int	cd9660_symlink	__P((void *));
-int	cd9660_bmap	__P((void *));
-int	cd9660_lock	__P((void *));
-int	cd9660_unlock	__P((void *));
-int	cd9660_strategy	__P((void *));
-int	cd9660_print	__P((void *));
-int	cd9660_islocked	__P((void *));
-int	cd9660_pathconf	__P((void *));
-int	cd9660_setattr	__P((void *));
-int	cd9660_blkatoff	__P((void *));
+int	cd9660_inactive(void *);
+int	cd9660_reclaim(void *);
+int	cd9660_link(void *);
+int	cd9660_symlink(void *);
+int	cd9660_bmap(void *);
+int	cd9660_lock(void *);
+int	cd9660_unlock(void *);
+int	cd9660_strategy(void *);
+int	cd9660_print(void *);
+int	cd9660_islocked(void *);
+int	cd9660_pathconf(void *));
+int	cd9660_setattr(void *);
+int	cd9660_blkatoff(void *);
 
-void	cd9660_defattr __P((struct iso_directory_record *,
-			struct iso_node *, struct buf *));
-void	cd9660_deftstamp __P((struct iso_directory_record *,
-			struct iso_node *, struct buf *));
-struct	vnode *cd9660_ihashget __P((dev_t, ino_t));
-void	cd9660_ihashins __P((struct iso_node *));
-void	cd9660_ihashrem __P((struct iso_node *));
-int	cd9660_tstamp_conv7 __P((u_char *, struct timespec *));
-int	cd9660_tstamp_conv17 __P((u_char *, struct timespec *));
-int	cd9660_vget_internal __P((struct mount *, ino_t, struct vnode **, int,
-			      struct iso_directory_record *));
+void	cd9660_defattr(struct iso_directory_record *,
+			struct iso_node *, struct buf *);
+void	cd9660_deftstamp(struct iso_directory_record *,
+			struct iso_node *, struct buf *);
+struct	vnode *cd9660_ihashget(dev_t, ino_t);
+void	cd9660_ihashins(struct iso_node *);
+void	cd9660_ihashrem(struct iso_node *);
+int	cd9660_tstamp_conv7(u_char *, struct timespec *);
+int	cd9660_tstamp_conv17(u_char *, struct timespec *);
+int	cd9660_vget_internal(struct mount *, ino_t, struct vnode **, int,
+			      struct iso_directory_record *);
 #ifdef	ISODEVMAP
-struct iso_dnode *iso_dmap __P((dev_t, ino_t, int));
-void iso_dunmap __P((dev_t));
+struct iso_dnode *iso_dmap(dev_t, ino_t, int);
+void iso_dunmap(dev_t);
 #endif
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index afa2ab078c5b..5837903527a1 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_rrip.c,v 1.7 2005/05/29 21:00:29 christos Exp $	*/
+/*	$NetBSD: cd9660_rrip.c,v 1.8 2005/08/30 18:47:19 xtraeme Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.7 2005/05/29 21:00:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.8 2005/08/30 18:47:19 xtraeme Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -59,27 +59,27 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.7 2005/05/29 21:00:29 christos Exp
 
 typedef struct {
 	char type[2];
-	int (*func) __P((void *, ISO_RRIP_ANALYZE *));
-	void (*func2) __P((void *, ISO_RRIP_ANALYZE *));
+	int (*func)(void *, ISO_RRIP_ANALYZE *);
+	void (*func2)(void *, ISO_RRIP_ANALYZE *);
 	int result;
 } RRIP_TABLE;
 
-static int cd9660_rrip_attr __P((void *, ISO_RRIP_ANALYZE *));
-static void cd9660_rrip_defattr __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_slink __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_altname __P((void *, ISO_RRIP_ANALYZE *));
-static void cd9660_rrip_defname __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_pclink __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_reldir __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_tstamp __P((void *, ISO_RRIP_ANALYZE *));
-static void cd9660_rrip_deftstamp __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_device __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_idflag __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_cont __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_stop __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_extref __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_loop __P((struct iso_directory_record *,
-				 ISO_RRIP_ANALYZE *, const RRIP_TABLE *));
+static int cd9660_rrip_attr(void *, ISO_RRIP_ANALYZE *);
+static void cd9660_rrip_defattr(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_slink(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_altname(void *, ISO_RRIP_ANALYZE *);
+static void cd9660_rrip_defname(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_pclink(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_reldir(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_tstamp(void *, ISO_RRIP_ANALYZE *);
+static void cd9660_rrip_deftstamp(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_device(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_idflag(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_cont(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_stop(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_extref(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_loop(struct iso_directory_record *,
+				 ISO_RRIP_ANALYZE *, const RRIP_TABLE *);
 /*
  * POSIX file attribute
  */
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index c331c111e5b0..7170ced5bc10 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_vfsops.c,v 1.25 2005/08/05 13:24:18 jmmv Exp $	*/
+/*	$NetBSD: cd9660_vfsops.c,v 1.26 2005/08/30 18:47:19 xtraeme Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.25 2005/08/05 13:24:18 jmmv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.26 2005/08/30 18:47:19 xtraeme Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -119,9 +119,9 @@ static const struct genfs_ops cd9660_genfsops = {
  */
 #define ROOTNAME	"root_device"
 
-static int iso_makemp __P((struct iso_mnt *isomp, struct buf *bp, int *ea_len));
-static int iso_mountfs __P((struct vnode *devvp, struct mount *mp,
-		struct proc *p, struct iso_args *argp));
+static int iso_makemp(struct iso_mnt *isomp, struct buf *bp, int *ea_len);
+static int iso_mountfs(struct vnode *devvp, struct mount *mp,
+		struct proc *p, struct iso_args *argp);
 
 int
 cd9660_mountroot()
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index ddc978f1750c..b6b591f43f72 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_vnops.c,v 1.14 2005/08/19 02:04:03 christos Exp $	*/
+/*	$NetBSD: cd9660_vnops.c,v 1.15 2005/08/30 18:47:19 xtraeme Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.14 2005/08/19 02:04:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.15 2005/08/30 18:47:19 xtraeme Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -80,8 +80,8 @@ struct isoreaddir {
 	int ncookies;
 };
 
-int	iso_uiodir __P((struct isoreaddir *, struct dirent *, off_t));
-int	iso_shipdir __P((struct isoreaddir *));
+int	iso_uiodir(struct isoreaddir *, struct dirent *, off_t);
+int	iso_shipdir(struct isoreaddir *);
 
 #if 0
 /*
@@ -905,7 +905,7 @@ cd9660_setattr(v)
 /*
  * Global vfs data structures for cd9660
  */
-int (**cd9660_vnodeop_p) __P((void *));
+int (**cd9660_vnodeop_p)(void *);
 const struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
 	{ &vop_lookup_desc, cd9660_lookup },		/* lookup */
@@ -961,7 +961,7 @@ const struct vnodeopv_desc cd9660_vnodeop_opv_desc =
 /*
  * Special device vnode ops
  */
-int (**cd9660_specop_p) __P((void *));
+int (**cd9660_specop_p)(void *);
 const struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
 	{ &vop_lookup_desc, spec_lookup },		/* lookup */
@@ -1015,7 +1015,7 @@ const struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 const struct vnodeopv_desc cd9660_specop_opv_desc =
 	{ &cd9660_specop_p, cd9660_specop_entries };
 
-int (**cd9660_fifoop_p) __P((void *));
+int (**cd9660_fifoop_p)(void *);
 const struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
 	{ &vop_lookup_desc, fifo_lookup },		/* lookup */
diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h
index 25864d3e9e28..67d769e081fd 100644
--- a/sys/fs/cd9660/iso_rrip.h
+++ b/sys/fs/cd9660/iso_rrip.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: iso_rrip.h,v 1.2 2003/08/07 16:31:36 agc Exp $	*/
+/*	$NetBSD: iso_rrip.h,v 1.3 2005/08/30 18:47:19 xtraeme Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -69,13 +69,13 @@ typedef struct {
 	int		cont;		/* continuation of above */
 } ISO_RRIP_ANALYZE;
 
-int cd9660_rrip_analyze __P((struct iso_directory_record *isodir,
-			    struct iso_node *inop, struct iso_mnt *imp));
-int cd9660_rrip_getname __P((struct iso_directory_record *isodir,
+int cd9660_rrip_analyze(struct iso_directory_record *isodir,
+			    struct iso_node *inop, struct iso_mnt *imp);
+int cd9660_rrip_getname(struct iso_directory_record *isodir,
 			    char *outbuf, u_short *outlen,
-			    ino_t *inump, struct iso_mnt *imp));
-int cd9660_rrip_getsymname __P((struct iso_directory_record *isodir,
+			    ino_t *inump, struct iso_mnt *imp);
+int cd9660_rrip_getsymname(struct iso_directory_record *isodir,
 			       char *outbuf, u_short *outlen,
-			       struct iso_mnt *imp));
-int cd9660_rrip_offset __P((struct iso_directory_record *isodir,
-			   struct iso_mnt *imp));
+			       struct iso_mnt *imp);
+int cd9660_rrip_offset(struct iso_directory_record *isodir,
+			   struct iso_mnt *imp);
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 788ead68d98e..e32719c05600 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: msdosfsmount.h,v 1.7 2004/05/20 06:34:26 atatat Exp $	*/
+/*	$NetBSD: msdosfsmount.h,v 1.8 2005/08/30 18:49:19 xtraeme Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -226,9 +226,9 @@ struct msdosfsmount {
 /*
  * Prototypes for MSDOSFS virtual filesystem operations
  */
-void msdosfs_init __P((void));
-void msdosfs_reinit __P((void));
-void msdosfs_done __P((void));
+void msdosfs_init(void);
+void msdosfs_reinit(void);
+void msdosfs_done(void);
 
 #ifdef SYSCTL_SETUP_PROTO
 SYSCTL_SETUP_PROTO(sysctl_vfs_msdosfs_setup);