diff --git a/bin/sh/builtins.def b/bin/sh/builtins.def
index f81c33f90879..61ec759cc06d 100644
--- a/bin/sh/builtins.def
+++ b/bin/sh/builtins.def
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: builtins.def,v 1.13 1997/02/06 23:24:52 christos Exp $
+#	$NetBSD: builtins.def,v 1.14 1997/03/14 01:42:18 christos Exp $
 #
 # Copyright (c) 1991, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -42,7 +42,7 @@
 # of a C routine.  The -j flag, if present, specifies that this command
 # is to be excluded from systems without job control, and the -h flag,
 # if present specifies that this command is to be excluded from systems
-# based on the NO_HISTORY compile-time symbol.  The rest of the line
+# based on the SMALL compile-time symbol.  The rest of the line
 # specifies the command name or names used to run the command.  The entry
 # for bltincmd, which is run when the user does not specify a command, must
 # come first.
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 39b43b123650..02f2abc7a1cd 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: eval.c,v 1.34 1997/01/11 02:04:29 tls Exp $	*/
+/*	$NetBSD: eval.c,v 1.35 1997/03/14 01:42:19 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #else
-static char sccsid[] = "$NetBSD: eval.c,v 1.34 1997/01/11 02:04:29 tls Exp $";
+static char sccsid[] = "$NetBSD: eval.c,v 1.35 1997/03/14 01:42:19 christos Exp $";
 #endif
 #endif /* not lint */
 
@@ -70,7 +70,7 @@ static char sccsid[] = "$NetBSD: eval.c,v 1.34 1997/01/11 02:04:29 tls Exp $";
 #include "error.h"
 #include "show.h"
 #include "mystring.h"
-#ifndef NO_HISTORY
+#ifndef SMALL
 #include "myhistedit.h"
 #endif
 
@@ -194,7 +194,7 @@ evaltree(n, flags)
 		exitstatus = 0;
 		goto out;
 	}
-#ifndef NO_HISTORY
+#ifndef SMALL
 	displayhist = 1;	/* show history substitutions done with fc */
 #endif
 	TRACE(("evaltree(0x%lx: %d) called\n", (long)n, n->type));
@@ -828,7 +828,7 @@ cmddone:
 			   || cmdentry.u.index == BLTINCMD
 			   || cmdentry.u.index == DOTCMD
 			   || cmdentry.u.index == EVALCMD
-#ifndef NO_HISTORY
+#ifndef SMALL
 			   || cmdentry.u.index == HISTCMD
 #endif
 			   || cmdentry.u.index == EXECCMD)
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index a73887df2c3b..af7f96fabbe9 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: histedit.c,v 1.11 1997/03/13 21:57:32 christos Exp $	*/
+/*	$NetBSD: histedit.c,v 1.12 1997/03/14 01:42:20 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)histedit.c	8.2 (Berkeley) 5/4/95";
 #else
-static char rcsid[] = "$NetBSD: histedit.c,v 1.11 1997/03/13 21:57:32 christos Exp $";
+static char rcsid[] = "$NetBSD: histedit.c,v 1.12 1997/03/14 01:42:20 christos Exp $";
 #endif
 #endif /* not lint */
 
@@ -59,7 +59,7 @@ static char rcsid[] = "$NetBSD: histedit.c,v 1.11 1997/03/13 21:57:32 christos E
 #include "main.h"
 #include "output.h"
 #include "mystring.h"
-#ifndef NO_HISTORY
+#ifndef SMALL
 #include "myhistedit.h"
 #include "error.h"
 #include "eval.h"
diff --git a/bin/sh/input.c b/bin/sh/input.c
index 396402da86c4..f205ec4ab0d2 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: input.c,v 1.24 1997/03/13 21:57:33 christos Exp $	*/
+/*	$NetBSD: input.c,v 1.25 1997/03/14 01:42:22 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)input.c	8.3 (Berkeley) 6/9/95";
 #else
-static char rcsid[] = "$NetBSD: input.c,v 1.24 1997/03/13 21:57:33 christos Exp $";
+static char rcsid[] = "$NetBSD: input.c,v 1.25 1997/03/14 01:42:22 christos Exp $";
 #endif
 #endif /* not lint */
 
@@ -183,7 +183,7 @@ pread()
 	parsenextc = parsefile->buf;
 
 retry:
-#ifndef NO_HISTORY
+#ifndef SMALL
 	if (parsefile->fd == 0 && el) {
 		const char *rl_cp;
 
@@ -294,7 +294,7 @@ check:
 	savec = *q;
 	*q = '\0';
 
-#ifndef NO_HISTORY
+#ifndef SMALL
 	if (parsefile->fd == 0 && hist && something) {
 		INTOFF;
 		history(hist, whichprompt == 1 ? H_ENTER : H_ADD, parsenextc);
diff --git a/bin/sh/options.c b/bin/sh/options.c
index de31304ce23a..11414ceb2cc5 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: options.c,v 1.23 1997/02/25 17:51:50 christos Exp $	*/
+/*	$NetBSD: options.c,v 1.24 1997/03/14 01:42:22 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 5/4/95";
 #else
-static char rcsid[] = "$NetBSD: options.c,v 1.23 1997/02/25 17:51:50 christos Exp $";
+static char rcsid[] = "$NetBSD: options.c,v 1.24 1997/03/14 01:42:22 christos Exp $";
 #endif
 #endif /* not lint */
 
@@ -62,7 +62,7 @@ static char rcsid[] = "$NetBSD: options.c,v 1.23 1997/02/25 17:51:50 christos Ex
 #include "memalloc.h"
 #include "error.h"
 #include "mystring.h"
-#ifndef NO_HISTORY
+#ifndef SMALL
 #include "myhistedit.h"
 #endif
 
@@ -131,7 +131,7 @@ void
 optschanged()
 {
 	setinteractive(iflag);
-#ifndef NO_HISTORY
+#ifndef SMALL
 	histedit();
 #endif
 	setjobctl(mflag);
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index e8edd9ca34ac..72eff05d8a8d 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.34 1997/01/26 18:05:34 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.35 1997/03/14 01:42:23 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-static char rcsid[] = "$NetBSD: parser.c,v 1.34 1997/01/26 18:05:34 christos Exp $";
+static char rcsid[] = "$NetBSD: parser.c,v 1.35 1997/03/14 01:42:23 christos Exp $";
 #endif
 #endif /* not lint */
 
@@ -61,7 +61,7 @@ static char rcsid[] = "$NetBSD: parser.c,v 1.34 1997/01/26 18:05:34 christos Exp
 #include "mystring.h"
 #include "alias.h"
 #include "show.h"
-#ifndef NO_HISTORY
+#ifndef SMALL
 #include "myhistedit.h"
 #endif
 
@@ -1513,7 +1513,7 @@ setprompt(which)
 	{
 	whichprompt = which;
 
-#ifndef NO_HISTORY
+#ifndef SMALL
 	if (!el)
 #endif
 		out2str(getprompt(NULL));
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 5602b30b7f92..293c9961e72d 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.16 1997/01/11 02:04:48 tls Exp $	*/
+/*	$NetBSD: var.c,v 1.17 1997/03/14 01:42:24 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 5/4/95";
 #else
-static char rcsid[] = "$NetBSD: var.c,v 1.16 1997/01/11 02:04:48 tls Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.17 1997/03/14 01:42:24 christos Exp $";
 #endif
 #endif /* not lint */
 
@@ -65,7 +65,7 @@ static char rcsid[] = "$NetBSD: var.c,v 1.16 1997/01/11 02:04:48 tls Exp $";
 #include "error.h"
 #include "mystring.h"
 #include "parser.h"
-#ifndef NO_HISTORY
+#ifndef SMALL
 #include "myhistedit.h"
 #endif
 
@@ -84,7 +84,7 @@ struct varinit {
 #if ATTY
 struct var vatty;
 #endif
-#ifndef NO_HISTORY
+#ifndef SMALL
 struct var vhistsize;
 #endif
 struct var vifs;
@@ -104,7 +104,7 @@ const struct varinit varinit[] = {
 	{ &vatty,	VSTRFIXED|VTEXTFIXED|VUNSET,	"ATTY=",
 	  NULL },
 #endif
-#ifndef NO_HISTORY
+#ifndef SMALL
 	{ &vhistsize,	VSTRFIXED|VTEXTFIXED|VUNSET,	"HISTSIZE=",
 	  sethistsize },
 #endif
diff --git a/bin/sh/var.h b/bin/sh/var.h
index b1314aebf626..e425b6209c6c 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.h,v 1.12 1996/11/02 18:26:05 christos Exp $	*/
+/*	$NetBSD: var.h,v 1.13 1997/03/14 01:42:26 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -84,7 +84,7 @@ extern struct var vps2;
 #if ATTY
 extern struct var vterm;
 #endif
-#ifndef NO_HISTORY
+#ifndef SMALL
 extern struct var vhistsize;
 #endif
 
@@ -104,7 +104,7 @@ extern struct var vhistsize;
 #define termval()	(vterm.text + 5)
 #endif
 #define optindval()	(voptind.text + 7)
-#ifndef NO_HISTORY
+#ifndef SMALL
 #define histsizeval()	(vhistsize.text + 9)
 #endif