A few function prototype fixes.

7 files changed