Use ifdefs around keyword redefinitions