#undef BSD4_4
#undef CNID_DB
#undef FILE_MANGLING
+#undef CNID_DB_CDB
#undef DISABLE_LOGGER
#undef LOGFILEPATH
#undef DEBUG
#undef DLSYM_PREPEND_UNDERSCORE
-#undef DID_MTAB
#undef DISABLE_SHELLCHECK
#undef DROPKLUDGE
#undef FHS_COMPATIBILITY
#undef USE_MOUNT_H
#undef USE_OLD_RQUOTA
#undef USE_UFS_QUOTA_H
-#undef WITH_CATSEARCH
+#undef HAVE_DECL_ERRNO
+#undef HAVE_DECL_SYS_ERRLIST
+#undef HAVE_DECL_SYS_NERR
+#undef HAVE_ERRNO
+#undef HAVE_LONG_DOUBLE
+#undef HAVE_LONG_LONG
+#undef HAVE_QUAD_T
+#undef HAVE_SYS_ERRLIST
+#undef HAVE_SYS_NERR