Continue with the C++ conversion.
Only one file left until I can start using actual C++ instead of compiling C as C++.
And it's done.