[PATCH 07/22] x86: Drop inclusion of ibmpc.h