Reorder typedefs