diff --git a/estruct.h b/estruct.h
index dccfcd2..eecc1d8 100644
--- a/estruct.h
+++ b/estruct.h
@@ -249,7 +249,6 @@
 
 /*	Internal defined functions					*/
 
-#define	nextab(a)	(a & ~tabmask) + (tabmask+1)
 #ifdef	abs
 #undef	abs
 #endif
diff --git a/eval.c b/eval.c
index 6ef6f0b..58aac09 100644
--- a/eval.c
+++ b/eval.c
@@ -40,10 +40,12 @@
 char outline[ NSTRING] ;	/* global string to hold debug line text */
 #endif
 
-int gflags = GFREAD ;		/* global control flag */
+int gflags = GFREAD ;		/* global control flag		*/
 int macbug = FALSE ;		/* macro debuging flag          */
 int cmdstatus = TRUE ;		/* last command status          */
 int flickcode = FALSE ;		/* do flicker supression?       */
+int rval = 0 ;			/* return value of a subprocess */
+
 
 static int saveflag = 0 ;	/* Flags, saved with the $target var */
 
diff --git a/eval.h b/eval.h
index 2b72134..fd674eb 100644
--- a/eval.h
+++ b/eval.h
@@ -19,6 +19,7 @@ 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 int rval ;		/* return value of a subprocess */
 extern long envram ;		/* # of bytes current in use by malloc */
 
 /*	Macro argument token types					*/
diff --git a/globals.c b/globals.c
index 73c61b4..ec7903b 100644
--- a/globals.c
+++ b/globals.c
@@ -10,11 +10,6 @@ int ctlxc = CONTROL | 'X';	/* current control X prefix char */
 int reptc = CONTROL | 'U';	/* current universal repeat char */
 int abortc = CONTROL | 'G';	/* current abort command char   */
 
-int tabmask = 0x07;		/* tabulator mask */
-
-
-int rval = 0;			/* return value of a subprocess */
-
 /* uninitialized global definitions */
 
 int thisflag;			/* Flags, this command          */
diff --git a/globals.h b/globals.h
index e2e10b4..63b717c 100644
--- a/globals.h
+++ b/globals.h
@@ -10,11 +10,6 @@ extern int ctlxc;		/* current control X prefix char */
 extern int reptc;		/* current universal repeat char */
 extern int abortc;		/* current abort command char   */
 
-extern int tabmask;
-
-
-extern int rval;		/* return value of a subprocess */
-
 /* Uninitialized global external declarations. */
 
 #define CFCPCN  0x0001		/* Last command was C-P, C-N    */
diff --git a/line.c b/line.c
index 3c07aec..25e7d5d 100644
--- a/line.c
+++ b/line.c
@@ -26,6 +26,9 @@
 #include "log.h"
 #include "window.h"
 
+
+int tabmask = 0x07 ;		/* tabulator mask */
+
 #define	BLOCK_SIZE 16 /* Line block chunk size. */
 
 static int ldelnewline( void) ;
diff --git a/line.h b/line.h
index cdcc55e..2080899 100644
--- a/line.h
+++ b/line.h
@@ -25,6 +25,9 @@ struct line {
 #define lputc(lp, n, c) ((lp)->l_text[(n)]=(c))
 #define llength(lp)     ((lp)->l_used)
 
+#define	nextab(a)	(a & ~tabmask) + (tabmask+1)
+extern int tabmask ;
+
 char *getkill( void) ;
 
 int backchar( int f, int n) ;