diff --git a/Makefile b/Makefile
index 7524ad2..91e68da 100644
--- a/Makefile
+++ b/Makefile
@@ -132,13 +132,13 @@ depend: ${SRC}
 
 ansi.o: ansi.c estruct.h edef.h
 basic.o: basic.c estruct.h edef.h
-bind.o: bind.c estruct.h edef.h
+bind.o: bind.c estruct.h edef.h fileio.h
 buffer.o: buffer.c estruct.h edef.h
 crypt.o: crypt.c estruct.h edef.h
 display.o: display.c estruct.h edef.h utf8.h version.h
-eval.o: eval.c estruct.h edef.h version.h
+eval.o: eval.c estruct.h edef.h version.h fileio.h
 exec.o: exec.c estruct.h edef.h
-file.o: file.c estruct.h edef.h
+file.o: file.c estruct.h edef.h fileio.h
 fileio.o: fileio.c fileio.h estruct.h edef.h
 ibmpc.o: ibmpc.c estruct.h edef.h
 input.o: input.c estruct.h edef.h
diff --git a/bind.c b/bind.c
index ba97b10..26b7ce6 100644
--- a/bind.c
+++ b/bind.c
@@ -12,6 +12,7 @@
 #include "estruct.h"
 #include "edef.h"
 #include "efunc.h"
+#include "fileio.h"
 #include "line.h"
 
 
diff --git a/efunc.h b/efunc.h
index e5cdace..27a1785 100644
--- a/efunc.h
+++ b/efunc.h
@@ -220,9 +220,6 @@ extern int writeout(char *fn);
 extern int filename(int f, int n);
 extern int ifile(char *fname);
 
-/* fileio.c */
-#include "fileio.h"
-
 /* exec.c */
 extern int namedcmd(int f, int n);
 extern int execcmd(int f, int n);
diff --git a/eval.c b/eval.c
index c554db3..41a94c3 100644
--- a/eval.c
+++ b/eval.c
@@ -11,6 +11,7 @@
 #include "estruct.h"
 #include "edef.h"
 #include "efunc.h"
+#include "fileio.h"
 #include "line.h"
 #include "version.h"
 
diff --git a/file.c b/file.c
index 1feb97a..42d5a2a 100644
--- a/file.c
+++ b/file.c
@@ -13,6 +13,7 @@
 #include "estruct.h"
 #include "edef.h"
 #include "efunc.h"
+#include "fileio.h"
 #include "line.h"
 
 #if defined(PKCODE)