diff --git a/display.c b/display.c
index 68cc8b1..415b0c3 100644
--- a/display.c
+++ b/display.c
@@ -71,6 +71,7 @@ static int taboff = 0 ;	/* tab offset for display       */
 
 int mpresf = FALSE ;	/* TRUE if message in last line */
 int scrollcount = 1 ;	/* number of lines to scroll */
+int discmd = TRUE ;	/* display command flag         */
 
 static int reframe(struct window *wp);
 static void updone(struct window *wp);
diff --git a/display.h b/display.h
index e3b9b13..84ab229 100644
--- a/display.h
+++ b/display.h
@@ -3,6 +3,9 @@
 
 extern int mpresf ;		/* Stuff in message line */
 extern int scrollcount ;	/* number of lines to scroll */
+extern int discmd ;		/* display command flag         */
+extern int gfcolor ;		/* global forgrnd color (white) */
+extern int gbcolor ;		/* global backgrnd color (black) */
 
 void vtinit( void) ;
 void vtfree( void) ;
diff --git a/eval.c b/eval.c
index 05f9c0a..6ef6f0b 100644
--- a/eval.c
+++ b/eval.c
@@ -43,6 +43,7 @@ char outline[ NSTRING] ;	/* global string to hold debug line text */
 int gflags = GFREAD ;		/* global control flag */
 int macbug = FALSE ;		/* macro debuging flag          */
 int cmdstatus = TRUE ;		/* last command status          */
+int flickcode = FALSE ;		/* do flicker supression?       */
 
 static int saveflag = 0 ;	/* Flags, saved with the $target var */
 
diff --git a/eval.h b/eval.h
index 3b1d9ea..2b72134 100644
--- a/eval.h
+++ b/eval.h
@@ -18,7 +18,7 @@ extern char outline[] ;		/* Global string to hold debug line text. */
 extern int gflags ;		/* global control flag          */
 extern int macbug ;		/* macro debuging flag          */
 extern int cmdstatus ;		/* last command status          */
-
+extern int flickcode ;		/* do flicker supression?       */
 extern long envram ;		/* # of bytes current in use by malloc */
 
 /*	Macro argument token types					*/
diff --git a/globals.c b/globals.c
index a899891..3f57941 100644
--- a/globals.c
+++ b/globals.c
@@ -9,11 +9,7 @@
 int fillcol = 72;		/* Current fill column          */
 
 
-int flickcode = FALSE;		/* do flicker supression?       */
-int sgarbf = TRUE;		/* TRUE if screen is garbage    */
 int clexec = FALSE;		/* command line execution flag  */
-int discmd = TRUE;		/* display command flag         */
-int disinp = TRUE;		/* display input characters     */
 
 int metac = CONTROL | '[';	/* current meta character */
 int ctlxc = CONTROL | 'X';	/* current control X prefix char */
diff --git a/globals.h b/globals.h
index 3af7f50..f6be871 100644
--- a/globals.h
+++ b/globals.h
@@ -8,13 +8,7 @@
 extern int fillcol;		/* Fill column                  */
 
 
-extern int flickcode;		/* do flicker supression?       */
-extern int gfcolor;		/* global forgrnd color (white) */
-extern int gbcolor;		/* global backgrnd color (black) */
-extern int sgarbf;		/* State of screen unknown      */
 extern int clexec;		/* command line execution flag  */
-extern int discmd;		/* display command flag         */
-extern int disinp;		/* display input characters     */
 
 extern int metac;		/* current meta character */
 extern int ctlxc;		/* current control X prefix char */
diff --git a/input.c b/input.c
index 12e7b44..9672b92 100644
--- a/input.c
+++ b/input.c
@@ -45,6 +45,8 @@ kbdstate kbdmode = STOP ;   /* current keyboard macro mode  */
 int lastkey = 0 ;       /* last keystoke                */
 int kbdrep = 0 ;        /* number of repetitions        */
 
+int disinp = TRUE ;	/* display input characters     */
+
 static const int quotec = 0x11 ;    /* quote char during mlreply() */
 
 /*
diff --git a/input.h b/input.h
index 1dd1970..6c30dd3 100644
--- a/input.h
+++ b/input.h
@@ -12,7 +12,8 @@ extern int lastkey ;		/* last keystoke                */
 extern int kbdrep ;		/* number of repetitions        */
 extern int kbdm[] ;		/* Holds kayboard macro data    */
 extern int *kbdptr ;		/* current position in keyboard buf */
-extern int *kbdend ;		/* ptr to end of the keyboard */
+extern int *kbdend ;		/* ptr to end of the keyboard	*/
+extern int disinp ;		/* display input characters     */
 
 int mlyesno( const char *prompt) ;
 int mlreply( const char *prompt, char *buf, int nbuf) ;
diff --git a/tcap.c b/tcap.c
index d08c4fd..1fe3621 100644
--- a/tcap.c
+++ b/tcap.c
@@ -36,6 +36,7 @@
 
 boolean eolexist = TRUE ;	/* does clear to EOL exist      */
 boolean revexist = FALSE ;	/* does reverse video exist?    */
+boolean sgarbf = TRUE ;		/* TRUE if screen is garbage    */
 
 char sres[ NBUFN] ;		/* current screen resolution    */
 
diff --git a/terminal.h b/terminal.h
index 2a8956d..1fe04ed 100644
--- a/terminal.h
+++ b/terminal.h
@@ -73,6 +73,7 @@ extern int ttcol ;		/* Column location of HW cursor */
 
 extern boolean eolexist ;	/* does clear to EOL exist?     */
 extern boolean revexist ;	/* does reverse video exist?    */
+extern boolean sgarbf ;		/* State of screen unknown      */
 
 extern char sres[] ;	        /* Current screen resolution.   */