[sr-dev] git:master:2d024cc2: sipt: reformat exported structures