Extract {or,origin}_circuit_t into their own headers

19 files changed, 39 insertions, 0 deletions

diff --git a/src/test/bench.c b/src/test/bench.c
index 9ab23c9921..784bcf326b 100644
--- a/src/test/bench.c
+++ b/src/test/bench.c
@@ -26,6 +26,8 @@
 #include "crypto_rand.h"
 #include "consdiff.h"
 
+#include "or_circuit_st.h"
+
 #if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID)
 static uint64_t nanostart;
 static inline uint64_t
diff --git a/src/test/test.c b/src/test/test.c
index f0e8b9b728..b92dd3c8a0 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -62,6 +62,8 @@ double fabs(double x);
 #include "statefile.h"
 #include "crypto_curve25519.h"
 
+#include "or_circuit_st.h"
+
 /** Run unit tests for the onion handshake code. */
 static void
 test_onion_handshake(void *arg)
diff --git a/src/test/test_cell_queue.c b/src/test/test_cell_queue.c
index df987f82ce..b41f7ac380 100644
--- a/src/test/test_cell_queue.c
+++ b/src/test/test_cell_queue.c
@@ -8,6 +8,9 @@
 #include "relay.h"
 #include "test.h"
 
+#include "or_circuit_st.h"
+#include "origin_circuit_st.h"
+
 static void
 test_cq_manip(void *arg)
 {
diff --git a/src/test/test_channel.c b/src/test/test_channel.c
index 76124a6e75..c41afff5d0 100644
--- a/src/test/test_channel.c
+++ b/src/test/test_channel.c
@@ -20,6 +20,8 @@
 #include "scheduler.h"
 #include "networkstatus.h"
 
+#include "origin_circuit_st.h"
+
 /* Test suite stuff */
 #include "log_test_helpers.h"
 #include "test.h"
diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c
index 3794ffc2c6..86e78c331e 100644
--- a/src/test/test_circuitlist.c
+++ b/src/test/test_circuitlist.c
@@ -14,6 +14,9 @@
 #include "test.h"
 #include "log_test_helpers.h"
 
+#include "or_circuit_st.h"
+#include "origin_circuit_st.h"
+
 static channel_t *
 new_fake_channel(void)
 {
diff --git a/src/test/test_circuitstats.c b/src/test/test_circuitstats.c
index 8ebef659ca..c03164954a 100644
--- a/src/test/test_circuitstats.c
+++ b/src/test/test_circuitstats.c
@@ -17,6 +17,8 @@
 #include "circuituse.h"
 #include "channel.h"
 
+#include "origin_circuit_st.h"
+
 void test_circuitstats_timeout(void *arg);
 void test_circuitstats_hoplen(void *arg);
 origin_circuit_t *subtest_fourhop_circuit(struct timeval, int);
diff --git a/src/test/test_circuituse.c b/src/test/test_circuituse.c
index df1b43807f..7d1b1d9b00 100644
--- a/src/test/test_circuituse.c
+++ b/src/test/test_circuituse.c
@@ -14,6 +14,8 @@
 #include "circuitbuild.h"
 #include "nodelist.h"
 
+#include "origin_circuit_st.h"
+
 static void
 test_circuit_is_available_for_use_ret_false_when_marked_for_close(void *arg)
 {
diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c
index e81aea8d66..70ce1a6960 100644
--- a/src/test/test_controller_events.c
+++ b/src/test/test_controller_events.c
@@ -11,6 +11,9 @@
 #include "control.h"
 #include "test.h"
 
+#include "or_circuit_st.h"
+#include "origin_circuit_st.h"
+
 static void
 add_testing_cell_stats_entry(circuit_t *circ, uint8_t command,
                              unsigned int waiting_time,
diff --git a/src/test/test_dns.c b/src/test/test_dns.c
index c472b97900..ffc6fb4514 100644
--- a/src/test/test_dns.c
+++ b/src/test/test_dns.c
@@ -11,6 +11,7 @@
 #include "router.h"
 
 #include "edge_connection_st.h"
+#include "or_circuit_st.h"
 
 #define NS_MODULE dns
 
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index d4939355d1..19a32aa8a2 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -34,6 +34,7 @@
 
 #include "test_helpers.h"
 #include "log_test_helpers.h"
+#include "origin_circuit_st.h"
 
 /* TODO:
  * choose_random_entry() test with state set.
diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c
index 86aeabb7c3..91cc7d4d2e 100644
--- a/src/test/test_helpers.c
+++ b/src/test/test_helpers.c
@@ -25,6 +25,7 @@
 #include "routerlist.h"
 
 #include "connection_st.h"
+#include "origin_circuit_st.h"
 
 #include "test.h"
 #include "test_helpers.h"
diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c
index 0420f70f84..bf0d56f8af 100644
--- a/src/test/test_hs_client.c
+++ b/src/test/test_hs_client.c
@@ -39,6 +39,7 @@
 
 #include "dir_connection_st.h"
 #include "entry_connection_st.h"
+#include "origin_circuit_st.h"
 
 static int
 mock_connection_ap_handshake_send_begin(entry_connection_t *ap_conn)
diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c
index 4253c9a388..b8462d294e 100644
--- a/src/test/test_hs_intropoint.c
+++ b/src/test/test_hs_intropoint.c
@@ -28,6 +28,8 @@
 #include "hs_intropoint.h"
 #include "hs_service.h"
 
+#include "or_circuit_st.h"
+
 /* Trunnel. */
 #include "hs/cell_establish_intro.h"
 #include "hs/cell_introduce1.h"
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 33b5e96070..06df50740f 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -53,6 +53,8 @@
 #include "dirauth/shared_random_state.h"
 #include "voting_schedule.h"
 
+#include "origin_circuit_st.h"
+
 /* Trunnel */
 #include "hs/cell_establish_intro.h"
 
diff --git a/src/test/test_oom.c b/src/test/test_oom.c
index 98935fe455..fcee7cc73f 100644
--- a/src/test/test_oom.c
+++ b/src/test/test_oom.c
@@ -19,6 +19,8 @@
 #include "test_helpers.h"
 
 #include "entry_connection_st.h"
+#include "or_circuit_st.h"
+#include "origin_circuit_st.h"
 
 /* small replacement mock for circuit_mark_for_close_ to avoid doing all
  * the other bookkeeping that comes with marking circuits. */
diff --git a/src/test/test_relay.c b/src/test/test_relay.c
index 73c0ed5586..4a526671be 100644
--- a/src/test/test_relay.c
+++ b/src/test/test_relay.c
@@ -9,6 +9,8 @@
 /* For init/free stuff */
 #include "scheduler.h"
 
+#include "or_circuit_st.h"
+
 /* Test suite stuff */
 #include "test.h"
 #include "fakechans.h"
diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c
index b4cb9d4bbc..e6a6734032 100644
--- a/src/test/test_relaycell.c
+++ b/src/test/test_relaycell.c
@@ -17,6 +17,7 @@
 #include "test.h"
 
 #include "entry_connection_st.h"
+#include "origin_circuit_st.h"
 
 static int srm_ncalls;
 static entry_connection_t *srm_conn;
diff --git a/src/test/test_relaycrypt.c b/src/test/test_relaycrypt.c
index 60bd479719..62bcedabc9 100644
--- a/src/test/test_relaycrypt.c
+++ b/src/test/test_relaycrypt.c
@@ -10,6 +10,10 @@
 #include "crypto_rand.h"
 #include "relay.h"
 #include "relay_crypto.h"
+
+#include "or_circuit_st.h"
+#include "origin_circuit_st.h"
+
 #include "test.h"
 
 static const char KEY_MATERIAL[3][CPATH_KEY_MATERIAL_LEN] = {
diff --git a/src/test/test_status.c b/src/test/test_status.c
index b4ca17891b..062a28f730 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -24,6 +24,9 @@
 #include "main.h"
 #include "nodelist.h"
 #include "statefile.h"
+
+#include "origin_circuit_st.h"
+
 #include "test.h"
 
 #define NS_MODULE status