diff --git a/basic.c b/basic.c
index 459bbc4..90f492b 100644
--- a/basic.c
+++ b/basic.c
@@ -2,6 +2,8 @@
 
 #include "basic.h"
 
+#define CVMVAS  1  /* arguments to page forward/back in pages      */
+
 /*	basic.c
  *
  * The routines in this file move the cursor around on the screen. They
diff --git a/defines.h b/defines.h
index 1ed7467..f84bd94 100644
--- a/defines.h
+++ b/defines.h
@@ -3,12 +3,13 @@
 */
 #define USG 1
 
-#define	NSTRING	128		/* # of bytes, string buffers   */
-
 #define PKCODE 1
 #define SCROLLCODE 1   /* scrolling code P.K.                          */
 #define ENVFUNC 1
 
+#define	NSTRING	128		/* # of bytes, string buffers	*/
+#define	NPAT	128		/* # of bytes, pattern		*/
+
 #define CONTROL 0x10000000	/* Control flag, or'ed in       */
 #define META    0x20000000	/* Meta flag, or'ed in          */
 #define CTLX    0x40000000	/* ^X flag, or'ed in            */
diff --git a/display.c b/display.c
index c6b1ae9..09bbb92 100644
--- a/display.c
+++ b/display.c
@@ -2,6 +2,8 @@
 
 #include "display.h"
 
+#define	REVSTA	1  /* Status line appears in reverse video         */
+
 /*	display.c
  *
  *      The functions in this file handle redisplay. There are two halves, the
diff --git a/estruct.h b/estruct.h
index 72aa1f9..6133e28 100644
--- a/estruct.h
+++ b/estruct.h
@@ -18,9 +18,6 @@
 #ifdef	EGA
 #undef	EGA
 #endif
-#ifdef	CTRLZ
-#undef	CTRLZ
-#endif
 
 /* Machine/OS definitions. */
 
@@ -122,15 +119,8 @@
 
 /*	Configuration options	*/
 
-#define CVMVAS  1  /* arguments to page forward/back in pages      */
-#define	CLRMSG	0  /* space clears the message line with no insert */
 #define	CFENCE	1  /* fench matching in CMODE                      */
-#define	TYPEAH	1  /* type ahead causes update to be skipped       */
 #define	VISMAC	0  /* update display during keyboard macros        */
-#define	CTRLZ	0  /* add a ^Z at end of files under MSDOS only    */
-#define ADDCR	0  /* ajout d'un CR en fin de chaque ligne (ST520) */
-#define	NBRACE	1  /* new style brace matching command             */
-#define	REVSTA	1  /* Status line appears in reverse video         */
 
 #ifndef	AUTOCONF
 
@@ -148,15 +138,6 @@
 
 #endif /* Autoconf. */
 
-#if 0
-#define	ISRCH	1  /* Incremental searches like ITS EMACS          */
-#define	WORDPRO	1  /* Advanced word processing features            */
-#define	APROP	1  /* Add code for Apropos command                 */
-#define	CRYPT	1  /* file encryption enabled?                     */
-#define MAGIC	1  /* include regular expression matching?         */
-#define	AEDIT	1  /* advanced editing options: en/detabbing       */
-#define	PROC	1  /* named procedures                             */
-#endif
 #define	CLEAN	0  /* de-alloc memory on exit                      */
 
 #define ASCII	1  /* always using ASCII char sequences for now    */
@@ -221,16 +202,6 @@
 #define	ENVFUNC	0
 #endif
 
-/* Internal constants. */
-
-#define	NSTRING	128		/* # of bytes, string buffers   */
-#define NPAT    128		/* # of bytes, pattern          */
-
-#define CONTROL 0x10000000	/* Control flag, or'ed in       */
-#define META    0x20000000	/* Meta flag, or'ed in          */
-#define CTLX    0x40000000	/* ^X flag, or'ed in            */
-#define	SPEC	0x80000000	/* special key (function keys)  */
-
 /*	Internal defined functions					*/
 
 #ifdef	abs
diff --git a/fileio.c b/fileio.c
index 8148e54..18812c3 100644
--- a/fileio.c
+++ b/fileio.c
@@ -2,6 +2,11 @@
 
 #include "fileio.h"
 
+#ifdef	CTRLZ
+#undef	CTRLZ
+#endif
+#define	CTRLZ	0  /* add a ^Z at end of files under MSDOS only    */
+
 /*  FILEIO.C
  *
  * The routines in this file read and write ASCII files from the disk. All of
diff --git a/main.c b/main.c
index 07778be..c2f8ff5 100644
--- a/main.c
+++ b/main.c
@@ -1,3 +1,7 @@
+/* main.c -- */
+
+#define	CLRMSG	0  /* space clears the message line with no insert */
+
 /*
  *	main.c
 
diff --git a/random.c b/random.c
index 1792c3a..79c1a32 100644
--- a/random.c
+++ b/random.c
@@ -1,6 +1,8 @@
 /* random.c -- implements random.h */
 #include "random.h"
 
+#define	NBRACE	1  /* new style brace matching command             */
+
 /*	random.c
  *
  *      This file contains the command processing functions for a number of
diff --git a/termio.h b/termio.h
index 79f9ca5..5a3382c 100644
--- a/termio.h
+++ b/termio.h
@@ -1,6 +1,8 @@
 #ifndef _TERMIO_H_
 #define _TERMIO_H_
 
+#define	TYPEAH	1  /* type ahead causes update to be skipped       */
+
 #define HUGE    1000		/* Huge number (for row/col)	*/
 
 extern int ttrow ;		/* Row location of HW cursor	*/