diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c
index 9040b2be32c2be690402d56711aaaa91775046e4..e8bfe47443c3e70d63c0dbbb0d1597a4ce22664a 100644
--- a/tests/libtest/lib502.c
+++ b/tests/libtest/lib502.c
@@ -22,6 +22,7 @@
 #include "test.h"
 
 #include "testutil.h"
+#include "warnless.h"
 #include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c
index 53f8f807b4d07299cffa2c19fc1efcb7e7b6a9e8..763318827533a2f9744b2e5a253bc068bf77d6c6 100644
--- a/tests/libtest/lib503.c
+++ b/tests/libtest/lib503.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "test.h"
 
-#include <sys/types.h>
-
 #include "testutil.h"
 #include "warnless.h"
 #include "memdebug.h"
diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c
index e83c6616798da4e516d9e39ce9b64040e9478bda..70aec38cc984295e260363674dcc0a1f6bf5f4c7 100644
--- a/tests/libtest/lib504.c
+++ b/tests/libtest/lib504.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "test.h"
 
-#include <sys/types.h>
-
 #include "testutil.h"
 #include "warnless.h"
 #include "memdebug.h"
diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c
index 0a255d673aa7df43e2550dabaa5c43ccabccb591..394131ebe263f9e6fd2bc24136e70a4400f7ced3 100644
--- a/tests/libtest/lib505.c
+++ b/tests/libtest/lib505.c
@@ -24,12 +24,6 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
index f9d2efd0805c7ca7d5cdd5c39045416466406ada..4477eaa50f322e1a85469b401c81fc6c4068ee85 100644
--- a/tests/libtest/lib506.c
+++ b/tests/libtest/lib506.c
@@ -20,8 +20,6 @@
  *
  ***************************************************************************/
 #include "test.h"
-#include <stdlib.h>
-#include <ctype.h>
 
 #include <curl/mprintf.h>
 
diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c
index c483d7ade5b39b76da6a464c90c6f1923b0b45cb..23f7f17c61eaf358340363aaf2a9d6cf828971ad 100644
--- a/tests/libtest/lib518.c
+++ b/tests/libtest/lib518.c
@@ -21,9 +21,6 @@
  ***************************************************************************/
 #include "test.h"
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
@@ -33,10 +30,8 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
 
+#include "warnless.h"
 #include "memdebug.h"
 
 #ifndef FD_SETSIZE
diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c
index 4a79cecc26792a0df322add95f5749c356da77ac..5814b030e55c1ca4df8f54f6e0f7379986d1aba7 100644
--- a/tests/libtest/lib525.c
+++ b/tests/libtest/lib525.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "test.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #include "testutil.h"
diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c
index e73eab02908a8139bb83a351d7295e6eea417231..6e16be11b3242c36ba7f1313588a6ab9fdbbcd91 100644
--- a/tests/libtest/lib526.c
+++ b/tests/libtest/lib526.c
@@ -40,8 +40,6 @@
 
 #include "test.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #include "testutil.h"
diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c
index 6ad946f2d60f766e1fb09a69b2a339c9675015b5..03c4a62fa57ca5e3ce87eead47d5226dcb578740 100644
--- a/tests/libtest/lib530.c
+++ b/tests/libtest/lib530.c
@@ -21,16 +21,6 @@
  ***************************************************************************/
 #include "test.h"
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
 #include "testutil.h"
 #include "warnless.h"
 #include "memdebug.h"
diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c
index 5b6d8bf73000032413c7a13f0e8427c5fc587d47..487e01824f4ed0e9cae2b0b455895bcb883437e5 100644
--- a/tests/libtest/lib533.c
+++ b/tests/libtest/lib533.c
@@ -23,8 +23,6 @@
 
 #include "test.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #include "testutil.h"
diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c
index 7e81351c937f0c42749dee4e96fb8c8c90305db5..4813145d044a81bfa46bfc17e28c8646cec90291 100644
--- a/tests/libtest/lib536.c
+++ b/tests/libtest/lib536.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "test.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #include "testutil.h"
diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c
index 97119129b431501d58d616aab62aa08be1f83a05..24d2522353053969de7cf8c0d344f8efd04f2fd7 100644
--- a/tests/libtest/lib537.c
+++ b/tests/libtest/lib537.c
@@ -21,9 +21,6 @@
  ***************************************************************************/
 #include "test.h"
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
@@ -33,10 +30,8 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
 
+#include "warnless.h"
 #include "memdebug.h"
 
 #if !defined(HAVE_POLL_FINE)    && \
diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c
index 6af7bc5cfea4df6e3e6d5a6577bad406227e23a7..5fe8dd8ad807419771cc7b853c94d9f17b150029 100644
--- a/tests/libtest/lib541.c
+++ b/tests/libtest/lib541.c
@@ -21,23 +21,10 @@
  ***************************************************************************/
 #include "test.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "memdebug.h"
 
 /*
diff --git a/tests/libtest/lib542.c b/tests/libtest/lib542.c
index efe8ea24ece30505afc794fb698af61ad6f9f143..84f493f3e2688b5ecba697ba7e818967e7d35aaf 100644
--- a/tests/libtest/lib542.c
+++ b/tests/libtest/lib542.c
@@ -21,23 +21,10 @@
  ***************************************************************************/
 #include "test.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "memdebug.h"
 
 /*
diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c
index 1e73a5a2ec407492384edca27e2d9fee05adbff9..b077927ac5ab5777aa5937fed3c53a686ca6cf4c 100644
--- a/tests/libtest/lib555.c
+++ b/tests/libtest/lib555.c
@@ -30,6 +30,7 @@
 
 #include "test.h"
 #include "testutil.h"
+#include "warnless.h"
 #include "memdebug.h"
 
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
diff --git a/tests/libtest/lib560.c b/tests/libtest/lib560.c
index a91d863ab57ce52f4b109c6d4679dc5394f57174..cba9aa0004472b87bd4afee61fd6c32c67154024 100644
--- a/tests/libtest/lib560.c
+++ b/tests/libtest/lib560.c
@@ -22,6 +22,7 @@
 #include "test.h"
 
 #include "warnless.h"
+#include "memdebug.h"
 
 /*
  * Simply download a HTTPS file!
diff --git a/tests/libtest/lib562.c b/tests/libtest/lib562.c
index 657a2d3cdc0b623468ca2d614208894f28085311..a5f0ea534884f7e9fed764bd10f55a32a1fa95c3 100644
--- a/tests/libtest/lib562.c
+++ b/tests/libtest/lib562.c
@@ -19,26 +19,12 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "memdebug.h"
 
 /*
diff --git a/tests/libtest/lib564.c b/tests/libtest/lib564.c
index 96504bd3d430fa6ba6c66f6b26be62c9f4b71d9c..9bb3c7404ab1d08da9b47819e774e673624b846b 100644
--- a/tests/libtest/lib564.c
+++ b/tests/libtest/lib564.c
@@ -19,11 +19,8 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #include "testutil.h"
diff --git a/tests/libtest/lib566.c b/tests/libtest/lib566.c
index 4aa6d98e9fc8fde1c40593d5815d7d819608b596..ba839d65f9a4ce1b367ddbf5f2efe4ed6286b14c 100644
--- a/tests/libtest/lib566.c
+++ b/tests/libtest/lib566.c
@@ -19,7 +19,6 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
 #include "memdebug.h"
diff --git a/tests/libtest/lib567.c b/tests/libtest/lib567.c
index 7466e74759e94f2f4bc69e2f026d21c032015bc7..573529cd86abec34abc553ed923f1e658d8fd60e 100644
--- a/tests/libtest/lib567.c
+++ b/tests/libtest/lib567.c
@@ -19,8 +19,8 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
+
 #include "memdebug.h"
 
 /*
diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c
index df0cd88d1ec97a8b72ffd91ad9de43e143442c45..4b15821f28ec2c9396e6fea7f9c44596e10d091b 100644
--- a/tests/libtest/lib568.c
+++ b/tests/libtest/lib568.c
@@ -19,7 +19,6 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
 #ifdef HAVE_SYS_STAT_H
diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c
index 366e4c3449c858d14764e41fdfcfacd50b7191b8..a434d7459ea8ecc72c3281f964665b2a2146392f 100644
--- a/tests/libtest/lib569.c
+++ b/tests/libtest/lib569.c
@@ -19,7 +19,6 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
 #include <curl/mprintf.h>
diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c
index 29d30dbef4a70e3b4b865219380a29b4556a49f8..a9fac9915ec5e6f1b7d548072005fb4637489a4f 100644
--- a/tests/libtest/lib570.c
+++ b/tests/libtest/lib570.c
@@ -19,7 +19,6 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
 #include <curl/mprintf.h>
diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c
index 1b2bf7b7409e3ce6ae4fe2f315074ee90914e4c0..c5f7240d0cebae6aa8e89b4e41aeee0d9e948f4a 100644
--- a/tests/libtest/lib571.c
+++ b/tests/libtest/lib571.c
@@ -19,12 +19,8 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
diff --git a/tests/libtest/lib572.c b/tests/libtest/lib572.c
index b54877cd4487d571e672631956fa3e5920c77576..3df4d036ac41b1de2ad790ed25d38f3b16308aba 100644
--- a/tests/libtest/lib572.c
+++ b/tests/libtest/lib572.c
@@ -19,7 +19,6 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
 #ifdef HAVE_SYS_STAT_H
diff --git a/tests/libtest/lib573.c b/tests/libtest/lib573.c
index b5fafe16e4c380aaa67475fee3bef479f7144cdb..1d8602e1ff5b4646191a7a75e99d1ce1101e340a 100644
--- a/tests/libtest/lib573.c
+++ b/tests/libtest/lib573.c
@@ -19,10 +19,10 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
 #include "testutil.h"
+#include "warnless.h"
 #include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
diff --git a/tests/libtest/lib574.c b/tests/libtest/lib574.c
index 8c57816096c58b39d7eaf43b62df57f77f2068b2..afb2bceaef67a4de459cb3b76e72765bc605a3c6 100644
--- a/tests/libtest/lib574.c
+++ b/tests/libtest/lib574.c
@@ -19,7 +19,6 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
 #include "memdebug.h"
diff --git a/tests/libtest/lib575.c b/tests/libtest/lib575.c
index bb84b1a1c7df1aa8aebca4d4fcca69469fb1d38d..144d11ce4b97224f3ab2ae7263dda6349d33d9dd 100644
--- a/tests/libtest/lib575.c
+++ b/tests/libtest/lib575.c
@@ -19,11 +19,8 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #include "testutil.h"
diff --git a/tests/libtest/lib576.c b/tests/libtest/lib576.c
index 48841b59d9b094d8f3531660025888048b1761fb..61bb61325d7f0778f52a586ef138ca45e1036e24 100644
--- a/tests/libtest/lib576.c
+++ b/tests/libtest/lib576.c
@@ -19,8 +19,8 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
+
 #include "testutil.h"
 #include "memdebug.h"
 
diff --git a/tests/libtest/lib578.c b/tests/libtest/lib578.c
index 51ead87226b45c29b3bfb9e81aa4b45e265cadcc..a39b31772a8fab6a7582588a98e6a7749bfae6d5 100644
--- a/tests/libtest/lib578.c
+++ b/tests/libtest/lib578.c
@@ -19,7 +19,6 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
 #include "memdebug.h"
diff --git a/tests/libtest/lib579.c b/tests/libtest/lib579.c
index ad8ba7e970a9a5ffe0a4afc506d4c041b6b65f9c..56193a1818f73568a5d938224c7c72b8350ca4fc 100644
--- a/tests/libtest/lib579.c
+++ b/tests/libtest/lib579.c
@@ -19,7 +19,6 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-
 #include "test.h"
 
 #include "memdebug.h"
diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c
index 2f8fcd992662181f8d2e69bdad8f39833f9a30b9..a2c78ddd03e0451ea79943930a4d5927e13125b6 100644
--- a/tests/libtest/lib582.c
+++ b/tests/libtest/lib582.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "test.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #include "testutil.h"
diff --git a/tests/libtest/lib583.c b/tests/libtest/lib583.c
index f1270e1d3368adef375f0ef7ac1388a6020a1d1d..57c9365bc4b348b12e48fbe87da319a348cf0c70 100644
--- a/tests/libtest/lib583.c
+++ b/tests/libtest/lib583.c
@@ -26,9 +26,12 @@
 
 #include "test.h"
 
-#include <unistd.h>
 #include <sys/stat.h>
 
+#include "testutil.h"
+#include "warnless.h"
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLMcode retVal;