Added self imports which are now necessary for enums

`master` is currently broken due to [this push to Rust](https://github.com/rust-lang/rust/pull/18973).  This pull request fixes the problem.