More header fixes.