Remove unnecessary allocation in building Headers.
Merge pull request #422 from adriancole/extra-alloc-headers

Remove unnecessary allocation in building Headers.