Fix CPP files