Remove #if from interface/withinc