Remove references to B_COMMON_*_DIRECTORY