diff --git a/src/common/buffers.c b/src/common/buffers.c
index 997bbdcccb89a4d548e001965f271125d72ea247..fd029c26c8a877b2725209a0b5c76461fb9e67a7 100644
--- a/src/common/buffers.c
+++ b/src/common/buffers.c
@@ -23,7 +23,7 @@
 #include <stddef.h>
 #include "common/buffers.h"
 #include "common/compat.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
 #include "common/util.h"
 #include "common/torint.h"
 #include "common/torlog.h"
diff --git a/src/common/buffers_tls.c b/src/common/buffers_tls.c
index dfc8e44b98b1c0cc0ba8f3e556c8075b757516c1..c380369b514c6864787b8fcc4da6cb07da0cf884 100644
--- a/src/common/buffers_tls.c
+++ b/src/common/buffers_tls.c
@@ -10,7 +10,7 @@
 #include "common/buffers.h"
 #include "common/buffers_tls.h"
 #include "common/compat.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
 #include "common/util.h"
 #include "common/torint.h"
 #include "common/torlog.h"
diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c
index 44bb891af437163d88f244d75844813051c3211f..0d0c8112e2dac56396b78dfa5ac10c0aaad3031f 100644
--- a/src/lib/compress/compress.c
+++ b/src/lib/compress/compress.c
@@ -21,11 +21,11 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_lzma.h"
-#include "common/compress_none.h"
-#include "common/compress_zlib.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_lzma.h"
+#include "lib/compress/compress_none.h"
+#include "lib/compress/compress_zlib.h"
+#include "lib/compress/compress_zstd.h"
 
 /** Total number of bytes allocated for compression state overhead. */
 static atomic_counter_t total_compress_allocation;
diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c
index 363dc1fb92c7efebb8c2569e2572f28b298f7861..921aaa1d727c917d955079a794d54b6cd79c1a24 100644
--- a/src/lib/compress/compress_lzma.c
+++ b/src/lib/compress/compress_lzma.c
@@ -15,8 +15,8 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_lzma.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_lzma.h"
 
 #ifdef HAVE_LZMA
 #include <lzma.h>
diff --git a/src/lib/compress/compress_none.c b/src/lib/compress/compress_none.c
index 7e67046d34c38e5b4fd53073bf84e9956fe067f0..05a27e5cc3ec41d656ad1fbc27a5931eafc64680 100644
--- a/src/lib/compress/compress_none.c
+++ b/src/lib/compress/compress_none.c
@@ -18,8 +18,8 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_none.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_none.h"
 
 /** Transfer some bytes using the identity transformation.  Read up to
  * *<b>in_len</b> bytes from *<b>in</b>, and write up to *<b>out_len</b> bytes
diff --git a/src/lib/compress/compress_zlib.c b/src/lib/compress/compress_zlib.c
index 663e27f794813e8736f1e4ea676a071d604047cd..56dda8a2de8c97160f8b80ea7a22e547dc8a332e 100644
--- a/src/lib/compress/compress_zlib.c
+++ b/src/lib/compress/compress_zlib.c
@@ -15,8 +15,8 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_zlib.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_zlib.h"
 
 /* zlib 1.2.4 and 1.2.5 do some "clever" things with macros.  Instead of
    saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory
diff --git a/src/lib/compress/compress_zstd.c b/src/lib/compress/compress_zstd.c
index dc0dcdec93a08e7ca59da39a9f7d44d07d5e7543..37204ab5efaaba937f59bf3e46c524ea2f425eac 100644
--- a/src/lib/compress/compress_zstd.c
+++ b/src/lib/compress/compress_zstd.c
@@ -15,8 +15,8 @@
 
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/compress.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress.h"
+#include "lib/compress/compress_zstd.h"
 
 #ifdef ENABLE_ZSTD_ADVANCED_APIS
 /* This is a lie, but we make sure it doesn't get us in trouble by wrapping
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index c3d017bf8daccf7b59f5dfac853ba064e68d8f35..1af970040dc1ae8d9d7119385bca63c21944b172 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -86,9 +86,9 @@
 #include "or/routerlist.h"
 #include "or/routerset.h"
 #include "or/channelpadding.h"
-#include "common/compress_lzma.h"
-#include "common/compress_zlib.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress_lzma.h"
+#include "lib/compress/compress_zlib.h"
+#include "lib/compress/compress_zstd.h"
 
 #include "ht.h"
 
diff --git a/src/or/config.c b/src/or/config.c
index 8c6e2382fbd4341722c0794feec0814210ce6755..37e6a6f9214ff8f1d233b276f979ee16aa68ab7b 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -70,7 +70,7 @@
 #include "or/circuitmux.h"
 #include "or/circuitmux_ewma.h"
 #include "or/circuitstats.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
 #include "or/config.h"
 #include "or/connection.h"
 #include "or/connection_edge.h"
diff --git a/src/or/main.c b/src/or/main.c
index 4ca180af2cc5bacbbb2bcd793ea5be962a88f1be..35d6d62bb65278cd1ae64c905fcd74e17dafeea1 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -61,7 +61,7 @@
 #include "or/circuituse.h"
 #include "or/circuitmux_ewma.h"
 #include "or/command.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
 #include "or/config.h"
 #include "or/confparse.h"
 #include "or/connection.h"
diff --git a/src/or/or.h b/src/or/or.h
index 55364beee96bc1d51d2820e9167e6faf0c7e2a2c..66e69f3caaf9542f9ea3cfb21008e7c741d3ccca 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -70,7 +70,7 @@
 #include "common/tortls.h"
 #include "common/torlog.h"
 #include "common/container.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
 #include "common/address.h"
 #include "common/compat_libevent.h"
 #include "ht.h"
diff --git a/src/or/relay.c b/src/or/relay.c
index 8a97d72f952971b3377690691e7689625e07c670..230d14130542a8e67a1986245133505cdf6820c8 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -55,7 +55,7 @@
 #include "or/circuitbuild.h"
 #include "or/circuitlist.h"
 #include "or/circuituse.h"
-#include "common/compress.h"
+#include "lib/compress/compress.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 8bdeb60bd93ea532f41587261361c7f23e3232c9..2bf91cca8bc5f2026a926d52e184d31448ec2d77 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -44,7 +44,7 @@ double fabs(double x);
 #include "common/buffers.h"
 #include "or/circuitlist.h"
 #include "or/circuitstats.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
 #include "or/config.h"
 #include "or/connection_edge.h"
 #include "or/rendcommon.h"
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index fbc14e3d30bceec6889acb4b5d25e2c05d09eb58..90ca7d357c5c377b44a6f186012262c180e6c2e7 100644
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -15,7 +15,7 @@
 #include "or/consdiffmgr.h"
 #include "or/directory.h"
 #include "test/test.h"
-#include "common/compress.h"
+#include "lib/compress/compress.h"
 #include "or/rendcommon.h"
 #include "or/rendcache.h"
 #include "or/router.h"
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 4d06e3e7c45b1745445f7c23a16c3330b7937ee3..4e0fccdff1af1eb409a5ce0538305a8c844cd9cc 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -17,7 +17,7 @@
 #include "common/memarea.h"
 #include "common/util_process.h"
 #include "test/log_test_helpers.h"
-#include "common/compress_zstd.h"
+#include "lib/compress/compress_zstd.h"
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>