Move more defines to Game-redefines.h