Fixed typedefs to compile on VC++ 2010