Merge branch 'x86/headers' into x86/core