x86, docbook: Fix errors from x86 headers merger