#include restructuring

@pbroadbery want to review this?

 looks OK... I guess we need to use CString more often.

Do you have an example where the sefo.c change is needed?  The change looks right, I'm just wondering what it fixed.