Remove util.h

Inline its contents (which were all includes) into or.h, and some of
its contents into other places that didn't include or.h at all.

19 files changed, 20 insertions, 28 deletions

diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c
index ada9fa6c2d..de574ac26d 100644
--- a/src/test/fuzz/fuzz_hsdescv3.c
+++ b/src/test/fuzz/fuzz_hsdescv3.c
@@ -9,7 +9,6 @@
 #include "lib/crypt_ops/crypto_ed25519.h"
 #include "or/hs_descriptor.h"
 #include "or/routerparse.h"
-#include "common/util.h"
 
 #include "test/fuzz/fuzzing.h"
 
diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 552cbbc551..8a4610e904 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -2,14 +2,16 @@
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
+#include "lib/crypt_ops/crypto_util.h"
+
+#include "lib/intmath/cmp.h"
+#include "lib/malloc/util_malloc.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <stdlib.h>
 
-#include "lib/crypt_ops/crypto_util.h"
-#include "common/util.h"
-
 static unsigned fill_a_buffer_memset(void) __attribute__((noinline));
 static unsigned fill_a_buffer_memwipe(void) __attribute__((noinline));
 static unsigned fill_a_buffer_nothing(void) __attribute__((noinline));
@@ -214,4 +216,3 @@ main(int argc, char **argv)
     return 0;
   }
 }
-
diff --git a/src/test/test-timers.c b/src/test/test-timers.c
index aed150bda6..a2365a2e38 100644
--- a/src/test/test-timers.c
+++ b/src/test/test-timers.c
@@ -8,9 +8,11 @@
 #include <string.h>
 
 #include "common/compat_libevent.h"
-#include "lib/crypt_ops/crypto_rand.h"
 #include "common/timers.h"
-#include "common/util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/log/util_bug.h"
+#include "lib/time/compat_time.h"
+#include "lib/wallclock/timeval.h"
 
 #define N_TIMERS 1000
 #define MAX_DURATION 30
@@ -138,4 +140,3 @@ main(int argc, char **argv)
   timers_shutdown();
   return ret;
 }
-
diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c
index 98e85cd6d8..685027c0e0 100644
--- a/src/test/test_bridges.c
+++ b/src/test/test_bridges.c
@@ -16,7 +16,6 @@
 #include "or/bridges.h"
 #include "or/config.h"
 #include "or/transports.h"
-#include "common/util.h"
 
 /* Test suite stuff */
 #include "test/test.h"
diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c
index 8a8221f190..3f7b0a203a 100644
--- a/src/test/test_bt_cl.c
+++ b/src/test/test_bt_cl.c
@@ -8,7 +8,6 @@
 /* To prevent 'assert' from going away. */
 #undef TOR_COVERAGE
 #include "or/or.h"
-#include "common/util.h"
 #include "lib/err/backtrace.h"
 #include "lib/log/torlog.h"
 
diff --git a/src/test/test_checkdir.c b/src/test/test_checkdir.c
index 09688cf0a9..a80c6ebd3a 100644
--- a/src/test/test_checkdir.c
+++ b/src/test/test_checkdir.c
@@ -12,7 +12,6 @@
 
 #include "or/config.h"
 #include "test/test.h"
-#include "common/util.h"
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/src/test/test_config.c b/src/test/test_config.c
index fb05645930..c7623d0c85 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -19,7 +19,6 @@
 #include "or/connection.h"
 #include "or/connection_edge.h"
 #include "test/test.h"
-#include "common/util.h"
 #include "or/connection_or.h"
 #include "or/control.h"
 #include "or/cpuworker.h"
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index 341dbc9a4f..2e38dfc279 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -9,7 +9,6 @@
 #include "or/or.h"
 #include "test/test.h"
 #include "lib/crypt_ops/aes.h"
-#include "common/util.h"
 #include "siphash.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "lib/crypt_ops/crypto_dh.h"
diff --git a/src/test/test_crypto_openssl.c b/src/test/test_crypto_openssl.c
index d443ba6fd0..1d31ad0279 100644
--- a/src/test/test_crypto_openssl.c
+++ b/src/test/test_crypto_openssl.c
@@ -7,14 +7,14 @@
 
 #define CRYPTO_RAND_PRIVATE
 
+#include "lib/crypt_ops/compat_openssl.h"
 #include "lib/crypt_ops/crypto_rand.h"
-#include "common/util.h"
 #include "lib/encoding/binascii.h"
 #include "test/test.h"
 
 #include <openssl/evp.h>
 #include <openssl/rand.h>
-#include "lib/crypt_ops/compat_openssl.h"
+#include <string.h>
 
 /* Test for rectifying openssl RAND engine. */
 static void
@@ -103,4 +103,3 @@ struct testcase_t crypto_openssl_tests[] = {
     TT_FORK, NULL, NULL },
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index 262e2fa680..9c35cdaaf2 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -28,7 +28,6 @@
 #include "or/routerparse.h"
 #include "or/routerset.h"
 #include "or/statefile.h"
-#include "common/util.h"
 
 #include "or/cpath_build_state_st.h"
 #include "or/crypt_path_st.h"
diff --git a/src/test/test_guardfraction.c b/src/test/test_guardfraction.c
index b7737cafa8..3c293e378b 100644
--- a/src/test/test_guardfraction.c
+++ b/src/test/test_guardfraction.c
@@ -10,7 +10,6 @@
 #include "or/config.h"
 #include "or/dirserv.h"
 #include "or/entrynodes.h"
-#include "common/util.h"
 #include "or/routerparse.h"
 #include "or/networkstatus.h"
 
diff --git a/src/test/test_handles.c b/src/test/test_handles.c
index 26c68aa8a3..2910d7e18f 100644
--- a/src/test/test_handles.c
+++ b/src/test/test_handles.c
@@ -4,8 +4,10 @@
 #include "orconfig.h"
 #include "test/test.h"
 
-#include "common/util.h"
 #include "lib/container/handles.h"
+#include "lib/log/util_bug.h"
+
+#include <stdio.h>
 
 typedef struct demo_t {
   HANDLE_ENTRY(demo, demo_t);
@@ -94,4 +96,3 @@ struct testcase_t handle_tests[] = {
   HANDLE_TEST(basic, 0),
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index 28c6316bd0..4c39570e30 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -31,7 +31,6 @@
 #include "or/statefile.h"
 #include "or/circuitlist.h"
 #include "or/dirauth/shared_random.h"
-#include "common/util.h"
 #include "or/voting_schedule.h"
 
 #include "or/microdesc_st.h"
diff --git a/src/test/test_hs_ntor_cl.c b/src/test/test_hs_ntor_cl.c
index 6bf11560b4..8643897db5 100644
--- a/src/test/test_hs_ntor_cl.c
+++ b/src/test/test_hs_ntor_cl.c
@@ -14,7 +14,6 @@
 
 #define ONION_NTOR_PRIVATE
 #include "or/or.h"
-#include "common/util.h"
 #include "lib/crypt_ops/crypto.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "lib/crypt_ops/crypto_ed25519.h"
diff --git a/src/test/test_keypin.c b/src/test/test_keypin.c
index e7e7e62963..e7897a8473 100644
--- a/src/test/test_keypin.c
+++ b/src/test/test_keypin.c
@@ -5,7 +5,6 @@
 #define KEYPIN_PRIVATE
 #include "or/or.h"
 #include "or/keypin.h"
-#include "common/util.h"
 
 #include "test/test.h"
 
diff --git a/src/test/test_ntor_cl.c b/src/test/test_ntor_cl.c
index 75d5ccc126..5711a9116a 100644
--- a/src/test/test_ntor_cl.c
+++ b/src/test/test_ntor_cl.c
@@ -7,7 +7,6 @@
 
 #define ONION_NTOR_PRIVATE
 #include "or/or.h"
-#include "common/util.h"
 #include "lib/crypt_ops/crypto.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "or/onion_ntor.h"
diff --git a/src/test/test_pt.c b/src/test/test_pt.c
index e685ab50de..189cb25846 100644
--- a/src/test/test_pt.c
+++ b/src/test/test_pt.c
@@ -15,7 +15,6 @@
 #include "or/control.h"
 #include "or/transports.h"
 #include "or/circuitbuild.h"
-#include "common/util.h"
 #include "or/statefile.h"
 #include "test/test.h"
 #include "lib/process/subprocess.h"
diff --git a/src/test/test_routerkeys.c b/src/test/test_routerkeys.c
index 8c2be30a8f..2a761ad6e1 100644
--- a/src/test/test_routerkeys.c
+++ b/src/test/test_routerkeys.c
@@ -9,7 +9,6 @@
 #include "or/config.h"
 #include "or/router.h"
 #include "or/routerkeys.h"
-#include "common/util.h"
 #include "lib/crypt_ops/crypto.h"
 #include "lib/crypt_ops/crypto_format.h"
 #include "or/torcert.h"
diff --git a/src/test/test_util_slow.c b/src/test/test_util_slow.c
index aeb0d422c1..5021e89dff 100644
--- a/src/test/test_util_slow.c
+++ b/src/test/test_util_slow.c
@@ -6,13 +6,17 @@
 #include "orconfig.h"
 #define UTIL_PRIVATE
 #define SUBPROCESS_PRIVATE
-#include "common/util.h"
-#include "lib/process/waitpid.h"
 #include "lib/crypt_ops/crypto.h"
 #include "lib/log/torlog.h"
 #include "lib/process/subprocess.h"
+#include "lib/process/waitpid.h"
+#include "lib/string/printf.h"
+#include "lib/time/compat_time.h"
 #include "test/test.h"
 
+#include <errno.h>
+#include <string.h>
+
 #ifndef BUILDDIR
 #define BUILDDIR "."
 #endif