Fix CPP compiling