This removes several define statements with different names in
  various functions