Correct import following dependency changes