diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2850,7 +2850,7 @@
 OLD_FILES+=usr/lib/libroken.so
 OLD_FILES+=usr/lib/libwind.a
 OLD_FILES+=usr/lib/libwind.so
-OLD_FILES+=usr/lib/libwind.so.11
+OLD_LIBS+=usr/lib/libwind.so.11
 OLD_FILES+=usr/libexec/digest-service
 OLD_FILES+=usr/libexec/hprop
 OLD_FILES+=usr/libexec/hpropd
@@ -3696,17 +3696,17 @@
 OLD_FILES+=usr/include/verto-module.h
 OLD_FILES+=usr/include/verto.h
 OLD_FILES+=usr/lib/krb5/plugins/kdb/db2.so
-OLD_FILES+=usr/lib/krb5/plugins/kdb/db2.so.122
+OLD_LIBS+=usr/lib/krb5/plugins/kdb/db2.so.122
 OLD_FILES+=usr/lib/krb5/plugins/preauth/otp.so
-OLD_FILES+=usr/lib/krb5/plugins/preauth/otp.so.122
+OLD_LIBS+=usr/lib/krb5/plugins/preauth/otp.so.122
 OLD_FILES+=usr/lib/krb5/plugins/preauth/pkinit.so
-OLD_FILES+=usr/lib/krb5/plugins/preauth/pkinit.so.122
+OLD_LIBS+=usr/lib/krb5/plugins/preauth/pkinit.so.122
 OLD_FILES+=usr/lib/krb5/plugins/preauth/spake.so
-OLD_FILES+=usr/lib/krb5/plugins/preauth/spake.so.122
+OLD_LIBS+=usr/lib/krb5/plugins/preauth/spake.so.122
 OLD_FILES+=usr/lib/krb5/plugins/preauth/test.so
-OLD_FILES+=usr/lib/krb5/plugins/preauth/test.so.122
+OLD_LIBS+=usr/lib/krb5/plugins/preauth/test.so.122
 OLD_FILES+=usr/lib/krb5/plugins/tls/k5tls.so
-OLD_FILES+=usr/lib/krb5/plugins/tls/k5tls.so.122
+OLD_LIBS+=usr/lib/krb5/plugins/tls/k5tls.so.122
 OLD_FILES+=usr/lib/libgssrpc.a
 OLD_FILES+=usr/lib/libgssrpc.so
 OLD_FILES+=usr/lib/libk5crypto.a
@@ -3812,7 +3812,7 @@
 .for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats}
 .  if ${MK_LIB${LIBCOMPAT}} == no
 OLD_FILES+=etc/mtree/BSD.lib${libcompat}.dist
-OLD_FILES+=libexec/ld-elf${libcompat}.so.1
+OLD_LIBS+=libexec/ld-elf${libcompat}.so.1
 .    if exists(${DESTDIR}/usr/lib${libcompat})
 LIB${LIBCOMPAT}_DIRS!=find ${DESTDIR}/usr/lib${libcompat} -type d \
     | sed -e 's,^${DESTDIR}/,,'; echo
@@ -8137,11 +8137,11 @@
 OLD_FILES+=usr/include/atf-c++/utils.hpp
 OLD_FILES+=usr/include/atf-c++.hpp
 OLD_FILES+=usr/lib/libatf-c_p.a
-OLD_FILES+=usr/lib/libatf-c.so.1
+OLD_LIBS+=usr/lib/libatf-c.so.1
 OLD_FILES+=usr/lib/libatf-c.so
 OLD_FILES+=usr/lib/libatf-c++.a
 OLD_FILES+=usr/lib/libatf-c++_p.a
-OLD_FILES+=usr/lib/libatf-c++.so.1
+OLD_LIBS+=usr/lib/libatf-c++.so.1
 OLD_FILES+=usr/lib/libatf-c++.so
 OLD_FILES+=usr/lib/libatf-c.a
 OLD_FILES+=usr/libexec/atf-check