Add missing typedefs.
Fix clang compiler error.