This fixes a faulty typedef that was forward declared in a number of places, but with an incorrect type.