diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STDINT_H.H b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STDINT_H.H
new file mode 100644
index 0000000..ae342a8
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STDINT_H.H
@@ -0,0 +1,19 @@
+// HAVE_STDINT_H : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_STDINT_H
+
+/* Since Linux/glibc 2.0, OpenBSD 2.0, FreeBSD 5.0, NetBSD 1.6, Mac OS
+ * and win32.
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 0) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(5, 0) || \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(199610) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 6) || \
+    defined(BUILD2_AUTOCONF_MACOS) || \
+    defined(_WIN32)
+#  define HAVE_STDINT_H 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINT16_T.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINT16_T.h
new file mode 100644
index 0000000..d244377
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINT16_T.h
@@ -0,0 +1,19 @@
+// HAVE_UINT16_T : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_UINT16_T
+
+/* Since Linux/glibc 2.0, OpenBSD 2.0, FreeBSD 5.0, NetBSD 1.6, Mac OS
+ * and win32.
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 0) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(5, 0) || \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(199610) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 6) || \
+    defined(BUILD2_AUTOCONF_MACOS) || \
+    defined(_WIN32)
+#  define HAVE_UINT16_T 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINT32_T.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINT32_T.h
new file mode 100644
index 0000000..471a509
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINT32_T.h
@@ -0,0 +1,19 @@
+// HAVE_UINT32_T : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_UINT32_T
+
+/* Since Linux/glibc 2.0, OpenBSD 2.0, FreeBSD 5.0, NetBSD 1.6, Mac OS
+ * and win32.
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 0) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(5, 0) || \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(199610) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 6) || \
+    defined(BUILD2_AUTOCONF_MACOS) || \
+    defined(_WIN32)
+#  define HAVE_UINT32_T 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINT64_T.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINT64_T.h
new file mode 100644
index 0000000..16a0165
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINT64_T.h
@@ -0,0 +1,19 @@
+// HAVE_UINT64_T : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_UINT64_T
+
+/* Since Linux/glibc 2.0, OpenBSD 2.0, FreeBSD 5.0, NetBSD 1.6, Mac OS
+ * and win32.
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 0) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(5, 0) || \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(199610) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 6) || \
+    defined(BUILD2_AUTOCONF_MACOS) || \
+    defined(_WIN32)
+#  define HAVE_UINT64_T 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINT8_T.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINT8_T.h
new file mode 100644
index 0000000..ca80ec1
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINT8_T.h
@@ -0,0 +1,19 @@
+// HAVE_UINT8_T : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_UINT8_T
+
+/* Since Linux/glibc 2.0, OpenBSD 2.0, FreeBSD 5.0, NetBSD 1.6, Mac OS
+ * and win32.
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 0) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(5, 0) || \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(199610) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 6) || \
+    defined(BUILD2_AUTOCONF_MACOS) || \
+    defined(_WIN32)
+#  define HAVE_UINT8_T 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINTPTR_T.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINTPTR_T.h
new file mode 100644
index 0000000..c4b3bdf
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_UINTPTR_T.h
@@ -0,0 +1,19 @@
+// HAVE_UINTPTR_T : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_UINTPTR_T
+
+/* Since Linux/glibc 2.0, OpenBSD 2.0, FreeBSD 5.0, NetBSD 1.6, Mac OS
+ * and win32.
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 0) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(5, 0) || \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(199610) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 6) || \
+    defined(BUILD2_AUTOCONF_MACOS) || \
+    defined(_WIN32)
+#  define HAVE_UINTPTR_T 1
+#endif