[sr-dev] git:master:4c157538: rr: reformat exported structures