Diff reduce with upstream and prep for next set of content pushes

svn path=/projects/netbsd-tests-upstream-01-2017/; revision=312302

contrib/netbsd-tests/lib/libpthread/t_detach.c

@@ -39,10 +39,6 @@ __RCSID("$NetBSD: t_detach.c,v 1.2 2017/01/16 16:29:54 christos Exp $");
 
 #include "h_common.h"
 
-#ifdef __FreeBSD__
-#include <time.h>
-#endif
-
 static void	*func(void *);
 
 static void *

contrib/netbsd-tests/lib/libpthread/t_fpu.c

@@ -60,11 +60,6 @@ __RCSID("$NetBSD: t_fpu.c,v 1.3 2017/01/16 16:27:43 christos Exp $");
 
 #include <atf-c.h>
 
-#ifdef	__FreeBSD__
-#include <errno.h>
-#include <string.h>
-#endif
-
 #include "h_common.h"
 
 #define N_RECURSE 10

contrib/netbsd-tests/lib/libpthread/t_once.c

@@ -31,6 +31,9 @@ __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
 __RCSID("$NetBSD: t_once.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $");
 
+#ifdef __FreeBSD__
+#include <sys/time.h> /* For itimer*, etc. */
+#endif
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
@@ -46,10 +49,6 @@ static int x;
 
 #define NTHREADS 25
 
-#ifdef __FreeBSD__
-#include <sys/time.h>
-#endif
-
 static void
 ofunc(void)
 {

contrib/netbsd-tests/lib/libpthread/t_sem.c

@@ -112,10 +112,6 @@ __RCSID("$NetBSD: t_sem.c,v 1.9 2017/01/16 16:22:22 christos Exp $");
 
 static sem_t sem;
 
-#ifdef __FreeBSD__
-#include <sys/time.h>
-#endif
-
 ATF_TC(named);
 ATF_TC_HEAD(named, tc)
 {