Mantis 6180: Use the appropriate define everywhere