Fixes for compiling XEmacs 21.5, compface on VC .NET