change the module location to interim.xcb
restore C-style enum type aliases