diff --git a/Makefile b/Makefile
index 1314f83..6dd2970 100644
--- a/Makefile
+++ b/Makefile
@@ -148,8 +148,8 @@ ebind.o: ebind.c ebind.h basic.h bind.h estruct.h retcode.h globals.h \
 eval.o: eval.c eval.h basic.h bind.h buffer.h crypt.h line.h utf8.h \
  display.h estruct.h retcode.h globals.h exec.h execute.h flook.h input.h \
  random.h search.h terminal.h defines.h termio.h version.h window.h
-exec.o: exec.c exec.h buffer.h crypt.h line.h utf8.h bind.h display.h \
- estruct.h retcode.h globals.h eval.h file.h flook.h input.h window.h \
+exec.o: exec.c exec.h retcode.h buffer.h crypt.h line.h utf8.h bind.h \
+ display.h estruct.h globals.h eval.h file.h flook.h input.h window.h \
  defines.h
 execute.o: execute.c execute.h estruct.h retcode.h globals.h bind.h \
  random.h display.h file.h crypt.h buffer.h line.h utf8.h terminal.h \
@@ -159,24 +159,24 @@ file.o: file.c file.h crypt.h retcode.h buffer.h line.h utf8.h defines.h \
  window.h
 fileio.o: fileio.c fileio.h crypt.h retcode.h defines.h
 flook.o: flook.c flook.h retcode.h defines.h fileio.h crypt.h
-globals.o: globals.c globals.h defines.h retcode.h
+globals.o: globals.c globals.h defines.h
 ibmpc.o: ibmpc.c estruct.h retcode.h globals.h
 input.o: input.c input.h bind.h estruct.h retcode.h globals.h bindable.h \
  display.h exec.h names.h terminal.h defines.h wrapper.h
 isearch.o: isearch.c isearch.h basic.h buffer.h crypt.h line.h utf8.h \
- display.h estruct.h retcode.h globals.h input.h bind.h search.h \
+ display.h estruct.h retcode.h globals.h exec.h input.h bind.h search.h \
  terminal.h defines.h window.h
 line.o: line.c line.h utf8.h buffer.h crypt.h estruct.h retcode.h \
  globals.h log.h window.h defines.h
 lock.o: lock.c lock.h estruct.h retcode.h display.h globals.h input.h \
  bind.h
 log.o: log.c log.h retcode.h
-main.o: main.c basic.h bind.h bindable.h buffer.h crypt.h line.h utf8.h \
- display.h estruct.h retcode.h globals.h eval.h execute.h file.h input.h \
- lock.h log.h random.h search.h terminal.h defines.h termio.h version.h \
- window.h
+main.o: main.c estruct.h retcode.h basic.h bind.h bindable.h buffer.h \
+ crypt.h line.h utf8.h display.h globals.h eval.h execute.h file.h \
+ input.h lock.h log.h random.h search.h terminal.h defines.h termio.h \
+ version.h window.h
 names.o: names.c names.h basic.h bind.h bindable.h buffer.h crypt.h \
- line.h utf8.h display.h eval.h exec.h file.h retcode.h isearch.h \
+ line.h utf8.h display.h eval.h exec.h retcode.h file.h isearch.h \
  region.h random.h search.h spawn.h window.h defines.h word.h
 pklock.o: pklock.c pklock.h estruct.h retcode.h globals.h
 posix.o: posix.c termio.h
@@ -189,9 +189,9 @@ search.o: search.c search.h line.h utf8.h basic.h buffer.h crypt.h \
  display.h estruct.h retcode.h globals.h input.h bind.h log.h terminal.h \
  defines.h window.h
 spawn.o: spawn.c spawn.h defines.h buffer.h crypt.h line.h utf8.h \
- display.h estruct.h retcode.h globals.h file.h flook.h input.h bind.h \
- log.h terminal.h window.h
-tcap.o: tcap.c terminal.h defines.h display.h estruct.h retcode.h \
+ display.h estruct.h retcode.h exec.h file.h flook.h input.h bind.h log.h \
+ terminal.h window.h
+tcap.o: tcap.c terminal.h defines.h retcode.h display.h estruct.h \
  globals.h termio.h
 termio.o: termio.c termio.h estruct.h retcode.h utf8.h
 utf8.o: utf8.c utf8.h
diff --git a/exec.c b/exec.c
index 46dcbc7..cfad97e 100644
--- a/exec.c
+++ b/exec.c
@@ -28,6 +28,8 @@
 
 
 char *execstr = NULL ;		/* pointer to string to execute */
+boolean clexec = FALSE ;	/* command line execution flag  */
+
 
 
 /*	Directive definitions	*/
@@ -138,7 +140,7 @@ int docmd(char *cline)
 	int n;		/* numeric repeat value */
 	fn_t fnc;		/* function to execute */
 	int status;		/* return status of function */
-	int oldcle;		/* old contents of clexec flag */
+	boolean oldcle ;	/* old contents of clexec flag */
 	char *oldestr;		/* original exec string */
 	char tkn[NSTRING];	/* next token off of command line */
 
@@ -272,7 +274,7 @@ char *token(char *src, char *tok, int size)
  */
 int macarg(char *tok)
 {
-	int savcle;		/* buffer to store original clexec */
+	boolean savcle ;	/* buffer to store original clexec */
 	int status;
 
 	savcle = clexec;	/* save execution mode */
diff --git a/exec.h b/exec.h
index cd0fb8a..b82c6b9 100644
--- a/exec.h
+++ b/exec.h
@@ -1,6 +1,9 @@
 #ifndef _EXEC_H_
 #define _EXEC_H_
 
+#include "retcode.h"
+
+
 #define	PROC	1	/* named procedures  */
 
 #if PROC
@@ -10,6 +13,8 @@ int execproc( int f, int n) ;
 
 
 extern char *execstr ;	/* pointer to string to execute */
+extern boolean clexec ;	/* command line execution flag  */
+
 
 
 int namedcmd( int f, int n) ;
diff --git a/globals.c b/globals.c
index 3f57941..4de1ca5 100644
--- a/globals.c
+++ b/globals.c
@@ -2,15 +2,12 @@
 #include "globals.h"
 
 #include "defines.h"
-#include "retcode.h"
 
 /* initialized global definitions */
 
 int fillcol = 72;		/* Current fill column          */
 
 
-int clexec = FALSE;		/* command line execution flag  */
-
 int metac = CONTROL | '[';	/* current meta character */
 int ctlxc = CONTROL | 'X';	/* current control X prefix char */
 int reptc = CONTROL | 'U';	/* current universal repeat char */
diff --git a/globals.h b/globals.h
index f6be871..99cb63b 100644
--- a/globals.h
+++ b/globals.h
@@ -7,9 +7,6 @@
 
 extern int fillcol;		/* Fill column                  */
 
-
-extern int clexec;		/* command line execution flag  */
-
 extern int metac;		/* current meta character */
 extern int ctlxc;		/* current control X prefix char */
 extern int reptc;		/* current universal repeat char */
diff --git a/isearch.c b/isearch.c
index 74a7147..c100963 100644
--- a/isearch.c
+++ b/isearch.c
@@ -32,6 +32,7 @@
 #include "display.h"
 #include "estruct.h"
 #include "globals.h"
+#include "exec.h"
 #include "input.h"
 #include "line.h"
 #include "search.h"
diff --git a/spawn.c b/spawn.c
index 654354f..2a55bff 100644
--- a/spawn.c
+++ b/spawn.c
@@ -18,7 +18,7 @@
 #include "buffer.h"
 #include "display.h"
 #include "estruct.h"
-#include "globals.h"
+#include "exec.h"
 #include "file.h"
 #include "flook.h"
 #include "input.h"