Kei,

I've checked in the .c files, as posted.  Not bad, not bad at all.
Can you just see how many of the attached can also be fixed?  I'll then
look at enabling it and pulling it into the 6 branch.

Andrew