Remove internals of typedef declaration
fix test for win32