diff --git a/histrap.c b/histrap.c
index 0407a43..5d2cc3e 100644
--- a/histrap.c
+++ b/histrap.c
@@ -3,7 +3,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.21 2006/08/12 20:32:33 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.22 2006/08/15 23:43:30 tg Exp $");
 
 static int	histfd;
 static int	hsize;
@@ -641,10 +641,7 @@ hist_init(Source *s)
 
 	hist_source = s;
 
-#ifdef __sun__
-	hname = NULL;
-	histfd = 0;
-#else
+#if !defined(__sun__)
 	hname = str_val(global("HISTFILE"));
 	if (hname == NULL)
 		return;
@@ -701,6 +698,9 @@ hist_init(Source *s)
 	}
 	(void) flock(histfd, LOCK_UN);
 	hsize = lseek(histfd, 0L, SEEK_END);
+#else
+	hname = NULL;
+	histfd = 0;
 #endif
 }
 
diff --git a/sh.h b/sh.h
index 7868ddb..b8e5fb6 100644
--- a/sh.h
+++ b/sh.h
@@ -8,7 +8,7 @@
 /*	$OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $	*/
 /*	$OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $	*/
 
-#define	MKSH_SH_H_ID	"$MirOS: src/bin/mksh/sh.h,v 1.32 2006/08/09 20:44:16 tg Exp $"
+#define	MKSH_SH_H_ID	"$MirOS: src/bin/mksh/sh.h,v 1.33 2006/08/15 23:43:30 tg Exp $"
 
 #include <sys/param.h>
 
@@ -27,6 +27,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <libgen.h>
 #include <limits.h>
 #if !defined(__sun__)
@@ -65,7 +66,7 @@
 #define	BIT(i)		(1<<(i))	/* define bit in flag */
 
 /* Table flag type - needs > 16 and < 32 bits */
-typedef int32_t Tflag;
+typedef int32_t		Tflag;
 
 #define	NUFILE		32	/* Number of user-accessible files */
 #define	FDBASE		10	/* First file usable by Shell */