Merge pull request #337 from exarkun/some-typedef-fixes

Switch two types which were declared as opaque but are actually integers...