Fix build errors after blind checkins from a different machine.