Fix build order issues for bootstrap files.