Move remaining C files in utility to C++