First changes from C to C++

This time the extension of the headers were preserved.