Add redefines missing from last commit.