sparc: merge header files with trivial differences