REFACTOR spi: change macros, remove includes