refactor: move libtransmission/ to lib/transmission/

.clang-format-ignore

@@ -4,7 +4,7 @@
 .*/*
 build/*
 cmake-build-*/*
-libtransmission/version.h
+lib/transmission/version.h
 web/node_modules/*
 
 # android

.gitignore

@@ -12,8 +12,8 @@ Transmission.xcodeproj/xcuserdata
 /daemon/transmission-remote
 /gtk/defines.h
 /gtk/transmission-gtk
-/libtransmission/*.a
-/libtransmission/version.h
+/lib/transmission/*.a
+/lib/transmission/version.h
 /macosx/Info.plist
 /macosx/**/*~.nib
 node_modules/

CMakeLists.txt

@@ -915,7 +915,7 @@ function(tr_install_web DST_DIR)
 endfunction()
 
 add_subdirectory(lib/base)
-add_subdirectory(libtransmission)
+add_subdirectory(lib/transmission)
 add_subdirectory(libtransmission-app)
 
 set(MAC_PROJECT_DIR macosx)

Transmission.xcodeproj/project.pbxproj

@@ -2197,7 +2197,7 @@
 				A292A6E50DFB45EC004B9C0A /* webseed.cc */,
 				A292A6E60DFB45EC004B9C0A /* webseed.h */,
 			);
-			path = libtransmission;
+			path = lib/transmission;
 			sourceTree = "<group>";
 		};
 		4DDBB70A09E16B3200284745 /* GUI */ = {
@@ -3467,8 +3467,8 @@
 			);
 			name = "Generate version file";
 			outputPaths = (
-				"$(SRCROOT)/libtransmission/version.h",
-				"$(SRCROOT)/libtransmission/version.h.new",
+				"$(SRCROOT)/lib/transmission/version.h",
+				"$(SRCROOT)/lib/transmission/version.h.new",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -4906,7 +4906,7 @@
 				IBC_WARNINGS = YES;
 				INFOPLIST_FILE = macosx/Info.plist;
 				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				INFOPLIST_PREFIX_HEADER = libtransmission/version.h;
+				INFOPLIST_PREFIX_HEADER = lib/transmission/version.h;
 				INFOPLIST_PREPROCESS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				ONLY_ACTIVE_ARCH = YES;
@@ -5114,7 +5114,7 @@
 				IBC_WARNINGS = YES;
 				INFOPLIST_FILE = macosx/Info.plist;
 				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				INFOPLIST_PREFIX_HEADER = libtransmission/version.h;
+				INFOPLIST_PREFIX_HEADER = lib/transmission/version.h;
 				INFOPLIST_PREPROCESS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_CFLAGS = (
@@ -5218,7 +5218,7 @@
 				IBC_WARNINGS = YES;
 				INFOPLIST_FILE = macosx/Info.plist;
 				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
-				INFOPLIST_PREFIX_HEADER = libtransmission/version.h;
+				INFOPLIST_PREFIX_HEADER = lib/transmission/version.h;
 				INFOPLIST_PREPROCESS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				ONLY_ACTIVE_ARCH = YES;

cli/cli.cc

@@ -21,11 +21,11 @@
 #include "lib/base/values.h"
 #include "lib/base/variant.h"
 
-#include "libtransmission/transmission.h"
-#include "libtransmission/utils.h" // _()
-#include "libtransmission/version.h"
-#include "libtransmission/web-utils.h"
-#include "libtransmission/web.h" // tr_sessionFetch()
+#include "lib/transmission/transmission.h"
+#include "lib/transmission/utils.h" // _()
+#include "lib/transmission/version.h"
+#include "lib/transmission/web-utils.h"
+#include "lib/transmission/web.h" // tr_sessionFetch()
 
 using namespace std::literals;
 using namespace tr::Values;

cmake/Transmission.rc.in

@@ -1,5 +1,5 @@
 #include "winresrc.h"
-#include <libtransmission/version.h>
+#include <lib/transmission/version.h>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

daemon/daemon.cc

@@ -40,11 +40,11 @@
 #include "lib/base/tr-strbuf.h"
 #include "lib/base/variant.h"
 
-#include "libtransmission/transmission.h"
-#include "libtransmission/timer-ev.h"
-#include "libtransmission/utils.h"
-#include "libtransmission/version.h"
-#include "libtransmission/watchdir.h"
+#include "lib/transmission/transmission.h"
+#include "lib/transmission/timer-ev.h"
+#include "lib/transmission/utils.h"
+#include "lib/transmission/version.h"
+#include "lib/transmission/watchdir.h"
 
 #include "daemon.h"
 

gtk/.clang-format

@@ -3,12 +3,12 @@ BasedOnStyle: InheritParentConfig
 
 IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex: '^<libtransmission-app/'
+  - Regex: '^[<"]libtransmission-app/'
     Priority: 3
-  - Regex: '^[<"]libtransmission/transmission.h[">]'
+  - Regex: '^[<"]lib/transmission/transmission.h[">]'
     Priority: 4
     SortPriority: 3
-  - Regex: '^[<"]libtransmission/'
+  - Regex: '^[<"]lib/transmission/'
     Priority: 4
     SortPriority: 4
   - Regex: '^[<"]lib/base/'

gtk/Application.cc

@@ -24,10 +24,10 @@
 #include "Torrent.h"
 #include "Utils.h"
 
-#include "libtransmission/transmission.h"
-#include "libtransmission/api-compat.h"
-#include "libtransmission/rpcimpl.h"
-#include "libtransmission/version.h"
+#include "lib/transmission/transmission.h"
+#include "lib/transmission/api-compat.h"
+#include "lib/transmission/rpcimpl.h"
+#include "lib/transmission/version.h"
 
 #include "lib/base/log.h"
 #include "lib/base/quark.h"

gtk/DetailsDialog.cc

@@ -14,8 +14,8 @@
 #include "Session.h"
 #include "Utils.h"
 
-#include "libtransmission/utils.h"
-#include "libtransmission/web-utils.h"
+#include "lib/transmission/utils.h"
+#include "lib/transmission/web-utils.h"
 
 #include "lib/base/file-utils.h"
 #include "lib/base/string-utils.h"

gtk/DetailsDialog.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <libtransmission/transmission.h>
+#include <lib/transmission/transmission.h>
 
 #include <glibmm/refptr.h>
 #include <gtkmm/builder.h>

gtk/Dialogs.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <libtransmission/transmission.h>
+#include <lib/transmission/transmission.h>
 
 #include <glibmm/refptr.h>
 #include <gtkmm/window.h>

gtk/FileList.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <libtransmission/transmission.h>
+#include <lib/transmission/transmission.h>
 
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>

gtk/FilterBar.cc

@@ -7,13 +7,14 @@
 
 #include "FilterListModel.hh"
 #include "HigWorkarea.h" // GUI_PAD
-#include "libtransmission-app/display-modes.h"
 #include "ListModelAdapter.h"
 #include "Session.h" // torrent_cols
 #include "Torrent.h"
 #include "TorrentFilter.h"
 #include "Utils.h"
 
+#include "libtransmission-app/display-modes.h"
+
 #include "lib/base/tr-macros.h"
 
 #include <gdkmm/pixbuf.h>

gtk/MainWindow.cc

@@ -18,9 +18,9 @@
 #include "TorrentCellRenderer.h"
 #endif
 
-#include <libtransmission-app/display-modes.h>
+#include <lib/transmission/transmission.h>
 
-#include <libtransmission/transmission.h>
+#include <libtransmission-app/display-modes.h>
 
 #include <lib/base/values.h>
 

gtk/MakeDialog.cc

@@ -11,8 +11,8 @@
 #include "Session.h"
 #include "Utils.h"
 
-#include <libtransmission/transmission.h>
-#include <libtransmission/makemeta.h>
+#include <lib/transmission/transmission.h>
+#include <lib/transmission/makemeta.h>
 
 #include "lib/base/error.h"
 #include "lib/base/values.h"

gtk/Notify.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <libtransmission/transmission.h>
+#include <lib/transmission/transmission.h>
 
 #include <glibmm/refptr.h>
 

gtk/OptionsDialog.cc

@@ -14,7 +14,7 @@
 #include "Session.h"
 #include "Utils.h"
 
-#include <libtransmission/transmission.h>
+#include <lib/transmission/transmission.h>
 
 #include <lib/base/file.h> /* tr_sys_path_is_same() */
 

gtk/Percents.cc

@@ -1,6 +1,6 @@
 #include "Percents.h"
 
-#include <libtransmission/utils.h>
+#include <lib/transmission/utils.h>
 
 std::string Percents::to_string() const
 {

gtk/Prefs.cc

@@ -7,9 +7,9 @@
 #include "GtkCompat.h"
 #include "PrefsDialog.h"
 
-#include <libtransmission-app/display-modes.h>
+#include <lib/transmission/transmission.h>
 
-#include <libtransmission/transmission.h>
+#include <libtransmission-app/display-modes.h>
 
 #include <lib/base/serializer.h>
 #include <lib/base/variant.h>

gtk/Prefs.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <libtransmission/transmission.h> /* tr_variant, tr_session */
+#include <lib/transmission/transmission.h> /* tr_variant, tr_session */
 
 #include <lib/base/quark.h>
 #include <lib/base/serializer.h>

gtk/PrefsDialog.cc

@@ -13,8 +13,8 @@
 #include "SystemTrayIcon.h"
 #include "Utils.h"
 
-#include <libtransmission/transmission.h>
-#include <libtransmission/web-utils.h>
+#include <lib/transmission/transmission.h>
+#include <lib/transmission/web-utils.h>
 
 #include <glibmm/date.h>
 #include <glibmm/i18n.h>

gtk/RelocateDialog.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <libtransmission/transmission.h>
+#include <lib/transmission/transmission.h>
 
 #include <glibmm/refptr.h>
 #include <gtkmm/builder.h>

gtk/Session.cc

@@ -14,11 +14,11 @@
 #include "TorrentSorter.h"
 #include "Utils.h"
 
-#include <libtransmission/transmission.h>
-#include <libtransmission/rpcimpl.h>
-#include <libtransmission/torrent-metainfo.h>
-#include <libtransmission/utils.h> // tr_time()
-#include <libtransmission/web-utils.h> // tr_urlIsValid()
+#include <lib/transmission/transmission.h>
+#include <lib/transmission/rpcimpl.h>
+#include <lib/transmission/torrent-metainfo.h>
+#include <lib/transmission/utils.h> // tr_time()
+#include <lib/transmission/web-utils.h> // tr_urlIsValid()
 
 #include "lib/base/env.h"
 #include <lib/base/log.h>

gtk/Session.h

@@ -8,9 +8,9 @@
 #include "Prefs.h"
 #include "Torrent.h"
 
-#include <libtransmission-app/favicon-cache.h>
+#include <lib/transmission/transmission.h>
 
-#include <libtransmission/transmission.h>
+#include <libtransmission-app/favicon-cache.h>
 
 #include <lib/base/serializer.h>
 #include <lib/base/variant.h>

gtk/SystemTrayIcon.cc

@@ -9,7 +9,7 @@
 #include "Session.h"
 #include "Utils.h"
 
-#include <libtransmission/transmission.h>
+#include <lib/transmission/transmission.h>
 
 #include <glibmm/i18n.h>
 #include <glibmm/ustring.h>

gtk/Torrent.cc

@@ -10,8 +10,8 @@
 #include "Percents.h"
 #include "Utils.h"
 
-#include <libtransmission/transmission.h>
-#include <libtransmission/utils.h>
+#include <lib/transmission/transmission.h>
+#include <lib/transmission/utils.h>
 
 #include "lib/base/file-utils.h"
 #include "lib/base/tr-macros.h"

gtk/Torrent.h

@@ -7,7 +7,7 @@
 
 #include "Flags.h"
 
-#include <libtransmission/transmission.h>
+#include <lib/transmission/transmission.h>
 
 #include <lib/base/values.h>
 

gtk/TorrentCellRenderer.cc

@@ -9,7 +9,7 @@
 #include "Percents.h"
 #include "Torrent.h"
 
-#include <libtransmission/transmission.h>
+#include <lib/transmission/transmission.h>
 
 #include <cairomm/context.h>
 #include <cairomm/refptr.h>

gtk/TorrentFilter.cc

@@ -8,7 +8,7 @@
 #include "FilterBase.hh"
 #include "Utils.h"
 
-#include "libtransmission/transmission.h"
+#include "lib/transmission/transmission.h"
 
 #include "lib/base/tr-macros.h"
 

gtk/TorrentSorter.cc

@@ -9,10 +9,11 @@
 #include "SorterBase.hh"
 #include "Utils.h"
 
+#include <lib/transmission/transmission.h>
+
 #include <libtransmission-app/display-modes.h>
 
-#include <libtransmission/transmission.h>
-#include <libtransmission/utils.h>
+#include <lib/transmission/utils.h>
 
 #include "lib/base/tr-macros.h"
 

gtk/Utils.cc

@@ -9,11 +9,11 @@
 #include "PrefsDialog.h"
 #include "Session.h"
 
-#include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
-#include <libtransmission/torrent-metainfo.h>
-#include <libtransmission/utils.h> /* tr_strratio() */
-#include <libtransmission/version.h> /* SHORT_VERSION_STRING */
-#include <libtransmission/web-utils.h>
+#include <lib/transmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
+#include <lib/transmission/torrent-metainfo.h>
+#include <lib/transmission/utils.h> /* tr_strratio() */
+#include <lib/transmission/version.h> /* SHORT_VERSION_STRING */
+#include <lib/transmission/web-utils.h>
 
 #include "lib/base/error.h"
 #include "lib/base/string-utils.h"

gtk/Utils.h

@@ -7,7 +7,7 @@
 
 #include "GtkCompat.h"
 
-#include <libtransmission/transmission.h>
+#include <lib/transmission/transmission.h>
 
 #include <lib/base/values.h>
 

gtk/main.cc

@@ -4,13 +4,15 @@
 
 #include "Application.h"
 #include "GtkCompat.h"
-#include "libtransmission-app/app.h"
 #include "Notify.h"
 #include "Prefs.h"
 #include "Utils.h"
 
-#include "libtransmission/transmission.h"
-#include "libtransmission/version.h"
+#include "lib/transmission/transmission.h"
+
+#include "libtransmission-app/app.h"
+
+#include "lib/transmission/version.h"
 
 #include "lib/base/serializer.h"
 

lib/base/.clang-tidy

@@ -1,5 +1,5 @@
 ---
-HeaderFilterRegex: .*/libtransmission/.*
+HeaderFilterRegex: .*/lib/base/.*
 
 # TODO: Enable `portability-template-virtual-member-function` after https://github.com/llvm/llvm-project/issues/139031 is fixed
 # TODO: Enable `cppcoreguidelines-pro-bounds-pointer-arithmetic` after converting all pointers to std::span

lib/transmission/.clang-tidy

@@ -1,5 +1,5 @@
 ---
-HeaderFilterRegex: .*/libtransmission/.*
+HeaderFilterRegex: .*/lib/transmission/.*
 
 # TODO: Enable `portability-template-virtual-member-function` after https://github.com/llvm/llvm-project/issues/139031 is fixed
 # TODO: Enable `cppcoreguidelines-pro-bounds-pointer-arithmetic` after converting all pointers to std::span

lib/transmission/CMakeLists.txt

@@ -201,8 +201,8 @@ target_compile_definitions(${TR_NAME}
 
 target_include_directories(${TR_NAME}
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/..
-        ${CMAKE_CURRENT_BINARY_DIR}/..
+        ${CMAKE_CURRENT_SOURCE_DIR}/../..
+        ${CMAKE_CURRENT_BINARY_DIR}/../..
         ${Intl_INCLUDE_DIRS})
 
 if(ANDROID)
@@ -252,7 +252,7 @@ if(INSTALL_LIB)
             timer-ev.h
             timer.h
             tr-buffer.h
-            ../lib/base/tr-getopt.h
+            ../base/tr-getopt.h
             transmission.h
             utils.h
             watchdir.h

lib/transmission/announce-list.cc

@@ -19,9 +19,9 @@
 #include "lib/base/tr-strbuf.h"
 #include "lib/base/variant.h"
 
-#include "libtransmission/announce-list.h"
-#include "libtransmission/types.h"
-#include "libtransmission/web-utils.h"
+#include "lib/transmission/announce-list.h"
+#include "lib/transmission/types.h"
+#include "lib/transmission/web-utils.h"
 
 using namespace std::literals;
 

lib/transmission/announce-list.h

@@ -14,9 +14,9 @@
 #include "lib/base/tr-macros.h" // TR_CONSTEXPR_VEC
 #include "lib/base/variant.h"
 
-#include "libtransmission/interned-string.h"
-#include "libtransmission/types.h"
-#include "libtransmission/web-utils.h"
+#include "lib/transmission/interned-string.h"
+#include "lib/transmission/types.h"
+#include "lib/transmission/web-utils.h"
 
 struct tr_error;
 struct tr_url_parsed_t;

lib/transmission/announcer-common.h

@@ -18,12 +18,12 @@
 #include <string_view>
 #include <vector>
 
-#include "libtransmission/announcer.h"
-#include "libtransmission/interned-string.h"
-#include "libtransmission/net.h"
-#include "libtransmission/peer-mgr.h" // tr_pex
-#include "libtransmission/types.h" // tr_peer_id_t
-#include "libtransmission/utils.h"
+#include "lib/transmission/announcer.h"
+#include "lib/transmission/interned-string.h"
+#include "lib/transmission/net.h"
+#include "lib/transmission/peer-mgr.h" // tr_pex
+#include "lib/transmission/types.h" // tr_peer_id_t
+#include "lib/transmission/utils.h"
 
 struct tr_url_parsed_t;
 

lib/transmission/announcer-http.cc

@@ -33,14 +33,14 @@
 #include "lib/base/tr-strbuf.h" // tr_strbuf, tr_urlbuf
 
 #define LIBTRANSMISSION_ANNOUNCER_MODULE
-#include "libtransmission/announcer-common.h"
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/net.h"
-#include "libtransmission/peer-mgr.h" /* pex */
-#include "libtransmission/session.h"
-#include "libtransmission/types.h"
-#include "libtransmission/web-utils.h"
-#include "libtransmission/web.h"
+#include "lib/transmission/announcer-common.h"
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/net.h"
+#include "lib/transmission/peer-mgr.h" /* pex */
+#include "lib/transmission/session.h"
+#include "lib/transmission/types.h"
+#include "lib/transmission/web-utils.h"
+#include "lib/transmission/web.h"
 
 using namespace std::literals;
 

lib/transmission/announcer-udp.cc

@@ -38,15 +38,15 @@
 #include "lib/base/tr-strbuf.h"
 
 #define LIBTRANSMISSION_ANNOUNCER_MODULE
-#include "libtransmission/announcer.h"
-#include "libtransmission/announcer-common.h"
-#include "libtransmission/crypto-utils.h" // for tr_rand_obj()
-#include "libtransmission/interned-string.h"
-#include "libtransmission/net.h"
-#include "libtransmission/peer-mgr.h" // for tr_pex::fromCompact4()
-#include "libtransmission/tr-buffer.h"
-#include "libtransmission/utils.h"
-#include "libtransmission/web-utils.h"
+#include "lib/transmission/announcer.h"
+#include "lib/transmission/announcer-common.h"
+#include "lib/transmission/crypto-utils.h" // for tr_rand_obj()
+#include "lib/transmission/interned-string.h"
+#include "lib/transmission/net.h"
+#include "lib/transmission/peer-mgr.h" // for tr_pex::fromCompact4()
+#include "lib/transmission/tr-buffer.h"
+#include "lib/transmission/utils.h"
+#include "lib/transmission/web-utils.h"
 
 #define logwarn(name, msg) tr_logAddWarn(msg, name)
 #define logdbg(name, msg) tr_logAddDebug(msg, name)

lib/transmission/announcer.cc

@@ -30,17 +30,17 @@
 #include "lib/base/tr-assert.h"
 
 #define LIBTRANSMISSION_ANNOUNCER_MODULE
-#include "libtransmission/announce-list.h"
-#include "libtransmission/announcer-common.h"
-#include "libtransmission/announcer.h"
-#include "libtransmission/crypto-utils.h" /* tr_rand_int() */
-#include "libtransmission/interned-string.h" // tr_interned_string
-#include "libtransmission/session.h"
-#include "libtransmission/timer.h"
-#include "libtransmission/torrent.h"
-#include "libtransmission/types.h" // tr_sha1_digest_t
-#include "libtransmission/utils.h"
-#include "libtransmission/web-utils.h"
+#include "lib/transmission/announce-list.h"
+#include "lib/transmission/announcer-common.h"
+#include "lib/transmission/announcer.h"
+#include "lib/transmission/crypto-utils.h" /* tr_rand_int() */
+#include "lib/transmission/interned-string.h" // tr_interned_string
+#include "lib/transmission/session.h"
+#include "lib/transmission/timer.h"
+#include "lib/transmission/torrent.h"
+#include "lib/transmission/types.h" // tr_sha1_digest_t
+#include "lib/transmission/utils.h"
+#include "lib/transmission/web-utils.h"
 
 using namespace std::literals;
 

lib/transmission/announcer.h

@@ -24,8 +24,8 @@
 #include <sys/socket.h> // socklen_t
 #endif
 
-#include "libtransmission/interned-string.h"
-#include "libtransmission/peer-mgr.h"
+#include "lib/transmission/interned-string.h"
+#include "lib/transmission/peer-mgr.h"
 
 struct tr_address;
 class tr_announcer_udp;

lib/transmission/api-compat.cc

@@ -18,9 +18,9 @@
 #include "lib/base/string-utils.h"
 #include "lib/base/variant.h"
 
-#include "libtransmission/api-compat.h"
-#include "libtransmission/rpcimpl.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/api-compat.h"
+#include "lib/transmission/rpcimpl.h"
+#include "lib/transmission/types.h"
 
 namespace tr::api_compat
 {

lib/transmission/bandwidth.cc

@@ -21,11 +21,11 @@
 #include "lib/base/tr-assert.h"
 #include "lib/base/values.h"
 
-#include "libtransmission/bandwidth.h"
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/peer-io.h"
-#include "libtransmission/types.h"
-#include "libtransmission/utils.h" // tr_time_msec()
+#include "lib/transmission/bandwidth.h"
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/peer-io.h"
+#include "lib/transmission/types.h"
+#include "lib/transmission/utils.h" // tr_time_msec()
 
 using namespace tr::Values;
 

lib/transmission/bandwidth.h

@@ -19,7 +19,7 @@
 #include "lib/base/tr-assert.h"
 #include "lib/base/values.h"
 
-#include "libtransmission/types.h"
+#include "lib/transmission/types.h"
 
 class tr_peerIo;
 

lib/transmission/bitfield.cc

@@ -11,7 +11,7 @@
 
 #include "lib/base/tr-assert.h" // TR_ASSERT, TR_ENABLE_ASSERTS
 
-#include "libtransmission/bitfield.h"
+#include "lib/transmission/bitfield.h"
 
 // ---
 

lib/transmission/block-info.cc

@@ -7,7 +7,7 @@
 
 #include "lib/base/tr-assert.h" // TR_ASSERT
 
-#include "libtransmission/block-info.h"
+#include "lib/transmission/block-info.h"
 
 void tr_block_info::init_sizes(uint64_t const total_size_in, uint32_t const piece_size_in) noexcept
 {

lib/transmission/block-info.h

@@ -7,7 +7,7 @@
 
 #include <cstdint> // uint32_t, uint64_t
 
-#include "libtransmission/types.h"
+#include "lib/transmission/types.h"
 
 struct tr_block_info
 {

lib/transmission/blocklist.cc

@@ -35,11 +35,11 @@
 #include "lib/base/tr-assert.h"
 #include "lib/base/tr-strbuf.h"
 
-#include "libtransmission/blocklist.h"
-#include "libtransmission/constants.h"
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/net.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/blocklist.h"
+#include "lib/transmission/constants.h"
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/net.h"
+#include "lib/transmission/types.h"
 
 using namespace std::literals;
 

lib/transmission/blocklist.h

@@ -20,7 +20,7 @@
 
 #include <sigslot/signal.hpp>
 
-#include "libtransmission/net.h" // for tr_address
+#include "lib/transmission/net.h" // for tr_address
 
 namespace tr
 {

lib/transmission/cache.cc

@@ -18,11 +18,11 @@
 #include "lib/base/log.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/cache.h"
-#include "libtransmission/inout.h"
-#include "libtransmission/torrent.h"
-#include "libtransmission/torrents.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/cache.h"
+#include "lib/transmission/inout.h"
+#include "lib/transmission/torrent.h"
+#include "lib/transmission/torrents.h"
+#include "lib/transmission/types.h"
 
 Cache::Key Cache::make_key(tr_torrent const& tor, tr_block_info::Location const loc) noexcept
 {

lib/transmission/cache.h

@@ -19,8 +19,8 @@
 
 #include "lib/base/values.h"
 
-#include "libtransmission/block-info.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/block-info.h"
+#include "lib/transmission/types.h"
 
 class tr_torrents;
 struct tr_torrent;

lib/transmission/clients.cc

@@ -20,8 +20,8 @@
 
 #include "lib/base/string-utils.h"
 
-#include "libtransmission/clients.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/clients.h"
+#include "lib/transmission/types.h"
 
 using namespace std::literals;
 

lib/transmission/clients.h

@@ -11,7 +11,7 @@
 
 #include <cstddef> // size_t
 
-#include "libtransmission/types.h" // tr_peer_id_t
+#include "lib/transmission/types.h" // tr_peer_id_t
 
 /**
  * @brief parse a peer-id into a human-readable client name and version number

lib/transmission/completion.cc

@@ -13,11 +13,11 @@
 #include "lib/base/i18n.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/bitfield.h"
-#include "libtransmission/block-info.h"
-#include "libtransmission/completion.h"
-#include "libtransmission/torrent.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/bitfield.h"
+#include "lib/transmission/block-info.h"
+#include "lib/transmission/completion.h"
+#include "lib/transmission/torrent.h"
+#include "lib/transmission/types.h"
 
 tr_completion::tr_completion(tr_torrent const* tor, tr_block_info const* block_info)
     : tr_completion{ [tor](tr_piece_index_t const piece) { return tor->piece_is_wanted(piece); }, block_info }

lib/transmission/completion.h

@@ -16,9 +16,9 @@
 #include <optional>
 #include <vector>
 
-#include "libtransmission/block-info.h"
-#include "libtransmission/bitfield.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/block-info.h"
+#include "lib/transmission/bitfield.h"
+#include "lib/transmission/types.h"
 
 /**
  * @brief knows which blocks and pieces we have

lib/transmission/constants.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "libtransmission/types.h"
+#include "lib/transmission/types.h"
 
 inline auto constexpr TrInet6AddrStrlen = 46U;
 

lib/transmission/crypto-utils-ccrypto.cc

@@ -15,8 +15,8 @@
 #include "lib/base/log.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/types.h"
 
 #define TR_CRYPTO_X509_FALLBACK
 #include "crypto-utils-fallback.cc" // NOLINT(bugprone-suspicious-include)

lib/transmission/crypto-utils-fallback.cc

@@ -9,7 +9,7 @@
 
 #ifdef TR_CRYPTO_X509_FALLBACK
 
-#include "libtransmission/crypto-utils.h"
+#include "lib/transmission/crypto-utils.h"
 
 tr_x509_store_t tr_ssl_get_x509_store(tr_ssl_ctx_t /*handle*/)
 {

lib/transmission/crypto-utils-mbedtls.cc

@@ -18,11 +18,11 @@
 #include "lib/base/log.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/types.h"
 
 #define TR_CRYPTO_X509_FALLBACK
-#include "libtransmission/crypto-utils-fallback.cc" // NOLINT(bugprone-suspicious-include)
+#include "lib/transmission/crypto-utils-fallback.cc" // NOLINT(bugprone-suspicious-include)
 
 #if !defined(WITH_MBEDTLS)
 #error mbedtls module

lib/transmission/crypto-utils-openssl.cc

@@ -26,8 +26,8 @@
 #include "lib/base/log.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/types.h"
 
 #if !defined(WITH_OPENSSL)
 #error OPENSSL module

lib/transmission/crypto-utils-wolfssl.cc

@@ -18,8 +18,8 @@
 #include "lib/base/log.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/types.h"
 
 #ifndef WITH_WOLFSSL
 #error wolfssl module

lib/transmission/crypto-utils.cc

@@ -29,7 +29,7 @@ extern "C"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/crypto-utils.h"
+#include "lib/transmission/crypto-utils.h"
 
 using namespace std::literals;
 

lib/transmission/crypto-utils.h

@@ -18,7 +18,7 @@
 #include "lib/base/i18n.h"
 #include "lib/base/tr-strbuf.h"
 
-#include "libtransmission/types.h" // tr_sha1_digest_t, tr_sha256_d...
+#include "lib/transmission/types.h" // tr_sha1_digest_t, tr_sha256_d...
 
 #if defined(WITH_CCRYPTO)
 #include <CommonCrypto/CommonDigest.h>

lib/transmission/file-piece-map.cc

@@ -13,11 +13,11 @@
 
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/bitfield.h"
-#include "libtransmission/block-info.h"
-#include "libtransmission/file-piece-map.h"
-#include "libtransmission/torrent-metainfo.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/bitfield.h"
+#include "lib/transmission/block-info.h"
+#include "lib/transmission/file-piece-map.h"
+#include "lib/transmission/torrent-metainfo.h"
+#include "lib/transmission/types.h"
 
 tr_file_piece_map::tr_file_piece_map(tr_torrent_metainfo const& tm)
 {

lib/transmission/file-piece-map.h

@@ -16,8 +16,8 @@
 
 #include "lib/base/tr-macros.h" // TR_CONSTEXPR_VEC
 
-#include "libtransmission/bitfield.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/bitfield.h"
+#include "lib/transmission/types.h"
 
 struct tr_block_info;
 struct tr_torrent_metainfo;

lib/transmission/handshake.cc

@@ -18,15 +18,15 @@
 #include "lib/base/log.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/bitfield.h"
-#include "libtransmission/clients.h"
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/handshake.h"
-#include "libtransmission/peer-io.h"
-#include "libtransmission/peer-mse.h" // tr_message_stream_encryption::DH
-#include "libtransmission/timer.h"
-#include "libtransmission/tr-buffer.h"
-#include "libtransmission/types.h" // tr_peer_id_t
+#include "lib/transmission/bitfield.h"
+#include "lib/transmission/clients.h"
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/handshake.h"
+#include "lib/transmission/peer-io.h"
+#include "lib/transmission/peer-mse.h" // tr_message_stream_encryption::DH
+#include "lib/transmission/timer.h"
+#include "lib/transmission/tr-buffer.h"
+#include "lib/transmission/types.h" // tr_peer_id_t
 
 #define tr_logAddTraceHand(handshake, msg) \
     tr_logAddTrace(msg, fmt::format("handshake {}", (handshake)->peer_io_->display_name()))

lib/transmission/handshake.h

@@ -23,10 +23,10 @@
 
 #include <small/vector.hpp>
 
-#include "libtransmission/peer-mse.h" // tr_message_stream_encryption::DH
-#include "libtransmission/peer-io.h"
-#include "libtransmission/timer.h"
-#include "libtransmission/types.h" // tr_sha1_digest_t, tr_peer_id_t
+#include "lib/transmission/peer-mse.h" // tr_message_stream_encryption::DH
+#include "lib/transmission/peer-io.h"
+#include "lib/transmission/timer.h"
+#include "lib/transmission/types.h" // tr_sha1_digest_t, tr_peer_id_t
 
 struct tr_error;
 struct tr_socket_address;

lib/transmission/inout.cc

@@ -19,13 +19,13 @@
 #include "lib/base/tr-strbuf.h" // tr_pathbuf
 #include "lib/base/i18n.h"
 
-#include "libtransmission/block-info.h" // tr_block_info
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/inout.h"
-#include "libtransmission/session.h"
-#include "libtransmission/torrent-files.h"
-#include "libtransmission/torrent.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/block-info.h" // tr_block_info
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/inout.h"
+#include "lib/transmission/session.h"
+#include "lib/transmission/torrent-files.h"
+#include "lib/transmission/torrent.h"
+#include "lib/transmission/types.h"
 
 using namespace std::literals;
 

lib/transmission/inout.h

@@ -12,8 +12,8 @@
 #include <cstddef> // size_t
 #include <cstdint> // uint8_t, uint32_t
 
-#include "libtransmission/block-info.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/block-info.h"
+#include "lib/transmission/types.h"
 
 struct tr_torrent;
 

lib/transmission/ip-cache.cc

@@ -28,8 +28,8 @@
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/ip-cache.h"
-#include "libtransmission/web.h"
+#include "lib/transmission/ip-cache.h"
+#include "lib/transmission/web.h"
 
 namespace
 {

lib/transmission/ip-cache.h

@@ -12,9 +12,9 @@
 #include <shared_mutex>
 #include <string_view>
 
-#include "libtransmission/net.h"
-#include "libtransmission/timer.h"
-#include "libtransmission/web.h"
+#include "lib/transmission/net.h"
+#include "lib/transmission/timer.h"
+#include "lib/transmission/web.h"
 
 #pragma once
 

lib/transmission/magnet-metainfo.cc

@@ -20,10 +20,10 @@
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-strbuf.h" // for tr_urlbuf
 
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/magnet-metainfo.h"
-#include "libtransmission/types.h" // for tr_sha1_digest_t
-#include "libtransmission/web-utils.h"
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/magnet-metainfo.h"
+#include "lib/transmission/types.h" // for tr_sha1_digest_t
+#include "lib/transmission/web-utils.h"
 
 using namespace std::literals;
 

lib/transmission/magnet-metainfo.h

@@ -12,8 +12,8 @@
 
 #include "lib/base/tr-macros.h" // TR_CONSTEXPR_VEC, tr_sha1_digest_t
 
-#include "libtransmission/announce-list.h"
-#include "libtransmission/crypto-utils.h"
+#include "lib/transmission/announce-list.h"
+#include "lib/transmission/crypto-utils.h"
 
 struct tr_error;
 

lib/transmission/makemeta.cc

@@ -29,13 +29,13 @@
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/block-info.h" // tr_block_info
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/makemeta.h"
-#include "libtransmission/session.h" // TR_NAME
-#include "libtransmission/torrent-files.h"
-#include "libtransmission/types.h"
-#include "libtransmission/version.h"
+#include "lib/transmission/block-info.h" // tr_block_info
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/makemeta.h"
+#include "lib/transmission/session.h" // TR_NAME
+#include "lib/transmission/torrent-files.h"
+#include "lib/transmission/types.h"
+#include "lib/transmission/version.h"
 
 using namespace std::literals;
 

lib/transmission/makemeta.h

@@ -17,10 +17,10 @@
 #include "lib/base/file.h"
 #include "lib/base/tr-macros.h" // TR_CONSTEXPR_VEC
 
-#include "libtransmission/announce-list.h"
-#include "libtransmission/block-info.h"
-#include "libtransmission/torrent-files.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/announce-list.h"
+#include "lib/transmission/block-info.h"
+#include "lib/transmission/torrent-files.h"
+#include "lib/transmission/types.h"
 
 class tr_metainfo_builder
 {

lib/transmission/net.cc

@@ -35,11 +35,11 @@
 #include "lib/base/tr-assert.h"
 #include "lib/base/tr-strbuf.h"
 
-#include "libtransmission/net.h"
-#include "libtransmission/peer-socket.h"
-#include "libtransmission/session.h"
-#include "libtransmission/types.h"
-#include "libtransmission/utils.h"
+#include "lib/transmission/net.h"
+#include "lib/transmission/peer-socket.h"
+#include "lib/transmission/session.h"
+#include "lib/transmission/types.h"
+#include "lib/transmission/utils.h"
 
 using namespace std::literals;
 

lib/transmission/net.h

@@ -63,8 +63,8 @@ using tr_socket_t = int;
 
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/types.h"
-#include "libtransmission/utils.h" // for tr_compare_3way()
+#include "lib/transmission/types.h"
+#include "lib/transmission/utils.h" // for tr_compare_3way()
 
 /**
  * Literally just a port number.

lib/transmission/open-files.cc

@@ -19,8 +19,8 @@
 #include "lib/base/tr-assert.h"
 #include "lib/base/tr-strbuf.h"
 
-#include "libtransmission/open-files.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/open-files.h"
+#include "lib/transmission/types.h"
 
 namespace
 {

lib/transmission/open-files.h

@@ -17,8 +17,8 @@
 
 #include "lib/base/file.h" // tr_sys_file_t
 
-#include "libtransmission/lru-cache.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/lru-cache.h"
+#include "lib/transmission/types.h"
 
 // A pool of open files that are cached while reading / writing torrents' data
 class tr_open_files

lib/transmission/peer-common.h

@@ -14,11 +14,11 @@
 #include <cstdint> // uint8_t, uint32_t, uint64_t
 #include <string>
 
-#include "libtransmission/bitfield.h"
-#include "libtransmission/block-info.h"
-#include "libtransmission/history.h"
-#include "libtransmission/net.h" // tr_port
-#include "libtransmission/types.h"
+#include "lib/transmission/bitfield.h"
+#include "lib/transmission/block-info.h"
+#include "lib/transmission/history.h"
+#include "lib/transmission/net.h" // tr_port
+#include "lib/transmission/types.h"
 
 /**
  * @addtogroup peers Peers

lib/transmission/peer-io.cc

@@ -27,14 +27,14 @@
 #include "lib/base/log.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/bandwidth.h"
-#include "libtransmission/block-info.h" // tr_block_info
-#include "libtransmission/net.h"
-#include "libtransmission/peer-io.h"
-#include "libtransmission/peer-socket.h" // tr_peer_socket, tr_netOpen...
-#include "libtransmission/session.h"
-#include "libtransmission/timer.h"
-#include "libtransmission/types.h"
+#include "lib/transmission/bandwidth.h"
+#include "lib/transmission/block-info.h" // tr_block_info
+#include "lib/transmission/net.h"
+#include "lib/transmission/peer-io.h"
+#include "lib/transmission/peer-socket.h" // tr_peer_socket, tr_netOpen...
+#include "lib/transmission/session.h"
+#include "lib/transmission/timer.h"
+#include "lib/transmission/types.h"
 
 struct sockaddr;
 

lib/transmission/peer-io.h

@@ -21,13 +21,13 @@
 
 #include "lib/base/i18n.h"
 
-#include "libtransmission/bandwidth.h"
-#include "libtransmission/block-info.h"
-#include "libtransmission/peer-mse.h"
-#include "libtransmission/peer-socket.h"
-#include "libtransmission/tr-buffer.h"
-#include "libtransmission/types.h"
-#include "libtransmission/utils-ev.h"
+#include "lib/transmission/bandwidth.h"
+#include "lib/transmission/block-info.h"
+#include "lib/transmission/peer-mse.h"
+#include "lib/transmission/peer-socket.h"
+#include "lib/transmission/tr-buffer.h"
+#include "lib/transmission/types.h"
+#include "lib/transmission/utils-ev.h"
 
 struct struct_utp_context;
 struct tr_error;

lib/transmission/peer-mgr-wishlist.cc

@@ -18,11 +18,11 @@
 #include "lib/base/tr-macros.h" // TR_CONSTEXPR_VEC
 
 #define LIBTRANSMISSION_PEER_MODULE
-#include "libtransmission/bitfield.h"
-#include "libtransmission/crypto-utils.h" // for tr_salt_shaker
-#include "libtransmission/peer-mgr-wishlist.h"
-#include "libtransmission/types.h"
-#include "libtransmission/utils.h"
+#include "lib/transmission/bitfield.h"
+#include "lib/transmission/crypto-utils.h" // for tr_salt_shaker
+#include "lib/transmission/peer-mgr-wishlist.h"
+#include "lib/transmission/types.h"
+#include "lib/transmission/utils.h"
 
 namespace
 {

lib/transmission/peer-mgr-wishlist.h

@@ -14,7 +14,7 @@
 #include <memory>
 #include <vector>
 
-#include "libtransmission/types.h"
+#include "lib/transmission/types.h"
 
 class tr_bitfield;
 

lib/transmission/peer-mgr.cc

@@ -35,27 +35,27 @@
 #include "lib/base/values.h"
 
 #define LIBTRANSMISSION_PEER_MODULE
-#include "libtransmission/announcer.h"
-#include "libtransmission/block-info.h" // tr_block_info
-#include "libtransmission/clients.h"
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/handshake.h"
-#include "libtransmission/interned-string.h"
-#include "libtransmission/net.h"
-#include "libtransmission/peer-common.h"
-#include "libtransmission/peer-io.h"
-#include "libtransmission/peer-mgr-wishlist.h"
-#include "libtransmission/peer-mgr.h"
-#include "libtransmission/peer-msgs.h"
-#include "libtransmission/peer-socket.h"
-#include "libtransmission/session.h"
-#include "libtransmission/timer.h"
-#include "libtransmission/torrent-magnet.h"
-#include "libtransmission/torrent.h"
-#include "libtransmission/torrents.h"
-#include "libtransmission/types.h"
-#include "libtransmission/utils.h"
-#include "libtransmission/webseed.h"
+#include "lib/transmission/announcer.h"
+#include "lib/transmission/block-info.h" // tr_block_info
+#include "lib/transmission/clients.h"
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/handshake.h"
+#include "lib/transmission/interned-string.h"
+#include "lib/transmission/net.h"
+#include "lib/transmission/peer-common.h"
+#include "lib/transmission/peer-io.h"
+#include "lib/transmission/peer-mgr-wishlist.h"
+#include "lib/transmission/peer-mgr.h"
+#include "lib/transmission/peer-msgs.h"
+#include "lib/transmission/peer-socket.h"
+#include "lib/transmission/session.h"
+#include "lib/transmission/timer.h"
+#include "lib/transmission/torrent-magnet.h"
+#include "lib/transmission/torrent.h"
+#include "lib/transmission/torrents.h"
+#include "lib/transmission/types.h"
+#include "lib/transmission/utils.h"
+#include "lib/transmission/webseed.h"
 
 using namespace std::literals;
 using namespace tr::Values;

lib/transmission/peer-mgr.h

@@ -20,11 +20,11 @@
 #include "lib/base/tr-assert.h"
 #include "lib/base/variant.h"
 
-#include "libtransmission/blocklist.h"
-#include "libtransmission/handshake.h"
-#include "libtransmission/net.h" /* tr_address */
-#include "libtransmission/types.h"
-#include "libtransmission/utils.h" /* tr_compare_3way */
+#include "lib/transmission/blocklist.h"
+#include "lib/transmission/handshake.h"
+#include "lib/transmission/net.h" /* tr_address */
+#include "lib/transmission/types.h"
+#include "lib/transmission/utils.h" /* tr_compare_3way */
 
 /**
  * @addtogroup peers Peers

lib/transmission/peer-mse.cc

@@ -14,10 +14,10 @@
 
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/crypto-utils.h" // tr_sha1
-#include "libtransmission/peer-mse.h"
-#include "libtransmission/tr-arc4.h"
-#include "libtransmission/types.h" // tr_sha1_digest_t
+#include "lib/transmission/crypto-utils.h" // tr_sha1
+#include "lib/transmission/peer-mse.h"
+#include "lib/transmission/tr-arc4.h"
+#include "lib/transmission/types.h" // tr_sha1_digest_t
 
 // workaround bug in GCC < 10.4
 // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99859

lib/transmission/peer-mse.h

@@ -16,8 +16,8 @@
 #include <cstddef> // size_t, std::byte
 #include <cstdint> // uint8_t
 
-#include "libtransmission/tr-arc4.h"
-#include "libtransmission/types.h" // tr_sha1_digest_t
+#include "lib/transmission/tr-arc4.h"
+#include "lib/transmission/types.h" // tr_sha1_digest_t
 
 // Spec: https://wiki.vuze.com/w/Message_Stream_Encryption
 namespace tr_message_stream_encryption

lib/transmission/peer-msgs.cc

@@ -34,23 +34,23 @@
 #include "lib/base/tr-assert.h"
 #include "lib/base/variant.h"
 
-#include "libtransmission/bitfield.h"
-#include "libtransmission/block-info.h"
-#include "libtransmission/cache.h"
-#include "libtransmission/clients.h"
-#include "libtransmission/crypto-utils.h"
-#include "libtransmission/interned-string.h"
-#include "libtransmission/peer-common.h"
-#include "libtransmission/peer-io.h"
-#include "libtransmission/peer-mgr.h"
-#include "libtransmission/peer-msgs.h"
-#include "libtransmission/session.h"
-#include "libtransmission/timer.h"
-#include "libtransmission/torrent-magnet.h"
-#include "libtransmission/torrent.h"
-#include "libtransmission/tr-buffer.h"
-#include "libtransmission/types.h"
-#include "libtransmission/version.h"
+#include "lib/transmission/bitfield.h"
+#include "lib/transmission/block-info.h"
+#include "lib/transmission/cache.h"
+#include "lib/transmission/clients.h"
+#include "lib/transmission/crypto-utils.h"
+#include "lib/transmission/interned-string.h"
+#include "lib/transmission/peer-common.h"
+#include "lib/transmission/peer-io.h"
+#include "lib/transmission/peer-mgr.h"
+#include "lib/transmission/peer-msgs.h"
+#include "lib/transmission/session.h"
+#include "lib/transmission/timer.h"
+#include "lib/transmission/torrent-magnet.h"
+#include "lib/transmission/torrent.h"
+#include "lib/transmission/tr-buffer.h"
+#include "lib/transmission/types.h"
+#include "lib/transmission/version.h"
 
 struct tr_error;
 

lib/transmission/peer-msgs.h

@@ -14,10 +14,10 @@
 #include <cstddef> // for size_t
 #include <memory>
 
-#include "libtransmission/interned-string.h"
-#include "libtransmission/net.h" // tr_socket_address
-#include "libtransmission/peer-common.h" // for tr_peer
-#include "libtransmission/types.h"
+#include "lib/transmission/interned-string.h"
+#include "lib/transmission/net.h" // tr_socket_address
+#include "lib/transmission/peer-common.h" // for tr_peer
+#include "lib/transmission/types.h"
 
 class tr_peerIo;
 class tr_peerMsgs;

lib/transmission/peer-socket.cc

@@ -17,9 +17,9 @@
 #include "lib/base/log.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/net.h"
-#include "libtransmission/peer-socket.h"
-#include "libtransmission/session.h"
+#include "lib/transmission/net.h"
+#include "lib/transmission/peer-socket.h"
+#include "lib/transmission/session.h"
 
 #define tr_logAddErrorIo(io, msg) tr_logAddError(msg, (io)->display_name())
 #define tr_logAddWarnIo(io, msg) tr_logAddWarn(msg, (io)->display_name())