Remove unused and buggy forward declarations.
Merge pull request #131 from nierob/smallFixups1

Remove unused and buggy forward declarations.