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