diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index 6540c44949c7..f529a0d39e6c 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -38,10 +38,11 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
- * $Id$
+ * $Id: cd9660_lookup.c,v 1.3 1994/08/02 07:41:17 davidg Exp $
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/buf.h>
 #include <sys/file.h>
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 43b1ffe4a827..79ee4f4683a4 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id$
+ * $Id: cd9660_node.c,v 1.3 1994/08/02 07:41:19 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -562,7 +562,7 @@ cd9660_deftstamp(isodir,inop,bp)
 int
 cd9660_tstamp_conv7(pi,pu)
 char *pi;
-struct timeval *pu;
+struct timespec *pu;
 {
 	int i;
 	int crtime, days;
@@ -577,8 +577,8 @@ struct timeval *pu;
 	tz = pi[6];
 	
 	if (y < 1970) {
-		pu->tv_sec  = 0;
-		pu->tv_usec = 0;
+		pu->ts_sec  = 0;
+		pu->ts_nsec = 0;
 		return 0;
 	} else {
 #ifdef	ORIGINAL
@@ -598,8 +598,8 @@ struct timeval *pu;
 		if (-48 <= tz && tz <= 52)
 			crtime += tz * 15 * 60;
 	}
-	pu->tv_sec  = crtime;
-	pu->tv_usec = 0;
+	pu->ts_sec  = crtime;
+	pu->ts_nsec = 0;
 	return 1;
 }
 
@@ -620,7 +620,7 @@ cd9660_chars2ui(begin,len)
 int
 cd9660_tstamp_conv17(pi,pu)
 	unsigned char *pi;
-	struct timeval *pu;
+	struct timespec *pu;
 {
 	unsigned char buf[7];
 	
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index bc4ec4b497af..d1839ef42932 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.2 (Berkeley) 1/23/94
- * $Id$
+ * $Id: cd9660_node.h,v 1.2 1994/08/02 07:41:22 davidg Exp $
  */
 
 /*
@@ -138,6 +138,10 @@ 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 *));
+int cd9660_tstamp_conv7 __P((char *pi, struct timespec *pu));
+int cd9660_tstamp_conv17 __P((unsigned char *pi, struct timespec *pu));
+void isodirino __P((ino_t *inump, struct iso_directory_record *isodir,
+		    struct iso_mnt *imp));
 #ifdef	ISODEVMAP
 struct iso_dnode *iso_dmap __P((dev_t, ino_t, int));
 void iso_dunmap __P((dev_t));
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index 78410a54f239..4ba2fa636ee4 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -36,10 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_rrip.c,v 1.2 1994/08/02 07:41:26 davidg Exp $
+ * $Id: cd9660_rrip.c,v 1.3 1994/09/09 11:10:58 dfr Exp $
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/buf.h>
 #include <sys/file.h>
@@ -325,7 +326,7 @@ cd9660_rrip_tstamp(p,ana)
 			cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_mtime);
 			ptime += 7;
 		} else
-			bzero(&ana->inop->inode.iso_mtime,sizeof(struct timeval));
+			bzero(&ana->inop->inode.iso_mtime,sizeof(struct timespec));
 		
 		if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {
 			cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_atime);
@@ -346,7 +347,7 @@ cd9660_rrip_tstamp(p,ana)
 			cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_mtime);
 			ptime += 17;
 		} else
-			bzero(&ana->inop->inode.iso_mtime,sizeof(struct timeval));
+			bzero(&ana->inop->inode.iso_mtime,sizeof(struct timespec));
 		
 		if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {
 			cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_atime);
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 7f2d1c3dc153..a02137047a73 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.3 (Berkeley) 1/31/94
- * $Id: cd9660_vfsops.c,v 1.4 1994/08/20 03:48:45 davidg Exp $
+ * $Id: cd9660_vfsops.c,v 1.5 1994/08/20 16:03:07 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -50,13 +50,13 @@
 #include <sys/buf.h>
 #include <sys/file.h>
 #include <sys/dkbad.h>
-#include <sys/disklabel.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 
 #include <isofs/cd9660/iso.h>
 #include <isofs/cd9660/cd9660_node.h>
+#include <isofs/cd9660/iso_rrip.h>
 
 struct vfsops cd9660_vfsops = {
 	cd9660_mount,
@@ -79,7 +79,8 @@ struct vfsops cd9660_vfsops = {
  */
 #define ROOTNAME	"root_device"
 
-static iso_mountfs();
+static int iso_mountfs __P((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 2c913f2b0ac4..ba61f5df41d2 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.3 (Berkeley) 1/23/94
- * $Id: cd9660_vnops.c,v 1.4 1994/08/08 09:11:18 davidg Exp $
+ * $Id: cd9660_vnops.c,v 1.5 1994/09/09 11:10:59 dfr Exp $
  */
 
 #include <sys/param.h>
@@ -400,7 +400,7 @@ iso_uiodir(idp,dp,off)
 		--idp->ncookies;
 	}
 	
-	if (error = uiomove(dp,dp->d_reclen,idp->uio))
+	if (error = uiomove((caddr_t)dp,dp->d_reclen,idp->uio))
 		return error;
 	idp->uio_off = off;
 	return 0;
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index 6540c44949c7..f529a0d39e6c 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -38,10 +38,11 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
- * $Id$
+ * $Id: cd9660_lookup.c,v 1.3 1994/08/02 07:41:17 davidg Exp $
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/buf.h>
 #include <sys/file.h>
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 43b1ffe4a827..79ee4f4683a4 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id$
+ * $Id: cd9660_node.c,v 1.3 1994/08/02 07:41:19 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -562,7 +562,7 @@ cd9660_deftstamp(isodir,inop,bp)
 int
 cd9660_tstamp_conv7(pi,pu)
 char *pi;
-struct timeval *pu;
+struct timespec *pu;
 {
 	int i;
 	int crtime, days;
@@ -577,8 +577,8 @@ struct timeval *pu;
 	tz = pi[6];
 	
 	if (y < 1970) {
-		pu->tv_sec  = 0;
-		pu->tv_usec = 0;
+		pu->ts_sec  = 0;
+		pu->ts_nsec = 0;
 		return 0;
 	} else {
 #ifdef	ORIGINAL
@@ -598,8 +598,8 @@ struct timeval *pu;
 		if (-48 <= tz && tz <= 52)
 			crtime += tz * 15 * 60;
 	}
-	pu->tv_sec  = crtime;
-	pu->tv_usec = 0;
+	pu->ts_sec  = crtime;
+	pu->ts_nsec = 0;
 	return 1;
 }
 
@@ -620,7 +620,7 @@ cd9660_chars2ui(begin,len)
 int
 cd9660_tstamp_conv17(pi,pu)
 	unsigned char *pi;
-	struct timeval *pu;
+	struct timespec *pu;
 {
 	unsigned char buf[7];
 	
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index bc4ec4b497af..d1839ef42932 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.2 (Berkeley) 1/23/94
- * $Id$
+ * $Id: cd9660_node.h,v 1.2 1994/08/02 07:41:22 davidg Exp $
  */
 
 /*
@@ -138,6 +138,10 @@ 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 *));
+int cd9660_tstamp_conv7 __P((char *pi, struct timespec *pu));
+int cd9660_tstamp_conv17 __P((unsigned char *pi, struct timespec *pu));
+void isodirino __P((ino_t *inump, struct iso_directory_record *isodir,
+		    struct iso_mnt *imp));
 #ifdef	ISODEVMAP
 struct iso_dnode *iso_dmap __P((dev_t, ino_t, int));
 void iso_dunmap __P((dev_t));
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index 78410a54f239..4ba2fa636ee4 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -36,10 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_rrip.c,v 1.2 1994/08/02 07:41:26 davidg Exp $
+ * $Id: cd9660_rrip.c,v 1.3 1994/09/09 11:10:58 dfr Exp $
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/buf.h>
 #include <sys/file.h>
@@ -325,7 +326,7 @@ cd9660_rrip_tstamp(p,ana)
 			cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_mtime);
 			ptime += 7;
 		} else
-			bzero(&ana->inop->inode.iso_mtime,sizeof(struct timeval));
+			bzero(&ana->inop->inode.iso_mtime,sizeof(struct timespec));
 		
 		if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {
 			cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_atime);
@@ -346,7 +347,7 @@ cd9660_rrip_tstamp(p,ana)
 			cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_mtime);
 			ptime += 17;
 		} else
-			bzero(&ana->inop->inode.iso_mtime,sizeof(struct timeval));
+			bzero(&ana->inop->inode.iso_mtime,sizeof(struct timespec));
 		
 		if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {
 			cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_atime);
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 7f2d1c3dc153..a02137047a73 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.3 (Berkeley) 1/31/94
- * $Id: cd9660_vfsops.c,v 1.4 1994/08/20 03:48:45 davidg Exp $
+ * $Id: cd9660_vfsops.c,v 1.5 1994/08/20 16:03:07 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -50,13 +50,13 @@
 #include <sys/buf.h>
 #include <sys/file.h>
 #include <sys/dkbad.h>
-#include <sys/disklabel.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 
 #include <isofs/cd9660/iso.h>
 #include <isofs/cd9660/cd9660_node.h>
+#include <isofs/cd9660/iso_rrip.h>
 
 struct vfsops cd9660_vfsops = {
 	cd9660_mount,
@@ -79,7 +79,8 @@ struct vfsops cd9660_vfsops = {
  */
 #define ROOTNAME	"root_device"
 
-static iso_mountfs();
+static int iso_mountfs __P((struct vnode *devvp, struct mount *mp,
+			    struct proc *p, struct iso_args *argp));
 
 int
 cd9660_mountroot()
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 2c913f2b0ac4..ba61f5df41d2 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.3 (Berkeley) 1/23/94
- * $Id: cd9660_vnops.c,v 1.4 1994/08/08 09:11:18 davidg Exp $
+ * $Id: cd9660_vnops.c,v 1.5 1994/09/09 11:10:59 dfr Exp $
  */
 
 #include <sys/param.h>
@@ -400,7 +400,7 @@ iso_uiodir(idp,dp,off)
 		--idp->ncookies;
 	}
 	
-	if (error = uiomove(dp,dp->d_reclen,idp->uio))
+	if (error = uiomove((caddr_t)dp,dp->d_reclen,idp->uio))
 		return error;
 	idp->uio_off = off;
 	return 0;