Merge "Fix code to compile with C++."