The patch below does the following:
- remove an unused static function
- removes the declaration of a function that is no longer present
- removes a variable declaration that shadows a function parameter

I've tested the compilation with 2.5.72-mm2.