include pshpack1.h and poppack.h before and after the structure typedefs (bug #419)