--- Libc/Libc-1725.40.4/include/err.h
+++ Libc/Libc-825.24/include/err.h
@@ -66,29 +66,26 @@
  * __darwin_va_list from <machine/_type.h> and use it.
  */
 #include <sys/cdefs.h>
-#include <_bounds.h>
 #include <_types.h>
 #include <Availability.h>
 
-_LIBC_SINGLE_BY_DEFAULT()
-
 __BEGIN_DECLS
-void	err(int, const char *, ...) __cold __dead2 __printflike(2, 3);
-void	verr(int, const char *, __darwin_va_list) __cold __dead2 __printflike(2, 0);
-void	errc(int, int, const char *, ...) __cold __dead2 __printflike(3, 4);
-void	verrc(int, int, const char *, __darwin_va_list) __cold __dead2 __printflike(3, 0);
-void	errx(int, const char *, ...) __cold __dead2 __printflike(2, 3);
-void	verrx(int, const char *, __darwin_va_list) __cold __dead2 __printflike(2, 0);
-void	warn(const char *, ...) __cold __printflike(1, 2);
-void	vwarn(const char *, __darwin_va_list) __cold __printflike(1, 0);
-void	warnc(int, const char *, ...) __cold __printflike(2, 3);
-void	vwarnc(int, const char *, __darwin_va_list) __cold __printflike(2, 0);
-void	warnx(const char *, ...) __cold __printflike(1, 2);
-void	vwarnx(const char *, __darwin_va_list) __cold __printflike(1, 0);
+void	err(int, const char *, ...) __dead2 __printflike(2, 3);
+void	verr(int, const char *, __darwin_va_list) __dead2 __printflike(2, 0);
+void	errc(int, int, const char *, ...) __dead2 __printflike(3, 4);
+void	verrc(int, int, const char *, __darwin_va_list) __dead2 __printflike(3, 0);
+void	errx(int, const char *, ...) __dead2 __printflike(2, 3);
+void	verrx(int, const char *, __darwin_va_list) __dead2 __printflike(2, 0);
+void	warn(const char *, ...) __printflike(1, 2);
+void	vwarn(const char *, __darwin_va_list) __printflike(1, 0);
+void	warnc(int, const char *, ...) __printflike(2, 3);
+void	vwarnc(int, const char *, __darwin_va_list) __printflike(2, 0);
+void	warnx(const char *, ...) __printflike(1, 2);
+void	vwarnx(const char *, __darwin_va_list) __printflike(1, 0);
 void	err_set_file(void *);
-void	err_set_exit(void (* _Nullable)(int));
+void	err_set_exit(void (*)(int));
 #ifdef __BLOCKS__
-void	err_set_exit_b(void (^ _Nullable)(int)) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
+void	err_set_exit_b(void (^)(int)) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
 #endif /* __BLOCKS__ */
 
 __END_DECLS