Fix a few invalid forward declarations

A few forward declarations use mismatched struct and class types. Clang
won't compile this with -Werror.