test suite: libtest header inclusion cleanup

Added missing memoryTracking to test cases 560 and 583. If this triggers
leak detection on these, it only means that previously it was going unnoticed.

33 files changed, 12 insertions, 106 deletions

diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c
index 9040b2be3..e8bfe4744 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 53f8f807b..763318827 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 e83c66167..70aec38cc 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 0a255d673..394131ebe 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 f9d2efd08..4477eaa50 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 c483d7ade..23f7f17c6 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 4a79cecc2..5814b030e 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 e73eab029..6e16be11b 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 6ad946f2d..03c4a62fa 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 5b6d8bf73..487e01824 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 7e81351c9..4813145d0 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 97119129b..24d252235 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 6af7bc5cf..5fe8dd8ad 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 efe8ea24e..84f493f3e 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 1e73a5a2e..b077927ac 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 a91d863ab..cba9aa000 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 657a2d3cd..a5f0ea534 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 96504bd3d..9bb3c7404 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 4aa6d98e9..ba839d65f 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 7466e7475..573529cd8 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 df0cd88d1..4b15821f2 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 366e4c344..a434d7459 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 29d30dbef..a9fac9915 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 1b2bf7b74..c5f7240d0 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 b54877cd4..3df4d036a 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 b5fafe16e..1d8602e1f 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 8c5781609..afb2bceae 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 bb84b1a1c..144d11ce4 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 48841b59d..61bb61325 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 51ead8722..a39b31772 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 ad8ba7e97..56193a181 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 2f8fcd992..a2c78ddd0 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 f1270e1d3..57c9365bc 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;