Fix cyclic inclusion in containers_conversion (2)