C++ compatibility

28 files changed