diff --git a/Makefile b/Makefile
index 91e68da..2838e08 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ OBJ=basic.o bind.o buffer.o crypt.o display.o eval.o exec.o \
 	termio.o window.o word.o names.o globals.o \
 	wrapper.o utf8.o
 
-HDR=ebind.h edef.h efunc.h estruct.h fileio.h version.h
+HDR=crypt.h ebind.h edef.h efunc.h estruct.h fileio.h version.h
 
 # DO NOT ADD OR MODIFY ANY LINES ABOVE THIS -- make source creates them
 
@@ -134,18 +134,19 @@ ansi.o: ansi.c estruct.h edef.h
 basic.o: basic.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
+crypt.o: crypt.c crypt.h 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 fileio.h
 exec.o: exec.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
+file.o: file.c crypt.h estruct.h edef.h fileio.h
+fileio.o: fileio.c fileio.h crypt.h estruct.h edef.h
 ibmpc.o: ibmpc.c estruct.h edef.h
 input.o: input.c estruct.h edef.h
 isearch.o: isearch.c estruct.h edef.h
 line.o: line.c estruct.h edef.h
 lock.o: lock.c estruct.h edef.h
-main.o: main.c estruct.h efunc.h edef.h ebind.h version.h
+main.o: main.c estruct.h crypt.h efunc.h edef.h ebind.h version.h
+names.o: names.c estruct.h crypt.h edef.h efunc.h line.h
 pklock.o: pklock.c estruct.h
 posix.o: posix.c estruct.h utf8.h
 random.o: random.c estruct.h edef.h
diff --git a/crypt.c b/crypt.c
index 5f11ff5..c2b1c6a 100644
--- a/crypt.c
+++ b/crypt.c
@@ -1,3 +1,7 @@
+/* crypt.c -- implements crypt.h */
+
+#include "crypt.h"
+
 /*	CRYPT.C
  *
  *	Encryption routines
@@ -8,7 +12,7 @@
 #include	<stdio.h>
 #include	"estruct.h"
 #include	"edef.h"
-#include        "efunc.h"
+#include    "efunc.h"
 
 #if	CRYPT
 
diff --git a/crypt.h b/crypt.h
new file mode 100644
index 0000000..18951c2
--- /dev/null
+++ b/crypt.h
@@ -0,0 +1,7 @@
+#ifndef _CRYPT_H_
+#define _CRYPT_H_
+
+int set_encryption_key( int f, int n) ;
+void myencrypt( char *bptr, unsigned len) ;
+
+#endif
diff --git a/ebind.h b/ebind.h
index f245246..85c3870 100644
--- a/ebind.h
+++ b/ebind.h
@@ -8,6 +8,7 @@
 #ifndef EBIND_H_
 #define EBIND_H_
 
+#include "crypt.h"
 #include "line.h"
 
 /*
diff --git a/efunc.h b/efunc.h
index 27a1785..4e0a8ab 100644
--- a/efunc.h
+++ b/efunc.h
@@ -340,10 +340,6 @@ extern int ernd(void);
 extern int sindex(char *source, char *pattern);
 extern char *xlat(char *source, char *lookup, char *trans);
 
-/* crypt.c */
-extern int set_encryption_key(int f, int n);
-extern void myencrypt(char *bptr, unsigned len);
-
 /* lock.c */
 extern int lockchk(char *fname);
 extern int lockrel(void);
diff --git a/file.c b/file.c
index 42d5a2a..c6423bc 100644
--- a/file.c
+++ b/file.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "crypt.h"
 #include "estruct.h"
 #include "edef.h"
 #include "efunc.h"
diff --git a/fileio.c b/fileio.c
index 0211c5f..5453edf 100644
--- a/fileio.c
+++ b/fileio.c
@@ -11,6 +11,7 @@
  */
 
 #include	<stdio.h>
+#include "crypt.h"
 #include	"estruct.h"
 #include	"edef.h"
 #include	"efunc.h"
diff --git a/main.c b/main.c
index ba2c22b..fd3f939 100644
--- a/main.c
+++ b/main.c
@@ -60,6 +60,7 @@
 /* Make global definitions not external. */
 #define	maindef
 
+#include "crypt.h"
 #include "estruct.h" /* Global structures and defines. */
 #include "edef.h"    /* Global definitions. */
 #include "efunc.h"   /* Function declarations and name table. */
diff --git a/names.c b/names.c
index 4ee6228..d2962d9 100644
--- a/names.c
+++ b/names.c
@@ -5,6 +5,7 @@
  * function.
 */
 
+#include "crypt.h"
 #include "estruct.h"
 #include "edef.h"
 #include "efunc.h"