Replace boguses ifdef/ifndef by if clauses