Extract or_state_t to its own header.

Fewer modules needed this than I had expected.

10 files changed, 13 insertions, 2 deletions

diff --git a/src/test/test.c b/src/test/test.c
index 64332e2645..d6be5ea2e7 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -12,6 +12,8 @@
 #include "lib/crypt_ops/crypto_dh.h"
 #include "lib/crypt_ops/crypto_rand.h"
 
+#include "or/or_state_st.h"
+
 #include <stdio.h>
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
diff --git a/src/test/test_accounting.c b/src/test/test_accounting.c
index ce8e08f7c9..7b9511dc20 100644
--- a/src/test/test_accounting.c
+++ b/src/test/test_accounting.c
@@ -9,6 +9,8 @@
 #define STATEFILE_PRIVATE
 #include "or/statefile.h"
 
+#include "or/or_state_st.h"
+
 #define NS_MODULE accounting
 
 #define NS_SUBMODULE limits
@@ -102,4 +104,3 @@ struct testcase_t accounting_tests[] = {
   { "bwlimits", test_accounting_limits, TT_FORK, NULL, NULL },
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index f0d649330d..262e2fa680 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -37,6 +37,7 @@
 #include "or/networkstatus_st.h"
 #include "or/node_st.h"
 #include "or/origin_circuit_st.h"
+#include "or/or_state_st.h"
 #include "or/routerinfo_st.h"
 #include "or/routerstatus_st.h"
 
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index cf221ca606..28c6316bd0 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -37,6 +37,7 @@
 #include "or/microdesc_st.h"
 #include "or/networkstatus_st.h"
 #include "or/node_st.h"
+#include "or/or_state_st.h"
 #include "or/routerinfo_st.h"
 #include "or/routerstatus_st.h"
 
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 3ea1e75300..e81a5eff4f 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -59,6 +59,7 @@
 #include "or/networkstatus_st.h"
 #include "or/node_st.h"
 #include "or/origin_circuit_st.h"
+#include "or/or_state_st.h"
 #include "or/routerinfo_st.h"
 
 /* Trunnel */
diff --git a/src/test/test_pt.c b/src/test/test_pt.c
index 0870405064..e685ab50de 100644
--- a/src/test/test_pt.c
+++ b/src/test/test_pt.c
@@ -21,6 +21,8 @@
 #include "lib/process/subprocess.h"
 #include "lib/encoding/confline.h"
 
+#include "or/or_state_st.h"
+
 static void
 reset_mp(managed_proxy_t *mp)
 {
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index 804df0f14e..b25a0be9a4 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -37,6 +37,7 @@
 #include "or/dir_connection_st.h"
 #include "or/networkstatus_st.h"
 #include "or/node_st.h"
+#include "or/or_state_st.h"
 #include "or/routerstatus_st.h"
 
 #include "lib/encoding/confline.h"
diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c
index 91ae20bff8..293ed6cf33 100644
--- a/src/test/test_shared_random.c
+++ b/src/test/test_shared_random.c
@@ -24,6 +24,7 @@
 
 #include "or/dir_server_st.h"
 #include "or/networkstatus_st.h"
+#include "or/or_state_st.h"
 
 static authority_cert_t *mock_cert;
 
@@ -1393,4 +1394,3 @@ struct testcase_t sr_tests[] = {
     NULL, NULL },
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_status.c b/src/test/test_status.c
index 071b3ba8a7..6c694be57e 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -27,6 +27,7 @@
 #include "lib/tls/tortls.h"
 
 #include "or/origin_circuit_st.h"
+#include "or/or_state_st.h"
 #include "or/routerinfo_st.h"
 
 #include "test/test.h"
diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c
index b456734684..9ae9d4dfbd 100644
--- a/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@ -34,6 +34,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "lib/log/torlog.h"
 #include "or/config.h"
 #include "lib/tls/tortls.h"
+#include "or/or_state_st.h"
 
 #include "test/test.h"
 #include "test/log_test_helpers.h"