Moving more defines.