From: Viktor Szakats <commit@vsz.me>
Date: Tue, 8 Jul 2025 22:43:44 +0000 (+0200)
Subject: tests: move `curlcheck.h` to libtest as `unitcheck.h`
X-Git-Tag: curl-8_15_0~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=784c17b7d98caa9b500a56e345c1aadca9d009ed;p=thirdparty%2Fcurl.git

tests: move `curlcheck.h` to libtest as `unitcheck.h`

To simplify dependencies, and sync tunits and units builds further.

`curlcheck.h` already depended on logic implemented within libtests:
it referenced a global variable (`unitfail`) defined in `first.c` and
declared in `test.h`.

Also:
- rename to `unitcheck.h` to indicate it's meant for unit tests.
- make `unitcheck.h` include `first.h` instead of `test.h`.
  This brings header use closer to libtests. It also includes
  `curlx/curlx.h` for all unit tests by default now.
- move `unitfail` declaration from `test.h` to `first.h`.
  To match its definition in `first.c`.
- drop now redundant per-test curlx header includes.

Closes #17868
---

diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 138e757eb5..8d338ecaba 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -31,7 +31,7 @@ FIRST_H = first.h
 
 # Common files used by test programs
 UTILS_C = memptr.c testutil.c testtrace.c
-UTILS_H = test.h testutil.h testtrace.h
+UTILS_H = test.h testutil.h testtrace.h unitcheck.h
 
 CURLX_C = \
   ../../lib/curlx/warnless.c \
diff --git a/tests/libtest/first.h b/tests/libtest/first.h
index 3a73d37094..aa8ae85978 100644
--- a/tests/libtest/first.h
+++ b/tests/libtest/first.h
@@ -34,6 +34,8 @@ struct entry_s {
 
 extern const struct entry_s s_entries[];
 
+extern int unitfail; /* for unittests */
+
 #include <curlx/curlx.h>
 
 #endif /* HEADER_LIBTEST_FIRST_H */
diff --git a/tests/libtest/test.h b/tests/libtest/test.h
index 2c01794fe0..53c9091366 100644
--- a/tests/libtest/test.h
+++ b/tests/libtest/test.h
@@ -71,8 +71,6 @@ extern int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc,
 
 extern char *hexdump(const unsigned char *buffer, size_t len);
 
-extern int unitfail;
-
 /*
 ** TEST_ERR_* values must within the CURLcode range to not cause compiler
 ** errors.
diff --git a/tests/unit/curlcheck.h b/tests/libtest/unitcheck.h
similarity index 99%
rename from tests/unit/curlcheck.h
rename to tests/libtest/unitcheck.h
index 9f9b01f5f5..8007f9f8b5 100644
--- a/tests/unit/curlcheck.h
+++ b/tests/libtest/unitcheck.h
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "test.h"
+#include "first.h"
 
 /* The fail macros mark the current test step as failed, and continue */
 #define fail_if(expr, msg)                                             \
diff --git a/tests/tunit/CMakeLists.txt b/tests/tunit/CMakeLists.txt
index 2ef294f513..e98b75aef1 100644
--- a/tests/tunit/CMakeLists.txt
+++ b/tests/tunit/CMakeLists.txt
@@ -41,8 +41,7 @@ target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${PROJECT_SOURCE_DIR}/src"            # for tool headers
-  "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h"
-  "${PROJECT_SOURCE_DIR}/tests/unit"     # for "curlcheck.h"
+  "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h", "unitcheck.h"
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
 set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")
diff --git a/tests/tunit/Makefile.am b/tests/tunit/Makefile.am
index 7434469052..14a5baaece 100644
--- a/tests/tunit/Makefile.am
+++ b/tests/tunit/Makefile.am
@@ -38,7 +38,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_srcdir)/lib            \
               -I$(top_srcdir)/src            \
               -I$(top_srcdir)/tests/libtest  \
-              -I$(top_srcdir)/tests/unit     \
               -I$(srcdir)
 
 # Get BUNDLE, FIRST_C, TESTS_C variables
diff --git a/tests/tunit/tool1394.c b/tests/tunit/tool1394.c
index eead5ea6a5..5abb7ad525 100644
--- a/tests/tunit/tool1394.c
+++ b/tests/tunit/tool1394.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "tool_getparam.h"
 
diff --git a/tests/tunit/tool1604.c b/tests/tunit/tool1604.c
index 4d3101fd01..e50a074d96 100644
--- a/tests/tunit/tool1604.c
+++ b/tests/tunit/tool1604.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "tool_cfgable.h"
 #include "tool_doswin.h"
diff --git a/tests/tunit/tool1621.c b/tests/tunit/tool1621.c
index f14924e5f9..4919988c6c 100644
--- a/tests/tunit/tool1621.c
+++ b/tests/tunit/tool1621.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "tool_xattr.h"
 
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 879bfd29a5..71bb680e78 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -22,7 +22,7 @@
 #
 ###########################################################################
 
-# Get BUNDLE, FIRST_C, UTILS_H, TESTS_C variables
+# Get BUNDLE, FIRST_C, TESTS_C variables
 curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 
@@ -41,7 +41,7 @@ target_link_libraries(${BUNDLE} curlu)
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h", "unitprotos.h"
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
-  "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h"
+  "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h", "unitcheck.h"
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
 set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 00054ec2be..eba0807441 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -39,10 +39,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_srcdir)/tests/libtest  \
               -I$(srcdir)
 
-# Get BUNDLE, FIRST_C, UTILS_H, TESTS_C variables
+# Get BUNDLE, FIRST_C, TESTS_C variables
 include Makefile.inc
 
-EXTRA_DIST = CMakeLists.txt README.md $(UTILS_H) $(TESTS_C)
+EXTRA_DIST = CMakeLists.txt README.md $(TESTS_C)
 
 CFLAGS += @CURL_CFLAG_EXTRAS@
 
diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index 17d257fb55..f64a1630c8 100644
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -28,9 +28,6 @@ BUNDLE = units
 # Files referenced from the bundle source
 FIRST_C = ../libtest/first.c
 
-# Common files used by test programs
-UTILS_H = curlcheck.h
-
 # All unit test programs
 TESTS_C = \
   unit1300.c            unit1302.c unit1303.c unit1304.c unit1305.c \
diff --git a/tests/unit/README.md b/tests/unit/README.md
index aa545205ef..99465a1ea0 100644
--- a/tests/unit/README.md
+++ b/tests/unit/README.md
@@ -45,7 +45,7 @@ and the `tests/FILEFORMAT.md` documentation.
 
 For the actual C file, here's a simple example:
 ~~~c
-    #include "curlcheck.h"
+    #include "unitcheck.h"
 
     #include "a libcurl header.h" /* from the lib dir */
 
@@ -66,7 +66,7 @@ For the actual C file, here's a simple example:
 
 Here's an example using optional initialization and cleanup:
 ~~~c
-    #include "curlcheck.h"
+    #include "unitcheck.h"
 
     #include "a libcurl header.h" /* from the lib dir */
 
diff --git a/tests/unit/unit1300.c b/tests/unit/unit1300.c
index bdc6b0162b..41b0a3b63b 100644
--- a/tests/unit/unit1300.c
+++ b/tests/unit/unit1300.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "llist.h"
 #include "unitprotos.h"
diff --git a/tests/unit/unit1302.c b/tests/unit/unit1302.c
index 1b1f4b44ba..81a4614505 100644
--- a/tests/unit/unit1302.c
+++ b/tests/unit/unit1302.c
@@ -21,11 +21,10 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "url.h" /* for Curl_safefree */
-#include <curlx/base64.h>
 #include "memdebug.h" /* LAST include file */
 
 struct etest {
diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c
index 415d574f0c..16334131d3 100644
--- a/tests/unit/unit1303.c
+++ b/tests/unit/unit1303.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "connect.h"
diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c
index 4c66170f45..0d7f04f9de 100644
--- a/tests/unit/unit1304.c
+++ b/tests/unit/unit1304.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 #include "netrc.h"
 #include "memdebug.h" /* LAST include file */
 
diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c
index 0ad1e00ee4..025b2321be 100644
--- a/tests/unit/unit1305.c
+++ b/tests/unit/unit1305.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff --git a/tests/unit/unit1307.c b/tests/unit/unit1307.c
index 1b3dcd0343..bd26ea07c4 100644
--- a/tests/unit/unit1307.c
+++ b/tests/unit/unit1307.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_fnmatch.h"
 
diff --git a/tests/unit/unit1309.c b/tests/unit/unit1309.c
index 5046305e7a..07b2cdfbfc 100644
--- a/tests/unit/unit1309.c
+++ b/tests/unit/unit1309.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "splay.h"
 
diff --git a/tests/unit/unit1323.c b/tests/unit/unit1323.c
index 4717559f2e..15417fa6d9 100644
--- a/tests/unit/unit1323.c
+++ b/tests/unit/unit1323.c
@@ -21,9 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
-
-#include <curlx/timeval.h>
+#include "unitcheck.h"
 
 static CURLcode test_unit1323(char *arg)
 {
diff --git a/tests/unit/unit1330.c b/tests/unit/unit1330.c
index 2144e1c216..9b03960286 100644
--- a/tests/unit/unit1330.c
+++ b/tests/unit/unit1330.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "memdebug.h"
 
diff --git a/tests/unit/unit1395.c b/tests/unit/unit1395.c
index 7c09b3b78a..28cb1e83a1 100644
--- a/tests/unit/unit1395.c
+++ b/tests/unit/unit1395.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 #include "memdebug.h"
 #include "unitprotos.h"
 
diff --git a/tests/unit/unit1396.c b/tests/unit/unit1396.c
index 03d0a38799..c56eaacace 100644
--- a/tests/unit/unit1396.c
+++ b/tests/unit/unit1396.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 static CURLcode t1396_setup(void)
 {
diff --git a/tests/unit/unit1397.c b/tests/unit/unit1397.c
index 478b2a8962..5da11021a7 100644
--- a/tests/unit/unit1397.c
+++ b/tests/unit/unit1397.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/hostcheck.h"
 
diff --git a/tests/unit/unit1398.c b/tests/unit/unit1398.c
index d3b54d3b73..614bd91b37 100644
--- a/tests/unit/unit1398.c
+++ b/tests/unit/unit1398.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #if defined(CURL_GNUC_DIAG) || defined(__clang__)
 #pragma GCC diagnostic push
diff --git a/tests/unit/unit1399.c b/tests/unit/unit1399.c
index 7fba074f4f..9c3be1c4a6 100644
--- a/tests/unit/unit1399.c
+++ b/tests/unit/unit1399.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "progress.h"
diff --git a/tests/unit/unit1600.c b/tests/unit/unit1600.c
index de8431d998..748e231149 100644
--- a/tests/unit/unit1600.c
+++ b/tests/unit/unit1600.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "curl_ntlm_core.h"
diff --git a/tests/unit/unit1601.c b/tests/unit/unit1601.c
index 23a1ab2179..c80622ba13 100644
--- a/tests/unit/unit1601.c
+++ b/tests/unit/unit1601.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_md5.h"
 
diff --git a/tests/unit/unit1602.c b/tests/unit/unit1602.c
index 0bd2bbc511..996c7f9ae8 100644
--- a/tests/unit/unit1602.c
+++ b/tests/unit/unit1602.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "hash.h"
 
diff --git a/tests/unit/unit1603.c b/tests/unit/unit1603.c
index 054b718999..e19b3c2a51 100644
--- a/tests/unit/unit1603.c
+++ b/tests/unit/unit1603.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "hash.h"
 
diff --git a/tests/unit/unit1605.c b/tests/unit/unit1605.c
index 0beeb0769f..e3ea870dfd 100644
--- a/tests/unit/unit1605.c
+++ b/tests/unit/unit1605.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "llist.h"
 
diff --git a/tests/unit/unit1606.c b/tests/unit/unit1606.c
index 56748e8d8b..0a42db0396 100644
--- a/tests/unit/unit1606.c
+++ b/tests/unit/unit1606.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "speedcheck.h"
 #include "urldata.h"
diff --git a/tests/unit/unit1607.c b/tests/unit/unit1607.c
index ba047361d3..a9ba56e325 100644
--- a/tests/unit/unit1607.c
+++ b/tests/unit/unit1607.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "connect.h"
diff --git a/tests/unit/unit1608.c b/tests/unit/unit1608.c
index 6a395c1fee..1c8ef3e961 100644
--- a/tests/unit/unit1608.c
+++ b/tests/unit/unit1608.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "hostip.h"
 
diff --git a/tests/unit/unit1609.c b/tests/unit/unit1609.c
index f8758f6acc..a6bf0e3002 100644
--- a/tests/unit/unit1609.c
+++ b/tests/unit/unit1609.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "connect.h"
diff --git a/tests/unit/unit1610.c b/tests/unit/unit1610.c
index 954613d3ad..2cded4df46 100644
--- a/tests/unit/unit1610.c
+++ b/tests/unit/unit1610.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_sha256.h"
 
diff --git a/tests/unit/unit1611.c b/tests/unit/unit1611.c
index 496c86aad5..c39334bdd1 100644
--- a/tests/unit/unit1611.c
+++ b/tests/unit/unit1611.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_md4.h"
 
diff --git a/tests/unit/unit1612.c b/tests/unit/unit1612.c
index dc8f5dc14a..8faf67f85f 100644
--- a/tests/unit/unit1612.c
+++ b/tests/unit/unit1612.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_hmac.h"
 #include "curl_md5.h"
diff --git a/tests/unit/unit1614.c b/tests/unit/unit1614.c
index 0b30fcd512..a6ee3130c2 100644
--- a/tests/unit/unit1614.c
+++ b/tests/unit/unit1614.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "noproxy.h"
 
diff --git a/tests/unit/unit1615.c b/tests/unit/unit1615.c
index f1004c1e8d..48ea21981d 100644
--- a/tests/unit/unit1615.c
+++ b/tests/unit/unit1615.c
@@ -22,7 +22,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "curl_sha512_256.h"
 
diff --git a/tests/unit/unit1616.c b/tests/unit/unit1616.c
index 5d03c274e7..10948e2efc 100644
--- a/tests/unit/unit1616.c
+++ b/tests/unit/unit1616.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "uint-hash.h"
 
diff --git a/tests/unit/unit1620.c b/tests/unit/unit1620.c
index 866ecb1baa..8521f63b92 100644
--- a/tests/unit/unit1620.c
+++ b/tests/unit/unit1620.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "url.h"
diff --git a/tests/unit/unit1650.c b/tests/unit/unit1650.c
index ad5dfa1900..b6807a5c5d 100644
--- a/tests/unit/unit1650.c
+++ b/tests/unit/unit1650.c
@@ -21,9 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
-
-#include <curlx/dynbuf.h>
+#include "unitcheck.h"
 
 #include "doh.h"
 
diff --git a/tests/unit/unit1651.c b/tests/unit/unit1651.c
index 19b84d4b01..aab5c37e8a 100644
--- a/tests/unit/unit1651.c
+++ b/tests/unit/unit1651.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/x509asn1.h"
 
diff --git a/tests/unit/unit1652.c b/tests/unit/unit1652.c
index f846731884..2d79390139 100644
--- a/tests/unit/unit1652.c
+++ b/tests/unit/unit1652.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "sendf.h"
diff --git a/tests/unit/unit1653.c b/tests/unit/unit1653.c
index 7b725f36ef..e203fd9f00 100644
--- a/tests/unit/unit1653.c
+++ b/tests/unit/unit1653.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "curl/urlapi.h"
diff --git a/tests/unit/unit1654.c b/tests/unit/unit1654.c
index 071fcbf9a1..bfed95997a 100644
--- a/tests/unit/unit1654.c
+++ b/tests/unit/unit1654.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "altsvc.h"
diff --git a/tests/unit/unit1655.c b/tests/unit/unit1655.c
index 369bea1c29..c7037f1135 100644
--- a/tests/unit/unit1655.c
+++ b/tests/unit/unit1655.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "doh.h" /* from the lib dir */
 
diff --git a/tests/unit/unit1656.c b/tests/unit/unit1656.c
index 98e9e57e80..7a41c8d0ee 100644
--- a/tests/unit/unit1656.c
+++ b/tests/unit/unit1656.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/x509asn1.h"
 
diff --git a/tests/unit/unit1657.c b/tests/unit/unit1657.c
index b5fb5398d4..efe5643435 100644
--- a/tests/unit/unit1657.c
+++ b/tests/unit/unit1657.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/x509asn1.h"
 
diff --git a/tests/unit/unit1658.c b/tests/unit/unit1658.c
index b572fbec3c..ecd856b8b4 100644
--- a/tests/unit/unit1658.c
+++ b/tests/unit/unit1658.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "doh.h" /* from the lib dir */
 
diff --git a/tests/unit/unit1660.c b/tests/unit/unit1660.c
index c47073a18f..5889479721 100644
--- a/tests/unit/unit1660.c
+++ b/tests/unit/unit1660.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "hsts.h"
diff --git a/tests/unit/unit1661.c b/tests/unit/unit1661.c
index 494f0b9e09..3ae53629c2 100644
--- a/tests/unit/unit1661.c
+++ b/tests/unit/unit1661.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 #include "bufref.h"
 #include "memdebug.h"
 
diff --git a/tests/unit/unit1663.c b/tests/unit/unit1663.c
index 52cbd7da22..b017965380 100644
--- a/tests/unit/unit1663.c
+++ b/tests/unit/unit1663.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff --git a/tests/unit/unit1664.c b/tests/unit/unit1664.c
index 49e00b3235..d3e7670108 100644
--- a/tests/unit/unit1664.c
+++ b/tests/unit/unit1664.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -30,8 +30,6 @@
 #include <netinet/in6.h>
 #endif
 
-#include <curlx/strparse.h>
-
 #include "memdebug.h" /* LAST include file */
 
 static CURLcode t1664_setup(void)
diff --git a/tests/unit/unit1979.c b/tests/unit/unit1979.c
index d670364a3a..eb46f65619 100644
--- a/tests/unit/unit1979.c
+++ b/tests/unit/unit1979.c
@@ -21,9 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
-
-#include <curlx/dynbuf.h>
+#include "unitcheck.h"
 
 #include "http_aws_sigv4.h"
 
diff --git a/tests/unit/unit1980.c b/tests/unit/unit1980.c
index acb4b2f470..836b80ae52 100644
--- a/tests/unit/unit1980.c
+++ b/tests/unit/unit1980.c
@@ -21,9 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
-
-#include <curlx/dynbuf.h>
+#include "unitcheck.h"
 
 #include "http_aws_sigv4.h"
 
diff --git a/tests/unit/unit2600.c b/tests/unit/unit2600.c
index 063eed3536..21e575258b 100644
--- a/tests/unit/unit2600.c
+++ b/tests/unit/unit2600.c
@@ -21,9 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
-
-#include <curlx/curlx.h>
+#include "unitcheck.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
diff --git a/tests/unit/unit2601.c b/tests/unit/unit2601.c
index 7d7fdd7779..3dbd9b40fc 100644
--- a/tests/unit/unit2601.c
+++ b/tests/unit/unit2601.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "bufq.h"
diff --git a/tests/unit/unit2602.c b/tests/unit/unit2602.c
index 1834412e73..2228d954f7 100644
--- a/tests/unit/unit2602.c
+++ b/tests/unit/unit2602.c
@@ -21,9 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
-
-#include <curlx/dynbuf.h>
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "dynhds.h"
diff --git a/tests/unit/unit2603.c b/tests/unit/unit2603.c
index cfbe8eb305..060356eecf 100644
--- a/tests/unit/unit2603.c
+++ b/tests/unit/unit2603.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "http.h"
diff --git a/tests/unit/unit2604.c b/tests/unit/unit2604.c
index 608a2ef0b7..23730e63c6 100644
--- a/tests/unit/unit2604.c
+++ b/tests/unit/unit2604.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 #include "vssh/curl_path.h"
 #include "memdebug.h"
 
diff --git a/tests/unit/unit3200.c b/tests/unit/unit3200.c
index 00c9481106..ff4e29e18f 100644
--- a/tests/unit/unit3200.c
+++ b/tests/unit/unit3200.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 #include "curl_get_line.h"
 #include "memdebug.h"
 
diff --git a/tests/unit/unit3205.c b/tests/unit/unit3205.c
index 779938cc6f..535ff6298e 100644
--- a/tests/unit/unit3205.c
+++ b/tests/unit/unit3205.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "vtls/cipher_suite.h"
 
diff --git a/tests/unit/unit3211.c b/tests/unit/unit3211.c
index 0cf6565fc9..efb58e95a3 100644
--- a/tests/unit/unit3211.c
+++ b/tests/unit/unit3211.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "uint-bset.h"
diff --git a/tests/unit/unit3212.c b/tests/unit/unit3212.c
index 1226a6b6fa..7386aad0e7 100644
--- a/tests/unit/unit3212.c
+++ b/tests/unit/unit3212.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "uint-table.h"
diff --git a/tests/unit/unit3213.c b/tests/unit/unit3213.c
index f59ad5a9cf..7ecdfb2664 100644
--- a/tests/unit/unit3213.c
+++ b/tests/unit/unit3213.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"
 #include "uint-spbset.h"
diff --git a/tests/unit/unit3214.c b/tests/unit/unit3214.c
index f1f88c078a..aff1292bb2 100644
--- a/tests/unit/unit3214.c
+++ b/tests/unit/unit3214.c
@@ -21,7 +21,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlcheck.h"
+#include "unitcheck.h"
 
 #include "urldata.h"