Remove the util_bug.h include from smartlist.h.

This change makes a whole bunch of things in torlog.c break, since
apparently I did not find all the fd dependencies.

4 files changed, 16 insertions, 1 deletions

diff --git a/src/lib/log/.may_include b/src/lib/log/.may_include
index 3806806405..4f6244c2d3 100644
--- a/src/lib/log/.may_include
+++ b/src/lib/log/.may_include
@@ -1,3 +1,13 @@
+orconfig.h
 
 lib/cc/*.h
+lib/container/smartlist.h
+lib/err/*.h
+lib/intmath/*.h
+lib/log/*.h
 lib/malloc/*.h
+lib/string/*.h
+lib/testsupport/*.h
+lib/wallclock/*.h
+
+micro-revision.i
\ No newline at end of file
diff --git a/src/lib/log/ratelim.c b/src/lib/log/ratelim.c
index 2d276055b7..677c499110 100644
--- a/src/lib/log/ratelim.c
+++ b/src/lib/log/ratelim.c
@@ -5,6 +5,7 @@
 
 #include "lib/log/ratelim.h"
 #include "lib/malloc/util_malloc.h"
+#include "lib/string/printf.h"
 
 /** If the rate-limiter <b>lim</b> is ready at <b>now</b>, return the number
  * of calls to rate_limit_is_ready (including this one!) since the last time
diff --git a/src/lib/log/ratelim.h b/src/lib/log/ratelim.h
index efaeb9bf62..4ee6c5fed4 100644
--- a/src/lib/log/ratelim.h
+++ b/src/lib/log/ratelim.h
@@ -6,6 +6,8 @@
 #ifndef TOR_RATELIM_H
 #define TOR_RATELIM_H
 
+#include <time.h>
+
 /* Rate-limiter */
 
 /** A ratelim_t remembers how often an event is occurring, and how often
diff --git a/src/lib/log/torlog.c b/src/lib/log/torlog.c
index e77b775c28..aec469c53b 100644
--- a/src/lib/log/torlog.c
+++ b/src/lib/log/torlog.c
@@ -11,7 +11,7 @@
 
 #include "orconfig.h"
 #include <stdarg.h>
-// #include <stdio.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef HAVE_SYS_TIME_H
@@ -32,6 +32,8 @@
 
 #define LOG_PRIVATE
 #include "lib/log/torlog.h"
+#include "lib/log/ratelim.h"
+#include "lib/lock/compat_mutex.h"
 #include "lib/container/smartlist.h"
 #include "lib/err/torerr.h"
 #include "lib/intmath/bits.h"