fix a few warnings, and matching class/struct in forward declaration
Merge pull request #220 from erwincoumans/master

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