ENG-5145: Make CPP code compile.