diff --git a/src/deque.h b/src/deque.h
index 43f810ec..8aae018c 100644
--- a/src/deque.h
+++ b/src/deque.h
@@ -47,6 +47,10 @@ SOFTWARE.
 #include "type_traits.h"
 #include "parameter_type.h"
 
+#ifdef ETL_COMPILER_MICROSOFT
+#undef min
+#endif
+
 #undef ETL_FILE
 #define ETL_FILE "1"
 
@@ -2144,4 +2148,8 @@ bool operator >=(const etl::ideque<T>& lhs, const etl::ideque<T>& rhs)
 
 #undef ETL_FILE
 
+#ifdef ETL_COMPILER_MICROSOFT
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
 #endif