Make all of base compile again

Without further separating out modules.