Fixes for header generation.

5 files changed