docbook: fix errors from x86 headers merger