diff --git a/bin/makefile-tail b/bin/makefile-tail
index d7f16c6..ee06f2f 100755
--- a/bin/makefile-tail
+++ b/bin/makefile-tail
@@ -235,7 +235,7 @@ $(OBJECTDIR)main.o : $(SRCDIR)main.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h \
 	 $(INCDIR)emlglob.h  $(INCDIR)address.h $(INCDIR)lsptypes.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lispmap.h  $(INCDIR)ifpage.h  $(INCDIR)iopage.h \
-	 $(INCDIR)return.h $(INCDIR)debug.h $(INCDIR)profile.h $(INCDIR)unixfork.h
+	 $(INCDIR)return.h $(INCDIR)debug.h $(INCDIR)profile.h $(INCDIR)unixfork.h $(INCDIR)dir.h
 	$(CC) $(RFLAGS) $(SRCDIR)main.c $(INLINE) -o $(OBJECTDIR)main$(OEXT)
 
 $(OBJECTDIR)dbgtool.o :  $(SRCDIR)dbgtool.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
@@ -481,7 +481,7 @@ $(OBJECTDIR)findkey.o :  $(SRCDIR)findkey.c  $(REQUIRED-INCS) $(INCDIR)lispemul.
 $(OBJECTDIR)dsk.o :  $(SRCDIR)dsk.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  $(INCDIR)lispmap.h \
 	 $(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	 $(INCDIR)fp.h $(INCDIR)arith.h  $(INCDIR)stream.h  $(INCDIR)timeout.h \
-	 $(INCDIR)locfile.h $(INCDIR)osmsg.h $(INCDIR)dbprint.h $(INCDIR)car-cdr.h $(INCDIR)dsk.h
+	 $(INCDIR)locfile.h $(INCDIR)osmsg.h $(INCDIR)dbprint.h $(INCDIR)car-cdr.h $(INCDIR)dsk.h $(INCDIR)dir.h
 	$(CC) $(RFLAGS) $(SRCDIR)dsk.c $(INLINE) -o $(OBJECTDIR)dsk$(OEXT)
 
 $(OBJECTDIR)ufs.o :  $(SRCDIR)ufs.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  $(INCDIR)lispmap.h  \
@@ -490,7 +490,7 @@ $(OBJECTDIR)ufs.o :  $(SRCDIR)ufs.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  $(INC
 	 $(INCDIR)stream.h $(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)dbprint.h $(INCDIR)dsk.h
 	$(CC) $(RFLAGS) $(SRCDIR)ufs.c $(INLINE) -o $(OBJECTDIR)ufs$(OEXT)
 
-$(OBJECTDIR)dir.o :  $(SRCDIR)dir.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
+$(OBJECTDIR)dir.o :  $(SRCDIR)dir.c  $(INCDIR)dir.h $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lispmap.h $(INCDIR)adr68k.h $(INCDIR)lsptypes.h  \
 	 $(INCDIR)arith.h $(INCDIR)lspglob.h $(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)dsk.h
 	$(CC) $(RFLAGS) $(SRCDIR)dir.c $(INLINE) -o $(OBJECTDIR)dir$(OEXT)
@@ -716,7 +716,7 @@ $(OBJECTDIR)subr.o :  $(SRCDIR)subr.c  $(REQUIRED-INCS) \
 	 $(INCDIR)adr68k.h $(INCDIR)subrs.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)emlglob.h \
 	 $(INCDIR)lspglob.h  $(INCDIR)cell.h  $(INCDIR)stack.h \
-	 $(INCDIR)arith.h $(INCDIR)profile.h $(INCDIR)dsk.h
+	 $(INCDIR)arith.h $(INCDIR)profile.h $(INCDIR)dsk.h $(INCDIR)dir.h
 	$(CC) $(RFLAGS) $(SRCDIR)subr.c $(INLINE) -o $(OBJECTDIR)subr$(OEXT)
 
 $(OBJECTDIR)miscn.o : $(SRCDIR)miscn.c  $(REQUIRED-INCS) \
@@ -789,7 +789,7 @@ $(OBJECTDIR)vars3.o :  $(SRCDIR)vars3.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 
 $(OBJECTDIR)vmemsave.o :  $(SRCDIR)vmemsave.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lispmap.h  $(INCDIR)lspglob.h \
-	 $(INCDIR)ifpage.h  $(INCDIR)dsk.h $(INCDIR)vmemsave.h 
+	 $(INCDIR)ifpage.h  $(INCDIR)dsk.h $(INCDIR)vmemsave.h $(INCDIR)dir.h
 	$(CC) $(RFLAGS) $(SRCDIR)vmemsave.c $(INLINE) -o $(OBJECTDIR)vmemsave$(OEXT)
 
 $(OBJECTDIR)array2.o : $(SRCDIR)array2.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
diff --git a/inc/dir.h b/inc/dir.h
new file mode 100644
index 0000000..32f457d
--- /dev/null
+++ b/inc/dir.h
@@ -0,0 +1,10 @@
+#ifdef DOS
+int make_old_version(char *old, char *file);
+#endif
+#ifdef FSDEBUG
+void print_finfo(FINFO *fp);
+#endif
+int init_finfo();
+LispPTR COM_gen_files(register LispPTR *args);
+LispPTR COM_next_file(register LispPTR *args);
+LispPTR COM_finish_finfo(register LispPTR *args);
diff --git a/src/dir.c b/src/dir.c
index 367bd65..c6d3ad3 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -88,6 +88,7 @@ static char *id = "$Id: dir.c,v 1.4 2001/12/26 22:17:01 sybalsky Exp $ Copyright
 #include "timeout.h"
 #include "locfile.h"
 #include "dsk.h"
+#include "dir.h"
 
 extern int *Lisp_errno;
 extern int Dummy_errno;
@@ -192,7 +193,7 @@ extern int Dummy_errno;
  * number of characters.
  */
 
-int match_pattern(char *tp, char *pp)
+static int match_pattern(char *tp, char *pp)
 {
   register char *tsp, *psp;
   register int inastr;
@@ -448,7 +449,7 @@ int init_finfo() {
  * FINFOARRAYRSIZE.
  */
 
-int get_finfo_id() {
+static int get_finfo_id() {
   register int i;
   DFINFO *dfap;
 
@@ -493,7 +494,7 @@ int get_finfo_id() {
  */
 
 #ifdef DOS
-int enum_dsk_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
+static int enum_dsk_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
 {
   register struct direct *dp;
   register FINFO *prevp;
@@ -653,7 +654,7 @@ int enum_dsk_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
   return (n);
 }
 #else  /* DOS */
-int enum_dsk_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
+static int enum_dsk_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
 {
   register struct direct *dp;
   register FINFO *prevp;
@@ -772,7 +773,7 @@ int enum_dsk_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
  * Similar to enum_dsk_prop, but file properties are not stored.
  */
 #ifdef DOS
-int enum_dsk(char *dir, char *name, char *ver, FINFO **finfo_buf)
+static int enum_dsk(char *dir, char *name, char *ver, FINFO **finfo_buf)
 {
   register struct direct *dp;
   register FINFO *prevp;
@@ -916,7 +917,7 @@ int enum_dsk(char *dir, char *name, char *ver, FINFO **finfo_buf)
 
 #else  /* DOS */
 
-int enum_dsk(char *dir, char *name, char *ver, FINFO **finfo_buf)
+static int enum_dsk(char *dir, char *name, char *ver, FINFO **finfo_buf)
 {
   register struct direct *dp;
   register FINFO *prevp;
@@ -1024,7 +1025,7 @@ int enum_dsk(char *dir, char *name, char *ver, FINFO **finfo_buf)
  * of FINFO structures.
  */
 #ifdef DOS
-int enum_ufs_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
+static int enum_ufs_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
 {
   register struct direct *dp;
   register FINFO *prevp;
@@ -1110,7 +1111,7 @@ int enum_ufs_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
   return (n);
 }
 #else  /* DOS */
-int enum_ufs_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
+static int enum_ufs_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
 {
   register struct direct *dp;
   register FINFO *prevp;
@@ -1223,7 +1224,7 @@ int enum_ufs_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
  * Similar to enum_ufs_prop, but file properties are not stored.
  */
 #ifdef DOS
-int enum_ufs(char *dir, char *name, char *ver, FINFO **finfo_buf)
+static int enum_ufs(char *dir, char *name, char *ver, FINFO **finfo_buf)
 {
   register struct direct *dp;
   register FINFO *prevp;
@@ -1293,7 +1294,7 @@ int enum_ufs(char *dir, char *name, char *ver, FINFO **finfo_buf)
   return (n);
 }
 #else  /* DOS */
-int enum_ufs(char *dir, char *name, char *ver, FINFO **finfo_buf)
+static int enum_ufs(char *dir, char *name, char *ver, FINFO **finfo_buf)
 {
   register struct direct *dp;
   register FINFO *prevp;
@@ -1388,7 +1389,7 @@ int enum_ufs(char *dir, char *name, char *ver, FINFO **finfo_buf)
  * This routine is only used by DSK codes.
  */
 
-int trim_finfo(FINFO **fp)
+static int trim_finfo(FINFO **fp)
 {
 #ifndef DOS
   register FINFO *tp, *sp, *mp, *cp, *pp;
@@ -1517,7 +1518,7 @@ int trim_finfo(FINFO **fp)
  * of.
  */
 
-int trim_finfo_highest(FINFO **fp, int highestp)
+static int trim_finfo_highest(FINFO **fp, int highestp)
 {
   register FINFO *tp, *sp, *mp, *cp, *pp;
   register int num, pnum;
@@ -1655,7 +1656,7 @@ int trim_finfo_highest(FINFO **fp, int highestp)
  * are got rid of.
  */
 
-int trim_finfo_version(FINFO **fp, int rver)
+static int trim_finfo_version(FINFO **fp, int rver)
 {
   register FINFO *tp, *sp, *mp, *cp, *pp, *vp;
   register int num, pnum;
diff --git a/src/dsk.c b/src/dsk.c
index 11d432e..18394f1 100644
--- a/src/dsk.c
+++ b/src/dsk.c
@@ -113,6 +113,7 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright
 #include "conspage.h"
 #include "car-cdr.h"
 #include "dsk.h"
+#include "dir.h"
 
 #if defined(ULTRIX) || defined(MACOSX) || defined(FREEBSD)
 #include <sys/mount.h>
diff --git a/src/main.c b/src/main.c
index f3662bc..ea9d5de 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,6 +23,7 @@ static char *id = "$Id: main.c,v 1.4 2001/12/26 22:17:03 sybalsky Exp $ Copyrigh
 #include "lispemul.h"
 #include "dbprint.h"
 #include "unixfork.h"
+#include "dir.h"
 
 #include <sys/types.h>
 #ifndef DOS
diff --git a/src/subr.c b/src/subr.c
index 43c7193..1158009 100644
--- a/src/subr.c
+++ b/src/subr.c
@@ -48,6 +48,7 @@ static char *id = "$Id: subr.c,v 1.3 1999/05/31 23:35:42 sybalsky Exp $ Copyrigh
 #include "profile.h"
 #include "dbprint.h"
 #include "dsk.h"
+#include "dir.h"
 
 extern LispPTR *PENDINGINTERRUPT68k;
 
diff --git a/src/vmemsave.c b/src/vmemsave.c
index 2360d8f..8a0eed1 100644
--- a/src/vmemsave.c
+++ b/src/vmemsave.c
@@ -77,6 +77,7 @@ static char *id = "$Id: vmemsave.c,v 1.2 1999/01/03 02:07:45 sybalsky Exp $ Copy
 #include "dbprint.h"
 #include "devif.h"
 #include "dsk.h"
+#include "dir.h"
 
 #ifdef GCC386
 #include "inlnPS2.h"