--- Libc/Libc-1725.40.4/stdlib/FreeBSD/putenv.c
+++ Libc/Libc-1353.100.2/stdlib/FreeBSD/putenv.c
@@ -38,9 +38,7 @@
 #include <sys/types.h>
 #include <db.h>
 #include <crt_externs.h>
-#include <errno.h>
-
-#include "libc_private.h"
+#include <errno.h> 
 
 extern struct owned_ptr *__env_owned;
 
@@ -50,6 +48,8 @@
 
 __private_extern__ int __init__env_owned_locked(int);
 __private_extern__ int __setenv_locked(const char *, const char *, int, int, char ***, struct owned_ptr *);
+__private_extern__ void __environ_lock(void);
+__private_extern__ void __environ_unlock(void);
 
 #ifndef BUILDING_VARIANT
 /*
@@ -60,20 +60,21 @@
 int
 _putenvp(char *str, char ***envp, void *state)
 {
-	environ_lock_np();
+	__environ_lock();
 	if (__init__env_owned_locked(1)) {
-		environ_unlock_np();
+		__environ_unlock();
 		return (-1);
 	}
 	int ret = __setenv_locked(str, NULL, 1, 0, envp,
 			(state ? (struct owned_ptr *)state : __env_owned));
-	environ_unlock_np();
+	__environ_unlock();
 	return ret;
 }
 #endif /* BUILDING_VARIANT */
 
 int
-putenv(char *str)
+putenv(str)
+	char *str;
 {
 	int ret;
 	int copy;
@@ -94,15 +95,15 @@
 	copy = -1;
 #endif /* __DARWIN_UNIX03 */
 
-	environ_lock_np();
+	__environ_lock();
 	if (__init__env_owned_locked(1)) {
-		environ_unlock_np();
+		__environ_unlock();
 		return (-1);
 	}
 	ret = __setenv_locked(str, NULL, 1, copy, _NSGetEnviron(), __env_owned);
 #ifdef LEGACY_CRT1_ENVIRON
 	_saved_environ = *_NSGetEnviron();
 #endif /* LEGACY_CRT1_ENVIRON */
-	environ_unlock_np();
+	__environ_unlock();
 	return ret;
 }