Major cleanup/change in the way things are included.
Needs a Linux compile check.
p4#: 21545