Tidy up the SPI includes and fix missing pieces

Merging in and unifying the F0 and F3 code unintentially broke the include tree for the L1 (at least) Fix this by correcting naming of files and removing the duplicate f3/f0 files.