added CXX definitions