Merge branch 'split_or_h'

57 files changed, 263 insertions, 8 deletions

diff --git a/src/test/bench.c b/src/test/bench.c
index 9ab23c9921..cce94a1ce0 100644
--- a/src/test/bench.c
+++ b/src/test/bench.c
@@ -26,6 +26,9 @@
 #include "crypto_rand.h"
 #include "consdiff.h"
 
+#include "cell_st.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/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c
index 2ffeb60244..e93204ea3e 100644
--- a/src/test/fuzz/fuzz_http.c
+++ b/src/test/fuzz/fuzz_http.c
@@ -14,6 +14,8 @@
 #include "directory.h"
 #include "torlog.h"
 
+#include "dir_connection_st.h"
+
 #include "fuzzing.h"
 
 static void
diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c
index dc674070b2..255a34169c 100644
--- a/src/test/fuzz/fuzz_http_connect.c
+++ b/src/test/fuzz/fuzz_http_connect.c
@@ -15,6 +15,9 @@
 #include "proto_socks.h"
 #include "torlog.h"
 
+#include "entry_connection_st.h"
+#include "socks_request_st.h"
+
 #include "fuzzing.h"
 
 static void
diff --git a/src/test/fuzz/fuzz_iptsv2.c b/src/test/fuzz/fuzz_iptsv2.c
index 4abde0c16d..db99f62dc9 100644
--- a/src/test/fuzz/fuzz_iptsv2.c
+++ b/src/test/fuzz/fuzz_iptsv2.c
@@ -4,6 +4,9 @@
 #include "or.h"
 #include "routerparse.h"
 #include "rendcommon.h"
+
+#include "rend_service_descriptor_st.h"
+
 #include "fuzzing.h"
 
 static void
diff --git a/src/test/fuzz/fuzz_vrs.c b/src/test/fuzz/fuzz_vrs.c
index baf0610a0b..a597674940 100644
--- a/src/test/fuzz/fuzz_vrs.c
+++ b/src/test/fuzz/fuzz_vrs.c
@@ -7,6 +7,10 @@
 #include "memarea.h"
 #include "microdesc.h"
 #include "networkstatus.h"
+
+#include "networkstatus_st.h"
+#include "vote_routerstatus_st.h"
+
 #include "fuzzing.h"
 
 static void
diff --git a/src/test/rend_test_helpers.c b/src/test/rend_test_helpers.c
index 9ac3894b0b..ec252c39b3 100644
--- a/src/test/rend_test_helpers.c
+++ b/src/test/rend_test_helpers.c
@@ -7,6 +7,10 @@
 #include "rendcommon.h"
 #include "rend_test_helpers.h"
 
+#include "extend_info_st.h"
+#include "rend_intro_point_st.h"
+#include "rend_service_descriptor_st.h"
+
 void
 generate_desc(int time_diff, rend_encoded_v2_service_descriptor_t **desc,
               char **service_id, int intro_points)
diff --git a/src/test/test.c b/src/test/test.c
index f0e8b9b728..14456d8666 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -62,6 +62,12 @@ double fabs(double x);
 #include "statefile.h"
 #include "crypto_curve25519.h"
 
+#include "extend_info_st.h"
+#include "or_circuit_st.h"
+#include "rend_encoded_v2_service_descriptor_st.h"
+#include "rend_intro_point_st.h"
+#include "rend_service_descriptor_st.h"
+
 /** Run unit tests for the onion handshake code. */
 static void
 test_onion_handshake(void *arg)
diff --git a/src/test/test_address_set.c b/src/test/test_address_set.c
index f7441a6491..93469573ff 100644
--- a/src/test/test_address_set.c
+++ b/src/test/test_address_set.c
@@ -10,6 +10,11 @@
 #include "routerlist.h"
 #include "torcert.h"
 
+#include "microdesc_st.h"
+#include "networkstatus_st.h"
+#include "routerinfo_st.h"
+#include "routerstatus_st.h"
+
 #include "test.h"
 
 static networkstatus_t *dummy_ns = NULL;
diff --git a/src/test/test_cell_formats.c b/src/test/test_cell_formats.c
index 54d9716780..fe9cfaf4af 100644
--- a/src/test/test_cell_formats.c
+++ b/src/test/test_cell_formats.c
@@ -18,6 +18,11 @@
 #include "onion_fast.h"
 #include "onion_ntor.h"
 #include "relay.h"
+
+#include "cell_st.h"
+#include "cell_queue_st.h"
+#include "var_cell_st.h"
+
 #include "test.h"
 
 #include <stdlib.h>
diff --git a/src/test/test_cell_queue.c b/src/test/test_cell_queue.c
index df987f82ce..a333fc55e8 100644
--- a/src/test/test_cell_queue.c
+++ b/src/test/test_cell_queue.c
@@ -8,6 +8,11 @@
 #include "relay.h"
 #include "test.h"
 
+#include "cell_st.h"
+#include "cell_queue_st.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..ba9d8bfb29 100644
--- a/src/test/test_channel.c
+++ b/src/test/test_channel.c
@@ -20,6 +20,12 @@
 #include "scheduler.h"
 #include "networkstatus.h"
 
+#include "cell_st.h"
+#include "networkstatus_st.h"
+#include "origin_circuit_st.h"
+#include "routerstatus_st.h"
+#include "var_cell_st.h"
+
 /* Test suite stuff */
 #include "log_test_helpers.h"
 #include "test.h"
diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c
index 2c803c3443..b2b9dc8d32 100644
--- a/src/test/test_channelpadding.c
+++ b/src/test/test_channelpadding.c
@@ -20,6 +20,11 @@
 #include "networkstatus.h"
 #include "log_test_helpers.h"
 
+#include "cell_st.h"
+#include "networkstatus_st.h"
+#include "or_connection_st.h"
+#include "routerstatus_st.h"
+
 int channelpadding_get_netflow_inactive_timeout_ms(channel_t *chan);
 int64_t channelpadding_compute_time_until_pad_for_netflow(channel_t *chan);
 int channelpadding_send_disable_command(channel_t*);
diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c
index 94f1893cae..0f134f1e70 100644
--- a/src/test/test_channeltls.c
+++ b/src/test/test_channeltls.c
@@ -17,6 +17,8 @@
 #include "scheduler.h"
 #include "tortls.h"
 
+#include "or_connection_st.h"
+
 /* Test suite stuff */
 #include "test.h"
 #include "fakechans.h"
diff --git a/src/test/test_circuitbuild.c b/src/test/test_circuitbuild.c
index a5282df69d..b09f7bf553 100644
--- a/src/test/test_circuitbuild.c
+++ b/src/test/test_circuitbuild.c
@@ -12,6 +12,8 @@
 #include "config.h"
 #include "circuitbuild.h"
 
+#include "extend_info_st.h"
+
 /* Dummy nodes smartlist for testing */
 static smartlist_t dummy_nodes;
 /* Dummy exit extend_info for testing */
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_circuitmux.c b/src/test/test_circuitmux.c
index 14c7598703..85d91ab8b2 100644
--- a/src/test/test_circuitmux.c
+++ b/src/test/test_circuitmux.c
@@ -13,6 +13,8 @@
 #include "scheduler.h"
 #include "test.h"
 
+#include "destroy_cell_queue_st.h"
+
 /* XXXX duplicated function from test_circuitlist.c */
 static channel_t *
 new_fake_channel(void)
diff --git a/src/test/test_circuitstats.c b/src/test/test_circuitstats.c
index 8ebef659ca..b8056e0d1d 100644
--- a/src/test/test_circuitstats.c
+++ b/src/test/test_circuitstats.c
@@ -17,6 +17,11 @@
 #include "circuituse.h"
 #include "channel.h"
 
+#include "cpath_build_state_st.h"
+#include "crypt_path_st.h"
+#include "extend_info_st.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..16ae84380a 100644
--- a/src/test/test_circuituse.c
+++ b/src/test/test_circuituse.c
@@ -14,6 +14,9 @@
 #include "circuitbuild.h"
 #include "nodelist.h"
 
+#include "cpath_build_state_st.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_config.c b/src/test/test_config.c
index 461aa646d6..ea0f45f22e 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -44,6 +44,10 @@
 
 #include "test_helpers.h"
 
+#include "dir_server_st.h"
+#include "port_cfg_st.h"
+#include "routerinfo_st.h"
+
 static void
 test_config_addressmap(void *arg)
 {
diff --git a/src/test/test_connection.c b/src/test/test_connection.c
index dc0f6860d9..5d2aa65c80 100644
--- a/src/test/test_connection.c
+++ b/src/test/test_connection.c
@@ -11,6 +11,7 @@
 #include "test.h"
 
 #include "connection.h"
+#include "connection_edge.h"
 #include "hs_common.h"
 #include "main.h"
 #include "microdesc.h"
@@ -23,6 +24,13 @@
 #include "test_connection.h"
 #include "test_helpers.h"
 
+#include "dir_connection_st.h"
+#include "entry_connection_st.h"
+#include "node_st.h"
+#include "or_connection_st.h"
+#include "routerinfo_st.h"
+#include "socks_request_st.h"
+
 static void * test_conn_get_basic_setup(const struct testcase_t *tc);
 static int test_conn_get_basic_teardown(const struct testcase_t *tc,
                                         void *arg);
diff --git a/src/test/test_consdiffmgr.c b/src/test/test_consdiffmgr.c
index 3b91baca39..dc223274b9 100644
--- a/src/test/test_consdiffmgr.c
+++ b/src/test/test_consdiffmgr.c
@@ -14,6 +14,8 @@
 #include "routerparse.h"
 #include "workqueue.h"
 
+#include "networkstatus_st.h"
+
 #include "test.h"
 #include "log_test_helpers.h"
 
diff --git a/src/test/test_controller.c b/src/test/test_controller.c
index c9517583c2..e91aa2e726 100644
--- a/src/test/test_controller.c
+++ b/src/test/test_controller.c
@@ -14,6 +14,9 @@
 #include "test.h"
 #include "test_helpers.h"
 
+#include "control_connection_st.h"
+#include "download_status_st.h"
+
 static void
 test_add_onion_helper_keyarg_v3(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_dir.c b/src/test/test_dir.c
index 0106e40d97..ac5b3bd7c2 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -28,6 +28,7 @@
 #include "dirserv.h"
 #include "dirauth/dirvote.h"
 #include "entrynodes.h"
+#include "fp_pair.h"
 #include "hibernate.h"
 #include "memarea.h"
 #include "networkstatus.h"
@@ -44,6 +45,19 @@
 #include "log_test_helpers.h"
 #include "voting_schedule.h"
 
+#include "authority_cert_st.h"
+#include "document_signature_st.h"
+#include "extrainfo_st.h"
+#include "networkstatus_st.h"
+#include "networkstatus_voter_info_st.h"
+#include "ns_detached_signatures_st.h"
+#include "port_cfg_st.h"
+#include "routerinfo_st.h"
+#include "routerlist_st.h"
+#include "tor_version_st.h"
+#include "vote_microdesc_hash_st.h"
+#include "vote_routerstatus_st.h"
+
 #define NS_MODULE dir
 
 static void
diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c
index 230410f7fa..3ec9fd6910 100644
--- a/src/test/test_dir_common.c
+++ b/src/test/test_dir_common.c
@@ -14,6 +14,13 @@
 #include "test_dir_common.h"
 #include "voting_schedule.h"
 
+#include "authority_cert_st.h"
+#include "networkstatus_st.h"
+#include "networkstatus_voter_info_st.h"
+#include "routerinfo_st.h"
+#include "vote_microdesc_hash_st.h"
+#include "vote_routerstatus_st.h"
+
 void dir_common_setup_vote(networkstatus_t **vote, time_t now);
 networkstatus_t * dir_common_add_rs_and_parse(networkstatus_t *vote,
                             networkstatus_t **vote_out,
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index 688d26bdc1..3babffb9ee 100644
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -34,6 +34,13 @@
 #include "log_test_helpers.h"
 #include "voting_schedule.h"
 
+#include "dir_connection_st.h"
+#include "dir_server_st.h"
+#include "networkstatus_st.h"
+#include "rend_encoded_v2_service_descriptor_st.h"
+#include "routerinfo_st.h"
+#include "routerlist_st.h"
+
 #ifdef _WIN32
 /* For mkdir() */
 #include <direct.h>
diff --git a/src/test/test_dns.c b/src/test/test_dns.c
index 1fee01d2c0..ffc6fb4514 100644
--- a/src/test/test_dns.c
+++ b/src/test/test_dns.c
@@ -10,6 +10,9 @@
 #include "connection.h"
 #include "router.h"
 
+#include "edge_connection_st.h"
+#include "or_circuit_st.h"
+
 #define NS_MODULE dns
 
 #define NS_SUBMODULE clip_ttl
diff --git a/src/test/test_dos.c b/src/test/test_dos.c
index 8ae967f3ae..bc77bd8cd6 100644
--- a/src/test/test_dos.c
+++ b/src/test/test_dos.c
@@ -15,6 +15,11 @@
 #include "networkstatus.h"
 #include "nodelist.h"
 #include "routerlist.h"
+
+#include "networkstatus_st.h"
+#include "or_connection_st.h"
+#include "routerstatus_st.h"
+
 #include "test.h"
 #include "log_test_helpers.h"
 
diff --git a/src/test/test_entryconn.c b/src/test/test_entryconn.c
index 9d8a072c77..1c1eda02f1 100644
--- a/src/test/test_entryconn.c
+++ b/src/test/test_entryconn.c
@@ -19,6 +19,9 @@
 #include "hs_cache.h"
 #include "rendcache.h"
 
+#include "entry_connection_st.h"
+#include "socks_request_st.h"
+
 static void *
 entryconn_rewrite_setup(const struct testcase_t *tc)
 {
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index cfcb88a66e..bc075e91ab 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -30,6 +30,16 @@
 #include "statefile.h"
 #include "util.h"
 
+#include "cpath_build_state_st.h"
+#include "crypt_path_st.h"
+#include "dir_connection_st.h"
+#include "microdesc_st.h"
+#include "networkstatus_st.h"
+#include "node_st.h"
+#include "origin_circuit_st.h"
+#include "routerinfo_st.h"
+#include "routerstatus_st.h"
+
 #include "test_helpers.h"
 #include "log_test_helpers.h"
 
diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c
index e05342cb8a..77874a74e2 100644
--- a/src/test/test_extorport.c
+++ b/src/test/test_extorport.c
@@ -13,6 +13,9 @@
 #include "crypto_rand.h"
 #include "ext_orport.h"
 #include "main.h"
+
+#include "or_connection_st.h"
+
 #include "test.h"
 
 /* Test connection_or_remove_from_ext_or_id_map and
diff --git a/src/test/test_guardfraction.c b/src/test/test_guardfraction.c
index 51ca8f08ec..38f237c5dd 100644
--- a/src/test/test_guardfraction.c
+++ b/src/test/test_guardfraction.c
@@ -15,6 +15,10 @@
 #include "routerparse.h"
 #include "networkstatus.h"
 
+#include "networkstatus_st.h"
+#include "vote_microdesc_hash_st.h"
+#include "vote_routerstatus_st.h"
+
 #include "test.h"
 #include "test_helpers.h"
 #include "log_test_helpers.h"
diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c
index 1db5e9064f..7b6aa25e60 100644
--- a/src/test/test_helpers.c
+++ b/src/test/test_helpers.c
@@ -24,6 +24,12 @@
 #include "relay.h"
 #include "routerlist.h"
 
+#include "cell_st.h"
+#include "connection_st.h"
+#include "node_st.h"
+#include "origin_circuit_st.h"
+#include "routerlist_st.h"
+
 #include "test.h"
 #include "test_helpers.h"
 #include "test_connection.h"
diff --git a/src/test/test_hs.c b/src/test/test_hs.c
index 64448de510..f2c520aeec 100644
--- a/src/test/test_hs.c
+++ b/src/test/test_hs.c
@@ -21,6 +21,12 @@
 #include "rendservice.h"
 #include "routerset.h"
 #include "circuitbuild.h"
+
+#include "node_st.h"
+#include "rend_encoded_v2_service_descriptor_st.h"
+#include "rend_intro_point_st.h"
+#include "routerinfo_st.h"
+
 #include "test_helpers.h"
 
 /* mock ID digest and longname for node that's in nodelist */
diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c
index 458ce1a92e..415f6f30ee 100644
--- a/src/test/test_hs_cache.c
+++ b/src/test/test_hs_cache.c
@@ -18,6 +18,9 @@
 #include "connection.h"
 #include "proto_http.h"
 
+#include "dir_connection_st.h"
+#include "networkstatus_st.h"
+
 #include "hs_test_helpers.h"
 #include "test_helpers.h"
 #include "test.h"
diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c
index 50dca588ed..64c098dbb1 100644
--- a/src/test/test_hs_client.c
+++ b/src/test/test_hs_client.c
@@ -37,6 +37,15 @@
 #include "connection_edge.h"
 #include "networkstatus.h"
 
+#include "cpath_build_state_st.h"
+#include "crypt_path_st.h"
+#include "dir_connection_st.h"
+#include "entry_connection_st.h"
+#include "extend_info_st.h"
+#include "networkstatus_st.h"
+#include "origin_circuit_st.h"
+#include "socks_request_st.h"
+
 static int
 mock_connection_ap_handshake_send_begin(entry_connection_t *ap_conn)
 {
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index 8bcb2c7e46..b4969fa7b0 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -33,6 +33,12 @@
 #include "util.h"
 #include "voting_schedule.h"
 
+#include "microdesc_st.h"
+#include "networkstatus_st.h"
+#include "node_st.h"
+#include "routerinfo_st.h"
+#include "routerstatus_st.h"
+
 /** Test the validation of HS v3 addresses */
 static void
 test_validate_address(void *arg)
diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c
index 308843e9b8..f720373375 100644
--- a/src/test/test_hs_control.c
+++ b/src/test/test_hs_control.c
@@ -7,10 +7,6 @@
  **/
 
 #define CONTROL_PRIVATE
-#define CIRCUITBUILD_PRIVATE
-#define RENDCOMMON_PRIVATE
-#define RENDSERVICE_PRIVATE
-#define HS_SERVICE_PRIVATE
 
 #include "or.h"
 #include "test.h"
@@ -19,10 +15,10 @@
 #include "hs_common.h"
 #include "hs_control.h"
 #include "nodelist.h"
-//#include "rendcommon.h"
-//#include "rendservice.h"
-//#include "routerset.h"
-//#include "circuitbuild.h"
+
+#include "node_st.h"
+#include "routerstatus_st.h"
+
 #include "test_helpers.h"
 
 /* mock ID digest and longname for node that's in nodelist */
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..a4a1449b4d 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -53,6 +53,13 @@
 #include "dirauth/shared_random_state.h"
 #include "voting_schedule.h"
 
+#include "cpath_build_state_st.h"
+#include "crypt_path_st.h"
+#include "networkstatus_st.h"
+#include "node_st.h"
+#include "origin_circuit_st.h"
+#include "routerinfo_st.h"
+
 /* Trunnel */
 #include "hs/cell_establish_intro.h"
 
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index 6840072d76..1447d0435a 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -21,6 +21,11 @@
 #include "scheduler.h"
 #include "torcert.h"
 
+#include "or_connection_st.h"
+#include "or_handshake_certs_st.h"
+#include "or_handshake_state_st.h"
+#include "var_cell_st.h"
+
 #include "test.h"
 #include "log_test_helpers.h"
 
diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c
index 4b168f49ed..28d3494663 100644
--- a/src/test/test_microdesc.c
+++ b/src/test/test_microdesc.c
@@ -13,6 +13,11 @@
 #include "routerparse.h"
 #include "torcert.h"
 
+#include "microdesc_st.h"
+#include "networkstatus_st.h"
+#include "routerinfo_st.h"
+#include "routerstatus_st.h"
+
 #include "test.h"
 
 #ifdef _WIN32
diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c
index 9499fd0380..df69466fbb 100644
--- a/src/test/test_nodelist.c
+++ b/src/test/test_nodelist.c
@@ -11,6 +11,13 @@
 #include "networkstatus.h"
 #include "nodelist.h"
 #include "torcert.h"
+
+#include "microdesc_st.h"
+#include "networkstatus_st.h"
+#include "node_st.h"
+#include "routerinfo_st.h"
+#include "routerstatus_st.h"
+
 #include "test.h"
 
 /** Test the case when node_get_by_id() returns NULL,
diff --git a/src/test/test_oom.c b/src/test/test_oom.c
index abf8896452..8d506271af 100644
--- a/src/test/test_oom.c
+++ b/src/test/test_oom.c
@@ -18,6 +18,11 @@
 #include "test.h"
 #include "test_helpers.h"
 
+#include "cell_st.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. */
 static void
diff --git a/src/test/test_oos.c b/src/test/test_oos.c
index e72fcf5de9..b341918030 100644
--- a/src/test/test_oos.c
+++ b/src/test/test_oos.c
@@ -12,6 +12,9 @@
 #include "main.h"
 #include "test.h"
 
+#include "dir_connection_st.h"
+#include "or_connection_st.h"
+
 static or_options_t mock_options;
 
 static void
diff --git a/src/test/test_policy.c b/src/test/test_policy.c
index e89d49aaf5..61ebd27dc9 100644
--- a/src/test/test_policy.c
+++ b/src/test/test_policy.c
@@ -10,6 +10,11 @@
 #include "policies.h"
 #include "test.h"
 
+#include "node_st.h"
+#include "port_cfg_st.h"
+#include "routerinfo_st.h"
+#include "routerstatus_st.h"
+
 /* Helper: assert that short_policy parses and writes back out as itself,
    or as <b>expected</b> if that's provided. */
 static void
diff --git a/src/test/test_proto_misc.c b/src/test/test_proto_misc.c
index 263ca47447..e2d063a772 100644
--- a/src/test/test_proto_misc.c
+++ b/src/test/test_proto_misc.c
@@ -15,6 +15,8 @@
 #include "proto_control0.h"
 #include "proto_ext_or.h"
 
+#include "var_cell_st.h"
+
 static void
 test_proto_var_cell(void *arg)
 {
diff --git a/src/test/test_relay.c b/src/test/test_relay.c
index 73c0ed5586..df1cfd79af 100644
--- a/src/test/test_relay.c
+++ b/src/test/test_relay.c
@@ -9,6 +9,9 @@
 /* For init/free stuff */
 #include "scheduler.h"
 
+#include "cell_st.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 841174982c..dc42709e03 100644
--- a/src/test/test_relaycell.c
+++ b/src/test/test_relaycell.c
@@ -16,6 +16,12 @@
 #include "relay.h"
 #include "test.h"
 
+#include "cell_st.h"
+#include "crypt_path_st.h"
+#include "entry_connection_st.h"
+#include "origin_circuit_st.h"
+#include "socks_request_st.h"
+
 static int srm_ncalls;
 static entry_connection_t *srm_conn;
 static int srm_atype;
diff --git a/src/test/test_relaycrypt.c b/src/test/test_relaycrypt.c
index 60bd479719..9f6b5bbe66 100644
--- a/src/test/test_relaycrypt.c
+++ b/src/test/test_relaycrypt.c
@@ -10,6 +10,11 @@
 #include "crypto_rand.h"
 #include "relay.h"
 #include "relay_crypto.h"
+
+#include "cell_st.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_rendcache.c b/src/test/test_rendcache.c
index 9f6cfc4a22..6bc8038281 100644
--- a/src/test/test_rendcache.c
+++ b/src/test/test_rendcache.c
@@ -11,6 +11,13 @@
 #include "routerlist.h"
 #include "config.h"
 #include "hs_common.h"
+
+#include "extend_info_st.h"
+#include "rend_encoded_v2_service_descriptor_st.h"
+#include "rend_intro_point_st.h"
+#include "rend_service_descriptor_st.h"
+#include "routerinfo_st.h"
+
 #include "rend_test_helpers.h"
 #include "log_test_helpers.h"
 
diff --git a/src/test/test_router.c b/src/test/test_router.c
index 4e96e24534..d560a1aecf 100644
--- a/src/test/test_router.c
+++ b/src/test/test_router.c
@@ -14,6 +14,8 @@
 #include "router.h"
 #include "routerlist.h"
 
+#include "routerinfo_st.h"
+
 /* Test suite stuff */
 #include "test.h"
 
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index 701227c1c7..41f7c09bde 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -33,6 +33,13 @@
 #include "routerparse.h"
 #include "dirauth/shared_random.h"
 #include "statefile.h"
+
+#include "authority_cert_st.h"
+#include "dir_connection_st.h"
+#include "networkstatus_st.h"
+#include "node_st.h"
+#include "routerstatus_st.h"
+
 #include "test.h"
 #include "test_dir_common.h"
 #include "log_test_helpers.h"
diff --git a/src/test/test_routerset.c b/src/test/test_routerset.c
index c541324674..11a1ff2aff 100644
--- a/src/test/test_routerset.c
+++ b/src/test/test_routerset.c
@@ -9,6 +9,12 @@
 #include "routerparse.h"
 #include "policies.h"
 #include "nodelist.h"
+
+#include "extend_info_st.h"
+#include "node_st.h"
+#include "routerinfo_st.h"
+#include "routerstatus_st.h"
+
 #include "test.h"
 
 #define NS_MODULE routerset
diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c
index f6ab0dfabd..a1b4d60a2c 100644
--- a/src/test/test_shared_random.c
+++ b/src/test/test_shared_random.c
@@ -22,6 +22,9 @@
 #include "shared_random_client.h"
 #include "voting_schedule.h"
 
+#include "dir_server_st.h"
+#include "networkstatus_st.h"
+
 static authority_cert_t *mock_cert;
 
 static authority_cert_t *
diff --git a/src/test/test_socks.c b/src/test/test_socks.c
index 8da7191e82..6c266438e8 100644
--- a/src/test/test_socks.c
+++ b/src/test/test_socks.c
@@ -9,6 +9,7 @@
 #include "proto_socks.h"
 #include "test.h"
 #include "log_test_helpers.h"
+#include "socks_request_st.h"
 
 typedef struct socks_test_data_t {
   socks_request_t *req;
diff --git a/src/test/test_status.c b/src/test/test_status.c
index b4ca17891b..cedce16765 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -24,6 +24,10 @@
 #include "main.h"
 #include "nodelist.h"
 #include "statefile.h"
+
+#include "origin_circuit_st.h"
+#include "routerinfo_st.h"
+
 #include "test.h"
 
 #define NS_MODULE status