Merge commit 'linus/headers'

3 files changed, 19 insertions, 0 deletions

diff --git a/src/test/test.c b/src/test/test.c
index a753db27f..755d1233f 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -43,10 +43,20 @@ long int lround(double x);
 double fabs(double x);
 
 #include "or.h"
+#include "buffers.h"
+#include "circuitbuild.h"
+#include "config.h"
+#include "connection_edge.h"
+#include "geoip.h"
+#include "rendcommon.h"
 #include "test.h"
 #include "torgzip.h"
 #include "mempool.h"
 #include "memarea.h"
+#include "onion.h"
+#include "policies.h"
+#include "rephist.h"
+#include "routerparse.h"
 
 #ifdef USE_DMALLOC
 #include <dmalloc.h>
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index a746beda2..a129bf977 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -8,6 +8,13 @@
 #define DIRVOTE_PRIVATE
 #define ROUTER_PRIVATE
 #include "or.h"
+#include "directory.h"
+#include "dirserv.h"
+#include "dirvote.h"
+#include "networkstatus.h"
+#include "router.h"
+#include "routerlist.h"
+#include "routerparse.h"
 #include "test.h"
 
 static void
diff --git a/src/test/test_util.c b/src/test/test_util.c
index bba96325c..22f2707d7 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -7,6 +7,8 @@
 #define CONTROL_PRIVATE
 #define MEMPOOL_PRIVATE
 #include "or.h"
+#include "config.h"
+#include "control.h"
 #include "test.h"
 #include "mempool.h"
 #include "memarea.h"