diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETADDRINFO.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETADDRINFO.h
new file mode 100644
index 0000000..9e52668
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETADDRINFO.h
@@ -0,0 +1,19 @@
+// HAVE_GETADDRINFO : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_GETADDRINFO
+
+/* Since Linux/glibc 2.4, OpenBSD 2.9, FreeBSD 3.5, NetBSD 1.5, and Mac OS
+ * (hard to tell but based on the manpages available online it looks like 
+ * Tiger at the latest).
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 4) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(3, 5)|| \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(200106) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 5) || \
+    defined(BUILD2_AUTOCONF_MACOS)
+#  define HAVE_GETADDRINFO 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETEGID.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETEGID.h
new file mode 100644
index 0000000..ff9f02a
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETEGID.h
@@ -0,0 +1,17 @@
+// HAVE_GETEGID : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_GETEGID
+
+/* Since Linux/glibc 2.4, OpenBSD 2.0, FreeBSD 1.0, NetBSD 1.0, and Mac OS
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 4) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(1, 0)|| \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(199610) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 0) || \
+    defined(BUILD2_AUTOCONF_MACOS)
+#  define HAVE_GETEGID 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETEUID.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETEUID.h
new file mode 100644
index 0000000..ca4701a
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETEUID.h
@@ -0,0 +1,17 @@
+// HAVE_GETEUID : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_GETEUID
+
+/* Since Linux/glibc 2.4, OpenBSD 2.0, FreeBSD 1.0, NetBSD 1.0, and Mac OS
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 4) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(1, 0)|| \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(199610) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 0) || \
+    defined(BUILD2_AUTOCONF_MACOS)
+#  define HAVE_GETEUID 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETIFADDRS.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETIFADDRS.h
new file mode 100644
index 0000000..fae5402
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETIFADDRS.h
@@ -0,0 +1,17 @@
+// HAVE_GETIFADDRS : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_GETIFADDRS
+
+/* Since Linux/glibc 2.3, OpenBSD 2.9, FreeBSD 4.1, NetBSD 1.5, and Mac OS
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 3) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(4, 1)|| \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(200106) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 5) || \
+    defined(BUILD2_AUTOCONF_MACOS)
+#  define HAVE_GETIFADDRS 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETPROTOBYNUMBER.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETPROTOBYNUMBER.h
new file mode 100644
index 0000000..b3e1cea
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETPROTOBYNUMBER.h
@@ -0,0 +1,19 @@
+// HAVE_GETPROTOBYNUMBER : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_GETPROTOBYNUMBER
+
+/* Since Linux/glibc 2.1, OpenBSD 2.0, FreeBSD 1.0, NetBSD 1.0, Mac OS
+ * and WIN32.
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 1) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(1, 0)|| \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(199610) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 0) || \
+    defined(BUILD2_AUTOCONF_MACOS) || \
+    defined(_WIN32)
+#  define HAVE_GETPROTOBYNUMBER 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETSERVBYNAME.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETSERVBYNAME.h
new file mode 100644
index 0000000..8bacf69
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETSERVBYNAME.h
@@ -0,0 +1,19 @@
+// HAVE_GETSERVBYNAME : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_GETSERVBYNAME
+
+/* Since Linux/glibc 2.1, OpenBSD 2.0, FreeBSD 1.0, NetBSD 1.0, Mac OS
+ * and WIN32.
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 1) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(1, 0)|| \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(199610) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 0) || \
+    defined(BUILD2_AUTOCONF_MACOS) || \
+    defined(_WIN32)
+#  define HAVE_GETSERVBYNAME 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETTIMEOFDAY.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETTIMEOFDAY.h
new file mode 100644
index 0000000..03ba1b9
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETTIMEOFDAY.h
@@ -0,0 +1,17 @@
+// HAVE_GETTIMEOFDAY : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_GETTIMEOFDAY
+
+/* Since Linux/glibc 2.1, OpenBSD 2.0, FreeBSD 1.0, NetBSD 1.0 and Mac OS.
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 1) || \
+    BUILD2_AUTOCONF_FREEBSD_PREREQ(1, 0)|| \
+    BUILD2_AUTOCONF_OPENBSD_PREREQ(199610) || \
+    BUILD2_AUTOCONF_NETBSD_PREREQ(1, 0) || \
+    defined(BUILD2_AUTOCONF_MACOS)
+#  define HAVE_GETTIMEOFDAY 1
+#endif