Fix PR918 by only using typedefs to name struct types. This makes the later