time.h and sys/time.h inclusion conditionally done in setup_once.h

lib/connect.c

@@ -22,9 +22,6 @@
 
 #include "setup.h"
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

lib/cookie.h

@@ -22,15 +22,6 @@
  *
  ***************************************************************************/
 
-#include <stdio.h>
-#if defined(WIN32)
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#endif
-
 #include <curl/curl.h>
 
 struct Cookie {

lib/dict.c

@@ -32,16 +32,12 @@
 #include <ctype.h>
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

lib/easy.c

@@ -32,7 +32,6 @@
 #include "strequal.h"
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
@@ -41,9 +40,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

lib/file.c

@@ -31,7 +31,6 @@
 #include <ctype.h>
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #include <fcntl.h>
 #else
@@ -41,9 +40,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

lib/formdata.c

@@ -32,10 +32,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
-#include <time.h>
 #if defined(HAVE_LIBGEN_H) && defined(HAVE_BASENAME)
 #include <libgen.h>
 #endif
+
 #include "urldata.h" /* for struct SessionHandle */
 #include "formdata.h"
 #include "curl_rand.h"

lib/ftplistparser.c

@@ -37,8 +37,6 @@
 
 #include "setup.h"
 
-#include <time.h>
-
 #include "ftplistparser.h"
 #include "curl_fnmatch.h"
 

lib/gopher.c

@@ -32,16 +32,12 @@
 #include <ctype.h>
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

lib/http.c

@@ -31,7 +31,6 @@
 #include <ctype.h>
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
@@ -40,15 +39,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifdef HAVE_TIME_H
-#ifdef TIME_WITH_SYS_TIME
-#include <time.h>
-#endif
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

lib/select.c

@@ -25,9 +25,6 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 
 #if !defined(HAVE_SELECT) && !defined(HAVE_POLL_FINE)
 #error "We can't compile without select() or poll() support."

lib/ssh.c

@@ -45,10 +45,6 @@
 #include <fcntl.h>
 #endif
 
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-
 #ifndef WIN32
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>

lib/telnet.c

@@ -31,16 +31,12 @@
 #include <ctype.h>
 
 #if defined(WIN32)
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

lib/tftp.c

@@ -30,16 +30,12 @@
 #include <ctype.h>
 
 #if defined(WIN32)
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 #include <netinet/in.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

lib/transfer.c

@@ -34,7 +34,6 @@
 #include "rawstr.h"
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
@@ -43,9 +42,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

lib/url.c

@@ -31,7 +31,6 @@
 #include <ctype.h>
 
 #ifdef WIN32
-#include <time.h>
 #include <io.h>
 #else
 #ifdef HAVE_SYS_SOCKET_H
@@ -40,9 +39,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif