Add header IDs for secondary headers

This change enables us to add header IDs for secondary headers in 6.1.x.

cc/ @ngaskill, @codyhoag