[coreboot-gerrit] Patch merged into coreboot/master: cpu/cpu.h: Drop excessive includes