Change all instances of skill/attribute values to use an appropriate typedef.