Revert "unified the headers.. more work to go"

This reverts commit 5d309bf3c39c9799963bccc32e2dfa107b58438f.