Merge branch 'x86/header-guards' into x86/core