Remove needless includes from or.h

or.h should really include only the minimum of stuff from or/*,
common/*, and lib/*.

25 files changed, 35 insertions, 14 deletions

diff --git a/src/test/bench.c b/src/test/bench.c
index f46eeef7fb..427ebd8145 100644
--- a/src/test/bench.c
+++ b/src/test/bench.c
@@ -21,10 +21,12 @@
 
 #include "or/config.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_dh.h"
 #include "or/onion_ntor.h"
 #include "lib/crypt_ops/crypto_ed25519.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "or/consdiff.h"
+#include "lib/compress/compress.h"
 
 #include "or/cell_st.h"
 #include "or/or_circuit_st.h"
diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c
index 9e736ea69d..c947ebfceb 100644
--- a/src/test/fuzz/fuzzing_common.c
+++ b/src/test/fuzz/fuzzing_common.c
@@ -6,6 +6,7 @@
 #include "lib/err/backtrace.h"
 #include "or/config.h"
 #include "test/fuzz/fuzzing.h"
+#include "lib/compress/compress.h"
 #include "lib/crypt_ops/crypto.h"
 #include "lib/crypt_ops/crypto_ed25519.h"
 
@@ -189,4 +190,3 @@ main(int argc, char **argv)
 }
 
 #endif
-
diff --git a/src/test/test.c b/src/test/test.c
index d36c47a07d..64332e2645 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -9,6 +9,7 @@
  **/
 
 #include "orconfig.h"
+#include "lib/crypt_ops/crypto_dh.h"
 #include "lib/crypt_ops/crypto_rand.h"
 
 #include <stdio.h>
diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c
index 66ee997225..604f1422c1 100644
--- a/src/test/test_buffers.c
+++ b/src/test/test_buffers.c
@@ -8,6 +8,8 @@
 #include "or/or.h"
 #include "lib/container/buffers.h"
 #include "lib/tls/buffers_tls.h"
+#include "lib/tls/tortls.h"
+#include "lib/compress/compress.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "or/proto_http.h"
 #include "or/proto_socks.h"
@@ -819,4 +821,3 @@ struct testcase_t buffer_tests[] = {
 
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_cell_formats.c b/src/test/test_cell_formats.c
index 844fa4a16c..da5e5defd1 100644
--- a/src/test/test_cell_formats.c
+++ b/src/test/test_cell_formats.c
@@ -1302,4 +1302,3 @@ struct testcase_t cell_format_tests[] = {
   TEST(is_destroy, 0),
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c
index 4ae7e16361..ec29c1d30a 100644
--- a/src/test/test_channelpadding.c
+++ b/src/test/test_channelpadding.c
@@ -19,6 +19,7 @@
 #include "or/main.h"
 #include "or/networkstatus.h"
 #include "test/log_test_helpers.h"
+#include "lib/tls/tortls.h"
 
 #include "or/cell_st.h"
 #include "or/networkstatus_st.h"
@@ -1168,4 +1169,3 @@ struct testcase_t channelpadding_tests[] = {
   TEST_CHANNELPADDING(channelpadding_timers, TT_FORK),
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 1138989826..d84cac4e91 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -51,6 +51,7 @@
 #include "lib/fs/conffile.h"
 #include "lib/meminfo/meminfo.h"
 #include "lib/net/gethostname.h"
+#include "lib/encoding/confline.h"
 
 static void
 test_config_addressmap(void *arg)
diff --git a/src/test/test_conscache.c b/src/test/test_conscache.c
index e3a617fe3e..3d3a50297b 100644
--- a/src/test/test_conscache.c
+++ b/src/test/test_conscache.c
@@ -4,6 +4,7 @@
 #include "or/or.h"
 #include "or/config.h"
 #include "or/conscache.h"
+#include "lib/encoding/confline.h"
 #include "test/test.h"
 
 #ifdef HAVE_UTIME_H
@@ -337,4 +338,3 @@ struct testcase_t conscache_tests[] = {
   ENT(filter),
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_consdiffmgr.c b/src/test/test_consdiffmgr.c
index c09586afcc..a0dfe95d35 100644
--- a/src/test/test_consdiffmgr.c
+++ b/src/test/test_consdiffmgr.c
@@ -13,6 +13,8 @@
 #include "or/networkstatus.h"
 #include "or/routerparse.h"
 #include "common/workqueue.h"
+#include "lib/compress/compress.h"
+#include "lib/encoding/confline.h"
 
 #include "or/networkstatus_st.h"
 
@@ -896,4 +898,3 @@ struct testcase_t consdiffmgr_tests[] = {
 
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index a85d036e36..eb4b36f08d 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -12,7 +12,9 @@
 #include "common/util.h"
 #include "siphash.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_dh.h"
 #include "lib/crypt_ops/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_hkdf.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "ed25519_vectors.inc"
 
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 498ecf942e..5891f1c9e4 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -45,6 +45,7 @@
 #include "or/relay.h"
 #include "test/log_test_helpers.h"
 #include "or/voting_schedule.h"
+#include "lib/compress/compress.h"
 
 #include "or/authority_cert_st.h"
 #include "or/document_signature_st.h"
diff --git a/src/test/test_entryconn.c b/src/test/test_entryconn.c
index d6ac5e1d38..b23f12087e 100644
--- a/src/test/test_entryconn.c
+++ b/src/test/test_entryconn.c
@@ -22,6 +22,8 @@
 #include "or/entry_connection_st.h"
 #include "or/socks_request_st.h"
 
+#include "lib/encoding/confline.h"
+
 static void *
 entryconn_rewrite_setup(const struct testcase_t *tc)
 {
@@ -833,4 +835,3 @@ struct testcase_t entryconn_tests[] = {
 
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index 4d37d0fe88..f0d649330d 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -44,6 +44,7 @@
 #include "test/log_test_helpers.h"
 
 #include "lib/container/bloomfilt.h"
+#include "lib/encoding/confline.h"
 
 /* TODO:
  * choose_random_entry() test with state set.
diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c
index ba279c790b..6d410af526 100644
--- a/src/test/test_helpers.c
+++ b/src/test/test_helpers.c
@@ -23,6 +23,7 @@
 #include "or/nodelist.h"
 #include "or/relay.h"
 #include "or/routerlist.h"
+#include "lib/encoding/confline.h"
 
 #include "or/cell_st.h"
 #include "or/connection_st.h"
@@ -282,4 +283,3 @@ helper_parse_options(const char *conf)
   }
   return opt;
 }
-
diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c
index 3a4d35431e..b5cb9bb912 100644
--- a/src/test/test_hs_client.c
+++ b/src/test/test_hs_client.c
@@ -22,12 +22,14 @@
 
 #include "or/config.h"
 #include "lib/crypt_ops/crypto.h"
+#include "lib/crypt_ops/crypto_dh.h"
 #include "or/channeltls.h"
 #include "or/main.h"
 #include "or/nodelist.h"
 #include "or/routerset.h"
 
 #include "or/hs_circuit.h"
+#include "or/hs_circuitmap.h"
 #include "or/hs_client.h"
 #include "or/hs_ident.h"
 #include "or/hs_cache.h"
@@ -609,4 +611,3 @@ struct testcase_t hs_client_tests[] = {
     TT_FORK, NULL, NULL },
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 684ac98f42..3ea1e75300 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -45,6 +45,7 @@
 #include "or/hs_intropoint.h"
 #include "or/hs_ntor.h"
 #include "or/hs_circuit.h"
+#include "or/hs_circuitmap.h"
 #include "or/hs_service.h"
 #include "or/hs_client.h"
 #include "or/main.h"
@@ -1634,4 +1635,3 @@ struct testcase_t hs_service_tests[] = {
 
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index ffb6c47b1e..515fdc50a7 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -24,6 +24,8 @@
 #include "or/or_handshake_state_st.h"
 #include "or/var_cell_st.h"
 
+#include "lib/tls/tortls.h"
+
 #include "test/test.h"
 #include "test/log_test_helpers.h"
 
diff --git a/src/test/test_options.c b/src/test/test_options.c
index ab8727c3db..76d95349cd 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -18,6 +18,7 @@
 #include "lib/sandbox/sandbox.h"
 #include "lib/memarea/memarea.h"
 #include "lib/osinfo/uname.h"
+#include "lib/encoding/confline.h"
 #include "or/policies.h"
 #include "test/test_helpers.h"
 
diff --git a/src/test/test_policy.c b/src/test/test_policy.c
index 2c29bbb16a..a723e82eb0 100644
--- a/src/test/test_policy.c
+++ b/src/test/test_policy.c
@@ -8,6 +8,7 @@
 #include "or/routerparse.h"
 #define POLICIES_PRIVATE
 #include "or/policies.h"
+#include "lib/encoding/confline.h"
 #include "test/test.h"
 
 #include "or/node_st.h"
@@ -2450,4 +2451,3 @@ struct testcase_t policy_tests[] = {
     test_policies_fascist_firewall_choose_address, 0, NULL, NULL },
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_pt.c b/src/test/test_pt.c
index c2c4e19897..0870405064 100644
--- a/src/test/test_pt.c
+++ b/src/test/test_pt.c
@@ -19,6 +19,7 @@
 #include "or/statefile.h"
 #include "test/test.h"
 #include "lib/process/subprocess.h"
+#include "lib/encoding/confline.h"
 
 static void
 reset_mp(managed_proxy_t *mp)
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index 5da42c1339..8fbe27cecd 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -39,6 +39,8 @@
 #include "or/node_st.h"
 #include "or/routerstatus_st.h"
 
+#include "lib/encoding/confline.h"
+
 #include "test/test.h"
 #include "test/test_dir_common.h"
 #include "test/log_test_helpers.h"
@@ -782,4 +784,3 @@ struct testcase_t routerlist_tests[] = {
   { "warn_early_consensus", test_warn_early_consensus, 0, NULL, NULL },
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_status.c b/src/test/test_status.c
index 09b9662b4c..071b3ba8a7 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -24,6 +24,7 @@
 #include "or/main.h"
 #include "or/nodelist.h"
 #include "or/statefile.h"
+#include "lib/tls/tortls.h"
 
 #include "or/origin_circuit_st.h"
 #include "or/routerinfo_st.h"
@@ -1097,4 +1098,3 @@ struct testcase_t status_tests[] = {
   TEST_CASE_ASPECT(log_heartbeat, tls_write_overhead),
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_storagedir.c b/src/test/test_storagedir.c
index d07d35e096..efb6a0027a 100644
--- a/src/test/test_storagedir.c
+++ b/src/test/test_storagedir.c
@@ -4,6 +4,7 @@
 #include "or/or.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/fs/storagedir.h"
+#include "lib/encoding/confline.h"
 #include "test/test.h"
 
 #ifdef HAVE_UTIME_H
@@ -373,4 +374,3 @@ struct testcase_t storagedir_tests[] = {
   ENT(read_labeled),
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 7f37a2ab9c..6d0162e6e1 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -22,6 +22,7 @@
 #include "lib/memarea/memarea.h"
 #include "lib/process/waitpid.h"
 #include "test/log_test_helpers.h"
+#include "lib/compress/compress.h"
 #include "lib/compress/compress_zstd.h"
 #include "lib/encoding/keyval.h"
 #include "lib/fdio/fdio.h"
@@ -35,6 +36,7 @@
 #include "lib/math/laplace.h"
 #include "lib/meminfo/meminfo.h"
 #include "lib/time/tvdiff.h"
+#include "lib/encoding/confline.h"
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>
diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index 3baeb98031..879382ce2b 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -13,12 +13,15 @@
 #include "or/or.h"
 #include "or/control.h"
 #include "or/config.h"
+#include "lib/crypt_ops/crypto_dh.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "or/rephist.h"
 #include "lib/err/backtrace.h"
 #include "test/test.h"
 #include "or/channelpadding.h"
 #include "or/main.h"
+#include "lib/compress/compress.h"
+#include "common/compat_libevent.h"
 
 #include <stdio.h>
 #ifdef HAVE_FCNTL_H