Moved defines, fixed warning.