Removed extra forward declarations.
Merge pull request #44 from tomatrow/master

Removed extra forward declarations.