More staged headers.
Merge pull request #1 from winocm/master

More staged headers.