Move typedefs to header.