diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 29fdeb0688e5..b496b590b210 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -7362,100 +7362,76 @@ OLD_DIRS+=usr/include/infiniband
 OLD_FILES+=usr/lib/libcxgb4.a
 OLD_FILES+=usr/lib/libcxgb4.so
 OLD_LIBS+=usr/lib/libcxgb4.so.1
-OLD_FILES+=usr/lib/libcxgb4_p.a
 OLD_FILES+=usr/lib/libibcm.a
 OLD_FILES+=usr/lib/libibcm.so
 OLD_LIBS+=usr/lib/libibcm.so.1
-OLD_FILES+=usr/lib/libibcm_p.a
 OLD_FILES+=usr/lib/libibmad.a
 OLD_FILES+=usr/lib/libibmad.so
 OLD_LIBS+=usr/lib/libibmad.so.5
-OLD_FILES+=usr/lib/libibmad_p.a
 OLD_FILES+=usr/lib/libibnetdisc.a
 OLD_FILES+=usr/lib/libibnetdisc.so
 OLD_LIBS+=usr/lib/libibnetdisc.so.5
-OLD_FILES+=usr/lib/libibnetdisc_p.a
 OLD_FILES+=usr/lib/libibumad.a
 OLD_FILES+=usr/lib/libibumad.so
 OLD_LIBS+=usr/lib/libibumad.so.1
-OLD_FILES+=usr/lib/libibumad_p.a
 OLD_FILES+=usr/lib/libibverbs.a
 OLD_FILES+=usr/lib/libibverbs.so
-OLD_LIBS+=usr/lib/libibverbs.so.1
-OLD_FILES+=usr/lib/libibverbs_p.a
+OLD_LIBS+=lib/libibverbs.so.1
 OLD_FILES+=usr/lib/libmlx4.a
 OLD_FILES+=usr/lib/libmlx4.so
 OLD_LIBS+=usr/lib/libmlx4.so.1
-OLD_FILES+=usr/lib/libmlx4_p.a
 OLD_FILES+=usr/lib/libmlx5.a
 OLD_FILES+=usr/lib/libmlx5.so
-OLD_LIBS+=usr/lib/libmlx5.so.1
-OLD_FILES+=usr/lib/libmlx5_p.a
+OLD_LIBS+=lib/libmlx5.so.1
 OLD_FILES+=usr/lib/libopensm.a
 OLD_FILES+=usr/lib/libopensm.so
 OLD_LIBS+=usr/lib/libopensm.so.5
-OLD_FILES+=usr/lib/libopensm_p.a
 OLD_FILES+=usr/lib/libosmcomp.a
 OLD_FILES+=usr/lib/libosmcomp.so
 OLD_LIBS+=usr/lib/libosmcomp.so.3
-OLD_FILES+=usr/lib/libosmcomp_p.a
 OLD_FILES+=usr/lib/libosmvendor.a
 OLD_FILES+=usr/lib/libosmvendor.so
 OLD_LIBS+=usr/lib/libosmvendor.so.4
-OLD_FILES+=usr/lib/libosmvendor_p.a
 OLD_FILES+=usr/lib/librdmacm.a
 OLD_FILES+=usr/lib/librdmacm.so
 OLD_LIBS+=usr/lib/librdmacm.so.1
-OLD_FILES+=usr/lib/librdmacm_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libcxgb4.a
 OLD_FILES+=usr/lib32/libcxgb4.so
 OLD_LIBS+=usr/lib32/libcxgb4.so.1
-OLD_FILES+=usr/lib32/libcxgb4_p.a
 OLD_FILES+=usr/lib32/libibcm.a
 OLD_FILES+=usr/lib32/libibcm.so
 OLD_LIBS+=usr/lib32/libibcm.so.1
-OLD_FILES+=usr/lib32/libibcm_p.a
 OLD_FILES+=usr/lib32/libibmad.a
 OLD_FILES+=usr/lib32/libibmad.so
 OLD_LIBS+=usr/lib32/libibmad.so.5
-OLD_FILES+=usr/lib32/libibmad_p.a
 OLD_FILES+=usr/lib32/libibnetdisc.a
 OLD_FILES+=usr/lib32/libibnetdisc.so
 OLD_LIBS+=usr/lib32/libibnetdisc.so.5
-OLD_FILES+=usr/lib32/libibnetdisc_p.a
 OLD_FILES+=usr/lib32/libibumad.a
 OLD_FILES+=usr/lib32/libibumad.so
 OLD_LIBS+=usr/lib32/libibumad.so.1
-OLD_FILES+=usr/lib32/libibumad_p.a
 OLD_FILES+=usr/lib32/libibverbs.a
 OLD_FILES+=usr/lib32/libibverbs.so
 OLD_LIBS+=usr/lib32/libibverbs.so.1
-OLD_FILES+=usr/lib32/libibverbs_p.a
 OLD_FILES+=usr/lib32/libmlx4.a
 OLD_FILES+=usr/lib32/libmlx4.so
 OLD_LIBS+=usr/lib32/libmlx4.so.1
-OLD_FILES+=usr/lib32/libmlx4_p.a
 OLD_FILES+=usr/lib32/libmlx5.a
 OLD_FILES+=usr/lib32/libmlx5.so
 OLD_LIBS+=usr/lib32/libmlx5.so.1
-OLD_FILES+=usr/lib32/libmlx5_p.a
 OLD_FILES+=usr/lib32/libopensm.a
 OLD_FILES+=usr/lib32/libopensm.so
 OLD_LIBS+=usr/lib32/libopensm.so.5
-OLD_FILES+=usr/lib32/libopensm_p.a
 OLD_FILES+=usr/lib32/libosmcomp.a
 OLD_FILES+=usr/lib32/libosmcomp.so
 OLD_LIBS+=usr/lib32/libosmcomp.so.3
-OLD_FILES+=usr/lib32/libosmcomp_p.a
 OLD_FILES+=usr/lib32/libosmvendor.a
 OLD_FILES+=usr/lib32/libosmvendor.so
 OLD_LIBS+=usr/lib32/libosmvendor.so.4
-OLD_FILES+=usr/lib32/libosmvendor_p.a
 OLD_FILES+=usr/lib32/librdmacm.a
 OLD_FILES+=usr/lib32/librdmacm.so
 OLD_LIBS+=usr/lib32/librdmacm.so.1
-OLD_FILES+=usr/lib32/librdmacm_p.a
 .endif
 OLD_FILES+=usr/share/man/man1/ibv_asyncwatch.1.gz
 OLD_FILES+=usr/share/man/man1/ibv_devices.1.gz