Use correct cpp-common