Part of trac #5529. We also now import the constructors in various modules that use them in FFI decls.