Remove the dependence to Occurrence.h