Extract node_t into its own header.

11 files changed, 18 insertions, 8 deletions

diff --git a/src/test/test_connection.c b/src/test/test_connection.c
index 93d5dc8469..6f9c2706c2 100644
--- a/src/test/test_connection.c
+++ b/src/test/test_connection.c
@@ -26,6 +26,7 @@
 
 #include "dir_connection_st.h"
 #include "entry_connection_st.h"
+#include "node_st.h"
 #include "or_connection_st.h"
 #include "socks_request_st.h"
 
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index bff6a40bd3..cf9da232ca 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -33,6 +33,7 @@
 #include "cpath_build_state_st.h"
 #include "crypt_path_st.h"
 #include "dir_connection_st.h"
+#include "node_st.h"
 #include "origin_circuit_st.h"
 
 #include "test_helpers.h"
diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c
index 91cc7d4d2e..78d10b261f 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 "node_st.h"
 #include "origin_circuit_st.h"
 
 #include "test.h"
diff --git a/src/test/test_hs.c b/src/test/test_hs.c
index 9343d131f2..c546af2fe9 100644
--- a/src/test/test_hs.c
+++ b/src/test/test_hs.c
@@ -22,6 +22,7 @@
 #include "routerset.h"
 #include "circuitbuild.h"
 
+#include "node_st.h"
 #include "rend_encoded_v2_service_descriptor_st.h"
 #include "rend_intro_point_st.h"
 
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index 8bcb2c7e46..21a109d2bc 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -33,6 +33,8 @@
 #include "util.h"
 #include "voting_schedule.h"
 
+#include "node_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..1fcea44f4b 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,9 @@
 #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 "test_helpers.h"
 
 /* mock ID digest and longname for node that's in nodelist */
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 3487785500..83a9d3cb59 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -55,6 +55,7 @@
 
 #include "cpath_build_state_st.h"
 #include "crypt_path_st.h"
+#include "node_st.h"
 #include "origin_circuit_st.h"
 
 /* Trunnel */
diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c
index 9499fd0380..a3f2de29f0 100644
--- a/src/test/test_nodelist.c
+++ b/src/test/test_nodelist.c
@@ -11,6 +11,9 @@
 #include "networkstatus.h"
 #include "nodelist.h"
 #include "torcert.h"
+
+#include "node_st.h"
+
 #include "test.h"
 
 /** Test the case when node_get_by_id() returns NULL,
diff --git a/src/test/test_policy.c b/src/test/test_policy.c
index e55452d3e4..673336eaeb 100644
--- a/src/test/test_policy.c
+++ b/src/test/test_policy.c
@@ -10,6 +10,7 @@
 #include "policies.h"
 #include "test.h"
 
+#include "node_st.h"
 #include "port_cfg_st.h"
 
 /* Helper: assert that short_policy parses and writes back out as itself,
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index d66f8933de..bf97499eee 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -35,6 +35,7 @@
 #include "statefile.h"
 
 #include "dir_connection_st.h"
+#include "node_st.h"
 
 #include "test.h"
 #include "test_dir_common.h"
diff --git a/src/test/test_routerset.c b/src/test/test_routerset.c
index c541324674..0e1ad3fdfa 100644
--- a/src/test/test_routerset.c
+++ b/src/test/test_routerset.c
@@ -9,6 +9,9 @@
 #include "routerparse.h"
 #include "policies.h"
 #include "nodelist.h"
+
+#include "node_st.h"
+
 #include "test.h"
 
 #define NS_MODULE routerset