Add extra imports to build on 7.10 without import warnings