Fix header inclusions.

WIP, round two.