The error you are reporting is very strange! There is no change in the error you are reporting due to the new pins.h file. The reason should be elsewhere!
Anyhow I have verified on my PC using the same pins.h file and I have found a different error relative to LCD definition. To correct the error you need to uncomment #define LCDI2C.
With this small correction it compile with no errors! Again it is very strange you find a different error!
Check what you are doing!
The code now it is rather complex , so every time you change anything there is the risk of new errors , so changing of #define flags in pins.h can be done but each new configuration need to be tested for compilation a/o runtime errors.