Get rid of more defines not supported by Ubuntu