Fixed the Travis build 'redefinition of typedef' warnings (= errors).
Merge pull request #454 from mditzel/master

Fixed the Travis build 'redefinition of typedef' warnings (= errors).