Log Message:
We had a bit of a nastiness there, with files defining functions as
static, and then relying on a global header file for the (non-static)
prototypes. On top of that, functions with identical names but
slightly differing functionality exist in different modules. Fun; I
hope I sorted this out alright.