Merge "These files had an older header."