Oops, forgot these two files.  Part of cfsworks' patch