Make new gcc -Wall happy
11 files changed