Defines remove

Two defines could be replaced by if declared() check