[sr-dev] git:master:c34bce14: xmpp: reformat exported structures