From ebc5212dacd3db8f5315b5a2d676415848e936d5 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Sun, 28 Jun 2026 13:10:38 +0200
Subject: [PATCH] tidy-up: drop redundant includes

`sys/types.h` and `sys/socket.h` (non-Win32). They are included via
`curl/curl.h` and `curl_setup.h`.

This drops `HAVE_SYS_TYPES_H` guards from the codebase. It's safe
because `sys/types.h` (POSIX) is already required unconditionally by
`curl/curl.h`. It remains used in feature checks by both autotools and
cmake; to be reviewed in a future step.

Closes #22374
---
 lib/curl_setup.h       | 9 ++++-----
 lib/file.c             | 4 ----
 lib/vtls/vtls.c        | 4 ----
 lib/vtls/vtls_config.c | 4 ----
 lib/vtls/vtls_scache.c | 4 ----
 src/tool_xattr.h       | 1 -
 tests/unit/unit1961.c  | 6 ------
 7 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 00e4694bc7..c8743108bd 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -506,12 +506,15 @@
 #endif
 
 #include <limits.h>
+/* Include after setting system macros that may affect type sizes
+   (e.g. 'off_t' or 'time_t'), or suppress warnings
+   (e.g. '_CRT_SECURE_NO_WARNINGS`), but before including sys/stat.h */
+#include <sys/types.h>
 
 #ifdef _WIN32
 #  ifdef HAVE_IO_H
 #  include <io.h>
 #  endif
-#  include <sys/types.h>
 #  include <sys/stat.h>
    /* Large file (>2Gb) support using Win32 functions. */
 #  define curl_lseek                      _lseeki64
@@ -830,10 +833,6 @@
 #include <time.h>
 #include <errno.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #include <sys/stat.h>
 
 #if !defined(_WIN32) || defined(__MINGW32__)
diff --git a/lib/file.c b/lib/file.c
index 9c151643f9..979204bf44 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -47,10 +47,6 @@
 #include <sys/param.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #ifdef HAVE_DIRENT_H
 #include <dirent.h>
 #endif
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 167c65763e..2da004adba 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -40,10 +40,6 @@
 
 #include "curl_setup.h"
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #include "urldata.h"
 #include "cfilters.h"
 #include "cf-dns.h"
diff --git a/lib/vtls/vtls_config.c b/lib/vtls/vtls_config.c
index 3e26e0bc8c..252c5ad885 100644
--- a/lib/vtls/vtls_config.c
+++ b/lib/vtls/vtls_config.c
@@ -40,10 +40,6 @@
 
 #include "curl_setup.h"
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #include "urldata.h"
 #include "setopt.h"
 #include "strcase.h"
diff --git a/lib/vtls/vtls_scache.c b/lib/vtls/vtls_scache.c
index 3c0881262f..3a4c467699 100644
--- a/lib/vtls/vtls_scache.c
+++ b/lib/vtls/vtls_scache.c
@@ -25,10 +25,6 @@
 
 #ifdef USE_SSL
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #include "urldata.h"
 #include "cfilters.h"
 
diff --git a/src/tool_xattr.h b/src/tool_xattr.h
index f2ccfe209a..0795ba8a67 100644
--- a/src/tool_xattr.h
+++ b/src/tool_xattr.h
@@ -30,7 +30,6 @@
 #  define USE_XATTR
 #elif (defined(__FreeBSD_version) && (__FreeBSD_version > 500000)) || \
   defined(__MidnightBSD_version)
-#  include <sys/types.h>
 #  include <sys/extattr.h>
 #  define USE_XATTR
 #elif defined(_WIN32)
diff --git a/tests/unit/unit1961.c b/tests/unit/unit1961.c
index 135386256a..338eeb176b 100644
--- a/tests/unit/unit1961.c
+++ b/tests/unit/unit1961.c
@@ -23,12 +23,6 @@
  ***************************************************************************/
 #include "unitcheck.h"
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifndef _WIN32
-#include <sys/socket.h>
-#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif