diff --git a/src/Environment.cc b/src/Environment.cc
index a0f62ba..552c918 100644
--- a/src/Environment.cc
+++ b/src/Environment.cc
@@ -22,7 +22,13 @@
 #include <string>
 #include <vector>
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#ifndef _WIN32
 extern char ** environ;
+#endif
 
 namespace gz
 {
@@ -158,7 +164,7 @@ EnvironmentMap env()
     ret[key] = value;
 
     // Advance to the next environment variable.
-    env_var = equal_sign + 1;
+    ev_var = equal_sign + 1;
   }
   free(env_buf);
 #else