diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index 7a051154eb64..7b50fb67a4d1 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.6 (Berkeley) 5/10/95
- * $Id: iso.h,v 1.14 1997/05/04 15:24:22 joerg Exp $
+ * $Id: iso.h,v 1.15 1997/05/04 16:17:49 joerg Exp $
  */
 
 #define ISODCL(from, to) (to - from + 1)
@@ -171,6 +171,8 @@ struct iso_extended_attributes {
 	u_char len_au			[ISODCL (247, 250)]; /* 723 */
 };
 
+#ifdef KERNEL
+
 /* CD-ROM Format type */
 enum ISO_FTYPE	{ ISO_FTYPE_DEFAULT, ISO_FTYPE_9660, ISO_FTYPE_RRIP,
 		  ISO_FTYPE_ECMA, ISO_FTYPE_HIGH_SIERRA };
@@ -219,6 +221,17 @@ extern vop_t **cd9660_vnodeop_p;
 extern vop_t **cd9660_specop_p;
 extern vop_t **cd9660_fifoop_p;
 
+int isofncmp __P((u_char *, int, u_char *, int));
+void isofntrans __P((u_char *, int, u_char *, u_short *, int, int));
+ino_t isodirino __P((struct iso_directory_record *, struct iso_mnt *));
+
+#endif /* KERNEL */
+
+/*
+ * The isonum_xxx functions are inlined anyway, and could come handy even
+ * outside the kernel.  Thus we don't hide them here.
+ */
+
 static __inline int isonum_711 __P((u_char *));
 static __inline int
 isonum_711(p)
@@ -293,10 +306,6 @@ isonum_733(p)
 
 #endif /* UNALIGNED_ACCESS */
 
-int isofncmp __P((u_char *, int, u_char *, int));
-void isofntrans __P((u_char *, int, u_char *, u_short *, int, int));
-ino_t isodirino __P((struct iso_directory_record *, struct iso_mnt *));
-
 /*
  * Associated files have a leading '='.
  */
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index 7a051154eb64..7b50fb67a4d1 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.6 (Berkeley) 5/10/95
- * $Id: iso.h,v 1.14 1997/05/04 15:24:22 joerg Exp $
+ * $Id: iso.h,v 1.15 1997/05/04 16:17:49 joerg Exp $
  */
 
 #define ISODCL(from, to) (to - from + 1)
@@ -171,6 +171,8 @@ struct iso_extended_attributes {
 	u_char len_au			[ISODCL (247, 250)]; /* 723 */
 };
 
+#ifdef KERNEL
+
 /* CD-ROM Format type */
 enum ISO_FTYPE	{ ISO_FTYPE_DEFAULT, ISO_FTYPE_9660, ISO_FTYPE_RRIP,
 		  ISO_FTYPE_ECMA, ISO_FTYPE_HIGH_SIERRA };
@@ -219,6 +221,17 @@ extern vop_t **cd9660_vnodeop_p;
 extern vop_t **cd9660_specop_p;
 extern vop_t **cd9660_fifoop_p;
 
+int isofncmp __P((u_char *, int, u_char *, int));
+void isofntrans __P((u_char *, int, u_char *, u_short *, int, int));
+ino_t isodirino __P((struct iso_directory_record *, struct iso_mnt *));
+
+#endif /* KERNEL */
+
+/*
+ * The isonum_xxx functions are inlined anyway, and could come handy even
+ * outside the kernel.  Thus we don't hide them here.
+ */
+
 static __inline int isonum_711 __P((u_char *));
 static __inline int
 isonum_711(p)
@@ -293,10 +306,6 @@ isonum_733(p)
 
 #endif /* UNALIGNED_ACCESS */
 
-int isofncmp __P((u_char *, int, u_char *, int));
-void isofntrans __P((u_char *, int, u_char *, u_short *, int, int));
-ino_t isodirino __P((struct iso_directory_record *, struct iso_mnt *));
-
 /*
  * Associated files have a leading '='.
  */