My change to 477174 did not work. Keep our C++ copies of xwax files and wrap them with extern C.
Also revert changes from ce3c119 as those don't work either.