Transformation into OO_C++ complete