Add back the headers we're getting via (likely) transitive includes.
We really do use these things in the header.