Fixing imports, looks like compilation did not detect this cc @cdeneux