Get it compiling with C++ compilers again.