windows: delete redundant headers

`winsock2.h` pulls in `windows.h`. `ws2tcpip.h` pulls in `winsock2.h`.
`winsock2.h` and `ws2tcpip.h` are also pulled by `curl/curl.h`.

Keep only those headers that are not already included, or the code under
it uses something from that specific header.

Closes #12539

diff --git a/CMake/CurlTests.c b/CMake/CurlTests.c
index e00acc542eca4485e3fe0adbfcaf9eb434210a49..83d743d34e41cec77ebdb4be8aafb7f9fb4a6b35 100644 (file)
--- a/CMake/CurlTests.c
+++ b/CMake/CurlTests.c
@@ -169,7 +169,6 @@ int main(void) { ; return 0; }
 #    define WIN32_LEAN_AND_MEAN
 #  endif
 #  include <winsock2.h>
-#  include <windows.h>
 #endif
 int main(void)
 {
@@ -189,7 +188,6 @@ int main(void)
 #    define WIN32_LEAN_AND_MEAN
 #  endif
 #  include <winsock2.h>
-#  include <windows.h>
 #endif
 int main(void)
 {
@@ -208,7 +206,6 @@ int main(void)
 #    define WIN32_LEAN_AND_MEAN
 #  endif
 #  include <winsock2.h>
-#  include <windows.h>
 #endif
 int main(void)
 {
@@ -228,7 +225,6 @@ int main(void)
 #    define WIN32_LEAN_AND_MEAN
 #  endif
 #  include <winsock2.h>
-#  include <windows.h>
 #endif
 int main(void)
 {
@@ -304,7 +300,6 @@ int main(void)
 #    define WIN32_LEAN_AND_MEAN
 #  endif
 #  include <winsock2.h>
-#  include <windows.h>
 #endif
 /* includes start */
 #ifdef HAVE_SYS_TYPES_H

diff --git a/acinclude.m4 b/acinclude.m4
index 96187ade14ecc42897422b11257a0679819f41c1..a44ae350e3609db6e7c167b29a513dfa9c671674 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -589,7 +589,6 @@ AC_DEFUN([TYPE_SOCKADDR_STORAGE],
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <winsock2.h>
-#include <windows.h>
 #else
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -625,7 +624,6 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <winsock2.h>
-#include <windows.h>
 #else
 $curl_includes_bsdsocket
 #ifdef HAVE_SYS_TYPES_H
@@ -674,7 +672,6 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <winsock2.h>
-#include <windows.h>
 #else
 $curl_includes_bsdsocket
 #ifdef HAVE_SYS_TYPES_H
@@ -719,7 +716,6 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <winsock2.h>
-#include <windows.h>
 #else
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -762,7 +758,6 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <winsock2.h>
-#include <windows.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -815,7 +810,6 @@ AC_DEFUN([TYPE_IN_ADDR_T], [
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <winsock2.h>
-#include <windows.h>
 #else
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -855,7 +849,6 @@ AC_DEFUN([TYPE_IN_ADDR_T], [
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <winsock2.h>
-#include <windows.h>
 #else
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -1134,7 +1127,6 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <winsock2.h>
-#include <windows.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/configure.ac b/configure.ac
index e809502dfa87cb8dd3504d6cc9fed8faf99ee5fa..3e89da9f328ef9d39d162fcd6735be695186c881 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1125,7 +1125,6 @@ then
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <winsock2.h>
-#include <windows.h>
 #endif
         ]],[[
           gethostbyname("localhost");

diff --git a/docs/examples/externalsocket.c b/docs/examples/externalsocket.c
index 6c9540a6dbe2945780468fa5e8bfd2d5007d2e5e..9c343734436be4a5b7a347963ca3d7ad3c3774d1 100644 (file)
--- a/docs/examples/externalsocket.c
+++ b/docs/examples/externalsocket.c
@@ -32,8 +32,6 @@
 
 #ifdef _WIN32
 #include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windows.h>
 #define close closesocket
 #else
 #include <sys/types.h>        /*  socket types              */

diff --git a/docs/examples/synctime.c b/docs/examples/synctime.c
index fcf25d94111b1a4a7e748ffc8a8d47f5513930a4..2d7d523d50d3e5eb9c78a839006c7495e17c881d 100644 (file)
--- a/docs/examples/synctime.c
+++ b/docs/examples/synctime.c
@@ -91,11 +91,11 @@
 
 #include <stdio.h>
 #include <time.h>
-#ifndef __CYGWIN__
-#include <winsock2.h>
+#include <curl/curl.h>
+
+#ifdef _WIN32
 #include <windows.h>
 #endif
-#include <curl/curl.h>
 
 
 #define MAX_STRING              256

diff --git a/lib/inet_pton.h b/lib/inet_pton.h
index a6d161a9996dedb7731039f6f40d432a71e49224..f8562fa8a7aa0dd9139cb33ffae3b7b13ec1a713 100644 (file)
--- a/lib/inet_pton.h
+++ b/lib/inet_pton.h
@@ -31,9 +31,6 @@ int Curl_inet_pton(int, const char *, void *);
 #ifdef HAVE_INET_PTON
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
-#elif defined(USE_WINSOCK)
-/* inet_pton() exists in Vista or later */
-#include <ws2tcpip.h>
 #endif
 #define Curl_inet_pton(x,y,z) inet_pton(x,y,z)
 #endif

diff --git a/lib/socketpair.c b/lib/socketpair.c
index e3d40ff94ebe904d3ac98913cd569aeb60c4edfc..d01b255134a6f3a590037586c4d9b00127800324 100644 (file)
--- a/lib/socketpair.c
+++ b/lib/socketpair.c
@@ -33,9 +33,6 @@
  * This is a socketpair() implementation for Windows.
  */
 #include <string.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windows.h>
 #include <io.h>
 #else
 #ifdef HAVE_NETDB_H

diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4
index 18147e4cac66f8bab4b8237405ddfcb8f7a896c4..425d9f96f8d7847f02c28ceb2ab3ec45e43069fa 100644 (file)
--- a/m4/curl-functions.m4
+++ b/m4/curl-functions.m4
@@ -419,7 +419,6 @@ curl_includes_winsock2="\
 #    define WIN32_LEAN_AND_MEAN
 #  endif
 #  include <winsock2.h>
-#  include <windows.h>
 #endif
 /* includes end */"
   CURL_CHECK_NATIVE_WINDOWS
@@ -440,7 +439,6 @@ curl_includes_ws2tcpip="\
 #  endif
 #  include <winsock2.h>
 #  include <ws2tcpip.h>
-#  include <windows.h>
 #endif
 /* includes end */"
   CURL_CHECK_NATIVE_WINDOWS

diff --git a/tests/libtest/lib1960.c b/tests/libtest/lib1960.c
index b01370e6e70be8889e489903492d0e3739049233..9b82128e9be5f09d7049726c16957a6564d823a0 100644 (file)
--- a/tests/libtest/lib1960.c
+++ b/tests/libtest/lib1960.c
@@ -25,12 +25,6 @@
 
 #ifdef HAVE_INET_PTON
 
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windows.h>
-#endif
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif