Update from Pedro Romano <pmcnr@…> which replaces C++ versions of these utilities with C implementations.