Fix imports according to last changes in orcc