CPP everything to unbreak the build for 7.6