diff --git a/compat.h b/compat.h
index 0650dc1c..a630d962 100644
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/* $Id: compat.h,v 1.13 2009-08-20 12:25:17 nicm Exp $ */
+/* $Id: compat.h,v 1.14 2009-08-20 12:49:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -16,6 +16,13 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef HAVE_U_INT
+typedef uint8_t u_int8_t;
+typedef uint16_t u_int16_t;
+typedef uint32_t u_int32_t;
+typedef uint64_t u_int64_t;
+#endif
+
 #ifndef HAVE_PATHS_H
 #define	_PATH_BSHELL	"/bin/sh"
 #define	_PATH_TMP	"/tmp/"
diff --git a/configure b/configure
index 89a02ef2..432a7b91 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.30 2009-08-20 12:39:21 nicm Exp $
+# $Id: configure,v 1.31 2009-08-20 12:49:18 nicm Exp $
 
 TMUX_PLATFORM=${TMUX_PLATFORM:-`uname -s`}
 
@@ -36,6 +36,7 @@ cat <<EOF >>$CONFIG_H
 #undef HAVE_TTYDEFAULTS_H
 #undef HAVE_TTYDEFCHARS
 #undef HAVE_UTIL_H
+#undef HAVE_U_INT
 #undef HAVE_VIS
 EOF
 
@@ -64,6 +65,7 @@ case $TMUX_PLATFORM in
 #define HAVE_TTYDEFAULTS_H
 #define HAVE_TTYDEFCHARS
 #define HAVE_UTIL_H
+#define HAVE_U_INT
 #define HAVE_VIS
 EOF
 	cat <<EOF >>$CONFIG_MK
@@ -87,6 +89,7 @@ EOF
 #define HAVE_STRCASESTR
 #define HAVE_STRSEP
 #define HAVE_TTYDEFAULTS_H
+#define HAVE_U_INT
 EOF
 	cat <<EOF >>$CONFIG_MK
 CFLAGS+= -std=c99 -D_GNU_SOURCE -D_POSIX_SOURCE
@@ -178,6 +181,7 @@ EOF
 #define HAVE_TTYDEFAULTS_H
 #define HAVE_TTYDEFCHARS
 #define HAVE_UTIL_H
+#define HAVE_U_INT
 EOF
 	cat <<EOF >>$CONFIG_MK
 LIBS+= -lcurses
@@ -210,6 +214,7 @@ EOF
 #define HAVE_STRTONUM
 #define HAVE_STRSEP
 #define HAVE_TTYDEFCHARS
+#define HAVE_U_INT
 EOF
 	cat <<EOF >>$CONFIG_MK
 LIBS+= -lcurses -lcrypt -lutil
@@ -239,6 +244,7 @@ EOF
 #define HAVE_STRSEP
 #define HAVE_TTYDEFCHARS
 #define HAVE_UTIL_H
+#define HAVE_U_INT
 EOF
 	cat <<EOF >>$CONFIG_MK
 CPPFLAGS+= -I/usr/pkg/include