diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 3d0506a138..324877e520 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -55,6 +55,14 @@
 #include "wx/numformatter.h"
 
 #include <float.h>
+#include <limits.h>
+
+// MinGW in strict ANSI mode doesn't define those in its limits.h.
+#if defined(wxNEEDS_STRICT_ANSI_WORKAROUNDS) && !defined(LLONG_MAX)
+    #define LLONG_MAX 9223372036854775807LL
+    #define LLONG_MIN (-LLONG_MAX - 1)
+    #define ULLONG_MAX (2ULL*LLONG_MAX + 1)
+#endif
 
 // -----------------------------------------------------------------------
 // wxStringProperty