Extract more constants from or.h

10 files changed, 10 insertions, 6 deletions

diff --git a/src/test/bench.c b/src/test/bench.c
index 427ebd8145..ced04fffd7 100644
--- a/src/test/bench.c
+++ b/src/test/bench.c
@@ -19,6 +19,7 @@
 #include <openssl/ecdh.h>
 #include <openssl/obj_mac.h>
 
+#include "or/circuitlist.h"
 #include "or/config.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "lib/crypt_ops/crypto_dh.h"
diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c
index aed766fc00..ad2b443cf2 100644
--- a/src/test/test_channeltls.c
+++ b/src/test/test_channeltls.c
@@ -11,6 +11,7 @@
 #include "lib/container/buffers.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
+#include "or/connection.h"
 #include "or/connection_or.h"
 #include "or/config.h"
 /* For init/free stuff */
@@ -336,4 +337,3 @@ struct testcase_t channeltls_tests[] = {
     TT_FORK, NULL, NULL },
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_circuitbuild.c b/src/test/test_circuitbuild.c
index d17a04614c..c09133c549 100644
--- a/src/test/test_circuitbuild.c
+++ b/src/test/test_circuitbuild.c
@@ -11,6 +11,7 @@
 #include "test/log_test_helpers.h"
 #include "or/config.h"
 #include "or/circuitbuild.h"
+#include "or/circuitlist.h"
 
 #include "or/extend_info_st.h"
 
@@ -132,4 +133,3 @@ struct testcase_t circuitbuild_tests[] = {
   { "unhandled_exit", test_new_route_len_unhandled_exit, 0, NULL, NULL },
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c
index b642a37d22..33a45a99cc 100644
--- a/src/test/test_controller_events.c
+++ b/src/test/test_controller_events.c
@@ -7,6 +7,7 @@
 #include "or/or.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
+#include "or/circuitlist.h"
 #include "or/connection.h"
 #include "or/control.h"
 #include "test/test.h"
@@ -331,4 +332,3 @@ struct testcase_t controller_event_tests[] = {
   TEST(event_mask, TT_FORK),
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 5551b55581..a2b4ec68a8 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -19,6 +19,7 @@
 
 #include "or/or.h"
 #include "or/bridges.h"
+#include "or/connection.h"
 #include "or/confparse.h"
 #include "or/config.h"
 #include "or/control.h"
diff --git a/src/test/test_dns.c b/src/test/test_dns.c
index 3bcef0aa7c..1407a5c47e 100644
--- a/src/test/test_dns.c
+++ b/src/test/test_dns.c
@@ -8,6 +8,7 @@
 
 #include "or/dns.h"
 #include "or/connection.h"
+#include "or/connection_edge.h"
 #include "or/router.h"
 
 #include "or/edge_connection_st.h"
@@ -748,4 +749,3 @@ struct testcase_t dns_tests[] = {
 };
 
 #undef NS_MODULE
-
diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c
index b5cb9bb912..1458c358d2 100644
--- a/src/test/test_hs_client.c
+++ b/src/test/test_hs_client.c
@@ -24,6 +24,7 @@
 #include "lib/crypt_ops/crypto.h"
 #include "lib/crypt_ops/crypto_dh.h"
 #include "or/channeltls.h"
+#include "or/directory.h"
 #include "or/main.h"
 #include "or/nodelist.h"
 #include "or/routerset.h"
diff --git a/src/test/test_oos.c b/src/test/test_oos.c
index 6ecb1a0786..f101390d67 100644
--- a/src/test/test_oos.c
+++ b/src/test/test_oos.c
@@ -9,6 +9,7 @@
 #include "or/config.h"
 #include "or/connection.h"
 #include "or/connection_or.h"
+#include "or/directory.h"
 #include "or/main.h"
 #include "test/test.h"
 
@@ -456,4 +457,3 @@ struct testcase_t oos_tests[] = {
   { "pick_oos_victims", test_oos_pick_oos_victims, TT_FORK, NULL, NULL },
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_relay.c b/src/test/test_relay.c
index 777153d11b..fe5795d11d 100644
--- a/src/test/test_relay.c
+++ b/src/test/test_relay.c
@@ -4,6 +4,7 @@
 #include "or/or.h"
 #define CIRCUITBUILD_PRIVATE
 #include "or/circuitbuild.h"
+#include "or/circuitlist.h"
 #define RELAY_PRIVATE
 #include "or/relay.h"
 /* For init/free stuff */
@@ -130,4 +131,3 @@ struct testcase_t relay_tests[] = {
     TT_FORK, NULL, NULL },
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_socks.c b/src/test/test_socks.c
index 3e4528af27..046ed35978 100644
--- a/src/test/test_socks.c
+++ b/src/test/test_socks.c
@@ -6,6 +6,7 @@
 #include "or/or.h"
 #include "lib/container/buffers.h"
 #include "or/config.h"
+#include "or/connection.h"
 #include "or/proto_socks.h"
 #include "test/test.h"
 #include "test/log_test_helpers.h"