diff --git a/lib/altsvc.c b/lib/altsvc.c
index 97b4c927d0..df6b2a05f6 100644
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -28,7 +28,6 @@
 #include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_ALTSVC)
-#include <curl/curl.h>
 #include "urldata.h"
 #include "altsvc.h"
 #include "curl_fopen.h"
diff --git a/lib/altsvc.h b/lib/altsvc.h
index c6f1b902c7..b82eaa8f71 100644
--- a/lib/altsvc.h
+++ b/lib/altsvc.h
@@ -26,7 +26,6 @@
 #include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_ALTSVC)
-#include <curl/curl.h>
 #include "llist.h"
 
 struct althost {
diff --git a/lib/amigaos.c b/lib/amigaos.c
index d4c1c2c856..4e5960b8f5 100644
--- a/lib/amigaos.c
+++ b/lib/amigaos.c
@@ -26,8 +26,6 @@
 
 #ifdef __AMIGA__
 
-#include <curl/curl.h>
-
 #include "hostip.h"
 #include "amigaos.h"
 
diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 8bf0c94820..49515c8468 100644
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -32,7 +32,6 @@
  * as defined in asyn.h, nothing else belongs in this file!
  **********************************************************************/
 
-#include <limits.h>
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
diff --git a/lib/bufq.h b/lib/bufq.h
index 112388a6bf..bcd7df2ab9 100644
--- a/lib/bufq.h
+++ b/lib/bufq.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 /**
  * A chunk of bytes for reading and writing.
  * The size is fixed a creation with read and write offset
diff --git a/lib/cf-h1-proxy.c b/lib/cf-h1-proxy.c
index b00061c3d0..c865a36122 100644
--- a/lib/cf-h1-proxy.c
+++ b/lib/cf-h1-proxy.c
@@ -26,7 +26,6 @@
 
 #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "curlx/dynbuf.h"
 #include "sendf.h"
diff --git a/lib/cf-h2-proxy.c b/lib/cf-h2-proxy.c
index 37af4e19d7..ff4e8dd938 100644
--- a/lib/cf-h2-proxy.c
+++ b/lib/cf-h2-proxy.c
@@ -28,6 +28,7 @@
   defined(USE_NGHTTP2)
 
 #include <nghttp2/nghttp2.h>
+
 #include "urldata.h"
 #include "url.h"
 #include "cfilters.h"
diff --git a/lib/cf-haproxy.c b/lib/cf-haproxy.c
index fa934229ed..ea35f040a3 100644
--- a/lib/cf-haproxy.c
+++ b/lib/cf-haproxy.c
@@ -26,7 +26,6 @@
 
 #ifndef CURL_DISABLE_PROXY
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "cfilters.h"
 #include "cf-haproxy.h"
diff --git a/lib/cf-haproxy.h b/lib/cf-haproxy.h
index 9190dd5b57..da9920fd89 100644
--- a/lib/cf-haproxy.h
+++ b/lib/cf-haproxy.h
@@ -25,6 +25,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "urldata.h"
 
 #ifndef CURL_DISABLE_PROXY
diff --git a/lib/cf-https-connect.c b/lib/cf-https-connect.c
index 849b45c773..4882f28c4b 100644
--- a/lib/cf-https-connect.c
+++ b/lib/cf-https-connect.c
@@ -27,7 +27,6 @@
 #ifndef CURL_DISABLE_HTTP
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "curl_trc.h"
 #include "cfilters.h"
 #include "connect.h"
diff --git a/lib/conncache.c b/lib/conncache.c
index 7d54042fa5..87d6a12fc8 100644
--- a/lib/conncache.c
+++ b/lib/conncache.c
@@ -25,8 +25,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "url.h"
 #include "cfilters.h"
diff --git a/lib/conncache.h b/lib/conncache.h
index b1a8aeaf09..fabb967bd0 100644
--- a/lib/conncache.h
+++ b/lib/conncache.h
@@ -25,7 +25,6 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
 #include "curlx/timeval.h"
 
 struct connectdata;
diff --git a/lib/content_encoding.c b/lib/content_encoding.c
index f0e527e8c4..50e82fab3c 100644
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@@ -25,8 +25,6 @@
 #include "curl_setup.h"
 
 #include "urldata.h"
-#include <curl/curl.h>
-#include <stddef.h>
 
 #ifdef HAVE_LIBZ
 #include <zlib.h>
diff --git a/lib/cookie.h b/lib/cookie.h
index 03877e509f..cbc7b748fc 100644
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "llist.h"
 
 struct Cookie {
diff --git a/lib/cshutdn.c b/lib/cshutdn.c
index 4a403b261e..89d2ba69cc 100644
--- a/lib/cshutdn.c
+++ b/lib/cshutdn.c
@@ -25,8 +25,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "url.h"
 #include "cfilters.h"
diff --git a/lib/cshutdn.h b/lib/cshutdn.h
index 510d5bf506..793b4c6c2c 100644
--- a/lib/cshutdn.h
+++ b/lib/cshutdn.h
@@ -25,7 +25,6 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
 #include "curlx/timeval.h"
 
 struct connectdata;
diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 7993631bf1..27282dd9f9 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
@@ -47,7 +45,7 @@
 #  include <inet.h>
 #endif
 
-#include <stddef.h>
+#include <stddef.h>  /* for offsetof() */
 
 #include "curl_addrinfo.h"
 #include "fake_addrinfo.h"
diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c
index 918be89d4b..d61e7d43bc 100644
--- a/lib/curl_fnmatch.c
+++ b/lib/curl_fnmatch.c
@@ -24,7 +24,6 @@
 
 #include "curl_setup.h"
 #ifndef CURL_DISABLE_FTP
-#include <curl/curl.h>
 
 #include "curl_fnmatch.h"
 
diff --git a/lib/curl_gssapi.h b/lib/curl_gssapi.h
index 6df7e059d3..d4fbf5c240 100644
--- a/lib/curl_gssapi.h
+++ b/lib/curl_gssapi.h
@@ -25,6 +25,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "urldata.h"
 
 #ifdef HAVE_GSSAPI
diff --git a/lib/curl_hmac.h b/lib/curl_hmac.h
index 5444d62bd2..4759ff6ec6 100644
--- a/lib/curl_hmac.h
+++ b/lib/curl_hmac.h
@@ -28,8 +28,6 @@
   !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) ||   \
   defined(USE_LIBSSH2) || defined(USE_SSL)
 
-#include <curl/curl.h>
-
 #define HMAC_MD5_LENGTH 16
 
 typedef CURLcode (*HMAC_hinit)(void *context);
diff --git a/lib/curl_md4.h b/lib/curl_md4.h
index f103d38b41..9d4a12ed3d 100644
--- a/lib/curl_md4.h
+++ b/lib/curl_md4.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include <curl/curl.h>
 
 #ifdef USE_CURL_NTLM_CORE
 
diff --git a/lib/curl_memrchr.c b/lib/curl_memrchr.c
index d8b4eef9f4..27f5fc01ba 100644
--- a/lib/curl_memrchr.c
+++ b/lib/curl_memrchr.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "curl_memrchr.h"
 
 #ifndef HAVE_MEMRCHR
diff --git a/lib/curl_memrchr.h b/lib/curl_memrchr.h
index 8e5d17708b..2ee65f3c0b 100644
--- a/lib/curl_memrchr.h
+++ b/lib/curl_memrchr.h
@@ -28,7 +28,6 @@
 
 #ifdef HAVE_MEMRCHR
 
-#include <string.h>
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif
diff --git a/lib/curl_range.c b/lib/curl_range.c
index 4f78868813..c4118b07d9 100644
--- a/lib/curl_range.c
+++ b/lib/curl_range.c
@@ -23,9 +23,9 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include <curl/curl.h>
+
 #include "curl_range.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "curlx/strparse.h"
 
 /* Only include this function if one or more of FTP, FILE are enabled. */
diff --git a/lib/curl_range.h b/lib/curl_range.h
index 77679e2b94..842ada9ab1 100644
--- a/lib/curl_range.h
+++ b/lib/curl_range.h
@@ -25,6 +25,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "urldata.h"
 
 CURLcode Curl_range(struct Curl_easy *data);
diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index 45a50674f5..90f8f6bbc8 100644
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -35,7 +35,7 @@
 #include "transfer.h"
 #include "bufref.h"
 #include "curlx/warnless.h"
-#include <curl/curl.h>
+
 #include <librtmp/rtmp.h>
 
 #if defined(USE_WINSOCK) || defined(LWIP_SO_SNDRCVTIMEO_NONSTANDARD)
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 054dc7c415..67925a523c 100644
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -39,9 +39,7 @@
   !defined(CURL_DISABLE_POP3) || \
   (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
 
-#include <curl/curl.h>
 #include "urldata.h"
-
 #include "curlx/base64.h"
 #include "vauth/vauth.h"
 #include "cfilters.h"
diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h
index 0674d56f86..0632e09ebd 100644
--- a/lib/curl_sasl.h
+++ b/lib/curl_sasl.h
@@ -24,8 +24,6 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
-
 #include "bufref.h"
 
 struct Curl_easy;
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index d487bfdff9..9a9596ea69 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -924,7 +924,7 @@ extern curl_calloc_callback Curl_ccalloc;
     (ptr) = NULL;          \
   } while(0)
 
-#include <curl/curl.h> /* for CURL_EXTERN, mprintf.h */
+#include <curl/curl.h> /* for CURL_EXTERN, curl_socket_t, mprintf.h */
 
 #ifdef CURLDEBUG
 #ifdef __clang__
diff --git a/lib/curl_setup_once.h b/lib/curl_setup_once.h
index 898b9a61ad..06ccc98639 100644
--- a/lib/curl_setup_once.h
+++ b/lib/curl_setup_once.h
@@ -28,7 +28,6 @@
  * Inclusion of common header files.
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/lib/curl_sha256.h b/lib/curl_sha256.h
index caa5080b3f..99a87b290b 100644
--- a/lib/curl_sha256.h
+++ b/lib/curl_sha256.h
@@ -25,10 +25,11 @@
  *
  ***************************************************************************/
 
+#include "curl_setup.h"
+
 #if !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) || \
   defined(USE_LIBSSH2) || defined(USE_SSL)
 
-#include <curl/curl.h>
 #include "curl_hmac.h"
 
 extern const struct HMAC_params Curl_HMAC_SHA256;
diff --git a/lib/curl_sha512_256.c b/lib/curl_sha512_256.c
index 78f60dfc26..df6aa05996 100644
--- a/lib/curl_sha512_256.c
+++ b/lib/curl_sha512_256.c
@@ -65,7 +65,6 @@
             (__NetBSD_Version__ >= 1099000000 &&  \
              __NetBSD_Version__ <  1099001100)
 #          define NEED_NETBSD_SHA512_256_WORKAROUND 1
-#          include <string.h>
 #        endif
 #      endif
 #    endif
diff --git a/lib/curl_sha512_256.h b/lib/curl_sha512_256.h
index c22491ddc0..0efcb27f3b 100644
--- a/lib/curl_sha512_256.h
+++ b/lib/curl_sha512_256.h
@@ -24,9 +24,10 @@
  *
  ***************************************************************************/
 
+#include "curl_setup.h"
+
 #if !defined(CURL_DISABLE_DIGEST_AUTH) && !defined(CURL_DISABLE_SHA512_256)
 
-#include <curl/curl.h>
 #include "curl_hmac.h"
 
 #define CURL_HAVE_SHA512_256
diff --git a/lib/curl_share.c b/lib/curl_share.c
index 109fe76b66..a458fb1a8e 100644
--- a/lib/curl_share.c
+++ b/lib/curl_share.c
@@ -24,7 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "connect.h"
 #include "curl_share.h"
diff --git a/lib/curl_share.h b/lib/curl_share.h
index 0699356dd4..25d67ce1d9 100644
--- a/lib/curl_share.h
+++ b/lib/curl_share.h
@@ -25,7 +25,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include <curl/curl.h>
+
 #include "cookie.h"
 #include "psl.h"
 #include "urldata.h"
diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index 35a9bc33e6..c652c9c9a4 100644
--- a/lib/curl_sspi.c
+++ b/lib/curl_sspi.c
@@ -26,7 +26,6 @@
 
 #ifdef USE_WINDOWS_SSPI
 
-#include <curl/curl.h>
 #include "curl_sspi.h"
 #include "strdup.h"
 #include "curlx/multibyte.h"
diff --git a/lib/curl_sspi.h b/lib/curl_sspi.h
index 89ebc9b0ba..46dc6faaa2 100644
--- a/lib/curl_sspi.h
+++ b/lib/curl_sspi.h
@@ -28,8 +28,6 @@
 
 #ifdef USE_WINDOWS_SSPI
 
-#include <curl/curl.h>
-
 /*
  * When including the following three headers, it is mandatory to define either
  * SECURITY_WIN32 or SECURITY_KERNEL, indicating who is compiling the code.
diff --git a/lib/curl_threads.c b/lib/curl_threads.c
index e4536078be..9e4bbc96ec 100644
--- a/lib/curl_threads.c
+++ b/lib/curl_threads.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
 #include <pthread.h>
 #endif
diff --git a/lib/curl_trc.c b/lib/curl_trc.c
index 5c15dcdc97..97a4c23960 100644
--- a/lib/curl_trc.c
+++ b/lib/curl_trc.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "curl_trc.h"
 #include "urldata.h"
 #include "cfilters.h"
diff --git a/lib/curlx/base64.c b/lib/curlx/base64.c
index 6ea1e425b4..e7d2defa03 100644
--- a/lib/curlx/base64.c
+++ b/lib/curlx/base64.c
@@ -26,7 +26,6 @@
 
 #include "../curl_setup.h"
 
-#include <curl/curl.h>
 #include "warnless.h"
 #include "base64.h"
 
diff --git a/lib/curlx/dynbuf.h b/lib/curlx/dynbuf.h
index 683b484610..6f09e1322e 100644
--- a/lib/curlx/dynbuf.h
+++ b/lib/curlx/dynbuf.h
@@ -24,8 +24,6 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
-
 struct dynbuf {
   char *bufr;    /* point to a null-terminated allocated buffer */
   size_t leng;   /* number of bytes *EXCLUDING* the null-terminator */
diff --git a/lib/curlx/nonblock.h b/lib/curlx/nonblock.h
index 4a1a6151f2..ee2cd286a7 100644
--- a/lib/curlx/nonblock.h
+++ b/lib/curlx/nonblock.h
@@ -24,8 +24,6 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h> /* for curl_socket_t */
-
 int curlx_nonblock(curl_socket_t sockfd,    /* operate on this */
                    int nonblock   /* TRUE or FALSE */);
 
diff --git a/lib/curlx/strerr.c b/lib/curlx/strerr.c
index 70ad1fb813..a971875a69 100644
--- a/lib/curlx/strerr.c
+++ b/lib/curlx/strerr.c
@@ -32,8 +32,6 @@
 #  endif
 #endif
 
-#include <curl/curl.h>
-
 #include "winapi.h"
 #include "snprintf.h"
 #include "strerr.h"
diff --git a/lib/curlx/strparse.c b/lib/curlx/strparse.c
index c5a3ed2102..e75173c69b 100644
--- a/lib/curlx/strparse.c
+++ b/lib/curlx/strparse.c
@@ -24,10 +24,6 @@
 
 #include "strparse.h"
 
-#ifndef WITHOUT_LIBCURL
-#include <curl/curl.h>  /* for curl_strnequal() */
-#endif
-
 void curlx_str_init(struct Curl_str *out)
 {
   out->str = NULL;
diff --git a/lib/curlx/timediff.c b/lib/curlx/timediff.c
index d8baabe63e..58a4dfd303 100644
--- a/lib/curlx/timediff.c
+++ b/lib/curlx/timediff.c
@@ -24,8 +24,6 @@
 
 #include "timediff.h"
 
-#include <limits.h>
-
 /*
  * Converts number of milliseconds into a timeval structure.
  *
diff --git a/lib/curlx/timeval.c b/lib/curlx/timeval.c
index 2f52515c28..08cc2aba5e 100644
--- a/lib/curlx/timeval.c
+++ b/lib/curlx/timeval.c
@@ -26,7 +26,6 @@
 
 #ifdef _WIN32
 
-#include <curl/curl.h>
 #include "version_win32.h"
 #include "../system_win32.h"
 
diff --git a/lib/curlx/version_win32.c b/lib/curlx/version_win32.c
index 9ab72c2fd5..c8d45bb147 100644
--- a/lib/curlx/version_win32.c
+++ b/lib/curlx/version_win32.c
@@ -26,7 +26,6 @@
 
 #ifdef _WIN32
 
-#include <curl/curl.h>
 #include "version_win32.h"
 #include "warnless.h"
 
diff --git a/lib/curlx/wait.c b/lib/curlx/wait.c
index f1dd6e7a7e..f42041961b 100644
--- a/lib/curlx/wait.c
+++ b/lib/curlx/wait.c
@@ -28,8 +28,6 @@
 #error "We cannot compile without select() support."
 #endif
 
-#include <limits.h>
-
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #elif defined(HAVE_UNISTD_H)
diff --git a/lib/curlx/warnless.c b/lib/curlx/warnless.c
index 45442bd462..1b3d88481a 100644
--- a/lib/curlx/warnless.c
+++ b/lib/curlx/warnless.c
@@ -35,8 +35,6 @@
 
 #endif /* __INTEL_COMPILER && __unix__ */
 
-#include <limits.h>
-
 #define CURL_MASK_UCHAR   ((unsigned char)~0)
 
 #define CURL_MASK_USHORT  ((unsigned short)~0)
diff --git a/lib/curlx/warnless.h b/lib/curlx/warnless.h
index 5f324ac375..31b7dcd070 100644
--- a/lib/curlx/warnless.h
+++ b/lib/curlx/warnless.h
@@ -26,10 +26,6 @@
 
 #include "../curl_setup.h"
 
-#ifdef USE_WINSOCK
-#include <curl/curl.h> /* for curl_socket_t */
-#endif
-
 #define CURLX_FUNCTION_CAST(target_type, func) \
   (target_type)(void (*)(void))(func)
 
diff --git a/lib/cw-out.c b/lib/cw-out.c
index 74d396000c..3ca8f5203f 100644
--- a/lib/cw-out.c
+++ b/lib/cw-out.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "cfilters.h"
 #include "headers.h"
diff --git a/lib/cw-pause.c b/lib/cw-pause.c
index ce8b39b64d..3b5b4c6fa2 100644
--- a/lib/cw-pause.c
+++ b/lib/cw-pause.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "bufq.h"
 #include "cfilters.h"
diff --git a/lib/dict.c b/lib/dict.c
index a04bb8d4fe..2e5883770f 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -53,7 +53,6 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "escape.h"
diff --git a/lib/dynhds.c b/lib/dynhds.c
index b6654114d6..d0a3eb6a74 100644
--- a/lib/dynhds.c
+++ b/lib/dynhds.c
@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "dynhds.h"
 #include "strcase.h"
 
diff --git a/lib/dynhds.h b/lib/dynhds.h
index d405a60c21..170721cf78 100644
--- a/lib/dynhds.h
+++ b/lib/dynhds.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
 #include "curlx/dynbuf.h"
 
 struct dynbuf;
diff --git a/lib/easy.c b/lib/easy.c
index e100a36ea0..2bd91da79b 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -45,7 +45,6 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "vtls/vtls.h"
 #include "vtls/vtls_scache.h"
diff --git a/lib/easygetopt.c b/lib/easygetopt.c
index 7ac39bc634..8eb96ebd17 100644
--- a/lib/easygetopt.c
+++ b/lib/easygetopt.c
@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "easyoptions.h"
 
 #ifndef CURL_DISABLE_GETOPTIONS
diff --git a/lib/easyoptions.c b/lib/easyoptions.c
index 4bd8457f75..4c0b4f0ce4 100644
--- a/lib/easyoptions.c
+++ b/lib/easyoptions.c
@@ -25,6 +25,7 @@
 /* This source code is generated by optiontable.pl - DO NOT EDIT BY HAND */
 
 #include "curl_setup.h"
+
 #include "easyoptions.h"
 
 /* all easy setopt options listed in alphabetical order */
diff --git a/lib/easyoptions.h b/lib/easyoptions.h
index 44b6a8280a..e908d15bed 100644
--- a/lib/easyoptions.h
+++ b/lib/easyoptions.h
@@ -26,8 +26,6 @@
 
 /* should probably go into the public header */
 
-#include <curl/curl.h>
-
 /* generated table with all easy options */
 extern const struct curl_easyoption Curl_easyopts[];
 
diff --git a/lib/escape.c b/lib/escape.c
index 3e49701bcb..bd10965380 100644
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -27,8 +27,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 struct Curl_easy;
 
 #include "urldata.h"
diff --git a/lib/fake_addrinfo.c b/lib/fake_addrinfo.c
index f771c29009..d4173dbaa2 100644
--- a/lib/fake_addrinfo.c
+++ b/lib/fake_addrinfo.c
@@ -23,12 +23,11 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "fake_addrinfo.h"
 
 #ifdef USE_FAKE_GETADDRINFO
 
-#include <string.h>
-#include <stdlib.h>
 #include <ares.h>
 
 void r_freeaddrinfo(struct addrinfo *cahead)
diff --git a/lib/fake_addrinfo.h b/lib/fake_addrinfo.h
index 13b0d71dba..4612aa02cb 100644
--- a/lib/fake_addrinfo.h
+++ b/lib/fake_addrinfo.h
@@ -31,7 +31,7 @@
 #endif
 
 #if defined(CURLDEBUG) && defined(USE_ARES) && defined(HAVE_GETADDRINFO) && \
-  (ARES_VERSION >= 0x011a00) /* >= 1.26. 0 */
+  (ARES_VERSION >= 0x011a00) /* >= 1.26.0 */
 #define USE_FAKE_GETADDRINFO 1
 #endif
 
diff --git a/lib/file.c b/lib/file.c
index 9d303d4cc3..d85acb32c7 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -55,7 +55,6 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "progress.h"
 #include "sendf.h"
 #include "escape.h"
diff --git a/lib/fileinfo.h b/lib/fileinfo.h
index 6746ee2575..a17b8d3426 100644
--- a/lib/fileinfo.h
+++ b/lib/fileinfo.h
@@ -24,7 +24,8 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include "curl_setup.h"
+
 #include "llist.h"
 #include "curlx/dynbuf.h"
 
diff --git a/lib/formdata.c b/lib/formdata.c
index 8f95fc3df0..af3ff8bde5 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -24,11 +24,10 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 struct Curl_easy;
 
 #include "formdata.h"
+
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_FORM_API)
 
 #include "urldata.h" /* for struct Curl_easy */
diff --git a/lib/ftp.c b/lib/ftp.c
index f84ac839f7..3db88a899d 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -40,7 +40,6 @@
 #include <inet.h>
 #endif
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "if2ip.h"
diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c
index 5a11946137..5836f1cec3 100644
--- a/lib/ftplistparser.c
+++ b/lib/ftplistparser.c
@@ -41,8 +41,6 @@
 
 #ifndef CURL_DISABLE_FTP
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "fileinfo.h"
 #include "llist.h"
diff --git a/lib/getenv.c b/lib/getenv.c
index e10688adb3..1955649ace 100644
--- a/lib/getenv.c
+++ b/lib/getenv.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 char *curl_getenv(const char *variable)
 {
 #if defined(CURL_WINDOWS_UWP) || \
diff --git a/lib/getinfo.c b/lib/getinfo.c
index a4ea3b7931..1f429b2227 100644
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "getinfo.h"
 #include "cfilters.h"
diff --git a/lib/gopher.c b/lib/gopher.c
index 85ca211466..c272d32b46 100644
--- a/lib/gopher.c
+++ b/lib/gopher.c
@@ -27,7 +27,6 @@
 #ifndef CURL_DISABLE_GOPHER
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "cfilters.h"
diff --git a/lib/hash.c b/lib/hash.c
index 84230121a0..9ef80dffe9 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "hash.h"
 
 /* random patterns for API verification */
diff --git a/lib/hash.h b/lib/hash.h
index 8dfef0d912..f669fa5801 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -26,8 +26,6 @@
 
 #include "curl_setup.h"
 
-#include <stddef.h>
-
 /* Hash function prototype */
 typedef size_t (*hash_function)(void *key,
                                 size_t key_length,
diff --git a/lib/hmac.c b/lib/hmac.c
index fdde197175..b4ee071ad1 100644
--- a/lib/hmac.c
+++ b/lib/hmac.c
@@ -30,8 +30,6 @@
   !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) ||   \
   defined(USE_SSL)
 
-#include <curl/curl.h>
-
 #include "curl_hmac.h"
 #include "curlx/warnless.h"
 
diff --git a/lib/hostip.h b/lib/hostip.h
index 8b3b962078..8964d29af9 100644
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -25,6 +25,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "hash.h"
 #include "curl_addrinfo.h"
 #include "curlx/timeval.h" /* for timediff_t */
diff --git a/lib/hsts.c b/lib/hsts.c
index e1f527dbf9..2dd22a8568 100644
--- a/lib/hsts.c
+++ b/lib/hsts.c
@@ -28,7 +28,6 @@
 #include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HSTS)
-#include <curl/curl.h>
 #include "urldata.h"
 #include "llist.h"
 #include "hsts.h"
diff --git a/lib/hsts.h b/lib/hsts.h
index bd6ebba4de..e2c9922f18 100644
--- a/lib/hsts.h
+++ b/lib/hsts.h
@@ -26,7 +26,6 @@
 #include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HSTS)
-#include <curl/curl.h>
 #include "llist.h"
 
 #if defined(DEBUGBUILD) || defined(UNITTESTS)
diff --git a/lib/http.c b/lib/http.c
index d0f044bf3c..d51c1dc402 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -48,7 +48,6 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "formdata.h"
diff --git a/lib/http1.c b/lib/http1.c
index 693a0dd7ef..e12dd32c5a 100644
--- a/lib/http1.c
+++ b/lib/http1.c
@@ -27,7 +27,6 @@
 #ifndef CURL_DISABLE_HTTP
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "http.h"
 #include "http1.h"
 #include "urlapi-int.h"
diff --git a/lib/http2.c b/lib/http2.c
index d547cf4894..442c424d74 100644
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -27,6 +27,7 @@
 #if !defined(CURL_DISABLE_HTTP) && defined(USE_NGHTTP2)
 #include <stdint.h>
 #include <nghttp2/nghttp2.h>
+
 #include "urldata.h"
 #include "bufq.h"
 #include "uint-hash.h"
@@ -3045,7 +3046,6 @@ void *Curl_nghttp2_realloc(void *ptr, size_t size, void *user_data)
 #else /* CURL_DISABLE_HTTP || !USE_NGHTTP2 */
 
 /* Satisfy external references even if http2 is not compiled in. */
-#include <curl/curl.h>
 
 char *curl_pushheader_bynum(struct curl_pushheaders *h, size_t num)
 {
diff --git a/lib/http_aws_sigv4.c b/lib/http_aws_sigv4.c
index e815dac729..7bc3af8b42 100644
--- a/lib/http_aws_sigv4.c
+++ b/lib/http_aws_sigv4.c
@@ -36,11 +36,10 @@
 #include "escape.h"
 #include "curlx/strparse.h"
 #include "curlx/timeval.h"
+#include "slist.h"
 
 #include <time.h>
 
-#include "slist.h"
-
 #define HMAC_SHA256(k, kl, d, dl, o)                \
   do {                                              \
     result = Curl_hmacit(&Curl_HMAC_SHA256,         \
diff --git a/lib/http_aws_sigv4.h b/lib/http_aws_sigv4.h
index ea7651896e..a8aacefe5f 100644
--- a/lib/http_aws_sigv4.h
+++ b/lib/http_aws_sigv4.h
@@ -24,6 +24,7 @@
  *
  ***************************************************************************/
 #include "curl_setup.h"
+
 #include "curlx/dynbuf.h"
 #include "urldata.h"
 #include "curlx/strparse.h"
diff --git a/lib/http_chunks.h b/lib/http_chunks.h
index b84e479fcd..d8e5982e6d 100644
--- a/lib/http_chunks.h
+++ b/lib/http_chunks.h
@@ -23,6 +23,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_HTTP
 
diff --git a/lib/http_digest.h b/lib/http_digest.h
index 5f797310fd..46cffb0bda 100644
--- a/lib/http_digest.h
+++ b/lib/http_digest.h
@@ -23,6 +23,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
+
 #include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_DIGEST_AUTH)
diff --git a/lib/http_negotiate.h b/lib/http_negotiate.h
index ad7c43d833..8e56e9dea3 100644
--- a/lib/http_negotiate.h
+++ b/lib/http_negotiate.h
@@ -24,6 +24,8 @@
  *
  ***************************************************************************/
 
+#include "curl_setup.h"
+
 #if !defined(CURL_DISABLE_HTTP) && defined(USE_SPNEGO)
 
 /* this is for Negotiate header input */
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index aa5d467284..a28e832ba1 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -28,7 +28,6 @@
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
 
-#include <curl/curl.h>
 #include "sendf.h"
 #include "http.h"
 #include "url.h"
diff --git a/lib/idn.c b/lib/idn.c
index ae781d3ca6..62149cf84e 100644
--- a/lib/idn.c
+++ b/lib/idn.c
@@ -27,6 +27,7 @@
  */
 
 #include "curl_setup.h"
+
 #include "urldata.h"
 #include "idn.h"
 #include "sendf.h"
diff --git a/lib/imap.c b/lib/imap.c
index 3a317a963f..69fe30f5aa 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -36,7 +36,6 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include "curlx/dynbuf.h"
 
 #ifndef CURL_DISABLE_IMAP
 
@@ -54,7 +53,7 @@
 #include <inet.h>
 #endif
 
-#include <curl/curl.h>
+#include "curlx/dynbuf.h"
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"
diff --git a/lib/ldap.c b/lib/ldap.c
index b94fff34d8..7e8ffcae34 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -77,7 +77,6 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "cfilters.h"
 #include "sendf.h"
 #include "escape.h"
diff --git a/lib/llist.c b/lib/llist.c
index 3c70905df2..ce8e064280 100644
--- a/lib/llist.c
+++ b/lib/llist.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "llist.h"
 
 #ifdef DEBUGBUILD
diff --git a/lib/llist.h b/lib/llist.h
index 0a4a685163..d90dd68463 100644
--- a/lib/llist.h
+++ b/lib/llist.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include <stddef.h>
 
 typedef void (*Curl_llist_dtor)(void *user, void *elem);
 
diff --git a/lib/macos.c b/lib/macos.c
index daf2ab94f6..8c49a07b8d 100644
--- a/lib/macos.c
+++ b/lib/macos.c
@@ -26,8 +26,6 @@
 
 #ifdef CURL_MACOS_CALL_COPYPROXIES
 
-#include <curl/curl.h>
-
 #include "macos.h"
 
 #include <SystemConfiguration/SCDynamicStoreCopySpecific.h>
diff --git a/lib/md4.c b/lib/md4.c
index befaeab68b..044ceb066f 100644
--- a/lib/md4.c
+++ b/lib/md4.c
@@ -26,8 +26,6 @@
 
 #ifdef USE_CURL_NTLM_CORE
 
-#include <string.h>
-
 #include "curl_md4.h"
 #include "curlx/warnless.h"
 
diff --git a/lib/md5.c b/lib/md5.c
index e1a443c923..f6c330cfc6 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -27,9 +27,6 @@
 #if (defined(USE_CURL_NTLM_CORE) && !defined(USE_WINDOWS_SSPI)) || \
   !defined(CURL_DISABLE_DIGEST_AUTH)
 
-#include <string.h>
-#include <curl/curl.h>
-
 #include "curl_md5.h"
 #include "curl_hmac.h"
 #include "curlx/warnless.h"
diff --git a/lib/memdebug.c b/lib/memdebug.c
index 7587a1001c..b390e81dac 100644
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -26,7 +26,7 @@
 
 #ifdef CURLDEBUG
 
-#include <curl/curl.h>
+#include <stddef.h>  /* for offsetof() */
 
 #include "urldata.h"
 #include "curl_threads.h"
diff --git a/lib/mime.c b/lib/mime.c
index 4f01086c12..f772833d26 100644
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 struct Curl_easy;
 
 #include "mime.h"
diff --git a/lib/mprintf.c b/lib/mprintf.c
index 5c58e907b4..39f45901ed 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -23,6 +23,7 @@
  */
 
 #include "curl_setup.h"
+
 #include "curlx/dynbuf.h"
 #include "curl_printf.h"
 #include "curlx/strparse.h"
diff --git a/lib/mqtt.c b/lib/mqtt.c
index 9f73f90052..ae98cce258 100644
--- a/lib/mqtt.c
+++ b/lib/mqtt.c
@@ -28,7 +28,6 @@
 #ifndef CURL_DISABLE_MQTT
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "progress.h"
diff --git a/lib/multi.c b/lib/multi.c
index af8330b392..22e89bb750 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "transfer.h"
 #include "url.h"
diff --git a/lib/multi_ev.c b/lib/multi_ev.c
index d4e219dfa2..8e71716d70 100644
--- a/lib/multi_ev.c
+++ b/lib/multi_ev.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "url.h"
 #include "cfilters.h"
diff --git a/lib/multi_ntfy.c b/lib/multi_ntfy.c
index 3eb3b312ea..d4cdbe16c8 100644
--- a/lib/multi_ntfy.c
+++ b/lib/multi_ntfy.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "curl_trc.h"
 #include "multihandle.h"
diff --git a/lib/netrc.c b/lib/netrc.c
index d26d194fe2..fe0380066b 100644
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #ifndef CURL_DISABLE_NETRC
 
 #ifdef HAVE_PWD_H
@@ -35,7 +36,6 @@
 #endif
 #endif
 
-#include <curl/curl.h>
 #include "netrc.h"
 #include "strcase.h"
 #include "curl_get_line.h"
diff --git a/lib/netrc.h b/lib/netrc.h
index 81012d0d97..af07c812a5 100644
--- a/lib/netrc.h
+++ b/lib/netrc.h
@@ -25,6 +25,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #ifndef CURL_DISABLE_NETRC
 #include "curlx/dynbuf.h"
 
diff --git a/lib/noproxy.c b/lib/noproxy.c
index 86acf8ba2b..5c0c58530d 100644
--- a/lib/noproxy.c
+++ b/lib/noproxy.c
@@ -26,7 +26,6 @@
 
 #ifndef CURL_DISABLE_PROXY
 
-#include <curl/curl.h>  /* for curl_strnequal() */
 #include "curlx/inet_pton.h"
 #include "noproxy.h"
 #include "curlx/strparse.h"
diff --git a/lib/openldap.c b/lib/openldap.c
index a1756e4279..b33e7a1d36 100644
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -42,7 +42,6 @@
 
 #include "urldata.h"
 #include "url.h"
-#include <curl/curl.h>
 #include "sendf.h"
 #include "vtls/vtls.h"
 #include "transfer.h"
diff --git a/lib/optiontable.pl b/lib/optiontable.pl
index 5e0c720f04..1222536794 100755
--- a/lib/optiontable.pl
+++ b/lib/optiontable.pl
@@ -31,6 +31,7 @@ print <<HEAD
 /* This source code is generated by optiontable.pl - DO NOT EDIT BY HAND */
 
 #include "curl_setup.h"
+
 #include "easyoptions.h"
 
 /* all easy setopt options listed in alphabetical order */
diff --git a/lib/parsedate.c b/lib/parsedate.c
index 43ac676765..69dbfe7fc0 100644
--- a/lib/parsedate.c
+++ b/lib/parsedate.c
@@ -77,9 +77,6 @@
 
 #include "curl_setup.h"
 
-#include <limits.h>
-
-#include <curl/curl.h>
 #include "curlx/warnless.h"
 #include "parsedate.h"
 #include "curlx/strparse.h"
diff --git a/lib/pop3.c b/lib/pop3.c
index 78c060d814..e02ed0c8b4 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -55,7 +55,6 @@
 #include <inet.h>
 #endif
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"
diff --git a/lib/psl.c b/lib/psl.c
index a089402ece..5346a57fce 100644
--- a/lib/psl.c
+++ b/lib/psl.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #ifdef USE_LIBPSL
 
 #include "psl.h"
diff --git a/lib/rand.c b/lib/rand.c
index a5694233fc..15c5a3296e 100644
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -24,13 +24,10 @@
 
 #include "curl_setup.h"
 
-#include <limits.h>
-
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "vtls/vtls.h"
 #include "sendf.h"
diff --git a/lib/rename.c b/lib/rename.c
index 11cd680aa6..c2f979a16f 100644
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -22,8 +22,6 @@
  *
  ***************************************************************************/
 
-#include "rename.h"
-
 #include "curl_setup.h"
 
 #if (!defined(CURL_DISABLE_HTTP) || !defined(CURL_DISABLE_COOKIES)) || \
@@ -31,6 +29,7 @@
 
 #include "curlx/multibyte.h"
 #include "curlx/timeval.h"
+#include "rename.h"
 
 /* return 0 on success, 1 on error */
 int Curl_rename(const char *oldpath, const char *newpath)
diff --git a/lib/rtsp.c b/lib/rtsp.c
index d73ad31813..47c993c960 100644
--- a/lib/rtsp.c
+++ b/lib/rtsp.c
@@ -27,7 +27,6 @@
 #ifndef CURL_DISABLE_RTSP
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "multiif.h"
diff --git a/lib/select.c b/lib/select.c
index 52dfa7376d..0c9fce7827 100644
--- a/lib/select.c
+++ b/lib/select.c
@@ -28,16 +28,12 @@
 #error "We cannot compile without select() or poll() support."
 #endif
 
-#include <limits.h>
-
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #elif defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "connect.h"
 #include "select.h"
diff --git a/lib/sendf.c b/lib/sendf.c
index bf9fa17c86..b3a7ac4f91 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -34,8 +34,6 @@
 #include <netinet/tcp.h>
 #endif
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "sendf.h"
 #include "transfer.h"
diff --git a/lib/setopt.c b/lib/setopt.c
index 9a0fdc5e8d..dc1353dc45 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <limits.h>
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
diff --git a/lib/slist.c b/lib/slist.c
index 9b7f11d426..3be71cb728 100644
--- a/lib/slist.c
+++ b/lib/slist.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "slist.h"
 
 /* returns last node in linked list */
diff --git a/lib/smtp.c b/lib/smtp.c
index 8c82ce6fc7..51fb26687a 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -57,7 +57,6 @@
 #include <inet.h>
 #endif
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"
diff --git a/lib/socketpair.c b/lib/socketpair.c
index 0b61112044..35c68c3a50 100644
--- a/lib/socketpair.c
+++ b/lib/socketpair.c
@@ -111,7 +111,6 @@ int Curl_socketpair(int domain, int type, int protocol,
 /*
  * This is a socketpair() implementation for Windows.
  */
-#include <string.h>
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif
diff --git a/lib/socketpair.h b/lib/socketpair.h
index 5387c09340..a839a2c50d 100644
--- a/lib/socketpair.h
+++ b/lib/socketpair.h
@@ -33,7 +33,6 @@
 #define wakeup_close         close
 #define wakeup_create(p, nb) Curl_eventfd(p, nb)
 
-#include <curl/curl.h>
 int Curl_eventfd(curl_socket_t socks[2], bool nonblocking);
 
 #elif defined(HAVE_PIPE)
@@ -43,7 +42,6 @@ int Curl_eventfd(curl_socket_t socks[2], bool nonblocking);
 #define wakeup_close         close
 #define wakeup_create(p, nb) Curl_pipe(p, nb)
 
-#include <curl/curl.h>
 int Curl_pipe(curl_socket_t socks[2], bool nonblocking);
 
 #else /* !USE_EVENTFD && !HAVE_PIPE */
@@ -73,8 +71,6 @@ int Curl_pipe(curl_socket_t socks[2], bool nonblocking);
 #endif /* USE_EVENTFD */
 
 #ifndef CURL_DISABLE_SOCKETPAIR
-#include <curl/curl.h>
-
 int Curl_socketpair(int domain, int type, int protocol,
                     curl_socket_t socks[2], bool nonblocking);
 #endif
diff --git a/lib/splay.h b/lib/splay.h
index 3a256b5713..9ed96f63e4 100644
--- a/lib/splay.h
+++ b/lib/splay.h
@@ -24,6 +24,7 @@
  *
  ***************************************************************************/
 #include "curl_setup.h"
+
 #include "curlx/timeval.h"
 
 /* only use function calls to access this struct */
diff --git a/lib/strcase.c b/lib/strcase.c
index e8424fa617..f36d2b8f10 100644
--- a/lib/strcase.c
+++ b/lib/strcase.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "strcase.h"
 
 /* Mapping table to go from lowercase to uppercase for plain ASCII.*/
diff --git a/lib/strcase.h b/lib/strcase.h
index 56839c2f3e..060ebba6e5 100644
--- a/lib/strcase.h
+++ b/lib/strcase.h
@@ -24,7 +24,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include "curl_setup.h"
 
 char Curl_raw_toupper(char in);
 char Curl_raw_tolower(char in);
diff --git a/lib/strdup.c b/lib/strdup.c
index 375f0f5044..99976a5dea 100644
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #ifdef _WIN32
 #include <wchar.h>
 #endif
diff --git a/lib/strequal.c b/lib/strequal.c
index 17dd34b7f3..14edad7e8c 100644
--- a/lib/strequal.c
+++ b/lib/strequal.c
@@ -24,7 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
 #include "strcase.h"
 
 /*
diff --git a/lib/strerror.c b/lib/strerror.c
index 899db8c61d..a15a8d01b4 100644
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -24,9 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-#include <curl/mprintf.h>
-
 #ifdef USE_WINDOWS_SSPI
 #include "curl_sspi.h"
 #endif
diff --git a/lib/strerror.h b/lib/strerror.h
index c52503ed93..a10164c9da 100644
--- a/lib/strerror.h
+++ b/lib/strerror.h
@@ -24,6 +24,8 @@
  *
  ***************************************************************************/
 
+#include "curl_setup.h"
+
 #ifdef USE_WINDOWS_SSPI
 const char *Curl_sspi_strerror(SECURITY_STATUS err, char *buf, size_t buflen);
 #endif
diff --git a/lib/system_win32.c b/lib/system_win32.c
index 42db33a3ed..21a991eb09 100644
--- a/lib/system_win32.c
+++ b/lib/system_win32.c
@@ -26,7 +26,6 @@
 
 #ifdef _WIN32
 
-#include <curl/curl.h>
 #include "system_win32.h"
 #include "curlx/version_win32.h"
 #include "curl_sspi.h"
diff --git a/lib/system_win32.h b/lib/system_win32.h
index 6bf89d3d9d..e3ed0547fe 100644
--- a/lib/system_win32.h
+++ b/lib/system_win32.h
@@ -28,8 +28,6 @@
 
 #ifdef _WIN32
 
-#include <curl/curl.h>
-
 extern LARGE_INTEGER Curl_freq;
 extern bool Curl_isVistaOrGreater;
 
diff --git a/lib/telnet.c b/lib/telnet.c
index e517b0c138..19b5901d84 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -48,7 +48,6 @@
 
 #include "urldata.h"
 #include "url.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "telnet.h"
diff --git a/lib/tftp.c b/lib/tftp.c
index 82e88c5f22..d60ab52fc2 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -47,7 +47,6 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "cfilters.h"
 #include "cf-socket.h"
 #include "transfer.h"
diff --git a/lib/transfer.c b/lib/transfer.c
index 6e190f46c0..3f6a995eac 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -56,9 +56,8 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
-#include "netrc.h"
 
+#include "netrc.h"
 #include "content_encoding.h"
 #include "hostip.h"
 #include "cfilters.h"
diff --git a/lib/uint-bset.h b/lib/uint-bset.h
index ff814bb5e6..7455c427df 100644
--- a/lib/uint-bset.h
+++ b/lib/uint-bset.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 /* A bitset for unsigned int values.
  * It can hold the numbers from 0 - (nmax - 1),
  * rounded to the next 64 multiple.
diff --git a/lib/uint-hash.c b/lib/uint-hash.c
index 43de42a19c..b3fd9dea19 100644
--- a/lib/uint-hash.c
+++ b/lib/uint-hash.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "uint-hash.h"
 
 /* random patterns for API verification */
diff --git a/lib/uint-hash.h b/lib/uint-hash.h
index 9f322bdd10..e7f2ab9cbc 100644
--- a/lib/uint-hash.h
+++ b/lib/uint-hash.h
@@ -26,8 +26,6 @@
 
 #include "curl_setup.h"
 
-#include <stddef.h>
-
 /* A version with uint32_t as key */
 typedef void Curl_uint32_hash_dtor(uint32_t id, void *value);
 struct uint_hash_entry;
diff --git a/lib/uint-spbset.c b/lib/uint-spbset.c
index e27f66fc7b..03e9efb424 100644
--- a/lib/uint-spbset.c
+++ b/lib/uint-spbset.c
@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "uint-bset.h"
 #include "uint-spbset.h"
 
diff --git a/lib/uint-spbset.h b/lib/uint-spbset.h
index 0220d05443..4b105c02ed 100644
--- a/lib/uint-spbset.h
+++ b/lib/uint-spbset.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 /* A "sparse" bitset for uint32_t values.
  * It can hold any uint32_t value.
  *
diff --git a/lib/uint-table.c b/lib/uint-table.c
index b4d5d94a3a..bbfabc9edf 100644
--- a/lib/uint-table.c
+++ b/lib/uint-table.c
@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "uint-table.h"
 
 #ifdef DEBUGBUILD
diff --git a/lib/uint-table.h b/lib/uint-table.h
index f3169fbc8f..3fc7e34ef4 100644
--- a/lib/uint-table.h
+++ b/lib/uint-table.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 /* Destructor for a single table entry */
 typedef void Curl_uint32_tbl_entry_dtor(uint32_t key, void *entry);
 
diff --git a/lib/url.c b/lib/url.c
index 34841bf9df..398bd5f7f6 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -66,8 +66,6 @@
 #include <iphlpapi.h>
 #endif
 
-#include <limits.h>
-
 #include "doh.h"
 #include "urldata.h"
 #include "netrc.h"
diff --git a/lib/urldata.h b/lib/urldata.h
index 8ff5ad98b5..6ecc077e9f 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -146,8 +146,6 @@ typedef unsigned int curl_prot_t;
 
 #include "curlx/timeval.h"
 
-#include <curl/curl.h>
-
 #include "http_chunks.h" /* for the structs and enum stuff */
 #include "hostip.h"
 #include "hash.h"
diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c
index c0e59fd273..a9fe574d63 100644
--- a/lib/vauth/cleartext.c
+++ b/lib/vauth/cleartext.c
@@ -31,8 +31,6 @@
   !defined(CURL_DISABLE_POP3) ||                                  \
   (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curlx/warnless.h"
 #include "../sendf.h"
diff --git a/lib/vauth/cram.c b/lib/vauth/cram.c
index 7cce86fd62..3251d90822 100644
--- a/lib/vauth/cram.c
+++ b/lib/vauth/cram.c
@@ -28,8 +28,6 @@
 
 #ifndef CURL_DISABLE_DIGEST_AUTH
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curl_hmac.h"
 #include "../curl_md5.h"
diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c
index ce3a7b3687..e08fcc9aa3 100644
--- a/lib/vauth/digest.c
+++ b/lib/vauth/digest.c
@@ -29,8 +29,6 @@
 
 #ifndef CURL_DISABLE_DIGEST_AUTH
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "digest.h"
 #include "../curlx/base64.h"
diff --git a/lib/vauth/digest.h b/lib/vauth/digest.h
index 99ce1f9138..63f388bf46 100644
--- a/lib/vauth/digest.h
+++ b/lib/vauth/digest.h
@@ -24,7 +24,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include "../curl_setup.h"
 
 #ifndef CURL_DISABLE_DIGEST_AUTH
 
diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c
index dc3afcc883..812b473556 100644
--- a/lib/vauth/digest_sspi.c
+++ b/lib/vauth/digest_sspi.c
@@ -29,8 +29,6 @@
 
 #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_DIGEST_AUTH)
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "digest.h"
 #include "../curlx/warnless.h"
diff --git a/lib/vauth/gsasl.c b/lib/vauth/gsasl.c
index 4c83793d78..896a246932 100644
--- a/lib/vauth/gsasl.c
+++ b/lib/vauth/gsasl.c
@@ -28,8 +28,6 @@
 
 #ifdef USE_GSASL
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../sendf.h"
 
diff --git a/lib/vauth/krb5_gssapi.c b/lib/vauth/krb5_gssapi.c
index 0c069c70d6..ac79418435 100644
--- a/lib/vauth/krb5_gssapi.c
+++ b/lib/vauth/krb5_gssapi.c
@@ -29,8 +29,6 @@
 
 #if defined(HAVE_GSSAPI) && defined(USE_KERBEROS5)
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curl_sasl.h"
 #include "../curl_gssapi.h"
diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c
index 32fa44cfcb..19cc3d34b0 100644
--- a/lib/vauth/krb5_sspi.c
+++ b/lib/vauth/krb5_sspi.c
@@ -28,8 +28,6 @@
 
 #if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5)
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curlx/warnless.h"
 #include "../sendf.h"
diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c
index dae7248f73..e5e37b771f 100644
--- a/lib/vauth/ntlm_sspi.c
+++ b/lib/vauth/ntlm_sspi.c
@@ -26,8 +26,6 @@
 
 #if defined(USE_WINDOWS_SSPI) && defined(USE_NTLM)
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curl_ntlm_core.h"
 #include "../curlx/warnless.h"
diff --git a/lib/vauth/oauth2.c b/lib/vauth/oauth2.c
index c9122debff..d9f07bba56 100644
--- a/lib/vauth/oauth2.c
+++ b/lib/vauth/oauth2.c
@@ -30,8 +30,6 @@
   !defined(CURL_DISABLE_POP3) ||                                  \
   (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curlx/warnless.h"
 
diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c
index 2feafdda4b..5df8cc9ce7 100644
--- a/lib/vauth/spnego_gssapi.c
+++ b/lib/vauth/spnego_gssapi.c
@@ -28,8 +28,6 @@
 
 #if defined(HAVE_GSSAPI) && defined(USE_SPNEGO)
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curlx/base64.h"
 #include "../curl_gssapi.h"
diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c
index 31747c0a0e..e58957d29e 100644
--- a/lib/vauth/spnego_sspi.c
+++ b/lib/vauth/spnego_sspi.c
@@ -28,8 +28,6 @@
 
 #if defined(USE_WINDOWS_SSPI) && defined(USE_SPNEGO)
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curlx/base64.h"
 #include "../curlx/warnless.h"
diff --git a/lib/vauth/vauth.c b/lib/vauth/vauth.c
index 25924806f2..bd271101b0 100644
--- a/lib/vauth/vauth.c
+++ b/lib/vauth/vauth.c
@@ -24,8 +24,6 @@
 
 #include "../curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../strdup.h"
 #include "../curlx/multibyte.h"
diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h
index 4c98d9b1c1..39dc0d3995 100644
--- a/lib/vauth/vauth.h
+++ b/lib/vauth/vauth.h
@@ -24,7 +24,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include "../curl_setup.h"
 
 #include "../bufref.h"
 #include "../curlx/dynbuf.h"
diff --git a/lib/version.c b/lib/version.c
index 246e7871db..a5be6c69cf 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -28,7 +28,6 @@
 #include <nghttp2/nghttp2.h>
 #endif
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "vtls/vtls.h"
 #include "http2.h"
diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index 1108d70cb2..7635111a8d 100644
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -29,8 +29,6 @@
 
 #ifdef USE_LIBSSH
 
-#include <limits.h>
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -45,7 +43,6 @@
 #include <inet.h>
 #endif
 
-#include <curl/curl.h>
 #include "../urldata.h"
 #include "../sendf.h"
 #include "../hostip.h"
diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index 0cabe28dbb..6ca4caf661 100644
--- a/lib/vssh/libssh2.c
+++ b/lib/vssh/libssh2.c
@@ -28,8 +28,6 @@
 
 #ifdef USE_LIBSSH2
 
-#include <limits.h>
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -44,7 +42,6 @@
 #include <inet.h>
 #endif
 
-#include <curl/curl.h>
 #include "../urldata.h"
 #include "../sendf.h"
 #include "../hostip.h"
diff --git a/lib/vssh/vssh.c b/lib/vssh/vssh.c
index bfc0a1eb3a..d322643eb4 100644
--- a/lib/vssh/vssh.c
+++ b/lib/vssh/vssh.c
@@ -27,7 +27,6 @@
 #ifdef USE_SSH
 
 #include "vssh.h"
-#include <curl/curl.h>
 #include "../curlx/strparse.h"
 #include "../curl_trc.h"
 #include "../escape.h"
diff --git a/lib/vssh/vssh.h b/lib/vssh/vssh.h
index 1a4e597b15..78de75c9e9 100644
--- a/lib/vssh/vssh.h
+++ b/lib/vssh/vssh.h
@@ -25,7 +25,7 @@
  ***************************************************************************/
 
 #include "../curl_setup.h"
-#include <curl/curl.h>
+
 #include "../urldata.h"
 
 CURLcode Curl_getworkingpath(struct Curl_easy *data,
diff --git a/lib/vtls/cipher_suite.c b/lib/vtls/cipher_suite.c
index 58d7556220..c026bdee91 100644
--- a/lib/vtls/cipher_suite.c
+++ b/lib/vtls/cipher_suite.c
@@ -25,7 +25,6 @@
 
 #if defined(USE_MBEDTLS) || defined(USE_RUSTLS)
 #include "cipher_suite.h"
-#include <string.h>
 
 /*
  * To support the CURLOPT_SSL_CIPHER_LIST option on SSL backends
diff --git a/lib/vtls/gtls.h b/lib/vtls/gtls.h
index 4949eee2d2..4ed79f63ed 100644
--- a/lib/vtls/gtls.h
+++ b/lib/vtls/gtls.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 
 #include "../curl_setup.h"
-#include <curl/curl.h>
 
 #ifdef USE_GNUTLS
 
diff --git a/lib/vtls/hostcheck.h b/lib/vtls/hostcheck.h
index b843d09c65..ca767be3ce 100644
--- a/lib/vtls/hostcheck.h
+++ b/lib/vtls/hostcheck.h
@@ -24,7 +24,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include "../curl_setup.h"
 
 #if defined(USE_OPENSSL) || defined(USE_SCHANNEL)
 
diff --git a/lib/vtls/keylog.c b/lib/vtls/keylog.c
index 03dda01f8d..2c1c595bfc 100644
--- a/lib/vtls/keylog.c
+++ b/lib/vtls/keylog.c
@@ -31,7 +31,6 @@
   defined(USE_RUSTLS)
 
 #include "keylog.h"
-#include <curl/curl.h>
 #include "../escape.h"
 #include "../curlx/fopen.h"
 
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 88cf373611..e0a97ac121 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -31,8 +31,6 @@
 
 #if defined(USE_QUICHE) || defined(USE_OPENSSL)
 
-#include <limits.h>
-
 /* Wincrypt must be included before anything that could include OpenSSL. */
 #ifdef USE_WIN32_CRYPTO
 #include <wincrypt.h>
diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c
index a4fafb6104..94ada9cfff 100644
--- a/lib/vtls/wolfssl.c
+++ b/lib/vtls/wolfssl.c
@@ -53,8 +53,6 @@
 #endif
 #endif
 
-#include <limits.h>
-
 #include "../urldata.h"
 #include "../sendf.h"
 #include "vtls.h"
diff --git a/lib/vtls/x509asn1.c b/lib/vtls/x509asn1.c
index 81c6e3c441..6dc66a9221 100644
--- a/lib/vtls/x509asn1.c
+++ b/lib/vtls/x509asn1.c
@@ -37,7 +37,6 @@
 #define WANT_EXTRACT_CERTINFO /* uses Curl_extract_certinfo() */
 #endif
 
-#include <curl/curl.h>
 #include "../urldata.h"
 #include "../curl_ctype.h"
 #include "hostcheck.h"
diff --git a/lib/ws.c b/lib/ws.c
index aea3bac98c..d4cacd9835 100644
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -22,7 +22,6 @@
  *
  ***************************************************************************/
 #include "curl_setup.h"
-#include <curl/curl.h>
 
 #if !defined(CURL_DISABLE_WEBSOCKETS) && !defined(CURL_DISABLE_HTTP)
 
diff --git a/src/tool_setup.h b/src/tool_setup.h
index f6cdffcac9..1699e5f34f 100644
--- a/src/tool_setup.h
+++ b/src/tool_setup.h
@@ -45,8 +45,6 @@ extern FILE *tool_stderr;
  * curl tool certainly uses libcurl's external interface.
  */
 
-#include <curl/curl.h> /* external interface */
-
 #include <curlx/curlx.h>
 
 /*
diff --git a/tests/libtest/first.h b/tests/libtest/first.h
index 1753d8ea0d..3a3af63c16 100644
--- a/tests/libtest/first.h
+++ b/tests/libtest/first.h
@@ -32,8 +32,6 @@
    knowledge about the system we are building this on */
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 typedef CURLcode (*entry_func_t)(const char *);
 
 struct entry_s {
diff --git a/tests/server/first.h b/tests/server/first.h
index 316a7a622e..49d5b89aaa 100644
--- a/tests/server/first.h
+++ b/tests/server/first.h
@@ -98,8 +98,6 @@ enum {
   DOCNUMBER_404        = -1
 };
 
-#include <curl/curl.h> /* for curl_socket_t */
-
 #ifdef USE_UNIX_SOCKETS
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h> /* for sockaddr_un */