Fix a few variable shadowing warnings in public headers.

[mkoscumb]

I'm happy to change the names or suppress these warnings as well.