Once the generic headers are merged, we can apply theseother patches from Remis to use them in x86. Arnd <><