21 files changed, 25 insertions, 25 deletions
diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index 913fa666e1..da323e55ac 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -34,7 +34,7 @@
 #include <mach/mach_time.h>
 #endif
 
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 #include "common/torlog.h"
 #include "common/util.h"
 #include "common/container.h"
diff --git a/src/common/log.c b/src/common/log.c
index 6dba5bf4b0..928a3fba8a 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -34,7 +34,7 @@
 #define LOG_PRIVATE
 #include "common/torlog.h"
 #include "common/container.h"
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 
 #ifdef HAVE_ANDROID_LOG_H
 #include <android/log.h>
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 3679037f8d..4fc1327307 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -34,7 +34,7 @@
 
 #include "common/sandbox.h"
 #include "common/container.h"
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 #include "common/torlog.h"
 #include "common/torint.h"
 #include "common/util.h"
@@ -80,7 +80,7 @@
   defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION)
 #define USE_BACKTRACE
 #define EXPOSE_CLEAN_BACKTRACE
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #endif /* defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && ... */
 
 #ifdef USE_BACKTRACE
diff --git a/src/common/util.c b/src/common/util.c
index 664ab34d2a..de46cc7c87 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -21,7 +21,7 @@
 #include "common/container.h"
 #include "common/address.h"
 #include "common/sandbox.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "common/util_process.h"
 #include "common/util_format.h"
 
diff --git a/src/common/util.h b/src/common/util.h
index a5e6c4d462..8761e455fd 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -22,7 +22,7 @@
 /* for the correct alias to struct stat */
 #include <sys/stat.h>
 #endif
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 #include "common/util_bug.h"
 
 #ifndef O_BINARY
diff --git a/src/common/util_bug.c b/src/common/util_bug.c
index da34201c1e..5cfd00649f 100644
--- a/src/common/util_bug.c
+++ b/src/common/util_bug.c
@@ -10,7 +10,7 @@
 #include "orconfig.h"
 #include "common/util_bug.h"
 #include "common/torlog.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "common/container.h"
 
 #ifdef __COVERITY__
diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c
index d83cbba0e8..cded6459f7 100644
--- a/src/lib/err/backtrace.c
+++ b/src/lib/err/backtrace.c
@@ -14,7 +14,7 @@
  */
 
 #include "orconfig.h"
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 
 #ifdef HAVE_EXECINFO_H
 #include <execinfo.h>
@@ -45,8 +45,8 @@
 #endif
 
 #define EXPOSE_CLEAN_BACKTRACE
-#include "common/backtrace.h"
-#include "common/torerr.h"
+#include "lib/err/backtrace.h"
+#include "lib/err/torerr.h"
 
 #if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \
   defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION)
diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c
index 0e0c4db355..81f3605964 100644
--- a/src/lib/err/torerr.c
+++ b/src/lib/err/torerr.c
@@ -28,8 +28,8 @@
 #include <sys/types.h>
 #endif
 
-#include "common/torerr.h"
-#include "common/backtrace.h"
+#include "lib/err/torerr.h"
+#include "lib/err/backtrace.h"
 
 /** Array of fds to log crash-style warnings to. */
 static int sigsafe_log_fds[TOR_SIGSAFE_LOG_MAX_FDS] = { STDERR_FILENO };
diff --git a/src/or/connection.c b/src/or/connection.c
index 267719881f..450903d6d1 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -65,7 +65,7 @@
  */
 #define TOR_CHANNEL_INTERNAL_
 #define CONNECTION_PRIVATE
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
 #include "or/circuitbuild.h"
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 125709786d..6d6279c831 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -57,7 +57,7 @@
 
 #include "or/or.h"
 
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 
 #include "or/addressmap.h"
 #include "common/buffers.h"
diff --git a/src/or/directory.c b/src/or/directory.c
index e008ac7f7e..9918433f5e 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -6,7 +6,7 @@
 #define DIRECTORY_PRIVATE
 
 #include "or/or.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "or/bridges.h"
 #include "common/buffers.h"
 #include "or/circuitbuild.h"
diff --git a/src/or/main.c b/src/or/main.c
index b2856d3f8d..4ca180af2c 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -49,7 +49,7 @@
 #define MAIN_PRIVATE
 #include "or/or.h"
 #include "or/addressmap.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "or/bridges.h"
 #include "common/buffers.h"
 #include "common/buffers_tls.h"
diff --git a/src/or/relay.c b/src/or/relay.c
index af03cd4748..8a97d72f95 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -48,7 +48,7 @@
 #define RELAY_PRIVATE
 #include "or/or.h"
 #include "or/addressmap.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "common/buffers.h"
 #include "or/channel.h"
 #include "or/circpathbias.h"
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 9ab01f4b39..9a6cf8c25e 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -92,7 +92,7 @@
 
 #define ROUTERLIST_PRIVATE
 #include "or/or.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "or/bridges.h"
 #include "common/crypto_ed25519.h"
 #include "or/circuitstats.h"
diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c
index a5be26df4f..564edbb55e 100644
--- a/src/test/fuzz/fuzz_http.c
+++ b/src/test/fuzz/fuzz_http.c
@@ -7,7 +7,7 @@
 #define DIRECTORY_PRIVATE
 
 #include "or/or.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "common/buffers.h"
 #include "or/config.h"
 #include "or/connection.h"
diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c
index 6640075023..1cde742f27 100644
--- a/src/test/fuzz/fuzz_http_connect.c
+++ b/src/test/fuzz/fuzz_http_connect.c
@@ -7,7 +7,7 @@
 #define CONNECTION_EDGE_PRIVATE
 
 #include "or/or.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "common/buffers.h"
 #include "or/config.h"
 #include "or/connection.h"
diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c
index b2fc85a497..12ebd97bd6 100644
--- a/src/test/fuzz/fuzzing_common.c
+++ b/src/test/fuzz/fuzzing_common.c
@@ -3,7 +3,7 @@
 #define CRYPTO_ED25519_PRIVATE
 #include "orconfig.h"
 #include "or/or.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "or/config.h"
 #include "test/fuzz/fuzzing.h"
 #include "common/crypto.h"
diff --git a/src/test/test.c b/src/test/test.c
index 98f554b319..8bdeb60bd9 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -40,7 +40,7 @@ long int lround(double x);
 double fabs(double x);
 
 #include "or/or.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "common/buffers.h"
 #include "or/circuitlist.h"
 #include "or/circuitstats.h"
diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c
index d2d167ac33..66dd931e54 100644
--- a/src/test/test_bt_cl.c
+++ b/src/test/test_bt_cl.c
@@ -9,7 +9,7 @@
 #undef TOR_COVERAGE
 #include "or/or.h"
 #include "common/util.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "common/torlog.h"
 
 /* -1: no crash.
diff --git a/src/test/test_logging.c b/src/test/test_logging.c
index eaad7ed135..d31c70437e 100644
--- a/src/test/test_logging.c
+++ b/src/test/test_logging.c
@@ -3,7 +3,7 @@
 
 #include "orconfig.h"
 #include "or/or.h"
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
 #include "common/torlog.h"
 #include "test/test.h"
 
diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index 8b83265d8f..f9e60001da 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -15,7 +15,7 @@
 #include "or/config.h"
 #include "common/crypto_rand.h"
 #include "or/rephist.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
 #include "test/test.h"
 #include "or/channelpadding.h"
 #include "or/main.h"