Don't shadow global declarations on older glibc

Older glibc's warning about shadowing some global declarations so this
cleans that up.