Extract routerinfo_t into its own header.

I was expecting this to be much worse.

17 files changed, 18 insertions, 0 deletions

diff --git a/src/test/test_address_set.c b/src/test/test_address_set.c
index efc4d4e8ab..93469573ff 100644
--- a/src/test/test_address_set.c
+++ b/src/test/test_address_set.c
@@ -12,6 +12,7 @@
 
 #include "microdesc_st.h"
 #include "networkstatus_st.h"
+#include "routerinfo_st.h"
 #include "routerstatus_st.h"
 
 #include "test.h"
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 2b761d2bae..ea0f45f22e 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -46,6 +46,7 @@
 
 #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 6f9c2706c2..5d2aa65c80 100644
--- a/src/test/test_connection.c
+++ b/src/test/test_connection.c
@@ -28,6 +28,7 @@
 #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);
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index c25665d3e3..ac5b3bd7c2 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -52,6 +52,7 @@
 #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"
diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c
index c23282ba85..3ec9fd6910 100644
--- a/src/test/test_dir_common.c
+++ b/src/test/test_dir_common.c
@@ -17,6 +17,7 @@
 #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"
 
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index c8704505e9..3babffb9ee 100644
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -38,6 +38,7 @@
 #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
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index 6a93921f90..bc075e91ab 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -37,6 +37,7 @@
 #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"
diff --git a/src/test/test_hs.c b/src/test/test_hs.c
index c546af2fe9..f2c520aeec 100644
--- a/src/test/test_hs.c
+++ b/src/test/test_hs.c
@@ -25,6 +25,7 @@
 #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"
 
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index 342626bcc1..b4969fa7b0 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -36,6 +36,7 @@
 #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 */
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index ab27b4dc4e..a4a1449b4d 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -58,6 +58,7 @@
 #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_microdesc.c b/src/test/test_microdesc.c
index 5930893353..28d3494663 100644
--- a/src/test/test_microdesc.c
+++ b/src/test/test_microdesc.c
@@ -15,6 +15,7 @@
 
 #include "microdesc_st.h"
 #include "networkstatus_st.h"
+#include "routerinfo_st.h"
 #include "routerstatus_st.h"
 
 #include "test.h"
diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c
index e41557ed35..df69466fbb 100644
--- a/src/test/test_nodelist.c
+++ b/src/test/test_nodelist.c
@@ -15,6 +15,7 @@
 #include "microdesc_st.h"
 #include "networkstatus_st.h"
 #include "node_st.h"
+#include "routerinfo_st.h"
 #include "routerstatus_st.h"
 
 #include "test.h"
diff --git a/src/test/test_policy.c b/src/test/test_policy.c
index 71c6230702..61ebd27dc9 100644
--- a/src/test/test_policy.c
+++ b/src/test/test_policy.c
@@ -12,6 +12,7 @@
 
 #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,
diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c
index e5d5316179..22af3473ba 100644
--- a/src/test/test_rendcache.c
+++ b/src/test/test_rendcache.c
@@ -15,6 +15,7 @@
 #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_routerset.c b/src/test/test_routerset.c
index 21db9bb3ba..004b88ac83 100644
--- a/src/test/test_routerset.c
+++ b/src/test/test_routerset.c
@@ -11,6 +11,7 @@
 #include "nodelist.h"
 
 #include "node_st.h"
+#include "routerinfo_st.h"
 #include "routerstatus_st.h"
 
 #include "test.h"
diff --git a/src/test/test_status.c b/src/test/test_status.c
index 062a28f730..cedce16765 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -26,6 +26,7 @@
 #include "statefile.h"
 
 #include "origin_circuit_st.h"
+#include "routerinfo_st.h"
 
 #include "test.h"