@@ -29,12 +29,12 @@
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
-#include "common/compat.h"
#include "common/util.h"
#define LOG_PRIVATE
#include "common/torlog.h"
#include "lib/container/smartlist.h"
#include "lib/err/torerr.h"
+#include "lib/malloc/util_malloc.h"
#include "lib/wallclock/tor_gettimeofday.h"
#include "lib/wallclock/approx_time.h"
@@ -12,7 +12,9 @@
#ifndef TOR_TORLOG_H
+#include <stdarg.h>
+#include "lib/cc/torint.h"
+#include "lib/cc/compat_compiler.h"
#include "lib/testsupport/testsupport.h"
#ifdef HAVE_SYSLOG_H
@@ -12,6 +12,7 @@
*/
#include "orconfig.h"
+#include <stddef.h>
#include "common/util_format.h"
@@ -532,4 +533,3 @@ base16_decode(char *dest, size_t destlen, const char *src, size_t srclen)
return (int) (dest-dest_orig);
}
-