[sr-dev] git:master:4267e1ef: tm: updated some structs to typedefs