Fix compilation problem with removed imports