diff --git a/EnvVar.cpp b/EnvVar.cpp
index 4e98f9f..015fe51 100755
--- a/EnvVar.cpp
+++ b/EnvVar.cpp
@@ -23,9 +23,12 @@
 
 #include <cassert>
 #include <limits>
-#include <windows.h>
 
-#undef max // unbelievable
+#ifndef NOMINMAX // We do not need min and max macroses from <Windows.h>
+#define NOMINMAX
+#endif
+
+#include <windows.h>
 
 #include "EnvVar.hpp"
 
@@ -294,4 +297,4 @@ void EnvVar::copy_ (EnvVar const &other)
 
 void EnvVar::destroy_ ()
 {
-}
\ No newline at end of file
+}