diff --git a/Makefile b/Makefile
index 2838e08..f1b580b 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=crypt.h ebind.h edef.h efunc.h estruct.h fileio.h version.h
+HDR=crypt.h display.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
 
@@ -135,11 +135,11 @@ 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 crypt.h estruct.h edef.h
-display.o: display.c estruct.h edef.h utf8.h version.h
+display.o: display.c display.h 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 crypt.h estruct.h edef.h fileio.h
-fileio.o: fileio.c fileio.h crypt.h estruct.h edef.h
+fileio.o: fileio.c fileio.h crypt.h display.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
diff --git a/display.c b/display.c
index e0fdc26..2f09f65 100644
--- a/display.c
+++ b/display.c
@@ -1,3 +1,7 @@
+/* display.c -- implements display.h */
+
+#include "display.h"
+
 /*	display.c
  *
  *      The functions in this file handle redisplay. There are two halves, the
diff --git a/display.h b/display.h
new file mode 100644
index 0000000..74e2785
--- /dev/null
+++ b/display.h
@@ -0,0 +1,23 @@
+#ifndef _DISPLAY_H_
+#define _DISPLAY_H_
+
+void vtinit( void) ;
+void vtfree( void) ;
+void vttidy( void) ;
+void vtmove( int row, int col) ;
+int upscreen( int f, int n) ;
+int update( int force) ;
+void updpos( void) ;
+void upddex( void) ;
+void updgar( void) ;
+int updupd( int force) ;
+void upmode( void) ;
+void movecursor( int row, int col) ;
+void mlerase( void) ;
+void mlwrite( const char *fmt, ...) ;
+void mlforce( char *s) ;
+void mlputs( char *s) ;
+void getscreensize( int *widthp, int *heightp) ;
+void sizesignal( int signr) ;
+
+#endif
diff --git a/efunc.h b/efunc.h
index 4e0a8ab..6ce5364 100644
--- a/efunc.h
+++ b/efunc.h
@@ -120,24 +120,7 @@ extern int unarg(int f, int n);
 extern int cexit(int status);
 
 /* display.c */
-extern void vtinit(void);
-extern void vtfree(void);
-extern void vttidy(void);
-extern void vtmove(int row, int col);
-extern int upscreen(int f, int n);
-extern int update(int force);
-extern void updpos(void);
-extern void upddex(void);
-extern void updgar(void);
-extern int updupd(int force);
-extern void upmode(void);
-extern void movecursor(int row, int col);
-extern void mlerase(void);
-extern void mlwrite(const char *fmt, ...);
-extern void mlforce(char *s);
-extern void mlputs(char *s);
-extern void getscreensize(int *widthp, int *heightp);
-extern void sizesignal(int signr);
+#include "display.h"
 
 /* region.c */
 extern int killregion(int f, int n);
diff --git a/fileio.c b/fileio.c
index 5453edf..6fcb3f3 100644
--- a/fileio.c
+++ b/fileio.c
@@ -10,11 +10,11 @@
  *	modified by Petri Kutvonen
  */
 
-#include	<stdio.h>
+#include <stdio.h>
 #include "crypt.h"
-#include	"estruct.h"
-#include	"edef.h"
-#include	"efunc.h"
+#include "display.h"
+#include "estruct.h"
+#include "edef.h"
 
 static FILE *ffp;			/* File pointer, all functions. */
 static int eofflag;			/* end-of-file flag */