diff --git a/lib/connect.c b/lib/connect.c
index d28f1f094bfe81f1120393b830e5296061f1cc00..17dddaf8733ec1ff7ec4cd337a822823b78b8f4d 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -25,7 +25,7 @@
 
 #ifndef WIN32
 /* headers for non-win32 */
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H
diff --git a/lib/cookie.h b/lib/cookie.h
index 6d1b065b2ea4e8728ca0921bc1979f9b0a4084b9..57c3acbddf2473e940291e7a8dac0441c675073b 100644
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -24,11 +24,13 @@
  ***************************************************************************/
 
 #include <stdio.h>
-#if defined(WIN32) || defined(__WATCOMC__)
+#if defined(WIN32)
 #include <time.h>
 #else
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+#endif
 
 #include <curl/curl.h>
 
diff --git a/lib/dict.c b/lib/dict.c
index 6a5697952bbba891fcf390ab55650d8d0aa0aed4..1f130ad159ef15d7ac6d62e53877a5b48ec6a3c2 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -46,7 +46,7 @@
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #ifdef HAVE_UNISTD_H
diff --git a/lib/easy.c b/lib/easy.c
index 5a41383619509af2ba8a6e600a32651d8d044d05..3356ca3cf2f93f402535a14c8befb65824edc01a 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -48,7 +48,7 @@
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #ifdef HAVE_UNISTD_H
diff --git a/lib/file.c b/lib/file.c
index 83cf8c679ca1647cadf68c6edc378d692919a739..4fb5b1f5f5947e92ecfaa082219e92f2244c8a7f 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -48,7 +48,7 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #ifdef HAVE_UNISTD_H
diff --git a/lib/http.c b/lib/http.c
index c148b4c79edb9d9de263d790b5b1b6cd24b0665b..1b638829be689e460d161ad3e926db6fba3ce51f 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -47,7 +47,7 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 
diff --git a/lib/telnet.c b/lib/telnet.c
index 9cbc666bc48efc2c13f360c47d40444ca573b7a5..5962719813ade5ee92a777d56e4e5117e3241e99 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -45,7 +45,7 @@
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #ifdef HAVE_UNISTD_H
diff --git a/lib/tftp.c b/lib/tftp.c
index 9ae3397340db934dfdbebdbbd06681a3f9b4f3f7..8901e77ae12bfda80c538044af00a64eeb745f9b 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -45,7 +45,7 @@
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #ifdef HAVE_UNISTD_H
diff --git a/lib/timeval.h b/lib/timeval.h
index a03ba2a6e3fe54a0d21342791b7b5e7cd54292ae..84ea274188d2f3da38fef7678f1e6555bec674ae 100644
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -33,7 +33,7 @@
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <time.h>
 #else
-#ifndef __WATCOMC__     /* todo: Add HAVE_SYS_TIME_H */
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #endif
diff --git a/lib/transfer.c b/lib/transfer.c
index 79ce14df2a3065c484eaa9eb5a6032c647b2e9fc..4fab23c734126cc41492cb3b3b76ed888728c267 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -51,7 +51,7 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #ifdef HAVE_UNISTD_H
diff --git a/lib/url.c b/lib/url.c
index 8bb429ba4375123da2a610d877f2ef8195bb0069..bc6e3f2b8a5659ec789f200940983fa36d337f1f 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -46,7 +46,7 @@
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifndef __WATCOMC__
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #ifdef HAVE_UNISTD_H