diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_DECL_CTL_KERN.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_DECL_CTL_KERN.h
index d385029..864e603 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_DECL_CTL_KERN.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_DECL_CTL_KERN.h
@@ -5,6 +5,7 @@
 #endif
 
 #undef HAVE_DECL_CTL_KERN
+
 /* Since 4.4BSD (OpenBSD 2.1-6.2, FreeBSD, NetBSD, Mac OS X 10.7),
  * <= glibc 2.31.
  * NOTE: Appears to have been available parallel to sysctl()
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_DECL_KERN_ARND.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_DECL_KERN_ARND.h
index 9c70547..b1b7377 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_DECL_KERN_ARND.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_DECL_KERN_ARND.h
@@ -5,6 +5,7 @@
 #endif
 
 #undef HAVE_DECL_KERN_ARND
+
 /* OpenBSD 2.6-6.0.
  * NOTE: Only mentioned in OpenBSD manual.
  */
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_FUTIMES.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_FUTIMES.h
index 4b8e9cf..bd76b9d 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_FUTIMES.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_FUTIMES.h
@@ -6,7 +6,7 @@
 
 #undef HAVE_FUTIMES
 
-/* Since Linux/glibc 2.3, FreeBSD 3.x, OpenBSD 1.2 (but the `OpenBSD` macro
+/* Since Linux/glibc 2.3, FreeBSD 3.x, OpenBSD 1.2 (but the OpenBSD macro
  * was only added in 2.0 with a value of 199610), NetBSD 1.2, Mac OS (all
  * versions).
  */
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETENV.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETENV.h
index 6b91c6b..744bb98 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETENV.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETENV.h
@@ -7,7 +7,7 @@
 #undef HAVE_GETENV
 
 /* Since Version 7 AT&T UNIX, 4.3BSD-Tahoe (OpenBSD, FreeBSD, NetBSD, Mac OS X),
-* glibc 1.09
+ * glibc 1.09
  */
 #if defined(__FreeBSD__)            || \
     defined(__OpenBSD__)            || \
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R.h
index c74804a..fa5863e 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R.h
@@ -6,11 +6,11 @@
 
 #undef HAVE_GETHOSTBYNAME_R
 
-/* Since Linux/glibc 2.1, SunOS, AIX and HPUX. 
+/* Since Linux/glibc 2.1, SunOS, AIX and HPUX.
  */
 #if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 1)       || \
-    defined(__SunOS) && defined(__SunOS_5_5) || \   
-    defined(_AIX) || \ 
-    defined(__hpux)  
+    defined(__SunOS) && defined(__SunOS_5_5) || \
+    defined(_AIX) || \
+    defined(__hpux)
 #  define HAVE_GETHOSTBYNAME_R 1
 #endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETNAMEINFO.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETNAMEINFO.h
index a06584d..e8145f3 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETNAMEINFO.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETNAMEINFO.h
@@ -6,8 +6,8 @@
 
 #undef HAVE_GETNAMEINFO
 
-/* Since Linux/glibc 2.1, OpenBSD 2.9, FreeBSD 4.0, NetBSD 1.5, and Mac OS X 
- * (hard to tell but based on the manpages available online it looks like 
+/* Since Linux/glibc 2.1, OpenBSD 2.9, FreeBSD 4.0, NetBSD 1.5, and Mac OS X
+ * (hard to tell but based on the manpages available online it looks like
  * Tiger at the latest).
  */
 #if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 1) || \
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_PUTENV.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_PUTENV.h
index 921d8c0..6158c96 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_PUTENV.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_PUTENV.h
@@ -7,7 +7,7 @@
 #undef HAVE_PUTENV
 
 /* Since AT&T System V Release 2 UNIX, 4.3BSD-Reno (OpenBSD, FreeBSD, NetBSD, Mac OS X),
-* glibc 1.09
+ * glibc 1.09
  */
 #if defined(__FreeBSD__)            || \
     defined(__OpenBSD__)            || \
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_RENAMEAT2.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_RENAMEAT2.h
index 3b5b555..ffe0bb3 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_RENAMEAT2.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_RENAMEAT2.h
@@ -6,8 +6,8 @@
 
 #undef HAVE_RENAMEAT2
 
-// Since Linux 3.15/glibc 2.28.
-//
+/* Since Linux 3.15/glibc 2.28. */
+
 #if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 28)
 #  define HAVE_RENAMEAT2 1
 #endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRTOLL.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRTOLL.h
index 6b29b74..8377ec5 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRTOLL.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRTOLL.h
@@ -6,7 +6,7 @@
 
 #undef HAVE_STRTOLL
 
-/* Since 'ISO C99' (OpenBSD ~2.7, FreeBSD ~4.0, NetBSD ~1.5, Mac OS X ~10.0),
+/* Since ISO C99 (OpenBSD ~2.7, FreeBSD ~4.0, NetBSD ~1.5, Mac OS X ~10.0),
  * glibc 1.90
  */
 #if BUILD2_AUTOCONF_OPENBSD_PREREQ(200015) || \
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_ADDRINFO.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_ADDRINFO.h
index 46c1e67..dc52059 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_ADDRINFO.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_ADDRINFO.h
@@ -7,7 +7,7 @@
 #undef HAVE_STRUCT_ADDRINFO
 
 /* 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 
+ * (hard to tell but based on the manpages available online it looks like
  * Tiger at the latest).
  * NOTE: Assuming same as HAVE_GETADDRINFO
  */
@@ -17,4 +17,4 @@
     BUILD2_AUTOCONF_NETBSD_PREREQ(1, 5)     || \
     defined(BUILD2_AUTOCONF_MACOS)
 #  define HAVE_STRUCT_ADDRINFO 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_IN6_ADDR.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_IN6_ADDR.h
index 3d99d58..a9eb817 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_IN6_ADDR.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_IN6_ADDR.h
@@ -14,4 +14,4 @@
     BUILD2_AUTOCONF_NETBSD_PREREQ(1, 5) || \
     defined(BUILD2_AUTOCONF_MACOS)
 #  define HAVE_STRUCT_IN6_ADDR 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_LINGER.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_LINGER.h
index 43ba267..1a1b007 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_LINGER.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_LINGER.h
@@ -14,4 +14,4 @@
     BUILD2_AUTOCONF_NETBSD_PREREQ(1, 5)     || \
     defined(BUILD2_AUTOCONF_MACOS)
 #  define HAVE_STRUCT_LINGER 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_IN6.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_IN6.h
index 3917711..02cb68f 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_IN6.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_IN6.h
@@ -13,4 +13,4 @@
     BUILD2_AUTOCONF_NETBSD_PREREQ(2, 1)     || \
     BUILD2_AUTOCONF_MACOS_PREREQ(10, 6)
 #  define HAVE_STRUCT_SOCKADDR_IN6 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN.h
index e319ff9..37e3041 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN.h
@@ -13,4 +13,4 @@
     BUILD2_AUTOCONF_NETBSD_PREREQ(2, 1)     || \
     BUILD2_AUTOCONF_MACOS_PREREQ(10, 6)
 #  define HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_IN_SIN_LEN.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_IN_SIN_LEN.h
index de4af39..d6061d6 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_IN_SIN_LEN.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_IN_SIN_LEN.h
@@ -14,4 +14,4 @@
     defined(__NetBSD__)             || \
     defined(BUILD2_AUTOCONF_MACOS)
 #  define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_STORAGE.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_STORAGE.h
index e32b01e..8b0c26a 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_STORAGE.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_STORAGE.h
@@ -14,4 +14,4 @@
     defined(__NetBSD__)                 || \
     defined(BUILD2_AUTOCONF_MACOS)
 #  define HAVE_STRUCT_SOCKADDR_STORAGE 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY.h
index 5dcabef..bbbe0fe 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY.h
@@ -16,4 +16,4 @@
     BUILD2_AUTOCONF_NETBSD_PREREQ(1, 5)     || \
     BUILD2_AUTOCONF_MACOS_PREREQ(10, 0)
 #  define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY.h
index ea1f49e..dde61fc 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY.h
@@ -12,4 +12,4 @@
  */
 #if !BUILD2_AUTOCONF_GLIBC_PREREQ(2, 3)
 #  define HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_UN.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_UN.h
index 104e3f4..9e4207e 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_UN.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_STRUCT_SOCKADDR_UN.h
@@ -14,4 +14,4 @@
     defined(__NetBSD__)                 || \
     defined(BUILD2_AUTOCONF_MACOS)
 #  define HAVE_STRUCT_SOCKADDR_UN 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_WORKING_KQUEUE.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_WORKING_KQUEUE.h
index a397b42..6150387 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_WORKING_KQUEUE.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_WORKING_KQUEUE.h
@@ -10,6 +10,9 @@
  * NOTE: No reliable sources found.
          See (some) info here: https://bugs.mysql.com/bug.php?id=105562
  */
-// #if ...
-// #  define HAVE_WORKING_KQUEUE 1
-// #endif
+
+/*
+   #if ...
+   #  define HAVE_WORKING_KQUEUE 1
+   #endif
+*/
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME.h
index f38c18d..eefad96 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME.h
@@ -10,4 +10,4 @@
  */
 #if defined(_WIN32)
 #  define HAVE__GMTIME 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME32.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME32.h
index 12329ee..cda5e98 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME32.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME32.h
@@ -10,4 +10,4 @@
  */
 #if defined(_WIN32)
 #  define HAVE__GMTIME32 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME32_S.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME32_S.h
index fe0321f..cefcfba 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME32_S.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME32_S.h
@@ -10,4 +10,4 @@
  */
 #if defined(_WIN32)
 #  define HAVE__GMTIME32_S 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME64.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME64.h
index 315b148..03abcef 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME64.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME64.h
@@ -10,4 +10,4 @@
  */
 #if defined(_WIN32)
 #  define HAVE__GMTIME64 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME64_S.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME64_S.h
index 55f2bd0..e225db5 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME64_S.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME64_S.h
@@ -10,4 +10,4 @@
  */
 #if defined(_WIN32)
 #  define HAVE__GMTIME64_S 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME_S.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME_S.h
index 92377e0..33836a4 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME_S.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE__GMTIME_S.h
@@ -10,4 +10,4 @@
  */
 #if defined(_WIN32)
 #  define HAVE__GMTIME_S 1
-#endif
\ No newline at end of file
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/SIZEOF_VOID_P.h b/libbuild2-autoconf/libbuild2/autoconf/checks/SIZEOF_VOID_P.h
index 7c543af..61d3773 100644
--- a/libbuild2-autoconf/libbuild2/autoconf/checks/SIZEOF_VOID_P.h
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/SIZEOF_VOID_P.h
@@ -2,6 +2,8 @@
 
 #undef SIZEOF_VOID_P
 
+/* @@ TODO: redo using SIZEOF_POINTER (see SIZEOF_SIZE_T). */
+
 #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
 #  define SIZEOF_VOID_P 8
 #else