2 files changed, 2 insertions, 1 deletions
diff --git a/debug.c b/debug.c
index 75d4cc6569..e0ff94886b 100644
--- a/debug.c
+++ b/debug.c
@@ -263,6 +263,7 @@ ruby_set_debug_option(const char *str)
 }
 
 #if RUBY_DEVEL
+#undef getenv
 
 // RUBY_DEBUG_LOG features
 // See vm_debug.h comments for details.
diff --git a/win32/win32.c b/win32/win32.c
index bb7471fbaf..9303a17607 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -811,7 +811,6 @@ StartSockets(void)
     InitializeCriticalSection(&select_mutex);
     InitializeCriticalSection(&socklist_mutex);
     InitializeCriticalSection(&conlist_mutex);
-    InitializeCriticalSection(&uenvarea_mutex);
 
     atexit(exit_handler);
 }
@@ -896,6 +895,7 @@ rb_w32_sysinit(int *argc, char ***argv)
 #endif
     SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX);
 
+    InitializeCriticalSection(&uenvarea_mutex);
     get_version();
 
     //