Change name of conflicting sources?

Recent arduino ide versions add a compiler -I include for the project folder/path, This, for example, causes compile failure due to clashes with the SPI library and the spi.h in the Marlin project code.

Can we please rename spi.h (I have not checked for other file name clashes).

This would then allow the project to compile in Arduino IDE 1.8.9/1.8.10 etc.

Thanks