Fixed macros and bitfields to compile on latest

"cargo test" still fails due to some `glutin` stuff.