Re: Fix some tests to be g++ >= 2.95 safe

[Akim Demaille]

I'm OK with this patch.  I'll apply the changes for the headers at
checkin if Franz doesn't have time to.  One yes is still expected.

Akim