Forgot copyright lines, if it is needed for either or both files. Updated patch to include them if necessary.