--- a/jdk/src/java.base/aix/native/libnet/aix_close.c	Fri May 05 17:48:44 2017 +0200
+++ b/jdk/src/java.base/aix/native/libnet/aix_close.c	Thu May 11 17:55:05 2017 -0700
@@ -64,7 +64,7 @@
 #include <sys/uio.h>
 #include <unistd.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 /*
  * Stack allocated by thread when doing blocking operation

--- a/jdk/src/java.base/aix/native/libnio/ch/AixPollPort.c	Fri May 05 17:48:44 2017 +0200
+++ b/jdk/src/java.base/aix/native/libnio/ch/AixPollPort.c	Thu May 11 17:55:05 2017 -0700
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/pollset.h>
 #include <fcntl.h>
 #include <stddef.h>

--- a/jdk/src/java.base/linux/native/libnet/linux_close.c	Fri May 05 17:48:44 2017 +0200
+++ b/jdk/src/java.base/linux/native/libnet/linux_close.c	Thu May 11 17:55:05 2017 -0700
@@ -36,7 +36,7 @@
 #include <sys/uio.h>
 #include <unistd.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 /*
  * Stack allocated by thread when doing blocking operation

--- a/jdk/src/java.base/linux/native/libnio/fs/LinuxWatchService.c	Fri May 05 17:48:44 2017 +0200
+++ b/jdk/src/java.base/linux/native/libnio/fs/LinuxWatchService.c	Thu May 11 17:55:05 2017 -0700
@@ -32,7 +32,7 @@
 #include <dlfcn.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/inotify.h>
 
 #include "sun_nio_fs_LinuxWatchService.h"

--- a/jdk/src/java.base/macosx/native/include/jvm_md.h	Fri May 05 17:48:44 2017 +0200
+++ b/jdk/src/java.base/macosx/native/include/jvm_md.h	Thu May 11 17:55:05 2017 -0700
@@ -60,7 +60,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <sys/signal.h>
+#include <signal.h>
 
 /* O Flags */
 

--- a/jdk/src/java.base/macosx/native/libnet/bsd_close.c	Fri May 05 17:48:44 2017 +0200
+++ b/jdk/src/java.base/macosx/native/libnet/bsd_close.c	Thu May 11 17:55:05 2017 -0700
@@ -38,7 +38,7 @@
 #include <sys/uio.h>
 #include <unistd.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 /*
  * Stack allocated by thread when doing blocking operation

--- a/jdk/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c	Fri May 05 17:48:44 2017 +0200
+++ b/jdk/src/java.base/solaris/native/libnio/ch/DevPollArrayWrapper.c	Thu May 11 17:55:05 2017 -0700
@@ -28,7 +28,7 @@
 #include "jvm.h"
 #include "jlong.h"
 #include "sun_nio_ch_DevPollArrayWrapper.h"
-#include <sys/poll.h>
+#include <poll.h>
 #include <unistd.h>
 #include <sys/time.h>
 

--- a/jdk/src/java.base/unix/native/include/jvm_md.h	Fri May 05 17:48:44 2017 +0200
+++ b/jdk/src/java.base/unix/native/include/jvm_md.h	Thu May 11 17:55:05 2017 -0700
@@ -65,7 +65,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <sys/signal.h>
+#include <signal.h>
 
 /* O Flags */
 

--- a/jdk/src/java.base/unix/native/libnet/net_util_md.h	Fri May 05 17:48:44 2017 +0200
+++ b/jdk/src/java.base/unix/native/libnet/net_util_md.h	Thu May 11 17:55:05 2017 -0700
@@ -27,7 +27,7 @@
 #define NET_UTILS_MD_H
 
 #include <netdb.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/socket.h>
 
 /************************************************************************

--- a/jdk/src/java.base/unix/native/libnio/ch/NativeThread.c	Fri May 05 17:48:44 2017 +0200
+++ b/jdk/src/java.base/unix/native/libnio/ch/NativeThread.c	Thu May 11 17:55:05 2017 -0700
@@ -31,24 +31,21 @@
 #include "jlong.h"
 #include "sun_nio_ch_NativeThread.h"
 #include "nio_util.h"
+#include <signal.h>
 
 #ifdef __linux__
   #include <pthread.h>
-  #include <sys/signal.h>
   /* Also defined in net/linux_close.c */
   #define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
 #elif _AIX
   #include <pthread.h>
-  #include <sys/signal.h>
   /* Also defined in net/aix_close.c */
   #define INTERRUPT_SIGNAL (SIGRTMAX - 1)
 #elif __solaris__
   #include <thread.h>
-  #include <signal.h>
   #define INTERRUPT_SIGNAL (SIGRTMAX - 2)
 #elif _ALLBSD_SOURCE
   #include <pthread.h>
-  #include <signal.h>
   /* Also defined in net/bsd_close.c */
   #define INTERRUPT_SIGNAL SIGIO
 #else

--- a/jdk/src/java.base/unix/native/libnio/ch/Net.c	Fri May 05 17:48:44 2017 +0200
+++ b/jdk/src/java.base/unix/native/libnio/ch/Net.c	Thu May 11 17:55:05 2017 -0700
@@ -23,7 +23,7 @@
  * questions.
  */
 
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <string.h>

--- a/jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c	Fri May 05 17:48:44 2017 +0200
+++ b/jdk/src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c	Thu May 11 17:55:05 2017 -0700
@@ -37,7 +37,7 @@
 #include <thread.h>
 #else
 #include <pthread.h>
-#include <sys/poll.h>
+#include <poll.h>
 #endif
 
 #include "socket_md.h"