x86: remove mach_apic.h, fix