diff --git a/edef.h b/edef.h
index 7a024b7..1dd5fc6 100644
--- a/edef.h
+++ b/edef.h
@@ -25,9 +25,10 @@ extern int fillcol;		/* Fill column                  */
 extern int kbdm[];		/* Holds kayboard macro data    */
 extern char pat[];		/* Search pattern               */
 extern char rpat[];		/* Replacement pattern          */
-extern char *execstr;		/* pointer to string to execute */
-extern char golabel[];		/* current line to go to        */
-extern int execlevel;		/* execution IF level           */
+extern char tap[];	    /* Reversed pattern array.      */
+extern char *execstr;	/* pointer to string to execute */
+
+
 extern int eolexist;		/* does clear to EOL exist?     */
 extern int revexist;		/* does reverse video exist?    */
 extern int flickcode;		/* do flicker supression?       */
@@ -46,7 +47,7 @@ extern int clexec;		/* command line execution flag  */
 extern int mstore;		/* storing text to macro flag   */
 extern int discmd;		/* display command flag         */
 extern int disinp;		/* display input characters     */
-extern struct buffer *bstore;	/* buffer to store macro text to */
+
 extern int vtrow;		/* Row location of SW cursor */
 extern int vtcol;		/* Column location of SW cursor */
 extern int lbound;		/* leftmost column of current line
@@ -114,9 +115,6 @@ extern struct buffer *bheadp;		/* Head of list of buffers      */
 extern struct buffer *blistp;		/* Buffer for C-X C-B           */
 
 extern char sres[NBUFN];	        /* Current screen resolution.   */
-extern char pat[];		        /* Search pattern.              */
-extern char tap[];		        /* Reversed pattern array.      */
-extern char rpat[];		        /* Replacement pattern.         */
 
 extern unsigned int matchlen;
 extern unsigned int mlenold;
diff --git a/exec.c b/exec.c
index 58ce976..ddda97c 100644
--- a/exec.c
+++ b/exec.c
@@ -64,6 +64,10 @@ static const char *dname[] = {
 	"force"
 };
 
+static char golabel[ NPAT] = "" ;	/* current line to go to        */
+static int execlevel = 0 ;			/* execution IF level           */
+static struct buffer *bstore = NULL ;	/* buffer to store macro text to */
+
 static int dobuf( struct buffer *bp) ;
 static void freewhile( struct while_block *wp) ;
 
diff --git a/globals.c b/globals.c
index f51bdbd..0c613b3 100644
--- a/globals.c
+++ b/globals.c
@@ -9,8 +9,8 @@
 int fillcol = 72;		/* Current fill column          */
 int kbdm[NKBDM];		/* Macro                        */
 char *execstr = NULL;		/* pointer to string to execute */
-char golabel[NPAT] = "";	/* current line to go to        */
-int execlevel = 0;		/* execution IF level           */
+
+
 int eolexist = TRUE;		/* does clear to EOL exist      */
 int revexist = FALSE;		/* does reverse video exist?    */
 int flickcode = FALSE;		/* do flicker supression?       */
@@ -54,7 +54,7 @@ int clexec = FALSE;		/* command line execution flag  */
 int mstore = FALSE;		/* storing text to macro flag   */
 int discmd = TRUE;		/* display command flag         */
 int disinp = TRUE;		/* display input characters     */
-struct buffer *bstore = NULL;	/* buffer to store macro text to */
+
 int vtrow = 0;			/* Row location of SW cursor */
 int vtcol = 0;			/* Column location of SW cursor */
 int lbound = 0;			/* leftmost column of current line