o: fixed compilation after typedef removed