Fixed compiler warning introduced in the last commit about redefining typedefs.

Redefinition of typedef 'foo' is a C11 feature [-Wtypedef-redefinition].