x86: convert almost generic headers to asm-generic version