BUG: fix imports following change in exposed API.