[sr-dev] git:master:e658599e: msrp: reformat exported structures