diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 04b9d59ed3..f70ed821e1 100644
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -17,6 +17,9 @@
     #define STRICT 1
 #endif
 
+// don't define min() and max() as macros, they conflict with standard C++ ones
+#define NOMINMAX
+
 #include <windows.h>
 
 #ifdef __WXWINCE__