diff --git a/Common/CreateFile.cpp b/Common/CreateFile.cpp
index 55bca74e0258e41a4ce32627a2f9e5d25960e978..5731e1490ecb47e0eb8510d20b283ebb05f1a643 100644
--- a/Common/CreateFile.cpp
+++ b/Common/CreateFile.cpp
@@ -23,6 +23,11 @@
 #include "gl2yuv.h"
 #endif
 
+#if defined(WIN32)
+#undef min
+#undef max
+#endif
+
 int GuessFileFormatFromFileName(std::string fileName)
 {
   std::string ext = SplitFileName(fileName)[2];