Change all C to C++ outside of TNG