diff -Naur openjdk-7.271_p01/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk-7.271_p01-copy/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
--- openjdk-7.271_p01/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	2020-10-15 21:59:39.479954972 -0400
+++ openjdk-7.271_p01-copy/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	2020-10-15 22:37:16.487943270 -0400
@@ -46,6 +46,8 @@
 
 #include "zip.h"
 
+#define uchar unsigned char
+
 #ifdef NO_ZLIB
 
 inline bool jar::deflate_bytes(bytes& head, bytes& tail) {
diff -Naur openjdk-7.271_p01/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk-7.271_p01-copy/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
--- openjdk-7.271_p01/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h	2020-10-15 21:59:39.479954972 -0400
+++ openjdk-7.271_p01-copy/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h	2020-10-15 22:37:32.791943186 -0400
@@ -26,6 +26,7 @@
 #define ushort unsigned short
 #define uint   unsigned int
 #define uchar  unsigned char
+#include <sys/types.h>
 
 struct unpacker;
 
diff -Naur openjdk-7.271_p01/jdk/src/share/native/sun/awt/medialib/mlib_types.h openjdk-7.271_p01-copy/jdk/src/share/native/sun/awt/medialib/mlib_types.h
--- openjdk-7.271_p01/jdk/src/share/native/sun/awt/medialib/mlib_types.h	2020-10-15 21:59:39.515954972 -0400
+++ openjdk-7.271_p01-copy/jdk/src/share/native/sun/awt/medialib/mlib_types.h	2020-10-15 22:38:10.879942988 -0400
@@ -27,6 +27,7 @@
 #ifndef MLIB_TYPES_H
 #define MLIB_TYPES_H
 
+#include <stddef.h>			/* for NULL */
 #include <limits.h>
 #if defined(_MSC_VER)
 #include <float.h>                      /* for FLT_MAX and DBL_MAX */
diff -Naur openjdk-7.271_p01/jdk/src/solaris/native/java/net/Inet4AddressImpl.c openjdk-7.271_p01-copy/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
--- openjdk-7.271_p01/jdk/src/solaris/native/java/net/Inet4AddressImpl.c	2020-10-15 21:59:39.539954972 -0400
+++ openjdk-7.271_p01-copy/jdk/src/solaris/native/java/net/Inet4AddressImpl.c	2020-10-15 22:39:04.595942710 -0400
@@ -47,7 +47,7 @@
 
 #include "java_net_Inet4AddressImpl.h"
 
-#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104))
+#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104))
 #define HAS_GLIBC_GETHOSTBY_R   1
 #endif
 
diff -Naur openjdk-7.271_p01/jdk/src/solaris/native/java/net/NetworkInterface.c openjdk-7.271_p01-copy/jdk/src/solaris/native/java/net/NetworkInterface.c
--- openjdk-7.271_p01/jdk/src/solaris/native/java/net/NetworkInterface.c	2020-10-15 21:59:39.539954972 -0400
+++ openjdk-7.271_p01-copy/jdk/src/solaris/native/java/net/NetworkInterface.c	2020-10-15 22:39:38.103942536 -0400
@@ -47,7 +47,6 @@
 
 #ifdef __linux__
 #include <sys/ioctl.h>
-#include <bits/ioctls.h>
 #include <sys/utsname.h>
 #include <stdio.h>
 #endif
diff -Naur openjdk-7.271_p01/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk-7.271_p01-copy/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
--- openjdk-7.271_p01/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2020-10-15 21:59:39.539954972 -0400
+++ openjdk-7.271_p01-copy/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2020-10-15 22:40:04.275942400 -0400
@@ -35,7 +35,6 @@
 #endif
 #ifdef __linux__
 #include <unistd.h>
-#include <sys/sysctl.h>
 #include <sys/utsname.h>
 #include <netinet/ip.h>
 
diff -Naur openjdk-7.271_p01/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk-7.271_p01-copy/jdk/src/solaris/native/java/net/PlainSocketImpl.c
--- openjdk-7.271_p01/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2020-10-15 21:59:39.539954972 -0400
+++ openjdk-7.271_p01-copy/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2020-10-15 22:40:35.663942238 -0400
@@ -43,7 +43,6 @@
 #endif
 #ifdef __linux__
 #include <unistd.h>
-#include <sys/sysctl.h>
 #endif
 
 #include "jvm.h"
diff -Naur openjdk-7.271_p01/jdk/src/solaris/native/java/net/linux_close.c openjdk-7.271_p01-copy/jdk/src/solaris/native/java/net/linux_close.c
--- openjdk-7.271_p01/jdk/src/solaris/native/java/net/linux_close.c	2020-10-15 21:59:39.539954972 -0400
+++ openjdk-7.271_p01-copy/jdk/src/solaris/native/java/net/linux_close.c	2020-10-15 22:41:37.471941917 -0400
@@ -75,7 +75,7 @@
 #ifdef _AIX
 static int sigWakeup = (SIGRTMAX - 1);
 #else
-static int sigWakeup = (__SIGRTMAX - 2);
+static int sigWakeup;
 #endif
 
 /*
@@ -148,6 +148,9 @@
     /*
      * Setup the signal handler
      */
+#ifndef __AIX
+    sigWakeup = SIGRTMAX - 2;
+#endif
     sa.sa_handler = sig_wakeup;
     sa.sa_flags   = 0;
     sigemptyset(&sa.sa_mask);
diff -Naur openjdk-7.271_p01/jdk/src/solaris/native/sun/nio/ch/NativeThread.c openjdk-7.271_p01-copy/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
--- openjdk-7.271_p01/jdk/src/solaris/native/sun/nio/ch/NativeThread.c	2020-10-15 21:59:39.559954972 -0400
+++ openjdk-7.271_p01-copy/jdk/src/solaris/native/sun/nio/ch/NativeThread.c	2020-10-15 22:42:01.295941794 -0400
@@ -38,7 +38,7 @@
 #include <sys/signal.h>
 
 /* Also defined in src/solaris/native/java/net/linux_close.c */
-#define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
+#define INTERRUPT_SIGNAL (SIGRTMAX - 2)
 
 static void
 nullHandler(int sig)