Rectify include paths (automated)

65 files changed, 105 insertions, 105 deletions

diff --git a/src/or/addressmap.c b/src/or/addressmap.c
index 9ca2326273..a0df5c9865 100644
--- a/src/or/addressmap.c
+++ b/src/or/addressmap.c
@@ -21,7 +21,7 @@
 #include "or/config.h"
 #include "or/connection_edge.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/dns.h"
 #include "or/nodelist.h"
 #include "or/routerset.h"
diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c
index 190f54f298..2afa483f52 100644
--- a/src/or/channelpadding.c
+++ b/src/or/channelpadding.c
@@ -16,7 +16,7 @@
 #include "or/networkstatus.h"
 #include "or/connection.h"
 #include "or/connection_or.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/main.h"
 #include "or/rephist.h"
 #include "or/router.h"
diff --git a/src/or/circpathbias.c b/src/or/circpathbias.c
index ace29c4a06..908b76b486 100644
--- a/src/or/circpathbias.c
+++ b/src/or/circpathbias.c
@@ -30,7 +30,7 @@
 #include "or/circuitstats.h"
 #include "or/connection_edge.h"
 #include "or/config.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/entrynodes.h"
 #include "or/networkstatus.h"
 #include "or/relay.h"
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index f527082773..28295147cc 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -43,7 +43,7 @@
 #include "or/connection_edge.h"
 #include "or/connection_or.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/directory.h"
 #include "or/entrynodes.h"
 #include "or/hs_ntor.h"
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 9f64a1a20f..a696533ae4 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -65,8 +65,8 @@
 #include "or/connection_edge.h"
 #include "or/connection_or.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/entrynodes.h"
 #include "or/main.h"
diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c
index 3b144e7d98..1ee5f1f621 100644
--- a/src/or/circuitmux_ewma.c
+++ b/src/or/circuitmux_ewma.c
@@ -37,7 +37,7 @@
 #include "or/or.h"
 #include "or/circuitmux.h"
 #include "or/circuitmux_ewma.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/networkstatus.h"
 
 /*** EWMA parameter #defines ***/
diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c
index ebd082306d..34605457d5 100644
--- a/src/or/circuitstats.c
+++ b/src/or/circuitstats.c
@@ -31,7 +31,7 @@
 #include "or/config.h"
 #include "or/confparse.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/main.h"
 #include "or/networkstatus.h"
 #include "or/rendclient.h"
diff --git a/src/or/command.c b/src/or/command.c
index dd8e7d6f3e..387fd49bd2 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -46,7 +46,7 @@
 #include "or/config.h"
 #include "or/control.h"
 #include "or/cpuworker.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/dos.h"
 #include "or/hibernate.h"
 #include "or/nodelist.h"
diff --git a/src/or/config.c b/src/or/config.c
index 37e6a6f921..6bdb4ab7dc 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -79,8 +79,8 @@
 #include "or/control.h"
 #include "or/confparse.h"
 #include "or/cpuworker.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/dirserv.h"
 #include "or/dns.h"
 #include "or/dos.h"
diff --git a/src/or/connection.c b/src/or/connection.c
index 450903d6d1..e06e9c650a 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -58,7 +58,7 @@
 #include "or/or.h"
 #include "or/bridges.h"
 #include "common/buffers.h"
-#include "common/buffers_tls.h"
+#include "lib/tls/buffers_tls.h"
 /*
  * Define this so we get channel internal functions, since we're implementing
  * part of a subclass (channel_tls_t).
@@ -76,7 +76,7 @@
 #include "or/connection_edge.h"
 #include "or/connection_or.h"
 #include "or/control.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/dirserv.h"
 #include "or/dns.h"
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 6d6279c831..5bb85255bb 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -70,7 +70,7 @@
 #include "or/connection_edge.h"
 #include "or/connection_or.h"
 #include "or/control.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/dns.h"
 #include "or/dnsserv.h"
 #include "or/directory.h"
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index aff5f105a1..7badcd3700 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -39,8 +39,8 @@
 #include "or/connection.h"
 #include "or/connection_or.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/dirserv.h"
 #include "or/entrynodes.h"
 #include "or/geoip.h"
diff --git a/src/or/conscache.c b/src/or/conscache.c
index 5bfd78a786..63ff0db787 100644
--- a/src/or/conscache.c
+++ b/src/or/conscache.c
@@ -5,7 +5,7 @@
 
 #include "or/config.h"
 #include "or/conscache.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "common/storagedir.h"
 
 #define CCE_MAGIC 0x17162253
diff --git a/src/or/control.c b/src/or/control.c
index 0460463d78..13814804a4 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -53,8 +53,8 @@
 #include "or/connection_edge.h"
 #include "or/connection_or.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/dirserv.h"
 #include "or/dnsserv.h"
@@ -104,7 +104,7 @@
 #include <sys/resource.h>
 #endif
 
-#include "common/crypto_s2k.h"
+#include "lib/crypt_ops/crypto_s2k.h"
 #include "common/procmon.h"
 
 /** Yield true iff <b>s</b> is the state of a control_connection_t that has
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index 18b8adab86..24a75b16df 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -24,8 +24,8 @@
 #include "or/connection_or.h"
 #include "or/config.h"
 #include "or/cpuworker.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/main.h"
 #include "or/onion.h"
 #include "or/rephist.h"
diff --git a/src/or/dirauth/shared_random.c b/src/or/dirauth/shared_random.c
index 0860efacad..8b53c1e743 100644
--- a/src/or/dirauth/shared_random.c
+++ b/src/or/dirauth/shared_random.c
@@ -91,8 +91,8 @@
 #include "or/dirauth/shared_random.h"
 #include "or/config.h"
 #include "or/confparse.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/networkstatus.h"
 #include "or/router.h"
 #include "or/routerkeys.h"
diff --git a/src/or/dirauth/shared_random_state.c b/src/or/dirauth/shared_random_state.c
index 9bea02e820..f77a64dfc9 100644
--- a/src/or/dirauth/shared_random_state.c
+++ b/src/or/dirauth/shared_random_state.c
@@ -13,7 +13,7 @@
 #include "or/or.h"
 #include "or/config.h"
 #include "or/confparse.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/dirauth/dirvote.h"
 #include "or/networkstatus.h"
 #include "or/router.h"
diff --git a/src/or/directory.c b/src/or/directory.c
index 9918433f5e..2d3f7fe9a0 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -18,8 +18,8 @@
 #include "or/consdiffmgr.h"
 #include "or/control.h"
 #include "common/compat.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/dirserv.h"
 #include "or/entrynodes.h"
diff --git a/src/or/dns.c b/src/or/dns.c
index 3f5d39b41d..8d809d8c3c 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -56,7 +56,7 @@
 #include "or/connection.h"
 #include "or/connection_edge.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/dns.h"
 #include "or/main.h"
 #include "or/policies.h"
diff --git a/src/or/dos.c b/src/or/dos.c
index 5f4142b0e9..02bdbcf35d 100644
--- a/src/or/dos.c
+++ b/src/or/dos.c
@@ -12,7 +12,7 @@
 #include "or/channel.h"
 #include "or/config.h"
 #include "or/connection_or.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/geoip.h"
 #include "or/main.h"
 #include "or/networkstatus.h"
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 6d13efda90..1fb6215906 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -124,7 +124,7 @@
 #include "or/confparse.h"
 #include "or/connection.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/directory.h"
 #include "or/entrynodes.h"
 #include "or/main.h"
diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c
index d84f263aa6..701dc45288 100644
--- a/src/or/ext_orport.c
+++ b/src/or/ext_orport.c
@@ -22,8 +22,8 @@
 #include "or/connection_or.h"
 #include "or/control.h"
 #include "or/config.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/ext_orport.h"
 #include "or/main.h"
 #include "or/proto_ext_or.h"
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 595b839574..12264f758f 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -36,7 +36,7 @@ hibernating, phase 2:
 #include "or/connection_edge.h"
 #include "or/connection_or.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/hibernate.h"
 #include "or/main.h"
 #include "or/router.h"
diff --git a/src/or/hs_cache.c b/src/or/hs_cache.c
index c16a42a482..a42fe6b1a3 100644
--- a/src/or/hs_cache.c
+++ b/src/or/hs_cache.c
@@ -11,7 +11,7 @@
 
 #include "or/or.h"
 #include "or/config.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/hs_ident.h"
 #include "or/hs_common.h"
 #include "or/hs_client.h"
diff --git a/src/or/hs_cache.h b/src/or/hs_cache.h
index 5ca158781b..78ed81b6e0 100644
--- a/src/or/hs_cache.h
+++ b/src/or/hs_cache.h
@@ -11,7 +11,7 @@
 
 #include <stdint.h>
 
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 #include "or/hs_common.h"
 #include "or/hs_descriptor.h"
 #include "or/rendcommon.h"
diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c
index 40ec4ba9e7..b50c87dfa3 100644
--- a/src/or/hs_cell.c
+++ b/src/or/hs_cell.c
@@ -8,7 +8,7 @@
 
 #include "or/or.h"
 #include "or/config.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/rendservice.h"
 #include "or/replaycache.h"
 #include "common/util.h"
diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c
index 36a9820446..9fcb30ecc6 100644
--- a/src/or/hs_circuit.c
+++ b/src/or/hs_circuit.c
@@ -13,8 +13,8 @@
 #include "or/circuitlist.h"
 #include "or/circuituse.h"
 #include "or/config.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/nodelist.h"
 #include "or/policies.h"
 #include "or/relay.h"
diff --git a/src/or/hs_circuit.h b/src/or/hs_circuit.h
index fbf11d1cc8..425070f4ca 100644
--- a/src/or/hs_circuit.h
+++ b/src/or/hs_circuit.h
@@ -10,7 +10,7 @@
 #define TOR_HS_CIRCUIT_H
 
 #include "or/or.h"
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 
 #include "or/hs_service.h"
 
diff --git a/src/or/hs_client.c b/src/or/hs_client.c
index 331793c1fa..90a3fb3dcb 100644
--- a/src/or/hs_client.c
+++ b/src/or/hs_client.c
@@ -17,8 +17,8 @@
 #include "or/connection.h"
 #include "or/connection_edge.h"
 #include "common/container.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/hs_cache.h"
 #include "or/hs_cell.h"
diff --git a/src/or/hs_client.h b/src/or/hs_client.h
index f7fca0b00e..8083910747 100644
--- a/src/or/hs_client.h
+++ b/src/or/hs_client.h
@@ -9,7 +9,7 @@
 #ifndef TOR_HS_CLIENT_H
 #define TOR_HS_CLIENT_H
 
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 #include "or/hs_descriptor.h"
 #include "or/hs_ident.h"
 
diff --git a/src/or/hs_common.c b/src/or/hs_common.c
index 51d74bf5af..e88a04620e 100644
--- a/src/or/hs_common.c
+++ b/src/or/hs_common.c
@@ -15,8 +15,8 @@
 
 #include "or/config.h"
 #include "or/circuitbuild.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/networkstatus.h"
 #include "or/nodelist.h"
 #include "or/hs_cache.h"
diff --git a/src/or/hs_control.c b/src/or/hs_control.c
index fc828d0721..76c40918bb 100644
--- a/src/or/hs_control.c
+++ b/src/or/hs_control.c
@@ -8,7 +8,7 @@
 
 #include "or/or.h"
 #include "or/control.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/hs_common.h"
 #include "or/hs_control.h"
 #include "or/hs_descriptor.h"
diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c
index feec0e66d4..db88cdc4a4 100644
--- a/src/or/hs_descriptor.c
+++ b/src/or/hs_descriptor.c
@@ -59,8 +59,8 @@
 #include "trunnel/ed25519_cert.h" /* Trunnel interface. */
 #include "or/hs_descriptor.h"
 #include "or/circuitbuild.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/parsecommon.h"
 #include "or/rendcache.h"
 #include "or/hs_cache.h"
diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h
index 8a2df95277..5478edc89b 100644
--- a/src/or/hs_descriptor.h
+++ b/src/or/hs_descriptor.h
@@ -14,8 +14,8 @@
 #include "or/or.h"
 #include "common/address.h"
 #include "common/container.h"
-#include "common/crypto.h"
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 #include "trunnel/ed25519_cert.h" /* needed for trunnel */
 #include "or/torcert.h"
 
diff --git a/src/or/hs_ident.c b/src/or/hs_ident.c
index d3d11393f0..20539ca878 100644
--- a/src/or/hs_ident.c
+++ b/src/or/hs_ident.c
@@ -7,7 +7,7 @@
  *        subsytem.
  **/
 
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/hs_ident.h"
 
 /* Return a newly allocated circuit identifier. The given public key is copied
diff --git a/src/or/hs_ident.h b/src/or/hs_ident.h
index 476cdc19ee..8c53b9dbeb 100644
--- a/src/or/hs_ident.h
+++ b/src/or/hs_ident.h
@@ -21,7 +21,7 @@
 #ifndef TOR_HS_IDENT_H
 #define TOR_HS_IDENT_H
 
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 
 #include "or/hs_common.h"
 
diff --git a/src/or/hs_intropoint.h b/src/or/hs_intropoint.h
index 77e41647be..5f82920991 100644
--- a/src/or/hs_intropoint.h
+++ b/src/or/hs_intropoint.h
@@ -9,7 +9,7 @@
 #ifndef TOR_HS_INTRO_H
 #define TOR_HS_INTRO_H
 
-#include "common/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_curve25519.h"
 #include "or/torcert.h"
 
 /* Authentication key type in an ESTABLISH_INTRO cell. */
diff --git a/src/or/hs_ntor.c b/src/or/hs_ntor.c
index 61e1474aad..a8a76ed54d 100644
--- a/src/or/hs_ntor.c
+++ b/src/or/hs_ntor.c
@@ -25,7 +25,7 @@
  */
 
 #include "or/or.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/hs_ntor.h"
 
 /* String constants used by the ntor HS protocol */
diff --git a/src/or/hs_service.c b/src/or/hs_service.c
index 722cc7fc5a..b5649e2636 100644
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@ -15,8 +15,8 @@
 #include "or/circuituse.h"
 #include "or/config.h"
 #include "or/connection.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/main.h"
 #include "or/networkstatus.h"
diff --git a/src/or/hs_service.h b/src/or/hs_service.h
index 32db63bd2e..4676042b54 100644
--- a/src/or/hs_service.h
+++ b/src/or/hs_service.h
@@ -9,8 +9,8 @@
 #ifndef TOR_HS_SERVICE_H
 #define TOR_HS_SERVICE_H
 
-#include "common/crypto_curve25519.h"
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 #include "or/replaycache.h"
 
 #include "or/hs_common.h"
diff --git a/src/or/keypin.c b/src/or/keypin.c
index 17b5010fa5..1bdb471b33 100644
--- a/src/or/keypin.c
+++ b/src/or/keypin.c
@@ -12,8 +12,8 @@
 
 #include "orconfig.h"
 #include "common/compat.h"
-#include "common/crypto_digest.h"
-#include "common/crypto_format.h"
+#include "lib/crypt_ops/crypto_digest.h"
+#include "lib/crypt_ops/crypto_format.h"
 #include "lib/ctime/di_ops.h"
 #include "ht.h"
 #include "or/keypin.h"
diff --git a/src/or/main.c b/src/or/main.c
index 35d6d62bb6..c690fdd906 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -52,7 +52,7 @@
 #include "lib/err/backtrace.h"
 #include "or/bridges.h"
 #include "common/buffers.h"
-#include "common/buffers_tls.h"
+#include "lib/tls/buffers_tls.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
 #include "or/channelpadding.h"
@@ -70,8 +70,8 @@
 #include "or/consdiffmgr.h"
 #include "or/control.h"
 #include "or/cpuworker.h"
-#include "common/crypto_s2k.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_s2k.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/directory.h"
 #include "or/dirserv.h"
 #include "or/dns.h"
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 649d146d45..e6eaffffad 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -48,8 +48,8 @@
 #include "or/connection_or.h"
 #include "or/consdiffmgr.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/dirserv.h"
 #include "or/dos.h"
diff --git a/src/or/onion.c b/src/or/onion.c
index 27e05c7cc7..776aacbf78 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -67,7 +67,7 @@
 #include "or/circuitlist.h"
 #include "or/config.h"
 #include "or/cpuworker.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/networkstatus.h"
 #include "or/onion.h"
 #include "or/onion_fast.h"
diff --git a/src/or/onion_fast.c b/src/or/onion_fast.c
index 7d92de038c..7d555c26e7 100644
--- a/src/or/onion_fast.c
+++ b/src/or/onion_fast.c
@@ -29,8 +29,8 @@
 
 #include "or/or.h"
 #include "or/onion_fast.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 
 /** Release all state held in <b>victim</b>. */
 void
diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c
index d44933a2bd..a6685eb999 100644
--- a/src/or/onion_ntor.c
+++ b/src/or/onion_ntor.c
@@ -21,10 +21,10 @@
 #include "orconfig.h"
 
 #define ONION_NTOR_PRIVATE
-#include "common/crypto.h"
-#include "common/crypto_hkdf.h"
-#include "common/crypto_digest.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto.h"
+#include "lib/crypt_ops/crypto_hkdf.h"
+#include "lib/crypt_ops/crypto_digest.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/onion_ntor.h"
 #include "common/torlog.h"
 #include "common/util.h"
diff --git a/src/or/onion_ntor.h b/src/or/onion_ntor.h
index 0dd66f1e87..b4da3a8d79 100644
--- a/src/or/onion_ntor.h
+++ b/src/or/onion_ntor.h
@@ -5,7 +5,7 @@
 #define TOR_ONION_NTOR_H
 
 #include "lib/cc/torint.h"
-#include "common/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_curve25519.h"
 #include "lib/ctime/di_ops.h"
 
 /** State to be maintained by a client between sending an ntor onionskin
diff --git a/src/or/onion_tap.c b/src/or/onion_tap.c
index 0f9fe31be4..cf5963b19e 100644
--- a/src/or/onion_tap.c
+++ b/src/or/onion_tap.c
@@ -29,8 +29,8 @@
 
 #include "or/or.h"
 #include "or/config.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/onion_tap.h"
 #include "or/rephist.h"
 
diff --git a/src/or/or.h b/src/or/or.h
index 53dc896072..cb7e84e68b 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -63,11 +63,11 @@
 #include <windows.h>
 #endif /* defined(_WIN32) */
 
-#include "common/crypto.h"
-#include "common/crypto_format.h"
-#include "common/crypto_dh.h"
-#include "common/crypto_hkdf.h"
-#include "common/tortls.h"
+#include "lib/crypt_ops/crypto.h"
+#include "lib/crypt_ops/crypto_format.h"
+#include "lib/crypt_ops/crypto_dh.h"
+#include "lib/crypt_ops/crypto_hkdf.h"
+#include "lib/tls/tortls.h"
 #include "common/torlog.h"
 #include "common/container.h"
 #include "lib/compress/compress.h"
@@ -76,8 +76,8 @@
 #include "ht.h"
 #include "common/confline.h"
 #include "or/replaycache.h"
-#include "common/crypto_curve25519.h"
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 #include "tor_queue.h"
 #include "common/token_bucket.h"
 #include "common/util_format.h"
diff --git a/src/or/parsecommon.h b/src/or/parsecommon.h
index bfd5c58b8e..93e62a559d 100644
--- a/src/or/parsecommon.h
+++ b/src/or/parsecommon.h
@@ -10,7 +10,7 @@
 #define TOR_PARSECOMMON_H
 
 #include "common/container.h"
-#include "common/crypto.h"
+#include "lib/crypt_ops/crypto.h"
 #include "common/memarea.h"
 
 /** Enumeration of possible token types.  The ones starting with K_ correspond
diff --git a/src/or/proto_socks.c b/src/or/proto_socks.c
index d113bc9cab..46439d66b1 100644
--- a/src/or/proto_socks.c
+++ b/src/or/proto_socks.c
@@ -9,7 +9,7 @@
 #include "common/buffers.h"
 #include "or/control.h"
 #include "or/config.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/ext_orport.h"
 #include "or/proto_socks.h"
 #include "or/reasons.h"
diff --git a/src/or/relay.c b/src/or/relay.c
index 230d141305..c81e4af303 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -61,8 +61,8 @@
 #include "or/connection_edge.h"
 #include "or/connection_or.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/geoip.h"
 #include "or/hs_cache.h"
diff --git a/src/or/relay_crypto.c b/src/or/relay_crypto.c
index 5179984e7d..6682cd86f4 100644
--- a/src/or/relay_crypto.c
+++ b/src/or/relay_crypto.c
@@ -7,7 +7,7 @@
 #include "or/or.h"
 #include "or/circuitlist.h"
 #include "or/config.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/hs_ntor.h" // for HS_NTOR_KEY_EXPANSION_KDF_OUT_LEN
 #include "or/relay.h"
 #include "or/relay_crypto.h"
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 6fde0ba266..1da695706c 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -16,8 +16,8 @@
 #include "or/connection.h"
 #include "or/connection_edge.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/hs_circuit.h"
 #include "or/hs_client.h"
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 2c1caa6ce5..1eadbd602c 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -16,8 +16,8 @@
 #include "or/circuituse.h"
 #include "or/config.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/hs_client.h"
 #include "or/hs_common.h"
 #include "or/hs_intropoint.h"
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 77a5347125..56b65079ab 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -12,7 +12,7 @@
 #include "or/circuitlist.h"
 #include "or/circuituse.h"
 #include "or/config.h"
-#include "common/crypto.h"
+#include "lib/crypt_ops/crypto.h"
 #include "or/dos.h"
 #include "or/relay.h"
 #include "or/rendmid.h"
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 21a5a4e03b..b2023c72cb 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -16,8 +16,8 @@
 #include "or/circuituse.h"
 #include "or/config.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"
 #include "or/hs_common.h"
 #include "or/hs_config.h"
diff --git a/src/or/rephist.c b/src/or/rephist.c
index c7a0a25563..a1cfc49327 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -78,7 +78,7 @@
 #include "or/circuitlist.h"
 #include "or/circuituse.h"
 #include "or/config.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/networkstatus.h"
 #include "or/nodelist.h"
 #include "or/rephist.h"
diff --git a/src/or/router.c b/src/or/router.c
index 4f162ceac1..f13788d66f 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -13,9 +13,9 @@
 #include "or/config.h"
 #include "or/connection.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
-#include "common/crypto_util.h"
-#include "common/crypto_curve25519.h"
+#include "lib/crypt_ops/crypto_rand.h"
+#include "lib/crypt_ops/crypto_util.h"
+#include "lib/crypt_ops/crypto_curve25519.h"
 #include "or/directory.h"
 #include "or/dirserv.h"
 #include "or/dns.h"
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index 6bf066fbb4..9f4def0e6a 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -16,9 +16,9 @@
 
 #include "or/or.h"
 #include "or/config.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/router.h"
-#include "common/crypto_pwbox.h"
+#include "lib/crypt_ops/crypto_pwbox.h"
 #include "or/routerkeys.h"
 #include "or/torcert.h"
 
diff --git a/src/or/routerkeys.h b/src/or/routerkeys.h
index 2339495d40..a6f06f6e20 100644
--- a/src/or/routerkeys.h
+++ b/src/or/routerkeys.h
@@ -4,7 +4,7 @@
 #ifndef TOR_ROUTERKEYS_H
 #define TOR_ROUTERKEYS_H
 
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 
 #define INIT_ED_KEY_CREATE                      (1u<<0)
 #define INIT_ED_KEY_REPLACE                     (1u<<1)
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 9a6cf8c25e..97b3270f5b 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -94,12 +94,12 @@
 #include "or/or.h"
 #include "lib/err/backtrace.h"
 #include "or/bridges.h"
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 #include "or/circuitstats.h"
 #include "or/config.h"
 #include "or/connection.h"
 #include "or/control.h"
-#include "common/crypto_rand.h"
+#include "lib/crypt_ops/crypto_rand.h"
 #include "or/directory.h"
 #include "or/dirserv.h"
 #include "or/entrynodes.h"
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 48b1828172..a0426b96c6 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -58,7 +58,7 @@
 #include "or/or.h"
 #include "or/circuitstats.h"
 #include "or/config.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/dirauth/shared_random.h"
 #include "or/dirserv.h"
 #include "or/entrynodes.h"
diff --git a/src/or/torcert.c b/src/or/torcert.c
index a6bbe4231d..23dfd3d437 100644
--- a/src/or/torcert.c
+++ b/src/or/torcert.c
@@ -27,7 +27,7 @@
 
 #include "or/or.h"
 #include "or/config.h"
-#include "common/crypto_util.h"
+#include "lib/crypt_ops/crypto_util.h"
 #include "or/torcert.h"
 #include "trunnel/ed25519_cert.h"
 #include "common/torlog.h"
diff --git a/src/or/torcert.h b/src/or/torcert.h
index cba3d3622b..ba5787934b 100644
--- a/src/or/torcert.h
+++ b/src/or/torcert.h
@@ -4,7 +4,7 @@
 #ifndef TORCERT_H_INCLUDED
 #define TORCERT_H_INCLUDED
 
-#include "common/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 
 #define SIGNED_KEY_TYPE_ED25519     0x01