x86: more header fixes