rwstruct: Updated header