Many defines added.