Follow-up to r362679, add more entries to OptionalObsoleteFiles.inc
MFC after: 3 days X-MFC-With: r362679