Update of typedefs in header file

Amended the header file to account for nset and winset types that had
previously been accidentally left in the .c file for this program.