Fix build.

Sorry, renaming headers isn't detected by Jam and not everything was
rebuilt.
...and also fix a mismatched prototype

gcc2 doesn't seem to notice.