test suite: libtest header inclusion cleanup - follow-up

Adjust tests/libtest/Makefile.inc and remove a couple of unused headers from
tests/libtest/lib583.c

tests/libtest/Makefile.inc

@@ -26,7 +26,7 @@ lib500_SOURCES = lib500.c $(SUPPORTFILES)
 
 lib501_SOURCES = lib501.c $(SUPPORTFILES)
 
-lib502_SOURCES = lib502.c $(SUPPORTFILES) $(TESTUTIL)
+lib502_SOURCES = lib502.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
 
 lib503_SOURCES = lib503.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
 
@@ -56,7 +56,7 @@ lib516_SOURCES = lib516.c $(SUPPORTFILES)
 
 lib517_SOURCES = lib517.c $(SUPPORTFILES)
 
-lib518_SOURCES = lib518.c $(SUPPORTFILES)
+lib518_SOURCES = lib518.c $(SUPPORTFILES) $(WARNLESS)
 
 lib519_SOURCES = lib519.c $(SUPPORTFILES)
 
@@ -89,7 +89,7 @@ lib533_SOURCES = lib533.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
 
 lib536_SOURCES = lib536.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
 
-lib537_SOURCES = lib537.c $(SUPPORTFILES)
+lib537_SOURCES = lib537.c $(SUPPORTFILES) $(WARNLESS)
 
 lib539_SOURCES = lib539.c $(SUPPORTFILES)
 
@@ -113,7 +113,7 @@ lib548_CPPFLAGS = $(AM_CPPFLAGS) -DLIB548
 
 lib549_SOURCES = lib549.c $(SUPPORTFILES)
 
-lib555_SOURCES = lib555.c $(SUPPORTFILES) $(TESTUTIL)
+lib555_SOURCES = lib555.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
 
 lib552_SOURCES = lib552.c $(SUPPORTFILES)
 
@@ -154,7 +154,7 @@ lib571_SOURCES = lib571.c $(SUPPORTFILES)
 
 lib572_SOURCES = lib572.c $(SUPPORTFILES)
 
-lib573_SOURCES = lib573.c $(SUPPORTFILES) $(TESTUTIL)
+lib573_SOURCES = lib573.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
 
 lib578_SOURCES = lib578.c $(SUPPORTFILES)
 

tests/libtest/lib583.c

@@ -28,8 +28,6 @@
 
 #include <sys/stat.h>
 
-#include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 int test(char *URL)