fix a few warnings, and matching class/struct in forward declaration