Index: Python/import.c
===================================================================
--- Python/import.c	(revision 59803)
+++ Python/import.c	(working copy)
@@ -1627,7 +1627,7 @@
 	FILEFINDBUF3 ffbuf;
 	APIRET rc;
 
-	if (getenv("PYTHONCASEOK") != NULL)
+	if (Py_GETENV("PYTHONCASEOK") != NULL)
 		return 1;
 
 	rc = DosFindFirst(buf,
Index: Python/thread.c
===================================================================
--- Python/thread.c	(revision 59803)
+++ Python/thread.c	(working copy)
@@ -79,7 +79,7 @@
 PyThread_init_thread(void)
 {
 #ifdef Py_DEBUG
-	char *p = getenv("THREADDEBUG");
+	char *p = Py_GETENV("PYTHONTHREADDEBUG");
 
 	if (p) {
 		if (*p)