Add and correct some function declarations.