Remove buggy and unused forward declarations
Merge pull request #122 from nierob/smallFixups

Remove buggy and unused forward declarations