diff --git a/edit.c b/edit.c
index ee64127..b1d6441 100644
--- a/edit.c
+++ b/edit.c
@@ -1,16 +1,12 @@
-/**	$MirOS: src/bin/mksh/edit.c,v 1.15 2005/10/07 18:34:18 tg Exp $ */
+/**	$MirOS: src/bin/mksh/edit.c,v 1.16 2005/10/25 19:53:26 tg Exp $ */
 /*	$OpenBSD: edit.c,v 1.30 2005/09/11 18:08:47 otto Exp $	*/
 /*	$OpenBSD: edit.h,v 1.8 2005/03/28 21:28:22 deraadt Exp $	*/
 /*	$OpenBSD: emacs.c,v 1.39 2005/09/26 19:25:22 otto Exp $	*/
 /*	$OpenBSD: vi.c,v 1.21 2005/03/30 17:16:37 deraadt Exp $	*/
 
 #include "sh.h"
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <libgen.h>
 
-__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.15 2005/10/07 18:34:18 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.16 2005/10/25 19:53:26 tg Exp $");
 
 /* tty driver characters we are interested in */
 typedef struct {
diff --git a/eval.c b/eval.c
index c062987..ef19601 100644
--- a/eval.c
+++ b/eval.c
@@ -1,12 +1,9 @@
-/**	$MirOS: src/bin/mksh/eval.c,v 1.7 2005/07/12 13:30:38 tg Exp $ */
+/**	$MirOS: src/bin/mksh/eval.c,v 1.8 2005/10/25 19:53:27 tg Exp $ */
 /*	$OpenBSD: eval.c,v 1.27 2005/03/30 17:16:37 deraadt Exp $	*/
 
 #include "sh.h"
-#include <sys/stat.h>
-#include <dirent.h>
-#include <pwd.h>
 
-__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.7 2005/07/12 13:30:38 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.8 2005/10/25 19:53:27 tg Exp $");
 
 /*
  * string expansion
diff --git a/exec.c b/exec.c
index 8cde307..9606e09 100644
--- a/exec.c
+++ b/exec.c
@@ -1,11 +1,9 @@
-/**	$MirOS: src/bin/mksh/exec.c,v 1.9 2005/10/08 19:30:58 tg Exp $ */
+/**	$MirOS: src/bin/mksh/exec.c,v 1.10 2005/10/25 19:53:27 tg Exp $ */
 /*	$OpenBSD: exec.c,v 1.41 2005/03/30 17:16:37 deraadt Exp $	*/
 
 #include "sh.h"
-#include <sys/stat.h>
-#include <ctype.h>
 
-__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.9 2005/10/08 19:30:58 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.10 2005/10/25 19:53:27 tg Exp $");
 
 static int	comexec(struct op *, struct tbl *volatile, char **,
 		    int volatile);
diff --git a/expr.c b/expr.c
index d815196..0c9b626 100644
--- a/expr.c
+++ b/expr.c
@@ -1,10 +1,9 @@
-/**	$MirOS: src/bin/mksh/expr.c,v 1.1 2005/05/23 03:06:07 tg Exp $ */
+/**	$MirOS: src/bin/mksh/expr.c,v 1.2 2005/10/25 19:53:27 tg Exp $ */
 /*	$OpenBSD: expr.c,v 1.18 2005/03/30 17:16:37 deraadt Exp $	*/
 
 #include "sh.h"
-#include <ctype.h>
 
-__RCSID("$MirOS: src/bin/mksh/expr.c,v 1.1 2005/05/23 03:06:07 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/expr.c,v 1.2 2005/10/25 19:53:27 tg Exp $");
 
 /* The order of these enums is constrained by the order of opinfo[] */
 enum token {
diff --git a/funcs.c b/funcs.c
index 4689a64..319f3a3 100644
--- a/funcs.c
+++ b/funcs.c
@@ -1,22 +1,12 @@
-/**	$MirOS: src/bin/mksh/funcs.c,v 1.22 2005/10/25 19:35:14 tg Exp $ */
+/**	$MirOS: src/bin/mksh/funcs.c,v 1.23 2005/10/25 19:53:27 tg Exp $ */
 /*	$OpenBSD: c_ksh.c,v 1.27 2005/03/30 17:16:37 deraadt Exp $	*/
 /*	$OpenBSD: c_sh.c,v 1.31 2005/10/08 18:07:31 otto Exp $	*/
 /*	$OpenBSD: c_test.c,v 1.17 2005/03/30 17:16:37 deraadt Exp $	*/
 /*	$OpenBSD: c_ulimit.c,v 1.14 2005/03/30 17:16:37 deraadt Exp $	*/
 
 #include "sh.h"
-#include <sys/time.h>
-#if defined(__sun__)
-#include <sys/mkdev.h>
-#endif
-#include <sys/stat.h>
-#include <sys/resource.h>
-#include <ctype.h>
-#if !defined(__OpenBSD__) && !defined(__CYGWIN__)
-#include <ulimit.h>
-#endif
 
-__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.22 2005/10/25 19:35:14 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.23 2005/10/25 19:53:27 tg Exp $");
 
 int
 c_cd(char **wp)
diff --git a/histrap.c b/histrap.c
index 6e08c84..67833bf 100644
--- a/histrap.c
+++ b/histrap.c
@@ -1,13 +1,10 @@
-/**	$MirOS: src/bin/mksh/histrap.c,v 1.11 2005/08/02 12:26:17 tg Exp $ */
+/**	$MirOS: src/bin/mksh/histrap.c,v 1.12 2005/10/25 19:53:28 tg Exp $ */
 /*	$OpenBSD: history.c,v 1.31 2005/07/31 16:12:52 espie Exp $	*/
 /*	$OpenBSD: trap.c,v 1.22 2005/03/30 17:16:37 deraadt Exp $	*/
 
 #include "sh.h"
-#include <sys/file.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
 
-__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.11 2005/08/02 12:26:17 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.12 2005/10/25 19:53:28 tg Exp $");
 
 static int	histfd;
 static int	hsize;
diff --git a/jobs.c b/jobs.c
index 04ce709..d73b9c0 100644
--- a/jobs.c
+++ b/jobs.c
@@ -1,13 +1,9 @@
-/**	$MirOS: src/bin/mksh/jobs.c,v 1.4 2005/08/21 12:43:55 bsiegert Exp $ */
+/**	$MirOS: src/bin/mksh/jobs.c,v 1.5 2005/10/25 19:53:28 tg Exp $ */
 /*	$OpenBSD: jobs.c,v 1.34 2005/03/30 17:16:37 deraadt Exp $	*/
 
 #include "sh.h"
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
 
-__RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.4 2005/08/21 12:43:55 bsiegert Exp $");
+__RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.5 2005/10/25 19:53:28 tg Exp $");
 
 /* Order important! */
 #define PRUNNING	0
diff --git a/lex.c b/lex.c
index 85b1850..33e7494 100644
--- a/lex.c
+++ b/lex.c
@@ -1,11 +1,9 @@
-/**	$MirOS: src/bin/mksh/lex.c,v 1.7 2005/07/04 12:47:13 tg Exp $ */
+/**	$MirOS: src/bin/mksh/lex.c,v 1.8 2005/10/25 19:53:28 tg Exp $ */
 /*	$OpenBSD: lex.c,v 1.36 2005/03/30 17:16:37 deraadt Exp $	*/
 
 #include "sh.h"
-#include <ctype.h>
-#include <libgen.h>
 
-__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.7 2005/07/04 12:47:13 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.8 2005/10/25 19:53:28 tg Exp $");
 
 /* Structure to keep track of the lexing state and the various pieces of info
  * needed for each particular state. */
diff --git a/main.c b/main.c
index 08a24a3..9d00a1d 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/**	$MirOS: src/bin/mksh/main.c,v 1.28 2005/10/21 12:41:55 tg Exp $ */
+/**	$MirOS: src/bin/mksh/main.c,v 1.29 2005/10/25 19:53:28 tg Exp $ */
 /*	$OpenBSD: main.c,v 1.38 2005/03/30 17:16:37 deraadt Exp $	*/
 /*	$OpenBSD: tty.c,v 1.8 2005/03/30 17:16:37 deraadt Exp $	*/
 /*	$OpenBSD: io.c,v 1.21 2005/03/30 17:16:37 deraadt Exp $	*/
@@ -6,14 +6,8 @@
 
 #define	EXTERN				/* define EXTERNs in sh.h */
 #include "sh.h"
-#include <sys/stat.h>
-#include <ctype.h>
-#include <pwd.h>
-#if !HAVE_ARC4RANDOM
-#include <time.h>
-#endif
 
-__RCSID("$MirOS: src/bin/mksh/main.c,v 1.28 2005/10/21 12:41:55 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/main.c,v 1.29 2005/10/25 19:53:28 tg Exp $");
 
 #define	MKSH_VERSION	"@(#)MIRBSD KSH R24 2005/10/21"
 
diff --git a/misc.c b/misc.c
index 5395793..79f066d 100644
--- a/misc.c
+++ b/misc.c
@@ -1,12 +1,10 @@
-/**	$MirOS: src/bin/mksh/misc.c,v 1.7 2005/07/07 23:27:52 tg Exp $ */
+/**	$MirOS: src/bin/mksh/misc.c,v 1.8 2005/10/25 19:53:28 tg Exp $ */
 /*	$OpenBSD: misc.c,v 1.28 2005/03/30 17:16:37 deraadt Exp $	*/
 /*	$OpenBSD: path.c,v 1.12 2005/03/30 17:16:37 deraadt Exp $	*/
 
 #include "sh.h"
-#include <sys/ioctl.h>
-#include <sys/stat.h>
 
-__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.7 2005/07/07 23:27:52 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.8 2005/10/25 19:53:28 tg Exp $");
 
 short chtypes[UCHAR_MAX+1];	/* type bits for unsigned char */
 
diff --git a/sh.h b/sh.h
index 893fdde..3e5f37f 100644
--- a/sh.h
+++ b/sh.h
@@ -1,4 +1,4 @@
-/**	$MirOS: src/bin/mksh/sh.h,v 1.20 2005/10/25 19:46:11 tg Exp $ */
+/**	$MirOS: src/bin/mksh/sh.h,v 1.21 2005/10/25 19:53:28 tg Exp $ */
 /*	$OpenBSD: sh.h,v 1.28 2005/10/04 20:35:11 otto Exp $	*/
 /*	$OpenBSD: shf.h,v 1.5 2005/03/30 17:16:37 deraadt Exp $	*/
 /*	$OpenBSD: table.h,v 1.6 2004/12/18 20:55:52 millert Exp $	*/
@@ -23,12 +23,23 @@
 #define	__RCSID(x)	static const char __rcsid[] __attribute__((used)) = (x)
 #endif
 
+#include <sys/time.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <ctype.h>
+#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <libgen.h>
 #include <limits.h>
 #if !defined(__sun__)
 #include <paths.h>
 #endif
+#include <pwd.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <stdarg.h>
@@ -38,10 +49,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
+#include <time.h>
 #include <unistd.h>
-#if defined(__sun__) || defined(__gnu_linux__)
-#include <values.h>
-#endif
 #if defined(NEED_COMPAT)
 #include "compat.h"
 #endif
diff --git a/shf.c b/shf.c
index 80016b8..f547a3a 100644
--- a/shf.c
+++ b/shf.c
@@ -1,10 +1,9 @@
-/**	$MirOS: src/bin/mksh/shf.c,v 1.1 2005/05/23 03:06:10 tg Exp $ */
+/**	$MirOS: src/bin/mksh/shf.c,v 1.2 2005/10/25 19:53:29 tg Exp $ */
 /*	$OpenBSD: shf.c,v 1.13 2005/03/30 17:16:37 deraadt Exp $	*/
 
 #include "sh.h"
-#include <sys/stat.h>
 
-__RCSID("$MirOS: src/bin/mksh/shf.c,v 1.1 2005/05/23 03:06:10 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/shf.c,v 1.2 2005/10/25 19:53:29 tg Exp $");
 
 /* flags to shf_emptybuf() */
 #define EB_READSW	0x01	/* about to switch to reading */
diff --git a/var.c b/var.c
index 5ed75a9..087a4e6 100644
--- a/var.c
+++ b/var.c
@@ -1,12 +1,9 @@
-/**	$MirOS: src/bin/mksh/var.c,v 1.9 2005/10/21 11:55:23 tg Exp $ */
+/**	$MirOS: src/bin/mksh/var.c,v 1.10 2005/10/25 19:53:29 tg Exp $ */
 /*	$OpenBSD: var.c,v 1.27 2005/10/08 18:02:59 otto Exp $	*/
 
 #include "sh.h"
-#include <sys/stat.h>
-#include <ctype.h>
-#include <time.h>
 
-__RCSID("$MirOS: src/bin/mksh/var.c,v 1.9 2005/10/21 11:55:23 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/var.c,v 1.10 2005/10/25 19:53:29 tg Exp $");
 
 /*
  * Variables