Get rid of a few C-style struct declarations
Merge pull request #665 from lioncash/cisms

Get rid of a few C-style struct declarations