diff --git a/src/bin/error.c b/src/bin/error.c
index b90a2319a8..5db4b329f6 100644
--- a/src/bin/error.c
+++ b/src/bin/error.c
@@ -19,7 +19,7 @@ struct error_pair {
 } kErrorNames[] = {
 #define E(e) { e, #e }
 // generated by:
-// tr ' ,=\t()+' '\n\n\n\n\n\n\n' <headers/os/support/Errors.h | grep '\(^B_\|^E[A-Z]\)' | sort | uniq | awk '{ print "\tE(" $1 ")," }'
+// tr ' ,=\t()+' '\n\n\n\n\n\n\n' <headers/os/support/Errors.h | grep '\(^B_\|^E[A-Z0-9]\)' | sort | uniq | awk '{ print "\tE(" $1 ")," }'
 	E(B_ALREADY_RUNNING),
 	E(B_AMBIGUOUS_APP_LAUNCH),
 	E(B_APP_ERROR_BASE),
@@ -40,7 +40,9 @@ struct error_pair {
 	E(B_BAD_TYPE),
 	E(B_BAD_VALUE),
 	E(B_BUFFER_NOT_AVAILABLE),
+#ifdef B_BUFFER_OVERFLOW
 	E(B_BUFFER_OVERFLOW),
+#endif
 	E(B_BUSTED_PIPE),
 	E(B_BUSY),
 	E(B_CANCELED),
@@ -48,7 +50,9 @@ struct error_pair {
 	E(B_DEBUGGER_ALREADY_INSTALLED),
 	E(B_DEVICE_ERROR_BASE),
 	E(B_DEVICE_FULL),
+#ifdef B_DEVICE_NOT_FOUND
 	E(B_DEVICE_NOT_FOUND),
+#endif
 	E(B_DEV_BAD_DRIVE_NUM),
 	E(B_DEV_BAD_PID),
 	E(B_DEV_CONFIGURATION_ERROR),
@@ -89,7 +93,9 @@ struct error_pair {
 	E(B_FILE_ERROR),
 	E(B_FILE_EXISTS),
 	E(B_FILE_NOT_FOUND),
+#ifdef B_FILE_TOO_LARGE
 	E(B_FILE_TOO_LARGE),
+#endif
 	E(B_GENERAL_ERROR_BASE),
 	E(B_INTERFACE_ERROR_BASE),
 	E(B_INTERRUPTED),
@@ -126,7 +132,9 @@ struct error_pair {
 	E(B_NOT_AN_EXECUTABLE),
 	E(B_NOT_A_DIRECTORY),
 	E(B_NOT_A_MESSAGE),
+#ifdef B_NOT_SUPPORTED
 	E(B_NOT_SUPPORTED),
+#endif
 	E(B_NO_ERROR),
 	E(B_NO_INIT),
 	E(B_NO_MEMORY),
@@ -145,19 +153,28 @@ struct error_pair {
 	E(B_READ_ONLY_DEVICE),
 	E(B_RESOURCE_NOT_FOUND),
 	E(B_RESOURCE_UNAVAILABLE),
+#ifdef B_RESULT_NOT_REPRESENTABLE
 	E(B_RESULT_NOT_REPRESENTABLE),
+#endif
 	E(B_SERVER_NOT_FOUND),
+#ifdef B_SHUTDOWN_CANCELLED
 	E(B_SHUTDOWN_CANCELLED),
+#endif
+#ifdef B_SHUTTING_DOWN
 	E(B_SHUTTING_DOWN),
+#endif
 	E(B_STORAGE_ERROR_BASE),
 	E(B_STREAM_NOT_FOUND),
 	E(B_SUBSCRIBER_NOT_ENTERED),
 	E(B_TIMED_OUT),
+#ifdef B_TOO_MANY_ARGS
 	E(B_TOO_MANY_ARGS),
+#endif
 	E(B_TRANSLATION_ERROR_BASE),
 	E(B_UNKNOWN_MIME_TYPE),
 	E(B_UNSUPPORTED),
 	E(B_WOULD_BLOCK),
+	E(E2BIG),
 	E(EACCES),
 	E(EADDRINUSE),
 	E(EADDRNOTAVAIL),
@@ -165,24 +182,36 @@ struct error_pair {
 	E(EAGAIN),
 	E(EALREADY),
 	E(EBADF),
+#ifdef EBADMSG
 	E(EBADMSG),
+#endif
 	E(EBUSY),
+#ifdef ECANCELED
 	E(ECANCELED),
+#endif
 	E(ECHILD),
 	E(ECONNABORTED),
 	E(ECONNREFUSED),
 	E(ECONNRESET),
 	E(EDEADLK),
+#ifdef EDESTADDRREQ
 	E(EDESTADDRREQ),
+#endif
 	E(EDOM),
+#ifdef EDQUOT
 	E(EDQUOT),
+#endif
 	E(EEXIST),
 	E(EFAULT),
 	E(EFBIG),
 	E(EFPOS),
+#ifdef EHOSTDOWN
 	E(EHOSTDOWN),
+#endif
 	E(EHOSTUNREACH),
+#ifdef EIDRM
 	E(EIDRM),
+#endif
 	E(EILSEQ),
 	E(EINPROGRESS),
 	E(EINTR),
@@ -194,31 +223,43 @@ struct error_pair {
 	E(EMFILE),
 	E(EMLINK),
 	E(EMSGSIZE),
+#ifdef EMULTIHOP
 	E(EMULTIHOP),
+#endif
 	E(ENAMETOOLONG),
 	E(ENETDOWN),
 	E(ENETRESET),
 	E(ENETUNREACH),
 	E(ENFILE),
 	E(ENOBUFS),
+#ifdef ENODATA
 	E(ENODATA),
+#endif
 	E(ENODEV),
 	E(ENOENT),
 	E(ENOEXEC),
 	E(ENOLCK),
+#ifdef ENOLINK
 	E(ENOLINK),
+#endif
 	E(ENOMEM),
 	E(ENOMSG),
 	E(ENOPROTOOPT),
 	E(ENOSPC),
+#ifdef ENOSR
 	E(ENOSR),
+#endif
+#ifdef ENOSTR
 	E(ENOSTR),
+#endif
 	E(ENOSYS),
 	E(ENOTCONN),
 	E(ENOTDIR),
 	E(ENOTEMPTY),
 	E(ENOTSOCK),
+#ifdef ENOTSUP
 	E(ENOTSUP),
+#endif
 	E(ENOTTY),
 	E(ENXIO),
 	E(EOPNOTSUPP),
@@ -226,7 +267,9 @@ struct error_pair {
 	E(EPERM),
 	E(EPFNOSUPPORT),
 	E(EPIPE),
+#ifdef EPROTO
 	E(EPROTO),
+#endif
 	E(EPROTONOSUPPORT),
 	E(EPROTOTYPE),
 	E(ERANGE),
@@ -236,9 +279,13 @@ struct error_pair {
 	E(ESPIPE),
 	E(ESRCH),
 	E(ESTALE),
+#ifdef ETIME
 	E(ETIME),
+#endif
 	E(ETIMEDOUT),
+#ifdef ETXTBSY
 	E(ETXTBSY),
+#endif
 	E(EWOULDBLOCK),
 	E(EXDEV),
 	{ 0, NULL }