Get rid of the defined(sun) checks.