Some header fixes.
Merge pull request #14 from joss/fix_layout

[Delivers #77430602] Some header fixes.