[sr-dev] git:master:57711e24: nosip: reformat exported structures