diff --git a/external/bsd/pdisk/bin/Makefile b/external/bsd/pdisk/bin/Makefile
index 2f0993e03c01..12909f0a47c2 100644
--- a/external/bsd/pdisk/bin/Makefile
+++ b/external/bsd/pdisk/bin/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2023/08/03 13:36:08 rin Exp $	
+#	$NetBSD: Makefile,v 1.8 2023/08/03 14:56:36 rin Exp $	
 
 .include <bsd.own.mk>
 WARNS=5
@@ -21,7 +21,6 @@ CPPFLAGS+=	-I${SRCDIR}
 CPPFLAGS+=	-D__unix__
 
 COPTS.file_media.c+=	${CC_WNO_IMPLICIT_FALLTHROUGH}
-COPTS.io.c+=		${CC_WNO_USE_AFTER_FREE}
 COPTS.partition_map.c+=	${CC_WNO_STRINGOP_TRUNCATION}
 COPTS.pathname.c+=	${CC_WNO_IMPLICIT_FALLTHROUGH}
 COPTS.pdisk.c+=		${CC_WNO_IMPLICIT_FALLTHROUGH} ${CC_WNO_STRINGOP_TRUNCATION}
diff --git a/external/bsd/tre/lib/Makefile b/external/bsd/tre/lib/Makefile
index 6319e5ccf00c..053f68d95e46 100644
--- a/external/bsd/tre/lib/Makefile
+++ b/external/bsd/tre/lib/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2023/08/03 13:36:08 rin Exp $
+#	$NetBSD: Makefile,v 1.5 2023/08/03 14:56:36 rin Exp $
 
 # for information:
 # the configure script is run as:
@@ -19,6 +19,4 @@ SRCS+=	tre-ast.c tre-compile.c tre-match-approx.c
 SRCS+=	tre-match-backtrack.c tre-match-parallel.c tre-mem.c
 SRCS+=	tre-parse.c tre-stack.c xmalloc.c
 
-COPTS.xmalloc.c+=	${CC_WNO_USE_AFTER_FREE}
-
 .include <bsd.lib.mk>
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index a69cef72d4dd..b37dab8ebefc 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.95 2023/08/03 13:36:08 rin Exp $
+#	$NetBSD: Makefile.inc,v 1.96 2023/08/03 14:56:36 rin Exp $
 #	@(#)Makefile.inc	8.2 (Berkeley) 9/5/93
 
 # net sources
@@ -152,5 +152,4 @@ MAN+=	sctp_bindx.3 sctp_connectx.3 sctp_freepaddrs.3 sctp_getaddrlen.3 \
 	sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3
 
 COPTS.getaddrinfo.c+=		${CC_WNO_STRINGOP_OVERFLOW}
-COPTS.gethnamaddr.c+=		${CC_WNO_USE_AFTER_FREE}
 COPTS.sctp_sys_calls.c+=	${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index 2f124091a7bf..f7cd3baf885f 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.69 2023/08/03 13:36:08 rin Exp $
+#	$NetBSD: Makefile,v 1.70 2023/08/03 14:56:36 rin Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 USE_SHLIBDIR=	yes
@@ -144,7 +144,6 @@ COPTS.tokenizer.c+=	-Wno-cast-qual
 COPTS.tokenizern.c+=	-Wno-cast-qual
 .endif
 
-COPTS.chartype.c+=	${CC_WNO_USE_AFTER_FREE}
 COPTS.history.c+=	${CC_WNO_STRINGOP_OVERFLOW}
 COPTS.historyn.c+=	${CC_WNO_STRINGOP_OVERFLOW}
 COPTS.readline.c+=	${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_STRINGOP_OVERFLOW}
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index 2f8ee59e63ec..be63162edffc 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.53 2023/08/03 13:36:08 rin Exp $
+#	$NetBSD: Makefile,v 1.54 2023/08/03 14:56:36 rin Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
 
 WARNS=	3
@@ -76,6 +76,5 @@ CPPFLAGS+=	-I.
 CPPFLAGS+=	-D_KMEMUSER
 .endif
 
-COPTS.kvm_proc.c+=	${CC_WNO_USE_AFTER_FREE}
 
 .include <bsd.lib.mk>
diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile
index b5dc680d5818..95ca90c8e1f0 100644
--- a/usr.bin/find/Makefile
+++ b/usr.bin/find/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2023/08/03 13:36:08 rin Exp $
+#	$NetBSD: Makefile,v 1.15 2023/08/03 14:56:36 rin Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
 
 .include <bsd.own.mk>
@@ -9,6 +9,4 @@ SRCS=	find.c function.c ls.c main.c misc.c operator.c option.c
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 
-COPTS.misc.c+=	${CC_WNO_USE_AFTER_FREE}
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index 0ad7a4ccae91..00836b651247 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.43 2023/08/03 13:36:09 rin Exp $
+#	$NetBSD: Makefile,v 1.44 2023/08/03 14:56:36 rin Exp $
 #	@(#)Makefile	8.3 (Berkeley) 4/20/95
 
 .include <bsd.own.mk>
@@ -78,7 +78,7 @@ FILESDIR_mail.rc=	/etc
 FILESMODE_mail.rc=	644
 
 COPTS.format.c+= -Wno-format-nonliteral
-COPTS.fio.c+=	${CC_WNO_FORMAT_TRUNCATION} ${CC_WNO_USE_AFTER_FREE}
+COPTS.fio.c+=	${CC_WNO_FORMAT_TRUNCATION}
 
 .include <bsd.prog.mk>
 .include <bsd.subdir.mk>
diff --git a/usr.bin/rs/Makefile b/usr.bin/rs/Makefile
index 6ac65aecf23e..142b57fbcf87 100644
--- a/usr.bin/rs/Makefile
+++ b/usr.bin/rs/Makefile
@@ -1,9 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 2023/08/03 13:36:09 rin Exp $
+#	$NetBSD: Makefile,v 1.4 2023/08/03 14:56:36 rin Exp $
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	rs
 
-COPTS.rs.c+=	${CC_WNO_USE_AFTER_FREE}
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile
index c622632798cf..2194796a9fd8 100644
--- a/usr.bin/sort/Makefile
+++ b/usr.bin/sort/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2023/08/03 13:36:09 rin Exp $
+#	$NetBSD: Makefile,v 1.12 2023/08/03 14:56:36 rin Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	sort
@@ -8,8 +8,6 @@ SRCS+=	radix_sort.c
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 
-COPTS.files.c+=		${CC_WNO_USE_AFTER_FREE}
 COPTS.init.c+=		${CC_WNO_FORMAT_TRUNCATION}
-COPTS.sort.c+=		${CC_WNO_USE_AFTER_FREE}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ypserv/ypserv/Makefile b/usr.sbin/ypserv/ypserv/Makefile
index 1568016a90ba..45834baba8d8 100644
--- a/usr.sbin/ypserv/ypserv/Makefile
+++ b/usr.sbin/ypserv/ypserv/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2023/08/03 13:36:09 rin Exp $
+#	$NetBSD: Makefile,v 1.24 2023/08/03 14:56:37 rin Exp $
 
 .include <bsd.own.mk>
 
@@ -20,7 +20,6 @@ CPPFLAGS.getnetnamadr.c=-UYP -D_LIBC
 
 SANITIZER_RENAME_SYMBOL+=	gethostbyname2
 
-COPTS.gethnamaddr.c+=	${CC_WNO_USE_AFTER_FREE}
 COPTS.ypserv.c+=	${CC_WNO_CAST_FUNCTION_TYPE}
 
 .include <bsd.prog.mk>