Added imports for alternatives to an enum

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