x86: merge some trivially mergeable headers