29 files changed, 29 insertions, 29 deletions

diff --git a/src/or/connection.c b/src/or/connection.c
index 9742813310..e3e9c313ae 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -57,7 +57,7 @@
 #define CONNECTION_PRIVATE
 #include "or/or.h"
 #include "or/bridges.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "lib/tls/buffers_tls.h"
 /*
  * Define this so we get channel internal functions, since we're implementing
diff --git a/src/or/connection.h b/src/or/connection.h
index 7fcf710215..1bbe17bffd 100644
--- a/src/or/connection.h
+++ b/src/or/connection.h
@@ -15,7 +15,7 @@
 listener_connection_t *TO_LISTENER_CONN(connection_t *);
 
 /* XXXX For buf_datalen in inline function */
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 
 const char *conn_type_to_string(int type);
 const char *conn_state_to_string(int type, int state);
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 5bb85255bb..e8185a5faa 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -60,7 +60,7 @@
 #include "lib/err/backtrace.h"
 
 #include "or/addressmap.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/channel.h"
 #include "or/circpathbias.h"
 #include "or/circuitlist.h"
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 7badcd3700..9692e5d676 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -22,7 +22,7 @@
  **/
 #include "or/or.h"
 #include "or/bridges.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 /*
  * Define this so we get channel internal functions, since we're implementing
  * part of a subclass (channel_tls_t).
diff --git a/src/or/control.c b/src/or/control.c
index 13814804a4..7063b4cb3b 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -38,7 +38,7 @@
 #include "or/or.h"
 #include "or/addressmap.h"
 #include "or/bridges.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
 #include "or/circuitbuild.h"
diff --git a/src/or/directory.c b/src/or/directory.c
index 2d3f7fe9a0..4e34af3054 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -8,7 +8,7 @@
 #include "or/or.h"
 #include "lib/err/backtrace.h"
 #include "or/bridges.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/circuitbuild.h"
 #include "or/config.h"
 #include "or/connection.h"
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 693160e80c..62d4e73223 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -5,7 +5,7 @@
 
 #define DIRSERV_PRIVATE
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/confparse.h"
 #include "or/channel.h"
diff --git a/src/or/geoip.c b/src/or/geoip.c
index 4a55e3f8db..fac35d3983 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -30,7 +30,7 @@
 #define GEOIP_PRIVATE
 #include "or/or.h"
 #include "ht.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/control.h"
 #include "or/dnsserv.h"
diff --git a/src/or/main.c b/src/or/main.c
index 67ebc980ca..856e988cd2 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -51,7 +51,7 @@
 #include "or/addressmap.h"
 #include "lib/err/backtrace.h"
 #include "or/bridges.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "lib/tls/buffers_tls.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
diff --git a/src/or/proto_cell.c b/src/or/proto_cell.c
index af0862a971..41554bd1b0 100644
--- a/src/or/proto_cell.c
+++ b/src/or/proto_cell.c
@@ -5,7 +5,7 @@
 /* See LICENSE for licensing information */
 
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/proto_cell.h"
 
 #include "or/connection_or.h"
diff --git a/src/or/proto_control0.c b/src/or/proto_control0.c
index 5d83b11cb9..34e7ddb8d9 100644
--- a/src/or/proto_control0.c
+++ b/src/or/proto_control0.c
@@ -5,7 +5,7 @@
 /* See LICENSE for licensing information */
 
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/proto_control0.h"
 
 /** Return 1 iff buf looks more like it has an (obsolete) v0 controller
diff --git a/src/or/proto_ext_or.c b/src/or/proto_ext_or.c
index 495b489bc4..f30d876231 100644
--- a/src/or/proto_ext_or.c
+++ b/src/or/proto_ext_or.c
@@ -5,7 +5,7 @@
 /* See LICENSE for licensing information */
 
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/ext_orport.h"
 #include "or/proto_ext_or.h"
 
diff --git a/src/or/proto_http.c b/src/or/proto_http.c
index 45f763b2af..ecc669e3a4 100644
--- a/src/or/proto_http.c
+++ b/src/or/proto_http.c
@@ -6,7 +6,7 @@
 
 #define PROTO_HTTP_PRIVATE
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/proto_http.h"
 
 /** Return true if <b>cmd</b> looks like a HTTP (proxy) request. */
diff --git a/src/or/proto_socks.c b/src/or/proto_socks.c
index 46439d66b1..94603c2609 100644
--- a/src/or/proto_socks.c
+++ b/src/or/proto_socks.c
@@ -6,7 +6,7 @@
 
 #include "or/or.h"
 #include "or/addressmap.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/control.h"
 #include "or/config.h"
 #include "lib/crypt_ops/crypto_util.h"
diff --git a/src/or/relay.c b/src/or/relay.c
index 9ff3d96c11..e8e1762b40 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -49,7 +49,7 @@
 #include "or/or.h"
 #include "or/addressmap.h"
 #include "lib/err/backtrace.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/channel.h"
 #include "or/circpathbias.h"
 #include "or/circuitbuild.h"
diff --git a/src/or/scheduler.c b/src/or/scheduler.c
index 5190100261..960972de86 100644
--- a/src/or/scheduler.c
+++ b/src/or/scheduler.c
@@ -9,7 +9,7 @@
 #define SCHEDULER_KIST_PRIVATE
 #include "or/scheduler.h"
 #include "or/main.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #define TOR_CHANNEL_INTERNAL_
 #include "or/channeltls.h"
 
diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c
index b62281d586..3059952b92 100644
--- a/src/or/scheduler_kist.c
+++ b/src/or/scheduler_kist.c
@@ -4,7 +4,7 @@
 #define SCHEDULER_KIST_PRIVATE
 
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/connection.h"
 #include "or/networkstatus.h"
diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c
index c82c658d97..772f2099b6 100644
--- a/src/test/fuzz/fuzz_http.c
+++ b/src/test/fuzz/fuzz_http.c
@@ -8,7 +8,7 @@
 
 #include "or/or.h"
 #include "lib/err/backtrace.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/connection.h"
 #include "or/directory.h"
diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c
index 32bd261350..bf0a9deba6 100644
--- a/src/test/fuzz/fuzz_http_connect.c
+++ b/src/test/fuzz/fuzz_http_connect.c
@@ -8,7 +8,7 @@
 
 #include "or/or.h"
 #include "lib/err/backtrace.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/connection.h"
 #include "or/connection_edge.h"
diff --git a/src/test/test.c b/src/test/test.c
index 8ce756492d..e3121293c3 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -41,7 +41,7 @@ double fabs(double x);
 
 #include "or/or.h"
 #include "lib/err/backtrace.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/circuitlist.h"
 #include "or/circuitstats.h"
 #include "lib/compress/compress.h"
diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c
index 080325538f..66ee997225 100644
--- a/src/test/test_buffers.c
+++ b/src/test/test_buffers.c
@@ -6,7 +6,7 @@
 #define BUFFERS_PRIVATE
 #define PROTO_HTTP_PRIVATE
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "lib/tls/buffers_tls.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "or/proto_http.h"
diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c
index bd11826778..aed766fc00 100644
--- a/src/test/test_channeltls.c
+++ b/src/test/test_channeltls.c
@@ -8,7 +8,7 @@
 #define TOR_CHANNEL_INTERNAL_
 #include "or/or.h"
 #include "lib/net/address.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
 #include "or/connection_or.h"
diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c
index 3e99961ce5..0032ef5b78 100644
--- a/src/test/test_extorport.c
+++ b/src/test/test_extorport.c
@@ -5,7 +5,7 @@
 #define EXT_ORPORT_PRIVATE
 #define MAIN_PRIVATE
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/connection.h"
 #include "or/connection_or.h"
 #include "or/config.h"
diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c
index 2b1c33aa62..ba279c790b 100644
--- a/src/test/test_helpers.c
+++ b/src/test/test_helpers.c
@@ -14,7 +14,7 @@
 #include "orconfig.h"
 #include "or/or.h"
 
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/confparse.h"
 #include "or/connection.h"
diff --git a/src/test/test_oom.c b/src/test/test_oom.c
index c78ec4099f..2e5989c0d0 100644
--- a/src/test/test_oom.c
+++ b/src/test/test_oom.c
@@ -8,7 +8,7 @@
 #define CIRCUITLIST_PRIVATE
 #define CONNECTION_PRIVATE
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/circuitlist.h"
 #include "common/compat_libevent.h"
 #include "or/connection.h"
diff --git a/src/test/test_proto_http.c b/src/test/test_proto_http.c
index b98ee83aea..57bfe24633 100644
--- a/src/test/test_proto_http.c
+++ b/src/test/test_proto_http.c
@@ -8,7 +8,7 @@
 
 #include "or/or.h"
 #include "test/test.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/proto_http.h"
 #include "test/log_test_helpers.h"
 
diff --git a/src/test/test_proto_misc.c b/src/test/test_proto_misc.c
index 979fc72f18..7f066e14ad 100644
--- a/src/test/test_proto_misc.c
+++ b/src/test/test_proto_misc.c
@@ -8,7 +8,7 @@
 
 #include "or/or.h"
 #include "test/test.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/connection_or.h"
 #include "or/ext_orport.h"
 #include "or/proto_cell.h"
diff --git a/src/test/test_socks.c b/src/test/test_socks.c
index 04c0280584..1d2c0cf2b5 100644
--- a/src/test/test_socks.c
+++ b/src/test/test_socks.c
@@ -4,7 +4,7 @@
 /* See LICENSE for licensing information */
 
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/proto_socks.h"
 #include "test/test.h"
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 77196028da..539782e93b 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -13,7 +13,7 @@
 #define SUBPROCESS_PRIVATE
 #include "lib/testsupport/testsupport.h"
 #include "or/or.h"
-#include "common/buffers.h"
+#include "lib/container/buffers.h"
 #include "or/config.h"
 #include "or/control.h"
 #include "or/transports.h"