@@ -60,9 +60,6 @@
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
-#ifdef HAVE_CRT_EXTERNS_H
-#include <crt_externs.h>
-#endif
#ifdef HAVE_SYS_STATVFS_H
#include <sys/statvfs.h>
@@ -18,6 +18,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_CRT_EXTERNS_H
+/* For _NSGetEnviron on macOS */
+#include <crt_externs.h>
+#endif
#ifndef HAVE__NSGETENVIRON
#ifndef HAVE_EXTERN_ENVIRON_DECLARED
@@ -15,6 +15,7 @@
+#include <string.h>
/** Helper for tor_strtok_r_impl: Advances cp past all characters in
* <b>sep</b>, and returns its new value. */
@@ -16,6 +16,7 @@
#include "lib/log/torlog.h"
#include "lib/log/util_bug.h"
#include "lib/intmath/muldiv.h"
+#include "lib/intmath/bits.h"
#include "lib/fs/winlib.h"
#include "lib/wallclock/timeval.h"
@@ -11,6 +11,9 @@
#ifdef _WIN32
#include <winsock2.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
#define TOR_USEC_PER_SEC 1000000