diff --git a/line.h b/line.h
index 634a18a..a01730b 100644
--- a/line.h
+++ b/line.h
@@ -27,7 +27,6 @@ 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) ;
diff --git a/random.c b/random.c
index 79c1a32..da10dce 100644
--- a/random.c
+++ b/random.c
@@ -40,7 +40,7 @@ static const char *cname[] = {						/* names of colors */
 int gfcolor = NCOLORS - 1 ;	/* global forgrnd color (white)  */
 int gbcolor = 0 ;		/* global backgrnd color (black) */
 
-int tabsize ;			/* Tab size (0: use real tabs)   */
+static int tabsize ;		/* Tab size (0: use real tabs)   */
 int fillcol = 72 ;		/* Current fill column           */
 
 /* uninitialized global definitions */
@@ -345,6 +345,8 @@ int detab(int f, int n)
  */
 int entab(int f, int n)
 {
+#define	nextab(a)	(a & ~tabmask) + (tabmask+1)
+
 	int inc;	/* increment to next line [sgn(n)] */
 	int fspace;	/* pointer to first space if in a run */
 	int ccol;	/* current cursor column */
diff --git a/random.h b/random.h
index da646ca..749a62c 100644
--- a/random.h
+++ b/random.h
@@ -3,7 +3,6 @@
 
 #define AEDIT 1
 
-extern int tabsize ;	/* Tab size (0: use real tabs). */
 extern int fillcol ;	/* Fill column                  */