--- a/gfx/2d/Matrix.h	2020-11-30 06:47:56.000000000 -0600
+++ b/gfx/2d/Matrix.h	2022-01-24 17:23:38.812193714 -0600
@@ -11,6 +11,7 @@
 #include "Point.h"
 #include "Quaternion.h"
 #include <iosfwd>
+#include <limits>
 #include <math.h>
 #include "mozilla/Attributes.h"
 #include "mozilla/DebugOnly.h"
--- a/gfx/2d/BaseRect.h	2020-11-30 06:47:56.000000000 -0600
+++ b/gfx/2d/BaseRect.h	2022-01-24 17:34:42.951126605 -0600
@@ -8,6 +8,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <limits>
 #include <ostream>
 
 #include "mozilla/Assertions.h"
--- a/nsprpub/pr/src/io/prmapopt.c	2020-11-30 06:47:56.000000000 -0600
+++ b/nsprpub/pr/src/io/prmapopt.c	2022-01-24 17:47:10.013250910 -0600
@@ -19,6 +19,7 @@
 
 #if defined(WINNT) || defined(__MINGW32__)
 #include <winsock.h>
+#include <winsock2.h>
 #endif
 
 /* MinGW doesn't define these in its winsock.h. */