diff --git a/bin/makefile-tail b/bin/makefile-tail
index 2305d23..bc6628d 100755
--- a/bin/makefile-tail
+++ b/bin/makefile-tail
@@ -481,10 +481,11 @@ $(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)dir.h
+	 $(INCDIR)locfile.h $(INCDIR)osmsg.h $(INCDIR)dbprint.h $(INCDIR)car-cdr.h $(INCDIR)dsk.h $(INCDIR)dir.h \
+	 $(INCDIR)ufs.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  \
+$(OBJECTDIR)ufs.o :  $(SRCDIR)ufs.c $(INCDIR)ufs.h $(REQUIRED-INCS) $(INCDIR)lispemul.h  $(INCDIR)lispmap.h  \
 	 $(INCDIR)adr68k.h $(INCDIR)dbprint.h  $(INLINE)\
 	 $(INCDIR)lsptypes.h  $(INCDIR)lspglob.h $(INCDIR)arith.h \
 	 $(INCDIR)stream.h $(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)dbprint.h $(INCDIR)dsk.h
@@ -492,7 +493,8 @@ $(OBJECTDIR)ufs.o :  $(SRCDIR)ufs.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  $(INC
 
 $(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
+	 $(INCDIR)arith.h $(INCDIR)lspglob.h $(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)dsk.h \
+	 $(INCDIR)ufs.h
 	$(CC) $(RFLAGS) $(SRCDIR)dir.c $(INLINE) -o $(OBJECTDIR)dir$(OEXT)
 
 $(OBJECTDIR)fvar.o :  $(SRCDIR)fvar.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
@@ -716,7 +718,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)dir.h
+	 $(INCDIR)arith.h $(INCDIR)profile.h $(INCDIR)dsk.h $(INCDIR)dir.h $(INCDIR)ufs.h
 	$(CC) $(RFLAGS) $(SRCDIR)subr.c $(INLINE) -o $(OBJECTDIR)subr$(OEXT)
 
 $(OBJECTDIR)miscn.o : $(SRCDIR)miscn.c  $(REQUIRED-INCS) \
@@ -789,7 +791,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)dir.h
+	 $(INCDIR)ifpage.h  $(INCDIR)dsk.h $(INCDIR)vmemsave.h $(INCDIR)dir.h $(INCDIR)ufs.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/return.h b/inc/return.h
index ba9ed8f..42d69ab 100755
--- a/inc/return.h
+++ b/inc/return.h
@@ -116,3 +116,4 @@
 		"End of stack isn't beyond current stk pointer."); 	\
   }
 
+void contextsw(register DLword fxnum, register DLword bytenum, register DLword flags);
diff --git a/inc/ufs.h b/inc/ufs.h
new file mode 100644
index 0000000..db0c502
--- /dev/null
+++ b/inc/ufs.h
@@ -0,0 +1,13 @@
+LispPTR UFS_getfilename(LispPTR *args);
+LispPTR UFS_deletefile(LispPTR *args);
+LispPTR UFS_renamefile(LispPTR *args);
+LispPTR UFS_directorynamep(LispPTR *args);
+#ifdef DOS
+int unixpathname(char *src, char *dst, int versionp, int genp, char *drive, int *extlenptr, char *rawname);
+#else
+int unixpathname(char *src, char *dst, int versionp, int genp);
+#endif
+int lisppathname(char *fullname, char *lispname, int dirp, int versionp);
+int quote_fname(char *file);
+int quote_fname_ufs(char *file);
+int quote_dname(char *dir);
diff --git a/src/bbtsub.c b/src/bbtsub.c
index 6ceabec..ed15356 100644
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -71,6 +71,8 @@ static char *id = "$Id: bbtsub.c,v 1.3 2001/12/24 01:08:59 sybalsky Exp $ Copyri
 #include "address.h"
 #include "arith.h"
 #include "stack.h"
+#include "llstk.h"
+#include "return.h"
 #include "cell.h"
 #include "car-cdr.h"
 #include "gc.h"
diff --git a/src/dir.c b/src/dir.c
index c6d3ad3..111db2c 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 "ufs.h"
 #include "dir.h"
 
 extern int *Lisp_errno;
diff --git a/src/dsk.c b/src/dsk.c
index 18394f1..13645b8 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 "ufs.h"
 #include "dir.h"
 
 #if defined(ULTRIX) || defined(MACOSX) || defined(FREEBSD)
diff --git a/src/intcall.c b/src/intcall.c
index 03be3cd..49afbeb 100644
--- a/src/intcall.c
+++ b/src/intcall.c
@@ -22,6 +22,7 @@ static char *id = "$Id: intcall.c,v 1.3 1999/05/31 23:35:34 sybalsky Exp $ Copyr
 #include "lsptypes.h"
 #include "lispmap.h"
 #include "stack.h"
+#include "llstk.h"
 #include "return.h"
 #include "emlglob.h"
 #include "lspglob.h"
diff --git a/src/subr.c b/src/subr.c
index 1158009..5f13f33 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 "ufs.h"
 #include "dir.h"
 
 extern LispPTR *PENDINGINTERRUPT68k;
diff --git a/src/ufs.c b/src/ufs.c
index a8ea4b3..73cc088 100644
--- a/src/ufs.c
+++ b/src/ufs.c
@@ -88,6 +88,7 @@ static char *id = "$Id: ufs.c,v 1.2 1999/01/03 02:07:41 sybalsky Exp $ Copyright
 #include "locfile.h"
 #include "dbprint.h"
 #include "dsk.h"
+#include "ufs.h"
 
 int *Lisp_errno;
 int Dummy_errno; /* If errno cell is not provided by Lisp, dummy_errno is used. */
diff --git a/src/vmemsave.c b/src/vmemsave.c
index 8a0eed1..d16b3c3 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 "ufs.h"
 #include "dir.h"
 
 #ifdef GCC386
diff --git a/src/xc.c b/src/xc.c
index 157655e..9227cbb 100644
--- a/src/xc.c
+++ b/src/xc.c
@@ -46,6 +46,7 @@ static char *id = "$Id: xc.c,v 1.4 2001/12/26 22:17:06 sybalsky Exp $ Copyright
 #include "adr68k.h"
 #include "stack.h"
 #include "llstk.h"
+#include "return.h"
 #include "dbprint.h"
 
 #include "lspglob.h"