Some header fixes.