--- tools/build/mk/OptionalObsoleteFiles.inc	(revision 284983)
+++ tools/build/mk/OptionalObsoleteFiles.inc	(working copy)
@@ -7363,7 +7363,6 @@ OLD_FILES+=usr/tests/usr.bin/yacc/undefined.y
 # ATF libraries.
 OLD_FILES+=etc/mtree/BSD.tests.dist
 OLD_FILES+=usr/bin/atf-sh
-OLD_DIRS+=usr/include/atf-c
 OLD_FILES+=usr/include/atf-c/build.h
 OLD_FILES+=usr/include/atf-c/check.h
 OLD_FILES+=usr/include/atf-c/config.h
@@ -7375,7 +7374,6 @@ OLD_FILES+=usr/include/atf-c/tc.h
 OLD_FILES+=usr/include/atf-c/tp.h
 OLD_FILES+=usr/include/atf-c/utils.h
 OLD_FILES+=usr/include/atf-c.h
-OLD_DIRS+=usr/include/atf-c++
 OLD_FILES+=usr/include/atf-c++/build.hpp
 OLD_FILES+=usr/include/atf-c++/check.hpp
 OLD_FILES+=usr/include/atf-c++/config.hpp
@@ -7393,9 +7391,7 @@ OLD_FILES+=usr/lib/libatf-c++.so
 OLD_FILES+=usr/lib/libatf-c.a
 OLD_FILES+=usr/libexec/atf-check
 OLD_FILES+=usr/libexec/atf-sh
-OLD_DIRS+=usr/share/atf
 OLD_FILES+=usr/share/atf/libatf-sh.subr
-OLD_DIRS+=usr/share/doc/atf
 OLD_FILES+=usr/share/doc/atf/AUTHORS
 OLD_FILES+=usr/share/doc/atf/COPYING
 OLD_FILES+=usr/share/doc/atf/NEWS