I missed a few errors in my previous email.  I'm attaching a diff file will all the changes needed to get it to compile.