Make all defines consistent