Resolve "redefinition of typedef" errors

On at least OpenBSD and NetBSD with gcc builds fail:

http://www.cpantesters.org/cpan/report/85a7faae-e6b2-11e3-84c4-fc77f9652e90
Merge remote-tracking branch 'bingos/master'