diff --git a/src/include/Makefile b/src/include/Makefile
index c97c7ebc..23c457d0 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.45 1997/08/17 21:31:23 millert Exp $
+#	$OpenBSD: Makefile,v 1.46 1997/08/18 05:29:41 millert Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -10,9 +10,9 @@
 
 FILES=	a.out.h ar.h assert.h bitstring.h blf.h bm.h cpio.h ctype.h db.h \
 	des.h dirent.h disktab.h elf_abi.h err.h fnmatch.h fstab.h fts.h \
-	glob.h grp.h ieeefp.h iso646.h kvm.h langinfo.h libgen.h limits.h \
-	locale.h malloc.h math.h md4.h md5.h memory.h mpool.h ndbm.h netdb.h \
-	netgroup.h nlist.h nl_types.h olf_abi.h paths.h poll.h pwd.h \
+	glob.h grp.h ieeefp.h inttypes.h iso646.h kvm.h langinfo.h libgen.h \
+	limits.h locale.h malloc.h math.h md4.h md5.h memory.h mpool.h ndbm.h \
+	netdb.h netgroup.h nlist.h nl_types.h olf_abi.h paths.h poll.h pwd.h \
 	ranlib.h re_comp.h regex.h resolv.h rmd160.h search.h setjmp.h sgtty.h \
 	sha1.h signal.h stab.h stddef.h stdio.h stdlib.h string.h \
 	strings.h struct.h sysexits.h tar.h time.h ttyent.h tzfile.h \
diff --git a/src/include/inttypes.h b/src/include/inttypes.h
new file mode 100644
index 00000000..af51555b
--- /dev/null
+++ b/src/include/inttypes.h
@@ -0,0 +1,53 @@
+/*	$OpenBSD: inttypes.h,v 1.1 1997/08/18 05:29:40 millert Exp $	*/
+
+/*
+ * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Todd C. Miller.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _INTTYPES_H_
+#define _INTTYPES_H_
+
+/* Machine type dependent parameters. */
+#include <machine/types.h>
+
+/*
+ * Fixed-size integer types as specified in XPG4.2.
+ * int8_t, int16_t, int32_t, int64_t are defined in <machine/types.h>
+ */
+
+typedef u_int8_t		uint8_t;
+typedef u_int16_t		uint16_t;
+typedef u_int32_t		uint32_t;
+typedef u_int64_t		uint64_t;
+
+/* XXX - these really belong in <machine/types.h> (maybe create u_register_t) */
+typedef long			intptr_t;
+typedef unsigned long		uintptr_t;
+
+#endif /* _INTTYPES_H_ */