Somewhat reign in include madness

Having trouble compiling a sidebranch because our includes are out of
control.  Be a bit more sane here.

Might add some more to this branch since unnecessary includes in headers significantly increase compilation times.