--- a/jdk/src/java.base/windows/native/libnet/SocketInputStream.c	Wed Oct 26 19:07:05 2016 -0700
+++ b/jdk/src/java.base/windows/native/libnet/SocketInputStream.c	Thu Oct 27 11:00:28 2016 +0200
@@ -22,24 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+#include <malloc.h>
 
-#include <windows.h>
-#include <winsock2.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <malloc.h>
-#include <sys/types.h>
+#include "net_util.h"
 
 #include "java_net_SocketInputStream.h"
 
-#include "net_util.h"
-#include "jni_util.h"
-
 /*************************************************************************
  * SocketInputStream
  */
-
 static jfieldID IO_fd_fdID;
 
 /*