Move certain typedef to more-appropriate location