diff --git a/tools/build/libc-bootstrap/namespace.h b/tools/build/libc-bootstrap/namespace.h
index 73e27f8cb02b..2c242f88072d 100644
--- a/tools/build/libc-bootstrap/namespace.h
+++ b/tools/build/libc-bootstrap/namespace.h
@@ -45,7 +45,9 @@
 #define _writev(a, b, c)	writev(a, b, c)
 #define _fsync(a)	fsync(a)
 #define	_getprogname()	getprogname()
-#define	_err(...)	err(__VA_ARGS__)
+/* These two need to be renamed to build libc/gen/err.c */
+#define	err	_err
+#define	warn	_warn
 
 #define _pthread_mutex_unlock	pthread_mutex_unlock
 #define _pthread_mutex_lock	pthread_mutex_lock
diff --git a/tools/build/libc-bootstrap/un-namespace.h b/tools/build/libc-bootstrap/un-namespace.h
index 398707791792..f08ab41ea543 100644
--- a/tools/build/libc-bootstrap/un-namespace.h
+++ b/tools/build/libc-bootstrap/un-namespace.h
@@ -36,5 +36,8 @@
  * $FreeBSD$
  */
 #pragma once
-/* This can be empty when building the FreeBSD compatible bootstrap files */
+
+/* Undo the changes made by namespace.h */
+#undef	err
+#undef	warn