Merge "Remove more namespace pollution (HAVE_FUNOPEN)."