Split includes across directories using 3 letters as originally specified Don't use the file extension when making dirnames for cache keys with fewer than 3 letters Check in the automated tests I was using BugzID: 69038