Added missing imports now needed for enums

[This push](https://github.com/rust-lang/rust/pull/18973) breaks `master`.  This pull request fixes the problem.