x86: cleanup duplicate includes