diff --git a/lib/altsvc.c b/lib/altsvc.c
index b4bb875438..3b99c14590 100644
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -36,7 +36,6 @@
 #include "curl_trc.h"
 #include "curlx/inet_pton.h"
 #include "curlx/strparse.h"
-#include "curlx/timeval.h"
 #include "connect.h"
 
 #define MAX_ALTSVC_LINE    4095
diff --git a/lib/cshutdn.h b/lib/cshutdn.h
index ad2d009673..0a15d39f1c 100644
--- a/lib/cshutdn.h
+++ b/lib/cshutdn.h
@@ -24,8 +24,6 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlx/timeval.h"
-
 struct connectdata;
 struct Curl_easy;
 struct curl_pollfds;
diff --git a/lib/file.c b/lib/file.c
index 8d171374a5..982f254b2d 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -64,7 +64,6 @@
 #include "url.h"
 #include "parsedate.h" /* for the week day and month names */
 #include "curlx/fopen.h"
-#include "curlx/timeval.h"
 #include "curl_range.h"
 
 #if defined(_WIN32) || defined(MSDOS)
diff --git a/lib/ftp.c b/lib/ftp.c
index 27e4c8aadd..12b8d4a637 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -67,7 +67,6 @@
 #include "strdup.h"
 #include "curlx/strerr.h"
 #include "curlx/strparse.h"
-#include "curlx/timeval.h"
 
 #ifndef NI_MAXHOST
 #define NI_MAXHOST 1025
diff --git a/lib/hostip.h b/lib/hostip.h
index 6f8e98218e..a40e24b88e 100644
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -27,7 +27,7 @@
 
 #include "hash.h"
 #include "curl_addrinfo.h"
-#include "curlx/timeval.h" /* for timediff_t */
+#include "curlx/timeval.h" /* for curltime, timediff_t */
 #include "asyn.h"
 #include "httpsrr.h"
 
diff --git a/lib/hsts.c b/lib/hsts.c
index a4e233e61e..de6c5731cd 100644
--- a/lib/hsts.c
+++ b/lib/hsts.c
@@ -36,7 +36,6 @@
 #include "parsedate.h"
 #include "curl_share.h"
 #include "curlx/strparse.h"
-#include "curlx/timeval.h"
 #include "curlx/strcopy.h"
 
 #define MAX_HSTS_LINE    4095
diff --git a/lib/http.c b/lib/http.c
index 3e52efa8d1..a78e2f666b 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -84,7 +84,6 @@
 #include "ws.h"
 #include "bufref.h"
 #include "curlx/strparse.h"
-#include "curlx/timeval.h"
 
 /*
  * Forward declarations.
diff --git a/lib/http_aws_sigv4.c b/lib/http_aws_sigv4.c
index a01b72202d..598d8cbe5f 100644
--- a/lib/http_aws_sigv4.c
+++ b/lib/http_aws_sigv4.c
@@ -34,7 +34,6 @@
 #include "curl_trc.h"
 #include "escape.h"
 #include "curlx/strparse.h"
-#include "curlx/timeval.h"
 #include "slist.h"
 
 #include <time.h>
diff --git a/lib/multi.c b/lib/multi.c
index aec0739c39..b65be60361 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -35,7 +35,6 @@
 #include "multi_ev.h"
 #include "sendf.h"
 #include "curl_trc.h"
-#include "curlx/timeval.h"
 #include "http.h"
 #include "select.h"
 #include "curlx/wait.h"
diff --git a/lib/multi_ev.c b/lib/multi_ev.c
index deebb970f3..0c89721f35 100644
--- a/lib/multi_ev.c
+++ b/lib/multi_ev.c
@@ -28,7 +28,6 @@
 #include "cfilters.h"
 #include "curl_trc.h"
 #include "multiif.h"
-#include "curlx/timeval.h"
 #include "multi_ev.h"
 #include "select.h"
 #include "uint-bset.h"
diff --git a/lib/progress.c b/lib/progress.c
index 6493f748eb..9fbe1f7a34 100644
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -28,7 +28,6 @@
 #include "multiif.h"
 #include "progress.h"
 #include "transfer.h"
-#include "curlx/timeval.h"
 #include "curlx/strcopy.h"
 
 /* check rate limits within this many recent milliseconds, at minimum. */
diff --git a/lib/rand.c b/lib/rand.c
index 25ecdf1086..a0b168c0ca 100644
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -30,7 +30,6 @@
 #include "urldata.h"
 #include "vtls/vtls.h"
 #include "curl_trc.h"
-#include "curlx/timeval.h"
 #include "rand.h"
 #include "escape.h"
 
diff --git a/lib/ratelimit.c b/lib/ratelimit.c
index 5f87c966a5..c7ba64615e 100644
--- a/lib/ratelimit.c
+++ b/lib/ratelimit.c
@@ -23,10 +23,8 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "curlx/timeval.h"
 #include "ratelimit.h"
 
-
 #define CURL_US_PER_SEC       1000000
 #define CURL_RLIMIT_MIN_CHUNK (16 * 1024)
 #define CURL_RLIMIT_MAX_STEPS 2   /* 500ms interval */
diff --git a/lib/socketpair.c b/lib/socketpair.c
index 69b42da04c..bdbe956233 100644
--- a/lib/socketpair.c
+++ b/lib/socketpair.c
@@ -123,7 +123,6 @@ int Curl_socketpair(int domain, int type, int protocol,
 #define INADDR_LOOPBACK 0x7f000001
 #endif
 
-#include "curlx/timeval.h"  /* needed before select.h */
 #include "select.h"   /* for Curl_poll */
 
 int Curl_socketpair(int domain, int type, int protocol,
diff --git a/lib/socks.c b/lib/socks.c
index ee89e89298..e49e8c8220 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -38,7 +38,6 @@
 #include "select.h"
 #include "cfilters.h"
 #include "connect.h"
-#include "curlx/timeval.h"
 #include "socks.h"
 #include "curlx/inet_pton.h"
 #include "url.h"
diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 1c2bfee987..2da11713eb 100644
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -32,7 +32,6 @@
 #include "cfilters.h"
 #include "connect.h"
 #include "curlx/nonblock.h"
-#include "curlx/timeval.h"
 #include "socks.h"
 #include "strdup.h"
 
diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index 5e9e49f2a9..0f3cfceb27 100644
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -32,7 +32,6 @@
 #include "connect.h"
 #include "strerror.h"
 #include "curlx/nonblock.h"
-#include "curlx/timeval.h"
 #include "socks.h"
 #include "curl_sspi.h"
 #include "curlx/multibyte.h"
diff --git a/lib/splay.c b/lib/splay.c
index 92a4b16199..5e4cd54d27 100644
--- a/lib/splay.c
+++ b/lib/splay.c
@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "curlx/timeval.h"
 #include "splay.h"
 
 /*
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 0fa7cfd6e1..934273e0ee 100644
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -52,7 +52,6 @@
 #include "../progress.h"
 #include "../strdup.h"
 #include "../curlx/fopen.h"
-#include "../curlx/timeval.h"
 #include "x509asn1.h"
 
 /* Enable GnuTLS debugging by defining GTLSDEBUG */
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 78f17ea132..be0c032bff 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -64,7 +64,6 @@
 #include "../url.h"
 #include "../progress.h"
 #include "../curlx/fopen.h"
-#include "../curlx/timeval.h"
 #include "../curl_sha256.h"
 #include "../curlx/base64.h"
 #include "../curlx/inet_pton.h"