Merge "clean_header: Write to correct dst_file"