Extract cell type and their queues into new headers

Since packed_cell and destroy_cell exist only to be queued, they go
in the same headers as the queues.

13 files changed, 21 insertions, 0 deletions

diff --git a/src/test/bench.c b/src/test/bench.c
index 784bcf326b..cce94a1ce0 100644
--- a/src/test/bench.c
+++ b/src/test/bench.c
@@ -26,6 +26,7 @@
 #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)
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 b41f7ac380..a333fc55e8 100644
--- a/src/test/test_cell_queue.c
+++ b/src/test/test_cell_queue.c
@@ -8,6 +8,8 @@
 #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"
 
diff --git a/src/test/test_channel.c b/src/test/test_channel.c
index fbc964ecc0..ba9d8bfb29 100644
--- a/src/test/test_channel.c
+++ b/src/test/test_channel.c
@@ -20,9 +20,11 @@
 #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"
diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c
index 206b57ad1a..b2b9dc8d32 100644
--- a/src/test/test_channelpadding.c
+++ b/src/test/test_channelpadding.c
@@ -20,6 +20,7 @@
 #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"
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_helpers.c b/src/test/test_helpers.c
index fc32665a18..7b6aa25e60 100644
--- a/src/test/test_helpers.c
+++ b/src/test/test_helpers.c
@@ -24,6 +24,7 @@
 #include "relay.h"
 #include "routerlist.h"
 
+#include "cell_st.h"
 #include "connection_st.h"
 #include "node_st.h"
 #include "origin_circuit_st.h"
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index 1c2e91b83c..1447d0435a 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -24,6 +24,7 @@
 #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_oom.c b/src/test/test_oom.c
index fcee7cc73f..8d506271af 100644
--- a/src/test/test_oom.c
+++ b/src/test/test_oom.c
@@ -18,6 +18,7 @@
 #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"
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 4a526671be..df1cfd79af 100644
--- a/src/test/test_relay.c
+++ b/src/test/test_relay.c
@@ -9,6 +9,7 @@
 /* For init/free stuff */
 #include "scheduler.h"
 
+#include "cell_st.h"
 #include "or_circuit_st.h"
 
 /* Test suite stuff */
diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c
index b5aba766d9..dc42709e03 100644
--- a/src/test/test_relaycell.c
+++ b/src/test/test_relaycell.c
@@ -16,6 +16,7 @@
 #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"
diff --git a/src/test/test_relaycrypt.c b/src/test/test_relaycrypt.c
index 62bcedabc9..9f6b5bbe66 100644
--- a/src/test/test_relaycrypt.c
+++ b/src/test/test_relaycrypt.c
@@ -11,6 +11,7 @@
 #include "relay.h"
 #include "relay_crypto.h"
 
+#include "cell_st.h"
 #include "or_circuit_st.h"
 #include "origin_circuit_st.h"