Changed from 'class' to 'struct' in a few forward declarations