Added imports for enums

[this push](https://github.com/rust-lang/rust/pull/18973) requires that alternatives to an `enum` be imported, breaking `master`.  This pull request fixes that.