Merge "Tweak file headers."