Remove "struct" keyword now that typedefs are available by #includes