Fix a few invalid forward declarations

A few forward declarations mix struct and class type declaration.