--- a/tools/jdk/java_tools.patch
+++ b/tools/jdk/java_tools.patch
@@ -18,3 +18,31 @@
      }),
  )
  
+
+--- java_tools/ijar/zlib_client.h
++++ java_tools/ijar/zlib_client.h
+@@ -16,6 +16,8 @@
+ #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_
+
+ #include <limits.h>
++#include <limits>
++#include <stdexcept>
+
+ #include "third_party/ijar/common.h"
+
+
+--- java_tools/ijar/mapped_file_unix.cc
++++ java_tools/ijar/mapped_file_unix.cc
+@@ -15,10 +15,11 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdio.h>
+-#include <unistd.h>
+ #include <sys/mman.h>
++#include <unistd.h>
+
+ #include <algorithm>
++#include <limits>
+
+ #include "third_party/ijar/mapped_file.h"
+