diff --git a/configure.ac b/configure.ac
index 6d0c7d096..d7133183c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,6 @@ AC_CHECK_HEADERS([arpa/inet.h ifaddrs.h netinet/in.h netinet/tcp.h net/if.h], []
 
 AC_HEADER_ASSERT
 AC_HEADER_STDBOOL
-AC_HEADER_TIME
 
 AC_C_BIGENDIAN
 
diff --git a/src/helper/system.h b/src/helper/system.h
index 97b3443be..1aaca3b33 100644
--- a/src/helper/system.h
+++ b/src/helper/system.h
@@ -28,19 +28,11 @@
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
+#include <time.h>
 
-/* +++ AC_HEADER_TIME +++ */
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
 #endif
-/* --- AC_HEADER_TIME --- */
 
 /* +++ platform specific headers +++ */
 #ifdef _WIN32
diff --git a/src/helper/time_support.h b/src/helper/time_support.h
index 7abbdb24d..a9f2dffad 100644
--- a/src/helper/time_support.h
+++ b/src/helper/time_support.h
@@ -25,15 +25,10 @@
 #ifndef OPENOCD_HELPER_TIME_SUPPORT_H
 #define OPENOCD_HELPER_TIME_SUPPORT_H
 
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
+#include <time.h>
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
 #endif
 
 int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);