Merge pull request #1582 from rubenk/missing-prototypes