cpp/cpp_v2 includes clean