2 files changed, 7 insertions, 5 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 5ccc58aed..42679a33b 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -31,6 +31,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#ifndef HAVE_GETTIMEOFDAY
+#ifdef HAVE_FTIME
+#include <sys/timeb.h>
+#endif
+#endif
+
 #include "util.h"
 #include "log.h"
 #include "crypto.h"
diff --git a/src/common/util.h b/src/common/util.h
index 0cc08e9a1..2d4702312 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -26,16 +26,12 @@
 #elif defined(_MSC_VER)
 #include <winsock.h>
 #endif
-#ifndef HAVE_GETTIMEOFDAY
-#ifdef HAVE_FTIME
-#define USING_FAKE_TIMEVAL
-#include <sys/timeb.h>
+#ifndef HAVE_STRUCT_TIMEVAL_TV_SEC
 struct timeval {
   time_t tv_sec;
   unsigned int tv_usec;
 };
 #endif
-#endif
 
 #ifdef MS_WINDOWS
 /* Windows names string functions differently from most other platforms. */