diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj
index f20694f91..fad7208f9 100644
--- a/Transmission.xcodeproj/project.pbxproj
+++ b/Transmission.xcodeproj/project.pbxproj
@@ -3717,19 +3717,6 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"third-party/dht",
-					"third-party/fast_float/include",
-					"third-party/wide-integer",
-					"third-party/libb64/include",
-					"third-party/libdeflate",
-					"third-party/libpsl/include",
-					"third-party/libutp/include",
-					"third-party/utfcpp/source",
-					"third-party/jsonsl",
-					"third-party/wildmat",
-				);
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-DWITH_UTP",
@@ -3742,13 +3729,24 @@
 				PRODUCT_NAME = transmission;
 				SYSTEM_HEADER_SEARCH_PATHS = (
 					"$(inherited)",
+					"third-party/dht",
+					"third-party/fast_float/include",
 					"third-party/fmt/include",
+					"third-party/jsonsl",
+					"third-party/libb64/include",
+					"third-party/libdeflate",
 					"third-party/libevent/include",
+					"third-party/libnatpmp",
+					"third-party/libpsl/include",
+					"third-party/libutp/include",
+					"third-party/miniupnpc",
+					"third-party/utfcpp/source",
+					"third-party/wide-integer",
+					"third-party/wildmat",
 				);
 				USER_HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					"third-party/libnatpmp",
-					"third-party/miniupnpc",
+					"."
 				);
 			};
 			name = Debug;
@@ -3985,13 +3983,24 @@
 				PRODUCT_NAME = transmission;
 				SYSTEM_HEADER_SEARCH_PATHS = (
 					"$(inherited)",
+					"third-party/dht",
+					"third-party/fast_float/include",
 					"third-party/fmt/include",
+					"third-party/jsonsl",
+					"third-party/libb64/include",
+					"third-party/libdeflate",
 					"third-party/libevent/include",
+					"third-party/libnatpmp",
+					"third-party/libpsl/include",
+					"third-party/libutp/include",
+					"third-party/miniupnpc",
+					"third-party/utfcpp/source",
+					"third-party/wide-integer",
+					"third-party/wildmat",
 				);
 				USER_HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					"third-party/libnatpmp",
-					"third-party/miniupnpc",
+					".",
 				);
 			};
 			name = Release;
@@ -4300,13 +4309,24 @@
 				PRODUCT_NAME = transmission;
 				SYSTEM_HEADER_SEARCH_PATHS = (
 					"$(inherited)",
+					"third-party/dht",
+					"third-party/fast_float/include",
 					"third-party/fmt/include",
+					"third-party/jsonsl",
+					"third-party/libb64/include",
+					"third-party/libdeflate",
 					"third-party/libevent/include",
+					"third-party/libnatpmp",
+					"third-party/libpsl/include",
+					"third-party/libutp/include",
+					"third-party/miniupnpc",
+					"third-party/utfcpp/source",
+					"third-party/wide-integer",
+					"third-party/wildmat",
 				);
 				USER_HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					"third-party/libnatpmp",
-					"third-party/miniupnpc",
+					".",
 				);
 			};
 			name = "Release - Debug";
diff --git a/libtransmission/CMakeLists.txt b/libtransmission/CMakeLists.txt
index 4476b1628..5680ec2c7 100644
--- a/libtransmission/CMakeLists.txt
+++ b/libtransmission/CMakeLists.txt
@@ -264,9 +264,7 @@ tr_target_compile_definitions_for_functions(${TR_NAME}
         $<$<BOOL:${HAVE_LIBINTL}>:${LIBINTL_LIBRARY}>) # gettext, ngettext
 
 target_include_directories(${TR_NAME}
-    PRIVATE
-        ${CMAKE_CURRENT_BINARY_DIR}
-    INTERFACE
+    PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}/..
         ${CMAKE_CURRENT_BINARY_DIR}/..)
 
diff --git a/libtransmission/announce-list.cc b/libtransmission/announce-list.cc
index 2af412902..16e9bf066 100644
--- a/libtransmission/announce-list.cc
+++ b/libtransmission/announce-list.cc
@@ -7,14 +7,14 @@
 #include <string>
 #include <string_view>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "announce-list.h"
-#include "quark.h"
-#include "torrent-metainfo.h"
-#include "utils.h"
-#include "variant.h"
-#include "web-utils.h"
+#include "libtransmission/announce-list.h"
+#include "libtransmission/quark.h"
+#include "libtransmission/torrent-metainfo.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant.h"
+#include "libtransmission/web-utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/announcer-http.cc b/libtransmission/announcer-http.cc
index 84fa0abe7..0ccf8884a 100644
--- a/libtransmission/announcer-http.cc
+++ b/libtransmission/announcer-http.cc
@@ -23,21 +23,21 @@
 
 #define LIBTRANSMISSION_ANNOUNCER_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "announcer-common.h"
-#include "benc.h"
-#include "crypto-utils.h"
-#include "error.h"
-#include "log.h"
-#include "net.h"
-#include "peer-mgr.h" /* pex */
-#include "quark.h"
-#include "torrent.h"
-#include "tr-assert.h"
-#include "utils.h"
-#include "web-utils.h"
-#include "web.h"
+#include "libtransmission/announcer-common.h"
+#include "libtransmission/benc.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/error.h"
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/peer-mgr.h" /* pex */
+#include "libtransmission/quark.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/web-utils.h"
+#include "libtransmission/web.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/announcer-udp.cc b/libtransmission/announcer-udp.cc
index 20e09ad62..d6bad6289 100644
--- a/libtransmission/announcer-udp.cc
+++ b/libtransmission/announcer-udp.cc
@@ -25,18 +25,18 @@
 
 #define LIBTRANSMISSION_ANNOUNCER_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "announcer.h"
-#include "announcer-common.h"
-#include "crypto-utils.h" // for tr_rand_obj()
-#include "log.h"
-#include "peer-io.h"
-#include "peer-mgr.h" // for tr_pex::fromCompact4()
-#include "tr-assert.h"
-#include "tr-buffer.h"
-#include "utils.h"
-#include "web-utils.h"
+#include "libtransmission/announcer.h"
+#include "libtransmission/announcer-common.h"
+#include "libtransmission/crypto-utils.h" // for tr_rand_obj()
+#include "libtransmission/log.h"
+#include "libtransmission/peer-io.h"
+#include "libtransmission/peer-mgr.h" // for tr_pex::fromCompact4()
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-buffer.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/web-utils.h"
 
 #define logwarn(interned, msg) tr_logAddWarn(msg, (interned).sv())
 #define logdbg(interned, msg) tr_logAddDebug(msg, (interned).sv())
diff --git a/libtransmission/announcer.cc b/libtransmission/announcer.cc
index ec6dc980e..b1517fbf5 100644
--- a/libtransmission/announcer.cc
+++ b/libtransmission/announcer.cc
@@ -22,19 +22,19 @@
 
 #define LIBTRANSMISSION_ANNOUNCER_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "announce-list.h"
-#include "announcer-common.h"
-#include "announcer.h"
-#include "crypto-utils.h" /* tr_rand_int() */
-#include "log.h"
-#include "session.h"
-#include "timer.h"
-#include "torrent.h"
-#include "tr-assert.h"
-#include "utils.h"
-#include "web-utils.h"
+#include "libtransmission/announce-list.h"
+#include "libtransmission/announcer-common.h"
+#include "libtransmission/announcer.h"
+#include "libtransmission/crypto-utils.h" /* tr_rand_int() */
+#include "libtransmission/log.h"
+#include "libtransmission/session.h"
+#include "libtransmission/timer.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/web-utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/bandwidth.cc b/libtransmission/bandwidth.cc
index cf0b88b98..e879b73e9 100644
--- a/libtransmission/bandwidth.cc
+++ b/libtransmission/bandwidth.cc
@@ -9,14 +9,14 @@
 
 #include <fmt/core.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "bandwidth.h"
-#include "crypto-utils.h"
-#include "log.h"
-#include "peer-io.h"
-#include "tr-assert.h"
-#include "utils.h" // tr_time_msec()
+#include "libtransmission/bandwidth.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/log.h"
+#include "libtransmission/peer-io.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h" // tr_time_msec()
 
 tr_bytes_per_second_t tr_bandwidth::getSpeedBytesPerSecond(RateControl& r, unsigned int interval_msec, uint64_t now)
 {
diff --git a/libtransmission/bitfield.cc b/libtransmission/bitfield.cc
index 45d80f2ed..56310988d 100644
--- a/libtransmission/bitfield.cc
+++ b/libtransmission/bitfield.cc
@@ -8,12 +8,11 @@
 #include <climits> // SIZE_MAX
 #include <vector>
 
-#include "tr-popcount.h"
+#include "libtransmission/transmission.h"
 
-#include "transmission.h"
-
-#include "bitfield.h"
-#include "tr-assert.h"
+#include "libtransmission/bitfield.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-popcount.h"
 
 // ---
 
diff --git a/libtransmission/block-info.cc b/libtransmission/block-info.cc
index 015151adf..dada74051 100644
--- a/libtransmission/block-info.cc
+++ b/libtransmission/block-info.cc
@@ -3,10 +3,10 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "block-info.h"
-#include "tr-assert.h"
+#include "libtransmission/block-info.h"
+#include "libtransmission/tr-assert.h"
 
 void tr_block_info::initSizes(uint64_t total_size_in, uint32_t piece_size_in) noexcept
 {
diff --git a/libtransmission/blocklist.cc b/libtransmission/blocklist.cc
index bc22bbb21..395fdeb6e 100644
--- a/libtransmission/blocklist.cc
+++ b/libtransmission/blocklist.cc
@@ -11,16 +11,16 @@
 
 #include <fmt/core.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "blocklist.h"
-#include "error.h"
-#include "file.h"
-#include "log.h"
-#include "net.h"
-#include "tr-assert.h"
-#include "tr-strbuf.h"
-#include "utils.h" // for _(), tr_strerror(), tr_strvEndsWith()
+#include "libtransmission/blocklist.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/utils.h" // for _(), tr_strerror(), tr_strvEndsWith()
 
 using namespace std::literals;
 
diff --git a/libtransmission/cache.cc b/libtransmission/cache.cc
index f7ae03dcc..ab73f0cd4 100644
--- a/libtransmission/cache.cc
+++ b/libtransmission/cache.cc
@@ -14,14 +14,15 @@
 
 #include <fmt/core.h>
 
-#include "transmission.h"
-#include "cache.h"
-#include "inout.h"
-#include "log.h"
-#include "torrent.h"
-#include "torrents.h"
-#include "tr-assert.h"
-#include "utils.h" // tr_time(), tr_formatter
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/cache.h"
+#include "libtransmission/inout.h"
+#include "libtransmission/log.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/torrents.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h" // tr_time(), tr_formatter
 
 Cache::Key Cache::makeKey(tr_torrent const* torrent, tr_block_info::Location loc) noexcept
 {
diff --git a/libtransmission/clients.cc b/libtransmission/clients.cc
index 1b1344efc..e1c83d773 100644
--- a/libtransmission/clients.cc
+++ b/libtransmission/clients.cc
@@ -16,10 +16,10 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "clients.h"
-#include "utils.h"
+#include "libtransmission/clients.h"
+#include "libtransmission/utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/completion.cc b/libtransmission/completion.cc
index 7bee7e7d5..496c59850 100644
--- a/libtransmission/completion.cc
+++ b/libtransmission/completion.cc
@@ -8,11 +8,11 @@
 #include <utility>
 #include <vector>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "completion.h"
-#include "torrent.h"
-#include "tr-assert.h"
+#include "libtransmission/completion.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
 
 uint64_t tr_completion::computeHasValid() const
 {
diff --git a/libtransmission/crypto-utils-ccrypto.cc b/libtransmission/crypto-utils-ccrypto.cc
index fafff1d4d..047201f74 100644
--- a/libtransmission/crypto-utils-ccrypto.cc
+++ b/libtransmission/crypto-utils-ccrypto.cc
@@ -11,12 +11,12 @@
 
 #include <fmt/core.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h"
-#include "log.h"
-#include "tr-assert.h"
-#include "utils.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/log.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
 
 #define TR_CRYPTO_X509_FALLBACK
 #include "crypto-utils-fallback.cc" // NOLINT(bugprone-suspicious-include)
diff --git a/libtransmission/crypto-utils-fallback.cc b/libtransmission/crypto-utils-fallback.cc
index e3e3be301..7f2c4a054 100644
--- a/libtransmission/crypto-utils-fallback.cc
+++ b/libtransmission/crypto-utils-fallback.cc
@@ -7,10 +7,10 @@
    implement missing (or duplicate) functionality without exposing internal
    details in header files. */
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h"
-#include "tr-macros.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/tr-macros.h"
 
 // ---
 
diff --git a/libtransmission/crypto-utils-mbedtls.cc b/libtransmission/crypto-utils-mbedtls.cc
index 6ee1e97ef..b0617a9b6 100644
--- a/libtransmission/crypto-utils-mbedtls.cc
+++ b/libtransmission/crypto-utils-mbedtls.cc
@@ -15,14 +15,15 @@
 
 #include <fmt/core.h>
 
-#include "transmission.h"
-#include "crypto-utils.h"
-#include "log.h"
-#include "tr-assert.h"
-#include "utils.h"
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/log.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
 
 #define TR_CRYPTO_X509_FALLBACK
-#include "crypto-utils-fallback.cc" // NOLINT(bugprone-suspicious-include)
+#include "libtransmission/crypto-utils-fallback.cc" // NOLINT(bugprone-suspicious-include)
 
 // ---
 
diff --git a/libtransmission/crypto-utils-openssl.cc b/libtransmission/crypto-utils-openssl.cc
index ba6cd2b96..f60e25cac 100644
--- a/libtransmission/crypto-utils-openssl.cc
+++ b/libtransmission/crypto-utils-openssl.cc
@@ -20,12 +20,12 @@
 
 #include <fmt/core.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h"
-#include "log.h"
-#include "tr-assert.h"
-#include "utils.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/log.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
 
 namespace
 {
diff --git a/libtransmission/crypto-utils-wolfssl.cc b/libtransmission/crypto-utils-wolfssl.cc
index cf5d2701e..81b7b9dd5 100644
--- a/libtransmission/crypto-utils-wolfssl.cc
+++ b/libtransmission/crypto-utils-wolfssl.cc
@@ -15,11 +15,12 @@
 
 #include <fmt/core.h>
 
-#include "transmission.h"
-#include "crypto-utils.h"
-#include "log.h"
-#include "tr-assert.h"
-#include "utils.h"
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/log.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
 
 #if LIBWOLFSSL_VERSION_HEX >= 0x04000000 // 4.0.0
 using TR_WC_RNG = WC_RNG;
diff --git a/libtransmission/crypto-utils.cc b/libtransmission/crypto-utils.cc
index a77e2c9a7..e20d0bdaf 100644
--- a/libtransmission/crypto-utils.cc
+++ b/libtransmission/crypto-utils.cc
@@ -22,10 +22,11 @@ extern "C"
 
 #include <fmt/format.h>
 
-#include "transmission.h"
-#include "crypto-utils.h"
-#include "tr-assert.h"
-#include "utils.h"
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/error.cc b/libtransmission/error.cc
index 0b5df26d2..aa3bced31 100644
--- a/libtransmission/error.cc
+++ b/libtransmission/error.cc
@@ -8,12 +8,12 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "error.h"
-#include "tr-assert.h"
-#include "tr-macros.h"
-#include "utils.h"
+#include "libtransmission/error.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-macros.h"
+#include "libtransmission/utils.h"
 
 namespace
 {
diff --git a/libtransmission/file-piece-map.cc b/libtransmission/file-piece-map.cc
index 447fd5927..6d8b592a6 100644
--- a/libtransmission/file-piece-map.cc
+++ b/libtransmission/file-piece-map.cc
@@ -7,12 +7,12 @@
 #include <set>
 #include <vector>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "block-info.h"
-#include "file-piece-map.h"
-#include "torrent-metainfo.h"
-#include "tr-assert.h"
+#include "libtransmission/block-info.h"
+#include "libtransmission/file-piece-map.h"
+#include "libtransmission/torrent-metainfo.h"
+#include "libtransmission/tr-assert.h"
 
 void tr_file_piece_map::reset(tr_block_info const& block_info, uint64_t const* file_sizes, size_t n_files)
 {
diff --git a/libtransmission/file-posix.cc b/libtransmission/file-posix.cc
index 92ed2a6e5..273f861ca 100644
--- a/libtransmission/file-posix.cc
+++ b/libtransmission/file-posix.cc
@@ -51,13 +51,13 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "error.h"
-#include "file.h"
-#include "log.h"
-#include "tr-assert.h"
-#include "tr-strbuf.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-strbuf.h"
 
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0
diff --git a/libtransmission/file-win32.cc b/libtransmission/file-win32.cc
index 322a51184..ecd3838a0 100644
--- a/libtransmission/file-win32.cc
+++ b/libtransmission/file-win32.cc
@@ -17,13 +17,13 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h" /* tr_rand_int() */
-#include "error.h"
-#include "file.h"
-#include "tr-assert.h"
-#include "utils.h"
+#include "libtransmission/crypto-utils.h" /* tr_rand_int() */
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/file.cc b/libtransmission/file.cc
index 4cb2c6f12..39ba1035c 100644
--- a/libtransmission/file.cc
+++ b/libtransmission/file.cc
@@ -6,10 +6,11 @@
 #include <algorithm>
 #include <string_view>
 
-#include "transmission.h"
-#include "error.h"
-#include "file.h"
-#include "tr-assert.h"
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/tr-assert.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/handshake.cc b/libtransmission/handshake.cc
index a09a2f0fc..139387672 100644
--- a/libtransmission/handshake.cc
+++ b/libtransmission/handshake.cc
@@ -12,18 +12,18 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "bitfield.h"
-#include "clients.h"
-#include "crypto-utils.h"
-#include "handshake.h"
-#include "log.h"
-#include "peer-io.h"
-#include "timer.h"
-#include "tr-assert.h"
-#include "tr-buffer.h"
-#include "utils.h"
+#include "libtransmission/bitfield.h"
+#include "libtransmission/clients.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/handshake.h"
+#include "libtransmission/log.h"
+#include "libtransmission/peer-io.h"
+#include "libtransmission/timer.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-buffer.h"
+#include "libtransmission/utils.h"
 
 #define tr_logAddTraceHand(handshake, msg) tr_logAddTrace(msg, (handshake)->peer_io_->display_name())
 
diff --git a/libtransmission/inout.cc b/libtransmission/inout.cc
index 458cb05b8..8eac8dd1d 100644
--- a/libtransmission/inout.cc
+++ b/libtransmission/inout.cc
@@ -10,17 +10,17 @@
 
 #include <fmt/core.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "cache.h" /* tr_cacheReadBlock() */
-#include "crypto-utils.h"
-#include "error.h"
-#include "file.h"
-#include "inout.h"
-#include "log.h"
-#include "torrent.h"
-#include "tr-assert.h"
-#include "utils.h"
+#include "libtransmission/cache.h" /* tr_cacheReadBlock() */
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/inout.h"
+#include "libtransmission/log.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/log.cc b/libtransmission/log.cc
index 63f5740a8..3b24742ae 100644
--- a/libtransmission/log.cc
+++ b/libtransmission/log.cc
@@ -13,20 +13,20 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/chrono.h>
-#include <fmt/format.h>
-
-#include "transmission.h"
-
-#include "file.h"
-#include "log.h"
-#include "tr-assert.h"
-#include "utils.h"
-
 #ifdef __ANDROID__
 #include <android/log.h>
 #endif
 
+#include <fmt/chrono.h>
+#include <fmt/format.h>
+
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
+
 using namespace std::literals;
 
 namespace
diff --git a/libtransmission/magnet-metainfo.cc b/libtransmission/magnet-metainfo.cc
index 04e003e8b..2dfa3b2c4 100644
--- a/libtransmission/magnet-metainfo.cc
+++ b/libtransmission/magnet-metainfo.cc
@@ -12,15 +12,15 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h"
-#include "error.h"
-#include "error-types.h"
-#include "magnet-metainfo.h"
-#include "tr-assert.h"
-#include "utils.h"
-#include "web-utils.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/error.h"
+#include "libtransmission/error-types.h"
+#include "libtransmission/magnet-metainfo.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/web-utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/makemeta.cc b/libtransmission/makemeta.cc
index e6e899d43..f74b27735 100644
--- a/libtransmission/makemeta.cc
+++ b/libtransmission/makemeta.cc
@@ -15,18 +15,18 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h"
-#include "error.h"
-#include "file.h"
-#include "log.h"
-#include "makemeta.h"
-#include "session.h" // TR_NAME
-#include "tr-assert.h"
-#include "utils.h" // for _()
-#include "variant.h"
-#include "version.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/makemeta.h"
+#include "libtransmission/session.h" // TR_NAME
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h" // for _()
+#include "libtransmission/variant.h"
+#include "libtransmission/version.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/net.cc b/libtransmission/net.cc
index dee7de52c..71a22373a 100644
--- a/libtransmission/net.cc
+++ b/libtransmission/net.cc
@@ -27,17 +27,17 @@
 
 #include <libutp/utp.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "log.h"
-#include "net.h"
-#include "peer-socket.h"
-#include "session.h"
-#include "tr-assert.h"
-#include "tr-macros.h"
-#include "tr-utp.h"
-#include "utils.h"
-#include "variant.h"
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/peer-socket.h"
+#include "libtransmission/session.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-macros.h"
+#include "libtransmission/tr-utp.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/open-files.cc b/libtransmission/open-files.cc
index 60b90406e..894920054 100644
--- a/libtransmission/open-files.cc
+++ b/libtransmission/open-files.cc
@@ -11,16 +11,16 @@
 
 #include <fmt/core.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "error-types.h"
-#include "error.h"
-#include "file.h"
-#include "log.h"
-#include "open-files.h"
-#include "tr-assert.h"
-#include "tr-strbuf.h"
-#include "utils.h" // _()
+#include "libtransmission/error-types.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/open-files.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/utils.h" // _()
 
 namespace
 {
diff --git a/libtransmission/peer-io.cc b/libtransmission/peer-io.cc
index 65e39ca92..a8181f4d9 100644
--- a/libtransmission/peer-io.cc
+++ b/libtransmission/peer-io.cc
@@ -17,15 +17,16 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
-#include "session.h"
-#include "bandwidth.h"
-#include "log.h"
-#include "net.h"
-#include "peer-io.h"
-#include "tr-assert.h"
-#include "tr-utp.h"
-#include "utils.h" // for _()
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/session.h"
+#include "libtransmission/bandwidth.h"
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/peer-io.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-utp.h"
+#include "libtransmission/utils.h" // for _()
 
 #ifdef _WIN32
 #undef EAGAIN
diff --git a/libtransmission/peer-mgr-active-requests.cc b/libtransmission/peer-mgr-active-requests.cc
index a5c21dc2b..dda6888fe 100644
--- a/libtransmission/peer-mgr-active-requests.cc
+++ b/libtransmission/peer-mgr-active-requests.cc
@@ -13,8 +13,10 @@
 
 #define LIBTRANSMISSION_PEER_MODULE
 
-#include "peer-mgr-active-requests.h"
-#include "tr-assert.h"
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/peer-mgr-active-requests.h"
+#include "libtransmission/tr-assert.h"
 
 namespace
 {
diff --git a/libtransmission/peer-mgr-wishlist.cc b/libtransmission/peer-mgr-wishlist.cc
index b0adbbc61..54113e3e7 100644
--- a/libtransmission/peer-mgr-wishlist.cc
+++ b/libtransmission/peer-mgr-wishlist.cc
@@ -11,11 +11,11 @@
 
 #define LIBTRANSMISSION_PEER_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h" // for tr_salt_shaker
-#include "peer-mgr-wishlist.h"
-#include "tr-assert.h"
+#include "libtransmission/crypto-utils.h" // for tr_salt_shaker
+#include "libtransmission/peer-mgr-wishlist.h"
+#include "libtransmission/tr-assert.h"
 
 namespace
 {
diff --git a/libtransmission/peer-mgr.cc b/libtransmission/peer-mgr.cc
index fda8ed918..dbaa07d97 100644
--- a/libtransmission/peer-mgr.cc
+++ b/libtransmission/peer-mgr.cc
@@ -23,31 +23,31 @@
 #include <fmt/format.h>
 
 #define LIBTRANSMISSION_PEER_MODULE
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "announcer.h"
-#include "bandwidth.h"
-#include "blocklist.h"
-#include "cache.h"
-#include "clients.h"
-#include "completion.h"
-#include "crypto-utils.h"
-#include "handshake.h"
-#include "log.h"
-#include "net.h"
-#include "peer-io.h"
-#include "peer-mgr-active-requests.h"
-#include "peer-mgr-wishlist.h"
-#include "peer-mgr.h"
-#include "peer-msgs.h"
-#include "session.h"
-#include "timer.h"
-#include "torrent.h"
-#include "torrent-magnet.h"
-#include "tr-assert.h"
-#include "tr-utp.h"
-#include "utils.h"
-#include "webseed.h"
+#include "libtransmission/announcer.h"
+#include "libtransmission/bandwidth.h"
+#include "libtransmission/blocklist.h"
+#include "libtransmission/cache.h"
+#include "libtransmission/clients.h"
+#include "libtransmission/completion.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/handshake.h"
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/peer-io.h"
+#include "libtransmission/peer-mgr-active-requests.h"
+#include "libtransmission/peer-mgr-wishlist.h"
+#include "libtransmission/peer-mgr.h"
+#include "libtransmission/peer-msgs.h"
+#include "libtransmission/session.h"
+#include "libtransmission/timer.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/torrent-magnet.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-utp.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/webseed.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/peer-mse.cc b/libtransmission/peer-mse.cc
index 6cb2ab640..cdf168069 100644
--- a/libtransmission/peer-mse.cc
+++ b/libtransmission/peer-mse.cc
@@ -8,11 +8,11 @@
 
 #include <math/wide_integer/uintwide_t.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h" // tr_sha1
-#include "peer-mse.h"
-#include "tr-arc4.h"
+#include "libtransmission/crypto-utils.h" // tr_sha1
+#include "libtransmission/peer-mse.h"
+#include "libtransmission/tr-arc4.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/peer-msgs.cc b/libtransmission/peer-msgs.cc
index eddaf175f..bb515cdf1 100644
--- a/libtransmission/peer-msgs.cc
+++ b/libtransmission/peer-msgs.cc
@@ -18,28 +18,28 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "bitfield.h"
-#include "cache.h"
-#include "completion.h"
-#include "crypto-utils.h"
-#include "file.h"
-#include "log.h"
-#include "peer-io.h"
-#include "peer-mgr.h"
-#include "peer-msgs.h"
-#include "quark.h"
-#include "session.h"
-#include "timer.h"
-#include "torrent-magnet.h"
-#include "torrent.h"
-#include "tr-assert.h"
-#include "tr-buffer.h"
-#include "tr-dht.h"
-#include "utils.h"
-#include "variant.h"
-#include "version.h"
+#include "libtransmission/bitfield.h"
+#include "libtransmission/cache.h"
+#include "libtransmission/completion.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/peer-io.h"
+#include "libtransmission/peer-mgr.h"
+#include "libtransmission/peer-msgs.h"
+#include "libtransmission/quark.h"
+#include "libtransmission/session.h"
+#include "libtransmission/timer.h"
+#include "libtransmission/torrent-magnet.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-buffer.h"
+#include "libtransmission/tr-dht.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant.h"
+#include "libtransmission/version.h"
 
 #ifndef EBADMSG
 #define EBADMSG EINVAL
diff --git a/libtransmission/peer-socket.cc b/libtransmission/peer-socket.cc
index fa45c1cdb..7863fec6f 100644
--- a/libtransmission/peer-socket.cc
+++ b/libtransmission/peer-socket.cc
@@ -7,11 +7,11 @@
 
 #include <libutp/utp.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "peer-socket.h"
-#include "net.h"
-#include "session.h"
+#include "libtransmission/peer-socket.h"
+#include "libtransmission/net.h"
+#include "libtransmission/session.h"
 
 #define tr_logAddErrorIo(io, msg) tr_logAddError(msg, (io)->display_name())
 #define tr_logAddWarnIo(io, msg) tr_logAddWarn(msg, (io)->display_name())
diff --git a/libtransmission/platform-quota.cc b/libtransmission/platform-quota.cc
index 7249dff4f..3ddbdb290 100644
--- a/libtransmission/platform-quota.cc
+++ b/libtransmission/platform-quota.cc
@@ -62,10 +62,11 @@
 #include <xfs/xqm.h>
 #endif
 
-#include "transmission.h"
-#include "tr-macros.h"
-#include "utils.h"
-#include "platform-quota.h"
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/tr-macros.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/platform-quota.h"
 
 namespace
 {
diff --git a/libtransmission/platform.cc b/libtransmission/platform.cc
index 96ef0db8f..3880620b5 100644
--- a/libtransmission/platform.cc
+++ b/libtransmission/platform.cc
@@ -34,14 +34,14 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "file.h"
-#include "log.h"
-#include "platform.h"
-#include "session.h"
-#include "tr-assert.h"
-#include "utils.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/platform.h"
+#include "libtransmission/session.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/port-forwarding-natpmp.cc b/libtransmission/port-forwarding-natpmp.cc
index 1f9bdcfc9..1700f7df6 100644
--- a/libtransmission/port-forwarding-natpmp.cc
+++ b/libtransmission/port-forwarding-natpmp.cc
@@ -13,16 +13,16 @@
 #include <fmt/core.h>
 
 #define ENABLE_STRNATPMPERR
-#include "natpmp.h"
+#include <natpmp.h>
 
 #define LIBTRANSMISSION_PORT_FORWARDING_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "log.h"
-#include "port-forwarding-natpmp.h"
-#include "port-forwarding.h"
-#include "utils.h"
+#include "libtransmission/log.h"
+#include "libtransmission/port-forwarding-natpmp.h"
+#include "libtransmission/port-forwarding.h"
+#include "libtransmission/utils.h"
 
 namespace
 {
diff --git a/libtransmission/port-forwarding-upnp.cc b/libtransmission/port-forwarding-upnp.cc
index 7c4865b61..1b7939676 100644
--- a/libtransmission/port-forwarding-upnp.cc
+++ b/libtransmission/port-forwarding-upnp.cc
@@ -25,13 +25,13 @@
 
 #define LIBTRANSMISSION_PORT_FORWARDING_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "log.h"
-#include "port-forwarding-upnp.h"
-#include "port-forwarding.h"
-#include "tr-assert.h"
-#include "utils.h" // for _(), tr_strerror()
+#include "libtransmission/log.h"
+#include "libtransmission/port-forwarding-upnp.h"
+#include "libtransmission/port-forwarding.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h" // for _(), tr_strerror()
 
 namespace
 {
diff --git a/libtransmission/port-forwarding.cc b/libtransmission/port-forwarding.cc
index ff8ee6bb2..d516a73e6 100644
--- a/libtransmission/port-forwarding.cc
+++ b/libtransmission/port-forwarding.cc
@@ -11,17 +11,17 @@
 
 #define LIBTRANSMISSION_PORT_FORWARDING_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "log.h"
-#include "net.h"
-#include "port-forwarding-natpmp.h"
-#include "port-forwarding-upnp.h"
-#include "port-forwarding.h"
-#include "timer.h"
-#include "torrent.h"
-#include "tr-assert.h"
-#include "utils.h" // for _()
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/port-forwarding-natpmp.h"
+#include "libtransmission/port-forwarding-upnp.h"
+#include "libtransmission/port-forwarding.h"
+#include "libtransmission/timer.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h" // for _()
 
 using namespace std::literals;
 
diff --git a/libtransmission/quark.cc b/libtransmission/quark.cc
index e0a06fdc6..12bd03502 100644
--- a/libtransmission/quark.cc
+++ b/libtransmission/quark.cc
@@ -9,9 +9,9 @@
 #include <string_view>
 #include <vector>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "quark.h"
+#include "libtransmission/quark.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/resume.cc b/libtransmission/resume.cc
index 2ac53724e..0220a3b68 100644
--- a/libtransmission/resume.cc
+++ b/libtransmission/resume.cc
@@ -12,19 +12,19 @@
 #include <fmt/core.h>
 #include <fmt/format.h> // fmt::ptr
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "error.h"
-#include "file.h"
-#include "log.h"
-#include "magnet-metainfo.h"
-#include "peer-mgr.h" /* pex */
-#include "resume.h"
-#include "session.h"
-#include "torrent.h"
-#include "tr-assert.h"
-#include "utils.h"
-#include "variant.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/magnet-metainfo.h"
+#include "libtransmission/peer-mgr.h" /* pex */
+#include "libtransmission/resume.h"
+#include "libtransmission/session.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/rpc-server.cc b/libtransmission/rpc-server.cc
index 7a215d0be..a5fc1b934 100644
--- a/libtransmission/rpc-server.cc
+++ b/libtransmission/rpc-server.cc
@@ -30,25 +30,25 @@
 
 #include <libdeflate.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h" /* tr_ssha1_matches() */
-#include "error.h"
-#include "log.h"
-#include "net.h"
-#include "platform.h" /* tr_getWebClientDir() */
-#include "quark.h"
-#include "rpc-server.h"
-#include "rpcimpl.h"
-#include "session-id.h"
-#include "session.h"
-#include "timer.h"
-#include "tr-assert.h"
-#include "tr-strbuf.h"
-#include "utils.h"
-#include "variant.h"
-#include "web-utils.h"
-#include "web.h"
+#include "libtransmission/crypto-utils.h" /* tr_ssha1_matches() */
+#include "libtransmission/error.h"
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/platform.h" /* tr_getWebClientDir() */
+#include "libtransmission/quark.h"
+#include "libtransmission/rpc-server.h"
+#include "libtransmission/rpcimpl.h"
+#include "libtransmission/session-id.h"
+#include "libtransmission/session.h"
+#include "libtransmission/timer.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant.h"
+#include "libtransmission/web-utils.h"
+#include "libtransmission/web.h"
 
 /* session-id is used to make cross-site request forgery attacks difficult.
  * Don't disable this feature unless you really know what you're doing!
diff --git a/libtransmission/rpcimpl.cc b/libtransmission/rpcimpl.cc
index 99ef5c059..4f730bc40 100644
--- a/libtransmission/rpcimpl.cc
+++ b/libtransmission/rpcimpl.cc
@@ -19,28 +19,28 @@
 
 #include <libdeflate.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "announcer.h"
-#include "completion.h"
-#include "crypto-utils.h"
-#include "error.h"
-#include "file.h"
-#include "log.h"
-#include "peer-mgr.h"
-#include "quark.h"
-#include "rpcimpl.h"
-#include "session-id.h"
-#include "session.h"
-#include "torrent.h"
-#include "tr-assert.h"
-#include "tr-macros.h"
-#include "tr-strbuf.h"
-#include "utils.h"
-#include "variant.h"
-#include "version.h"
-#include "web-utils.h"
-#include "web.h"
+#include "libtransmission/announcer.h"
+#include "libtransmission/completion.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/peer-mgr.h"
+#include "libtransmission/quark.h"
+#include "libtransmission/rpcimpl.h"
+#include "libtransmission/session-id.h"
+#include "libtransmission/session.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-macros.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant.h"
+#include "libtransmission/version.h"
+#include "libtransmission/web-utils.h"
+#include "libtransmission/web.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/session-alt-speeds.cc b/libtransmission/session-alt-speeds.cc
index 85d3c45af..33ad7a6ac 100644
--- a/libtransmission/session-alt-speeds.cc
+++ b/libtransmission/session-alt-speeds.cc
@@ -5,12 +5,12 @@
 
 #include <fmt/chrono.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "log.h"
-#include "session-alt-speeds.h"
-#include "variant.h"
-#include "utils.h" // for _()
+#include "libtransmission/log.h"
+#include "libtransmission/session-alt-speeds.h"
+#include "libtransmission/variant.h"
+#include "libtransmission/utils.h" // for _()
 
 using namespace std::literals;
 
diff --git a/libtransmission/session-id.cc b/libtransmission/session-id.cc
index c5b55c8eb..5a4ace357 100644
--- a/libtransmission/session-id.cc
+++ b/libtransmission/session-id.cc
@@ -13,18 +13,17 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "session-id.h"
-
-#include "crypto-utils.h" // for tr_rand_obj()
-#include "error-types.h"
-#include "error.h"
-#include "file.h"
-#include "log.h"
-#include "platform.h"
-#include "tr-strbuf.h" // for tr_pathbuf
-#include "utils.h" // for _()
+#include "libtransmission/crypto-utils.h" // for tr_rand_obj()
+#include "libtransmission/error-types.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/platform.h"
+#include "libtransmission/session-id.h"
+#include "libtransmission/tr-strbuf.h" // for tr_pathbuf
+#include "libtransmission/utils.h" // for _()
 
 using namespace std::literals;
 
diff --git a/libtransmission/session-settings.cc b/libtransmission/session-settings.cc
index 41ee83fda..5c381e3c2 100644
--- a/libtransmission/session-settings.cc
+++ b/libtransmission/session-settings.cc
@@ -5,10 +5,10 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "session-settings.h"
-#include "variant.h"
+#include "libtransmission/session-settings.h"
+#include "libtransmission/variant.h"
 
 void tr_session_settings::load(tr_variant* src)
 {
diff --git a/libtransmission/session-thread.cc b/libtransmission/session-thread.cc
index b950a9bab..fd3609e14 100644
--- a/libtransmission/session-thread.cc
+++ b/libtransmission/session-thread.cc
@@ -22,13 +22,13 @@
 #include <event2/event.h>
 #include <event2/thread.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "log.h"
-#include "session-thread.h"
-#include "tr-assert.h"
-#include "utils.h" // for tr_net_init()
-#include "utils-ev.h"
+#include "libtransmission/log.h"
+#include "libtransmission/session-thread.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h" // for tr_net_init()
+#include "libtransmission/utils-ev.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/session.cc b/libtransmission/session.cc
index 7e8cb6299..4f8e790d0 100644
--- a/libtransmission/session.cc
+++ b/libtransmission/session.cc
@@ -32,35 +32,35 @@
 #include <fmt/core.h>
 #include <fmt/format.h> // fmt::ptr
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "announcer.h"
-#include "bandwidth.h"
-#include "blocklist.h"
-#include "cache.h"
-#include "crypto-utils.h"
-#include "error-types.h"
-#include "error.h"
-#include "file.h"
-#include "log.h"
-#include "net.h"
-#include "peer-io.h"
-#include "peer-mgr.h"
-#include "port-forwarding.h"
-#include "rpc-server.h"
-#include "session-id.h"
-#include "session.h"
-#include "timer-ev.h"
-#include "torrent.h"
-#include "tr-assert.h"
-#include "tr-lpd.h"
-#include "tr-strbuf.h"
-#include "tr-utp.h"
-#include "utils.h"
-#include "variant.h"
-#include "verify.h"
-#include "version.h"
-#include "web.h"
+#include "libtransmission/announcer.h"
+#include "libtransmission/bandwidth.h"
+#include "libtransmission/blocklist.h"
+#include "libtransmission/cache.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/error-types.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/peer-io.h"
+#include "libtransmission/peer-mgr.h"
+#include "libtransmission/port-forwarding.h"
+#include "libtransmission/rpc-server.h"
+#include "libtransmission/session-id.h"
+#include "libtransmission/session.h"
+#include "libtransmission/timer-ev.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-lpd.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/tr-utp.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant.h"
+#include "libtransmission/verify.h"
+#include "libtransmission/version.h"
+#include "libtransmission/web.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/stats.cc b/libtransmission/stats.cc
index b2218dad5..a48dd5ca0 100644
--- a/libtransmission/stats.cc
+++ b/libtransmission/stats.cc
@@ -3,13 +3,13 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "file.h"
-#include "stats.h"
-#include "tr-strbuf.h"
-#include "utils.h" // for tr_getRatio(), tr_time()
-#include "variant.h"
+#include "libtransmission/file.h"
+#include "libtransmission/stats.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/utils.h" // for tr_getRatio(), tr_time()
+#include "libtransmission/variant.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/subprocess-posix.cc b/libtransmission/subprocess-posix.cc
index 8f446a047..ac30d1e81 100644
--- a/libtransmission/subprocess-posix.cc
+++ b/libtransmission/subprocess-posix.cc
@@ -16,14 +16,14 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "error.h"
-#include "subprocess.h"
-#include "tr-assert.h"
-#include "tr-macros.h"
-#include "tr-strbuf.h"
-#include "utils.h"
+#include "libtransmission/error.h"
+#include "libtransmission/subprocess.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-macros.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/subprocess-win32.cc b/libtransmission/subprocess-win32.cc
index febafe9a2..41dcf8caf 100644
--- a/libtransmission/subprocess-win32.cc
+++ b/libtransmission/subprocess-win32.cc
@@ -17,11 +17,12 @@
 
 #include <windows.h>
 
-#include "transmission.h"
-#include "error.h"
-#include "subprocess.h"
-#include "tr-assert.h"
-#include "utils.h"
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/error.h"
+#include "libtransmission/subprocess.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/timer-ev.cc b/libtransmission/timer-ev.cc
index a599012ef..2ea6450bb 100644
--- a/libtransmission/timer-ev.cc
+++ b/libtransmission/timer-ev.cc
@@ -9,9 +9,11 @@
 
 #include <event2/event.h>
 
-#include "timer-ev.h"
-#include "tr-assert.h"
-#include "utils-ev.h"
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/timer-ev.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils-ev.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/torrent-ctor.cc b/libtransmission/torrent-ctor.cc
index 148cd6096..5f2c46673 100644
--- a/libtransmission/torrent-ctor.cc
+++ b/libtransmission/torrent-ctor.cc
@@ -10,16 +10,16 @@
 #include <utility>
 #include <vector>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "error.h"
-#include "error-types.h"
-#include "magnet-metainfo.h"
-#include "session.h"
-#include "torrent-metainfo.h"
-#include "torrent.h"
-#include "tr-assert.h"
-#include "utils.h"
+#include "libtransmission/error-types.h"
+#include "libtransmission/error.h"
+#include "libtransmission/magnet-metainfo.h"
+#include "libtransmission/session.h"
+#include "libtransmission/torrent-metainfo.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/torrent-files.cc b/libtransmission/torrent-files.cc
index cc0edf453..a3c42b5a6 100644
--- a/libtransmission/torrent-files.cc
+++ b/libtransmission/torrent-files.cc
@@ -15,12 +15,12 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "error.h"
-#include "log.h"
-#include "torrent-files.h"
-#include "utils.h"
+#include "libtransmission/error.h"
+#include "libtransmission/log.h"
+#include "libtransmission/torrent-files.h"
+#include "libtransmission/utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/torrent-magnet.cc b/libtransmission/torrent-magnet.cc
index c32defb43..7aa0cfb07 100644
--- a/libtransmission/torrent-magnet.cc
+++ b/libtransmission/torrent-magnet.cc
@@ -14,19 +14,19 @@
 
 #include <fmt/core.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h" /* tr_sha1() */
-#include "error.h"
-#include "log.h"
-#include "magnet-metainfo.h"
-#include "resume.h"
-#include "torrent-magnet.h"
-#include "torrent-metainfo.h"
-#include "torrent.h"
-#include "tr-assert.h"
-#include "utils.h"
-#include "variant.h"
+#include "libtransmission/crypto-utils.h" // for tr_sha1()
+#include "libtransmission/error.h"
+#include "libtransmission/log.h"
+#include "libtransmission/magnet-metainfo.h"
+#include "libtransmission/resume.h"
+#include "libtransmission/torrent-magnet.h"
+#include "libtransmission/torrent-metainfo.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant.h"
 
 namespace
 {
diff --git a/libtransmission/torrent-metainfo.cc b/libtransmission/torrent-metainfo.cc
index b290017de..6d1c57739 100644
--- a/libtransmission/torrent-metainfo.cc
+++ b/libtransmission/torrent-metainfo.cc
@@ -13,20 +13,20 @@
 #include <fmt/core.h>
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "benc.h"
-#include "crypto-utils.h"
-#include "error-types.h"
-#include "error.h"
-#include "file.h"
-#include "log.h"
-#include "quark.h"
-#include "torrent-metainfo.h"
-#include "tr-assert.h"
-#include "tr-strbuf.h"
-#include "utils.h"
-#include "web-utils.h"
+#include "libtransmission/benc.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/error-types.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/quark.h"
+#include "libtransmission/torrent-metainfo.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/web-utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/torrent.cc b/libtransmission/torrent.cc
index 73a817265..80fed1322 100644
--- a/libtransmission/torrent.cc
+++ b/libtransmission/torrent.cc
@@ -27,28 +27,28 @@
 #include <fmt/chrono.h>
 #include <fmt/core.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "announcer.h"
-#include "bandwidth.h"
-#include "completion.h"
-#include "crypto-utils.h" /* for tr_sha1 */
-#include "error.h"
-#include "file.h"
-#include "inout.h" /* tr_ioTestPiece() */
-#include "log.h"
-#include "magnet-metainfo.h"
-#include "peer-mgr.h"
-#include "resume.h"
-#include "session.h"
-#include "subprocess.h"
-#include "torrent-magnet.h"
-#include "torrent-metainfo.h"
-#include "torrent.h"
-#include "tr-assert.h"
-#include "utils.h"
-#include "version.h"
-#include "web-utils.h"
+#include "libtransmission/announcer.h"
+#include "libtransmission/bandwidth.h"
+#include "libtransmission/completion.h"
+#include "libtransmission/crypto-utils.h" // for tr_sha1()
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/inout.h" // tr_ioTestPiece()
+#include "libtransmission/log.h"
+#include "libtransmission/magnet-metainfo.h"
+#include "libtransmission/peer-mgr.h"
+#include "libtransmission/resume.h"
+#include "libtransmission/session.h"
+#include "libtransmission/subprocess.h"
+#include "libtransmission/torrent-magnet.h"
+#include "libtransmission/torrent-metainfo.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/version.h"
+#include "libtransmission/web-utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/torrents.cc b/libtransmission/torrents.cc
index 886d1f29a..3fa888e33 100644
--- a/libtransmission/torrents.cc
+++ b/libtransmission/torrents.cc
@@ -7,12 +7,12 @@
 #include <string_view>
 #include <vector>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "magnet-metainfo.h"
-#include "torrent.h"
-#include "torrents.h"
-#include "tr-assert.h"
+#include "libtransmission/magnet-metainfo.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/torrents.h"
+#include "libtransmission/tr-assert.h"
 
 namespace
 {
diff --git a/libtransmission/tr-assert.cc b/libtransmission/tr-assert.cc
index 41f8f55f8..bad925391 100644
--- a/libtransmission/tr-assert.cc
+++ b/libtransmission/tr-assert.cc
@@ -8,7 +8,7 @@
 #include <iostream>
 #include <string_view>
 
-#include "tr-assert.h"
+#include "libtransmission/tr-assert.h"
 
 #if !defined(NDEBUG) || defined(TR_FORCE_ASSERTIONS)
 
diff --git a/libtransmission/tr-dht.cc b/libtransmission/tr-dht.cc
index 3f223b614..931d15ed7 100644
--- a/libtransmission/tr-dht.cc
+++ b/libtransmission/tr-dht.cc
@@ -32,19 +32,19 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h"
-#include "file.h"
-#include "log.h"
-#include "net.h"
-#include "peer-mgr.h" // for tr_peerMgrCompactToPex()
-#include "timer.h"
-#include "tr-assert.h"
-#include "tr-dht.h"
-#include "tr-strbuf.h"
-#include "variant.h"
-#include "utils.h" // for tr_time(), _()
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/peer-mgr.h" // for tr_peerMgrCompactToPex()
+#include "libtransmission/timer.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-dht.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/variant.h"
+#include "libtransmission/utils.h" // for tr_time(), _()
 
 using namespace std::literals;
 
diff --git a/libtransmission/tr-getopt.cc b/libtransmission/tr-getopt.cc
index 41dabcaf9..1eabe7820 100644
--- a/libtransmission/tr-getopt.cc
+++ b/libtransmission/tr-getopt.cc
@@ -10,11 +10,11 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "tr-getopt.h"
-#include "tr-macros.h"
-#include "utils.h"
+#include "libtransmission/tr-getopt.h"
+#include "libtransmission/tr-macros.h"
+#include "libtransmission/utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/tr-lpd.cc b/libtransmission/tr-lpd.cc
index de253ed94..b5a8554cd 100644
--- a/libtransmission/tr-lpd.cc
+++ b/libtransmission/tr-lpd.cc
@@ -22,16 +22,16 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h" // for tr_rand_obj()
-#include "log.h"
-#include "net.h"
-#include "timer.h"
-#include "tr-assert.h"
-#include "tr-lpd.h"
-#include "utils.h" // for tr_net_init()
-#include "utils-ev.h" // for tr_net_init()
+#include "libtransmission/crypto-utils.h" // for tr_rand_obj()
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/timer.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-lpd.h"
+#include "libtransmission/utils.h" // for tr_net_init()
+#include "libtransmission/utils-ev.h" // for tr_net_init()
 
 using namespace std::literals;
 
diff --git a/libtransmission/tr-udp.cc b/libtransmission/tr-udp.cc
index ef66a4ffa..4f8466a9f 100644
--- a/libtransmission/tr-udp.cc
+++ b/libtransmission/tr-udp.cc
@@ -11,13 +11,14 @@
 
 #include <fmt/core.h>
 
-#include "transmission.h"
-#include "log.h"
-#include "net.h"
-#include "session.h"
-#include "tr-assert.h"
-#include "tr-utp.h"
-#include "utils.h"
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/session.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-utp.h"
+#include "libtransmission/utils.h"
 
 namespace
 {
diff --git a/libtransmission/tr-utp.cc b/libtransmission/tr-utp.cc
index 905c68e85..a5b1cedd0 100644
--- a/libtransmission/tr-utp.cc
+++ b/libtransmission/tr-utp.cc
@@ -10,18 +10,18 @@
 
 #include <libutp/utp.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "crypto-utils.h" // tr_rand_int()
-#include "log.h"
-#include "net.h"
-#include "peer-io.h"
-#include "peer-mgr.h"
-#include "peer-socket.h"
-#include "session.h"
-#include "timer.h"
-#include "tr-utp.h"
-#include "utils.h"
+#include "libtransmission/crypto-utils.h" // tr_rand_int()
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/peer-io.h"
+#include "libtransmission/peer-mgr.h"
+#include "libtransmission/peer-socket.h"
+#include "libtransmission/session.h"
+#include "libtransmission/timer.h"
+#include "libtransmission/tr-utp.h"
+#include "libtransmission/utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/utils-ev.cc b/libtransmission/utils-ev.cc
index e4486b4c9..2fb7b3edd 100644
--- a/libtransmission/utils-ev.cc
+++ b/libtransmission/utils-ev.cc
@@ -5,13 +5,13 @@
 
 #include <memory>
 
-#include "event2/buffer.h"
-#include "event2/event.h"
-#include "event2/http.h"
+#include <event2/buffer.h>
+#include <event2/event.h>
+#include <event2/http.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "utils-ev.h"
+#include "libtransmission/utils-ev.h"
 
 namespace libtransmission::evhelpers
 {
diff --git a/libtransmission/utils.cc b/libtransmission/utils.cc
index 37c7cbd84..29bee1c6f 100644
--- a/libtransmission/utils.cc
+++ b/libtransmission/utils.cc
@@ -40,19 +40,19 @@
 #include <fast_float/fast_float.h>
 #include <wildmat.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "error-types.h"
-#include "error.h"
-#include "file.h"
-#include "log.h"
-#include "mime-types.h"
-#include "net.h" // ntohl()
-#include "platform-quota.h" /* tr_device_info_create(), tr_device_info_get_disk_space(), tr_device_info_free() */
-#include "tr-assert.h"
-#include "tr-strbuf.h"
-#include "utils.h"
-#include "variant.h"
+#include "libtransmission/error-types.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/mime-types.h"
+#include "libtransmission/net.h" // ntohl()
+#include "libtransmission/platform-quota.h" /* tr_device_info_create(), tr_device_info_get_disk_space(), tr_device_info_free() */
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/variant-benc.cc b/libtransmission/variant-benc.cc
index 780cbf0b1..950dc8ad5 100644
--- a/libtransmission/variant-benc.cc
+++ b/libtransmission/variant-benc.cc
@@ -14,15 +14,15 @@
 
 #define LIBTRANSMISSION_VARIANT_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "benc.h"
-#include "quark.h"
-#include "tr-assert.h"
-#include "tr-buffer.h"
-#include "utils.h"
-#include "variant-common.h"
-#include "variant.h"
+#include "libtransmission/benc.h"
+#include "libtransmission/quark.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-buffer.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant-common.h"
+#include "libtransmission/variant.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/variant-converters.cc b/libtransmission/variant-converters.cc
index e56e54cd0..a5f0dabdb 100644
--- a/libtransmission/variant-converters.cc
+++ b/libtransmission/variant-converters.cc
@@ -5,12 +5,12 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "log.h" // for tr_log_level
-#include "net.h" // for tr_port
-#include "utils.h" // for tr_strvStrip(), tr_strlower()
-#include "variant.h"
+#include "libtransmission/log.h" // for tr_log_level
+#include "libtransmission/net.h" // for tr_port
+#include "libtransmission/utils.h" // for tr_strvStrip(), tr_strlower()
+#include "libtransmission/variant.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/variant-json.cc b/libtransmission/variant-json.cc
index 95c5d44be..1fcb86115 100644
--- a/libtransmission/variant-json.cc
+++ b/libtransmission/variant-json.cc
@@ -23,16 +23,16 @@
 
 #define LIBTRANSMISSION_VARIANT_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "error.h"
-#include "log.h"
-#include "quark.h"
-#include "tr-assert.h"
-#include "tr-buffer.h"
-#include "utils.h"
-#include "variant-common.h"
-#include "variant.h"
+#include "libtransmission/error.h"
+#include "libtransmission/log.h"
+#include "libtransmission/quark.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-buffer.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant-common.h"
+#include "libtransmission/variant.h"
 
 using namespace std::literals;
 using Buffer = libtransmission::Buffer;
diff --git a/libtransmission/variant.cc b/libtransmission/variant.cc
index 2036ebcfd..d62544e93 100644
--- a/libtransmission/variant.cc
+++ b/libtransmission/variant.cc
@@ -19,16 +19,16 @@
 
 #define LIBTRANSMISSION_VARIANT_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "error.h"
-#include "file.h"
-#include "log.h"
-#include "quark.h"
-#include "tr-assert.h"
-#include "utils.h"
-#include "variant-common.h"
-#include "variant.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/quark.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant-common.h"
+#include "libtransmission/variant.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/verify.cc b/libtransmission/verify.cc
index c98a46236..513978da3 100644
--- a/libtransmission/verify.cc
+++ b/libtransmission/verify.cc
@@ -13,16 +13,16 @@
 
 #include <fmt/core.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "completion.h"
-#include "crypto-utils.h"
-#include "file.h"
-#include "log.h"
-#include "torrent.h"
-#include "tr-assert.h"
-#include "utils.h" // tr_time(), tr_wait()
-#include "verify.h"
+#include "libtransmission/completion.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h" // tr_time(), tr_wait()
+#include "libtransmission/verify.h"
 
 using namespace std::chrono_literals;
 
diff --git a/libtransmission/watchdir-generic.cc b/libtransmission/watchdir-generic.cc
index a06d87025..11ba94789 100644
--- a/libtransmission/watchdir-generic.cc
+++ b/libtransmission/watchdir-generic.cc
@@ -7,9 +7,9 @@
 
 #define LIBTRANSMISSION_WATCHDIR_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "watchdir-base.h"
+#include "libtransmission/watchdir-base.h"
 
 namespace libtransmission
 {
diff --git a/libtransmission/watchdir-inotify.cc b/libtransmission/watchdir-inotify.cc
index c81fe4f68..a4a9d8281 100644
--- a/libtransmission/watchdir-inotify.cc
+++ b/libtransmission/watchdir-inotify.cc
@@ -19,13 +19,13 @@
 
 #define LIBTRANSMISSION_WATCHDIR_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "log.h"
-#include "tr-assert.h"
-#include "tr-strbuf.h"
-#include "utils.h"
-#include "watchdir-base.h"
+#include "libtransmission/log.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/watchdir-base.h"
 
 namespace libtransmission
 {
diff --git a/libtransmission/watchdir-kqueue.cc b/libtransmission/watchdir-kqueue.cc
index d4c3ae630..6903a427b 100644
--- a/libtransmission/watchdir-kqueue.cc
+++ b/libtransmission/watchdir-kqueue.cc
@@ -23,13 +23,13 @@
 #include <fmt/core.h>
 
 #define LIBTRANSMISSION_WATCHDIR_MODULE
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "log.h"
-#include "tr-strbuf.h"
-#include "utils.h" // for _()
-#include "utils-ev.h"
-#include "watchdir-base.h"
+#include "libtransmission/log.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/utils.h" // for _()
+#include "libtransmission/utils-ev.h"
+#include "libtransmission/watchdir-base.h"
 
 namespace libtransmission
 {
diff --git a/libtransmission/watchdir-win32.cc b/libtransmission/watchdir-win32.cc
index e77199e83..360f3148d 100644
--- a/libtransmission/watchdir-win32.cc
+++ b/libtransmission/watchdir-win32.cc
@@ -21,12 +21,13 @@
 
 #define LIBTRANSMISSION_WATCHDIR_MODULE
 
-#include "transmission.h"
-#include "log.h"
-#include "net.h"
-#include "tr-assert.h"
-#include "utils.h"
-#include "watchdir-base.h"
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/watchdir-base.h"
 
 namespace libtransmission
 {
diff --git a/libtransmission/watchdir.cc b/libtransmission/watchdir.cc
index 58cb58c48..9331ab345 100644
--- a/libtransmission/watchdir.cc
+++ b/libtransmission/watchdir.cc
@@ -8,15 +8,15 @@
 
 #define LIBTRANSMISSION_WATCHDIR_MODULE
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "error-types.h"
-#include "error.h"
-#include "file.h"
-#include "log.h"
-#include "tr-strbuf.h"
-#include "utils.h" // for _()
-#include "watchdir-base.h"
+#include "libtransmission/error-types.h"
+#include "libtransmission/error.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/utils.h" // for _()
+#include "libtransmission/watchdir-base.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/web-utils.cc b/libtransmission/web-utils.cc
index d0bb18f33..3c495ab7f 100644
--- a/libtransmission/web-utils.cc
+++ b/libtransmission/web-utils.cc
@@ -19,14 +19,14 @@
 #define PSL_STATIC
 #include <libpsl.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "log.h"
-#include "net.h"
-#include "tr-assert.h"
-#include "tr-strbuf.h"
-#include "utils.h"
-#include "web-utils.h"
+#include "libtransmission/log.h"
+#include "libtransmission/net.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/tr-strbuf.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/web-utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/web.cc b/libtransmission/web.cc
index 343318510..99d117823 100644
--- a/libtransmission/web.cc
+++ b/libtransmission/web.cc
@@ -26,14 +26,16 @@
 #include <fmt/core.h>
 #include <fmt/format.h>
 
-#include "crypto-utils.h"
-#include "log.h"
-#include "peer-io.h"
-#include "tr-assert.h"
-#include "utils-ev.h"
-#include "utils.h"
-#include "web.h"
-#include "web-utils.h"
+#include "libtransmission/transmission.h"
+
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/log.h"
+#include "libtransmission/peer-io.h"
+#include "libtransmission/tr-assert.h"
+#include "libtransmission/utils-ev.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/web.h"
+#include "libtransmission/web-utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/webseed.cc b/libtransmission/webseed.cc
index 8136139d8..c0e17a1cd 100644
--- a/libtransmission/webseed.cc
+++ b/libtransmission/webseed.cc
@@ -15,19 +15,19 @@
 
 #include <fmt/format.h>
 
-#include "transmission.h"
+#include "libtransmission/transmission.h"
 
-#include "bandwidth.h"
-#include "cache.h"
-#include "peer-io.h"
-#include "peer-mgr.h"
-#include "timer.h"
-#include "torrent.h"
-#include "utils-ev.h"
-#include "utils.h"
-#include "web-utils.h"
-#include "web.h"
-#include "webseed.h"
+#include "libtransmission/bandwidth.h"
+#include "libtransmission/cache.h"
+#include "libtransmission/peer-io.h"
+#include "libtransmission/peer-mgr.h"
+#include "libtransmission/timer.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/utils-ev.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/web-utils.h"
+#include "libtransmission/web.h"
+#include "libtransmission/webseed.h"
 
 using namespace std::literals;