[coreboot-gerrit] Change in coreboot[master]: southbridge/intel: Tidy up preprocessor and headers