diff --git a/vpx/vpx_integer.h b/vpx/vpx_integer.h
index ffeefb8192fb9c5eeac0fb1a06d88dc5b021ee2b..500f9b901ebb6f71d88f594f5a8469b44499b99e 100644
--- a/vpx/vpx_integer.h
+++ b/vpx/vpx_integer.h
@@ -49,9 +49,15 @@ typedef size_t uintptr_t;
 
 /* Most platforms have the C99 standard integer types. */
 
-#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS)
-#define __STDC_FORMAT_MACROS
-#endif
+#if defined(__cplusplus)
+# if !defined(__STDC_FORMAT_MACROS)
+#  define __STDC_FORMAT_MACROS
+# endif
+# if !defined(__STDC_LIMIT_MACROS)
+#  define __STDC_LIMIT_MACROS
+# endif
+#endif  // __cplusplus
+
 #include <stdint.h>
 
 #endif