Move header file inclusion logic and definition of timeval

struct for platforms that don't have it to setup_once.h

2 files changed, 2 insertions, 20 deletions

diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c
index dc0211026..146660c71 100644
--- a/tests/libtest/testutil.c
+++ b/tests/libtest/testutil.c
@@ -21,6 +21,8 @@
  * $Id$
  ***************************************************************************/
 
+#include "setup.h"
+
 #include "testutil.h"
 
 #ifndef HAVE_GETTIMEOFDAY
diff --git a/tests/libtest/testutil.h b/tests/libtest/testutil.h
index e248c1ebe..6f7839d24 100644
--- a/tests/libtest/testutil.h
+++ b/tests/libtest/testutil.h
@@ -25,26 +25,6 @@
 
 #include "setup.h"
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <time.h>
-#endif
-#else
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-#endif
-
-#ifndef HAVE_STRUCT_TIMEVAL
-struct timeval {
- long tv_sec;
- long tv_usec;
-};
-#endif
 
 struct timeval tutil_tvnow(void);