Reduce diff with upstreamRemove local no longer needed modifications.
merge conflicts
Ensure free(3) is declared before use.
import 7.3.1