diff --git a/bind.c b/bind.c
index 6b59eb3..51805f9 100644
--- a/bind.c
+++ b/bind.c
@@ -15,6 +15,7 @@
 #include "estruct.h"
 #include "edef.h"
 #include "efunc.h"
+#include "file.h"
 #include "fileio.h"
 #include "line.h"
 
diff --git a/buffer.c b/buffer.c
index a66587b..fdb751f 100644
--- a/buffer.c
+++ b/buffer.c
@@ -17,6 +17,7 @@
 #include "estruct.h"
 #include "edef.h"
 #include "efunc.h"
+#include "file.h"
 #include "line.h"
 
 /*
diff --git a/ebind.h b/ebind.h
index 85c3870..8bbc5ce 100644
--- a/ebind.h
+++ b/ebind.h
@@ -9,6 +9,7 @@
 #define EBIND_H_
 
 #include "crypt.h"
+#include "file.h"
 #include "line.h"
 
 /*
diff --git a/efunc.h b/efunc.h
index 661c473..5e5fec8 100644
--- a/efunc.h
+++ b/efunc.h
@@ -47,9 +47,6 @@
 /* buffer.c */
 #include "buffer.h"
 
-/* file.c */
-#include "file.h"
-
 /* exec.c */
 #include "exec.h"
 
diff --git a/exec.c b/exec.c
index 6ac8919..b612e82 100644
--- a/exec.c
+++ b/exec.c
@@ -15,6 +15,7 @@
 #include "estruct.h"
 #include "edef.h"
 #include "efunc.h"
+#include "file.h"
 #include "line.h"
 
 /*
diff --git a/names.c b/names.c
index d2962d9..0b6931b 100644
--- a/names.c
+++ b/names.c
@@ -9,6 +9,7 @@
 #include "estruct.h"
 #include "edef.h"
 #include "efunc.h"
+#include "file.h"
 #include "line.h"
 
 struct name_bind names[] = {
diff --git a/spawn.c b/spawn.c
index 29a9129..13018f5 100644
--- a/spawn.c
+++ b/spawn.c
@@ -14,6 +14,7 @@
 #include "estruct.h"
 #include "edef.h"
 #include "efunc.h"
+#include "file.h"
 
 #if     VMS
 #define EFN     0		/* Event flag.          */