In addition to standard code separation, this change opens the door
to fixing several include inter-dependencies.