PDK-2666: c++ build fix