diff --git a/tests/server/getpart.c b/tests/server/getpart.c
index b66281aeb67871485449417c783682078ef5de51..0b327030b692e1a0a78ddec387d8fd4a02a67f92 100644
--- a/tests/server/getpart.c
+++ b/tests/server/getpart.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -23,10 +23,6 @@
 
 #include "setup.h"
 
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
 #include "getpart.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
diff --git a/tests/server/resolve.c b/tests/server/resolve.c
index b579d460e3e942b6824b859404da8b1999b45bcb..75b86432bc9c3c89deaf98b97a04f595a3d23590 100644
--- a/tests/server/resolve.c
+++ b/tests/server/resolve.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -32,16 +32,9 @@
  */
 #include "setup.h" /* portability help from the lib directory */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#include <time.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 8db3ed5227cb1007269207c7356572f99014bf7c..c54734a52b875178d40888a15e1e5d063e6603c3 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -48,16 +48,9 @@
  */
 #include "setup.h" /* portability help from the lib directory */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#include <time.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/tests/server/sws.c b/tests/server/sws.c
index 99f0bddbda61d6f0ac288f96b0e32a0899d4f162..5e68a31604a3a81f6572511622f4a602b2a922d7 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -29,16 +29,9 @@
  */
 #include "setup.h" /* portability help from the lib directory */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <ctype.h>
-
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/tests/server/testpart.c b/tests/server/testpart.c
index c1ebdd44fd48ddd095437dbe52550013529563ad..df0d1aa8f3b34bc6c2b4a17f2f6a49af78406d00 100644
--- a/tests/server/testpart.c
+++ b/tests/server/testpart.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -23,10 +23,6 @@
 
 #include "setup.h"
 
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
 #include "getpart.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index be5c5b95c9165431a6c3fba3c6f9627ac6195cd0..a98791de63c40440ebcb1ab1fad14ac6d8e5cb5c 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -49,18 +49,13 @@
  */
 
 #include "setup.h" /* portability help from the lib directory */
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
+
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-
+#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -84,12 +79,9 @@
 #endif
 
 #include <setjmp.h>
-#include <stdio.h>
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
diff --git a/tests/server/util.c b/tests/server/util.c
index 762fa8450c5bb3e492be5dd0901bbc47bcba5925..3d12ba9b9f54664dc63cfbd82a279e0349669150 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -22,13 +22,9 @@
  ***************************************************************************/
 #include "setup.h" /* portability help from the lib directory */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#include <sys/types.h>
-
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/tests/server/util.h b/tests/server/util.h
index 0ec820e17f774b607075d513dd6074486f5101b0..f5ec0333bf73eb7948490db3f27567752c3e2ca5 100644
--- a/tests/server/util.h
+++ b/tests/server/util.h
@@ -22,6 +22,7 @@
  *
  * $Id$
  ***************************************************************************/
+#include "setup.h" /* portability help from the lib directory */
 
 void logmsg(const char *msg, ...);