fixup headers deals with more files