Fix header inclusion.

WIP, take three.