Generate header IDs for secondary headers and deconflict them within the same file.
Merge pull request #1061 from jhinkey/generate-secondary-header-ids

Generate header IDs for secondary headers and deconflict them within a file.