Some minor fixups before merging

- Move static headers to files and source them
- Fix a typo in the header name
- Can't reset a puppet manifest value