Removed "redefinition of typedef" build errors