Drop typedef redeclarations

C99 doesn't permit redeclaring typedefs in the same scope.
Merge pull request #122 from czarkoff/redeclarations

Drop typedef redeclarations