More fixes to forward declarations.

I forgot that I still need forward declarations, even if they're
not typedefs. Now things should build.