diff --git a/cli/cli.cc b/cli/cli.cc
index 19f4f58cf..7916904d7 100644
--- a/cli/cli.cc
+++ b/cli/cli.cc
@@ -11,7 +11,7 @@
 
 #include <signal.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/daemon/daemon-posix.cc b/daemon/daemon-posix.cc
index dba9cca59..efb1a1490 100644
--- a/daemon/daemon-posix.cc
+++ b/daemon/daemon-posix.cc
@@ -17,7 +17,7 @@
 
 #include <event2/event.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/error.h>
 #include <libtransmission/utils.h>
diff --git a/daemon/daemon-win32.cc b/daemon/daemon-win32.cc
index 269521b6b..02b2ee138 100644
--- a/daemon/daemon-win32.cc
+++ b/daemon/daemon-win32.cc
@@ -8,7 +8,7 @@
 
 #include <algorithm> /* std::max() */
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/error.h>
 #include <libtransmission/log.h>
diff --git a/daemon/daemon.cc b/daemon/daemon.cc
index ef037239a..87a2c180d 100644
--- a/daemon/daemon.cc
+++ b/daemon/daemon.cc
@@ -26,7 +26,7 @@
 
 #include <event2/event.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/gtk/Application.cc b/gtk/Application.cc
index 6995fa1c3..9e250bb85 100644
--- a/gtk/Application.cc
+++ b/gtk/Application.cc
@@ -63,7 +63,7 @@
 #include <gtkmm/selectiondata.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <algorithm>
 #include <csignal>
diff --git a/gtk/DetailsDialog.cc b/gtk/DetailsDialog.cc
index 77e80f173..72b59512d 100644
--- a/gtk/DetailsDialog.cc
+++ b/gtk/DetailsDialog.cc
@@ -47,7 +47,7 @@
 #include <gtkmm/treeview.h>
 
 #include <fmt/chrono.h>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <fmt/ranges.h>
 
 #include <algorithm>
diff --git a/gtk/Dialogs.cc b/gtk/Dialogs.cc
index b7fa96e36..f92ab87b3 100644
--- a/gtk/Dialogs.cc
+++ b/gtk/Dialogs.cc
@@ -12,7 +12,7 @@
 #include <glibmm/ustring.h>
 #include <gtkmm/messagedialog.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <memory>
 #include <vector>
diff --git a/gtk/FileList.cc b/gtk/FileList.cc
index fe2c2d658..d0d89674b 100644
--- a/gtk/FileList.cc
+++ b/gtk/FileList.cc
@@ -32,7 +32,7 @@
 #include <gtkmm/treestore.h>
 #include <gtkmm/treeview.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <algorithm>
 #include <memory>
diff --git a/gtk/FilterBar.cc b/gtk/FilterBar.cc
index 4d3b5eb13..5c1582c92 100644
--- a/gtk/FilterBar.cc
+++ b/gtk/FilterBar.cc
@@ -34,7 +34,7 @@
 #include <gtkmm/filterlistmodel.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <algorithm> // std::transform()
 #include <array>
diff --git a/gtk/FreeSpaceLabel.cc b/gtk/FreeSpaceLabel.cc
index 8ce83f01c..0b080ad56 100644
--- a/gtk/FreeSpaceLabel.cc
+++ b/gtk/FreeSpaceLabel.cc
@@ -13,7 +13,7 @@
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <memory>
 #include <string>
diff --git a/gtk/MakeDialog.cc b/gtk/MakeDialog.cc
index 37edbd099..5cc93d4f5 100644
--- a/gtk/MakeDialog.cc
+++ b/gtk/MakeDialog.cc
@@ -41,7 +41,7 @@
 #include <gtkmm/selectiondata.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <chrono>
 #include <future>
diff --git a/gtk/MessageLogWindow.cc b/gtk/MessageLogWindow.cc
index 335a689a1..0f3345a14 100644
--- a/gtk/MessageLogWindow.cc
+++ b/gtk/MessageLogWindow.cc
@@ -33,7 +33,7 @@
 #include <gtkmm/treemodelsort.h>
 #include <gtkmm/treeview.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 
 #include <array>
diff --git a/gtk/Notify.cc b/gtk/Notify.cc
index 95b4adba4..4d5817a91 100644
--- a/gtk/Notify.cc
+++ b/gtk/Notify.cc
@@ -20,7 +20,7 @@
 #include <glibmm/ustring.h>
 #include <glibmm/variant.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <map>
 #include <utility>
diff --git a/gtk/PrefsDialog.cc b/gtk/PrefsDialog.cc
index 9b7292cd4..81d2b39f8 100644
--- a/gtk/PrefsDialog.cc
+++ b/gtk/PrefsDialog.cc
@@ -40,7 +40,7 @@
 #include <gtkmm/eventcontrollerfocus.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <array>
 #include <limits>
diff --git a/gtk/RelocateDialog.cc b/gtk/RelocateDialog.cc
index 7d26348bb..b252f6282 100644
--- a/gtk/RelocateDialog.cc
+++ b/gtk/RelocateDialog.cc
@@ -17,7 +17,7 @@
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/messagedialog.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <memory>
 #include <string>
diff --git a/gtk/Session.cc b/gtk/Session.cc
index 20fab0dbf..dd69dd523 100644
--- a/gtk/Session.cc
+++ b/gtk/Session.cc
@@ -41,7 +41,7 @@
 #include <gtkmm/treemodelsort.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <algorithm>
 #include <array>
diff --git a/gtk/StatsDialog.cc b/gtk/StatsDialog.cc
index 57f99f7a3..262a99727 100644
--- a/gtk/StatsDialog.cc
+++ b/gtk/StatsDialog.cc
@@ -16,7 +16,7 @@
 #include <gtkmm/label.h>
 #include <gtkmm/messagedialog.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <memory>
 
diff --git a/gtk/Torrent.cc b/gtk/Torrent.cc
index 294157909..d787abbdc 100644
--- a/gtk/Torrent.cc
+++ b/gtk/Torrent.cc
@@ -17,7 +17,7 @@
 #include <glibmm/i18n.h>
 #include <glibmm/value.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <array>
 #include <cmath>
diff --git a/gtk/TorrentCellRenderer.cc b/gtk/TorrentCellRenderer.cc
index cf54d9b84..c6e85961d 100644
--- a/gtk/TorrentCellRenderer.cc
+++ b/gtk/TorrentCellRenderer.cc
@@ -30,7 +30,7 @@
 #include <gtkmm/snapshot.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <algorithm> // std::max()
 #include <cstring> // strchr()
diff --git a/gtk/Utils.cc b/gtk/Utils.cc
index 13f74dc3c..09a74186a 100644
--- a/gtk/Utils.cc
+++ b/gtk/Utils.cc
@@ -41,7 +41,7 @@
 #include <gtkmm/clipboard.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <functional>
 #include <memory>
diff --git a/gtk/Utils.h b/gtk/Utils.h
index 2d9d818c6..d21b3d7f3 100644
--- a/gtk/Utils.h
+++ b/gtk/Utils.h
@@ -26,7 +26,7 @@
 #include <gtkmm/listview.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/gtk/main.cc b/gtk/main.cc
index 1431ad5af..3f1a06e63 100644
--- a/gtk/main.cc
+++ b/gtk/main.cc
@@ -25,7 +25,7 @@
 #include <glibmm/wrap.h>
 #include <gtkmm.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <cstdio>
 #include <string>
diff --git a/libtransmission/announcer-http.cc b/libtransmission/announcer-http.cc
index 0c743fb9b..071934456 100644
--- a/libtransmission/announcer-http.cc
+++ b/libtransmission/announcer-http.cc
@@ -20,7 +20,7 @@
 
 #include <event2/http.h> /* for HTTP_OK */
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #define LIBTRANSMISSION_ANNOUNCER_MODULE
 
diff --git a/libtransmission/announcer-udp.cc b/libtransmission/announcer-udp.cc
index 8d08413ac..51c353cc6 100644
--- a/libtransmission/announcer-udp.cc
+++ b/libtransmission/announcer-udp.cc
@@ -29,7 +29,7 @@
 #include <sys/socket.h> // sockaddr_storage, AF_INET
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #define LIBTRANSMISSION_ANNOUNCER_MODULE
 
diff --git a/libtransmission/announcer.cc b/libtransmission/announcer.cc
index b3246872a..a5b19fe8f 100644
--- a/libtransmission/announcer.cc
+++ b/libtransmission/announcer.cc
@@ -21,7 +21,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #define LIBTRANSMISSION_ANNOUNCER_MODULE
 
diff --git a/libtransmission/bandwidth.cc b/libtransmission/bandwidth.cc
index 289a4d5a7..c71e3978f 100644
--- a/libtransmission/bandwidth.cc
+++ b/libtransmission/bandwidth.cc
@@ -13,7 +13,7 @@
 #include <utility> // for std::swap()
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/blocklist.cc b/libtransmission/blocklist.cc
index e1bf5a0b8..f3d514e06 100644
--- a/libtransmission/blocklist.cc
+++ b/libtransmission/blocklist.cc
@@ -24,7 +24,7 @@
 #include <netinet/in.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/cache.cc b/libtransmission/cache.cc
index a5b4352f6..746385108 100644
--- a/libtransmission/cache.cc
+++ b/libtransmission/cache.cc
@@ -13,7 +13,7 @@
 #include <utility> // std::make_pair()
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/clients.cc b/libtransmission/clients.cc
index 21ed5cc8f..3b90e8944 100644
--- a/libtransmission/clients.cc
+++ b/libtransmission/clients.cc
@@ -15,7 +15,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/clients.h"
 #include "libtransmission/tr-macros.h" // tr_peer_id_t
diff --git a/libtransmission/crypto-utils-ccrypto.cc b/libtransmission/crypto-utils-ccrypto.cc
index 79864309c..ec168fc12 100644
--- a/libtransmission/crypto-utils-ccrypto.cc
+++ b/libtransmission/crypto-utils-ccrypto.cc
@@ -9,7 +9,7 @@
 #include <CommonCrypto/CommonDigest.h>
 #include <CommonCrypto/CommonRandom.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/crypto-utils-mbedtls.cc b/libtransmission/crypto-utils-mbedtls.cc
index 41fe277d5..40fb0f29a 100644
--- a/libtransmission/crypto-utils-mbedtls.cc
+++ b/libtransmission/crypto-utils-mbedtls.cc
@@ -12,7 +12,7 @@
 #include <mbedtls/sha256.h>
 #include <mbedtls/version.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/crypto-utils-openssl.cc b/libtransmission/crypto-utils-openssl.cc
index 3f0fe26ce..7b640cd54 100644
--- a/libtransmission/crypto-utils-openssl.cc
+++ b/libtransmission/crypto-utils-openssl.cc
@@ -20,7 +20,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509_vfy.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/log.h"
diff --git a/libtransmission/crypto-utils-wolfssl.cc b/libtransmission/crypto-utils-wolfssl.cc
index 78c5e4232..1d62b58ff 100644
--- a/libtransmission/crypto-utils-wolfssl.cc
+++ b/libtransmission/crypto-utils-wolfssl.cc
@@ -12,7 +12,7 @@
 #include <wolfssl/wolfcrypt/sha256.h>
 #include <wolfssl/version.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/crypto-utils.cc b/libtransmission/crypto-utils.cc
index 2ef9fa04f..4503706e6 100644
--- a/libtransmission/crypto-utils.cc
+++ b/libtransmission/crypto-utils.cc
@@ -21,7 +21,7 @@ extern "C"
 #include <b64/cencode.h>
 }
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/tr-assert.h"
diff --git a/libtransmission/favicon-cache.h b/libtransmission/favicon-cache.h
index c15ea1b63..a239fa9f4 100644
--- a/libtransmission/favicon-cache.h
+++ b/libtransmission/favicon-cache.h
@@ -18,7 +18,7 @@
 #include <string_view>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/file.h>
 #include <libtransmission/utils.h> // for tr_file_save()
diff --git a/libtransmission/file-win32.cc b/libtransmission/file-win32.cc
index 78af23270..c6a08d441 100644
--- a/libtransmission/file-win32.cc
+++ b/libtransmission/file-win32.cc
@@ -15,7 +15,7 @@
 #include <shlobj.h> /* SHCreateDirectoryEx() */
 #include <winioctl.h> /* FSCTL_SET_SPARSE */
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/inout.cc b/libtransmission/inout.cc
index ed61774e6..efba7a23f 100644
--- a/libtransmission/inout.cc
+++ b/libtransmission/inout.cc
@@ -10,7 +10,7 @@
 #include <optional>
 #include <string_view>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/interned-string.h b/libtransmission/interned-string.h
index 35cfd3620..991275ae6 100644
--- a/libtransmission/interned-string.h
+++ b/libtransmission/interned-string.h
@@ -7,7 +7,7 @@
 
 #include <string_view>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/quark.h"
 
diff --git a/libtransmission/ip-cache.cc b/libtransmission/ip-cache.cc
index feb90c314..12d51cb5c 100644
--- a/libtransmission/ip-cache.cc
+++ b/libtransmission/ip-cache.cc
@@ -19,7 +19,7 @@
 #include <sys/socket.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/ip-cache.h"
 #include "libtransmission/log.h"
diff --git a/libtransmission/magnet-metainfo.cc b/libtransmission/magnet-metainfo.cc
index 7086f7f23..0c505003f 100644
--- a/libtransmission/magnet-metainfo.cc
+++ b/libtransmission/magnet-metainfo.cc
@@ -12,7 +12,7 @@
 #include <string>
 #include <string_view>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/error-types.h"
diff --git a/libtransmission/makemeta.cc b/libtransmission/makemeta.cc
index 6e398c4aa..a44b16a62 100644
--- a/libtransmission/makemeta.cc
+++ b/libtransmission/makemeta.cc
@@ -14,7 +14,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/net.cc b/libtransmission/net.cc
index f3e9141a4..805a8b2da 100644
--- a/libtransmission/net.cc
+++ b/libtransmission/net.cc
@@ -27,7 +27,7 @@
 
 #include <event2/util.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/log.h"
 #include "libtransmission/net.h"
diff --git a/libtransmission/peer-io.cc b/libtransmission/peer-io.cc
index a3e451ad8..c3d6deb6a 100644
--- a/libtransmission/peer-io.cc
+++ b/libtransmission/peer-io.cc
@@ -18,7 +18,7 @@
 
 #include <libutp/utp.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/peer-mgr.cc b/libtransmission/peer-mgr.cc
index fe956141e..4c1a93628 100644
--- a/libtransmission/peer-mgr.cc
+++ b/libtransmission/peer-mgr.cc
@@ -23,7 +23,7 @@
 #include <small/map.hpp>
 #include <small/vector.hpp>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #define LIBTRANSMISSION_PEER_MODULE
 #include "libtransmission/transmission.h"
diff --git a/libtransmission/peer-msgs.cc b/libtransmission/peer-msgs.cc
index 64b0f3848..c2afc5e4e 100644
--- a/libtransmission/peer-msgs.cc
+++ b/libtransmission/peer-msgs.cc
@@ -23,7 +23,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <small/vector.hpp>
 
diff --git a/libtransmission/peer-socket.cc b/libtransmission/peer-socket.cc
index 0cdfbd968..68e55d9a6 100644
--- a/libtransmission/peer-socket.cc
+++ b/libtransmission/peer-socket.cc
@@ -7,7 +7,7 @@
 #include <cerrno>
 #include <cstddef> // std::byte
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libutp/utp.h>
 
diff --git a/libtransmission/platform.cc b/libtransmission/platform.cc
index 9dcca67e4..30b894d87 100644
--- a/libtransmission/platform.cc
+++ b/libtransmission/platform.cc
@@ -36,7 +36,7 @@
 #include <FindDirectory.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/port-forwarding.cc b/libtransmission/port-forwarding.cc
index e9129f6b8..064a6cc15 100644
--- a/libtransmission/port-forwarding.cc
+++ b/libtransmission/port-forwarding.cc
@@ -7,7 +7,7 @@
 #include <chrono>
 #include <memory>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #define LIBTRANSMISSION_PORT_FORWARDING_MODULE
 
diff --git a/libtransmission/resume.cc b/libtransmission/resume.cc
index c0983dd1c..beb61ebdb 100644
--- a/libtransmission/resume.cc
+++ b/libtransmission/resume.cc
@@ -12,7 +12,7 @@
 #include <string_view>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/rpc-server.cc b/libtransmission/rpc-server.cc
index c58880375..d5540b087 100644
--- a/libtransmission/rpc-server.cc
+++ b/libtransmission/rpc-server.cc
@@ -28,8 +28,8 @@
 #include <event2/http.h>
 #include <event2/listener.h>
 
-#include <fmt/core.h>
 #include <fmt/chrono.h>
+#include <fmt/format.h>
 
 #include <libdeflate.h>
 
diff --git a/libtransmission/rpcimpl.cc b/libtransmission/rpcimpl.cc
index 333625cdb..08b5084cb 100644
--- a/libtransmission/rpcimpl.cc
+++ b/libtransmission/rpcimpl.cc
@@ -17,7 +17,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libdeflate.h>
 
diff --git a/libtransmission/session-id.cc b/libtransmission/session-id.cc
index 75fd6741f..3a25afe3d 100644
--- a/libtransmission/session-id.cc
+++ b/libtransmission/session-id.cc
@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/crypto-utils.h" // for tr_rand_obj()
 #include "libtransmission/error-types.h"
diff --git a/libtransmission/session.cc b/libtransmission/session.cc
index b1700ad9b..f3e139fa0 100644
--- a/libtransmission/session.cc
+++ b/libtransmission/session.cc
@@ -26,7 +26,7 @@
 
 #include <event2/event.h>
 
-#include <fmt/core.h> // fmt::ptr
+#include <fmt/format.h> // fmt::ptr
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/settings.cc b/libtransmission/settings.cc
index ba49464f2..bc8438656 100644
--- a/libtransmission/settings.cc
+++ b/libtransmission/settings.cc
@@ -12,7 +12,7 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/subprocess-win32.cc b/libtransmission/subprocess-win32.cc
index 42f32a4b8..4d65a4cbf 100644
--- a/libtransmission/subprocess-win32.cc
+++ b/libtransmission/subprocess-win32.cc
@@ -12,7 +12,7 @@
 #include <string>
 #include <string_view>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <fmt/xchar.h> // for wchar_t support
 
 #include <windows.h>
diff --git a/libtransmission/torrent-files.cc b/libtransmission/torrent-files.cc
index db5bc811b..86f4e720f 100644
--- a/libtransmission/torrent-files.cc
+++ b/libtransmission/torrent-files.cc
@@ -15,7 +15,7 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/torrent-magnet.cc b/libtransmission/torrent-magnet.cc
index 94607428b..c9d6cea8b 100644
--- a/libtransmission/torrent-magnet.cc
+++ b/libtransmission/torrent-magnet.cc
@@ -15,7 +15,7 @@
 #include <string_view>
 #include <utility> // std::move
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/torrent-metainfo.cc b/libtransmission/torrent-metainfo.cc
index 8973fd1bf..46e397fa1 100644
--- a/libtransmission/torrent-metainfo.cc
+++ b/libtransmission/torrent-metainfo.cc
@@ -11,7 +11,7 @@
 #include <string_view>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/torrent.cc b/libtransmission/torrent.cc
index 879b26478..632546767 100644
--- a/libtransmission/torrent.cc
+++ b/libtransmission/torrent.cc
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include <fmt/chrono.h>
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <small/map.hpp>
 
diff --git a/libtransmission/tr-dht.cc b/libtransmission/tr-dht.cc
index f72a669c1..10284793b 100644
--- a/libtransmission/tr-dht.cc
+++ b/libtransmission/tr-dht.cc
@@ -30,7 +30,7 @@
 #include <netinet/in.h> /* sockaddr_in */
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/tr-getopt.cc b/libtransmission/tr-getopt.cc
index 060c4b8fc..2eeb9a69a 100644
--- a/libtransmission/tr-getopt.cc
+++ b/libtransmission/tr-getopt.cc
@@ -10,7 +10,7 @@
 #include <string>
 #include <string_view>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/tr-getopt.h"
 #include "libtransmission/utils.h"
diff --git a/libtransmission/tr-lpd.cc b/libtransmission/tr-lpd.cc
index daa4e3925..a2fdbbf49 100644
--- a/libtransmission/tr-lpd.cc
+++ b/libtransmission/tr-lpd.cc
@@ -25,7 +25,7 @@
 
 #include <event2/event.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/tr-strbuf.h b/libtransmission/tr-strbuf.h
index c2b009cae..358015859 100644
--- a/libtransmission/tr-strbuf.h
+++ b/libtransmission/tr-strbuf.h
@@ -9,7 +9,7 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 /**
  * A memory buffer which uses a builtin array of N bytes, using heap
diff --git a/libtransmission/tr-udp.cc b/libtransmission/tr-udp.cc
index 9aeb94325..9b6e19637 100644
--- a/libtransmission/tr-udp.cc
+++ b/libtransmission/tr-udp.cc
@@ -16,7 +16,7 @@
 
 #include <event2/event.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/log.h"
 #include "libtransmission/net.h"
diff --git a/libtransmission/tr-utp.cc b/libtransmission/tr-utp.cc
index 069ca5f5d..5ad253064 100644
--- a/libtransmission/tr-utp.cc
+++ b/libtransmission/tr-utp.cc
@@ -6,7 +6,6 @@
 #include <cstddef>
 #include <cstdint>
 
-#include <fmt/core.h>
 #include <fmt/format.h> // fmt::ptr
 
 #include <libutp/utp.h>
diff --git a/libtransmission/utils.cc b/libtransmission/utils.cc
index d1a631a67..363e6863e 100644
--- a/libtransmission/utils.cc
+++ b/libtransmission/utils.cc
@@ -40,7 +40,7 @@
 
 #include <curl/curl.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <fast_float/fast_float.h>
 #include <wildmat.h>
diff --git a/libtransmission/values.h b/libtransmission/values.h
index 587b73aed..1bd1fad4c 100644
--- a/libtransmission/values.h
+++ b/libtransmission/values.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <string_view>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 namespace libtransmission::Values
 {
diff --git a/libtransmission/variant-benc.cc b/libtransmission/variant-benc.cc
index f210b1495..bff24bb78 100644
--- a/libtransmission/variant-benc.cc
+++ b/libtransmission/variant-benc.cc
@@ -14,8 +14,8 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/core.h>
 #include <fmt/compile.h>
+#include <fmt/format.h>
 
 #define LIBTRANSMISSION_VARIANT_MODULE
 
diff --git a/libtransmission/variant.cc b/libtransmission/variant.cc
index 2b6d12331..b59f0d1b4 100644
--- a/libtransmission/variant.cc
+++ b/libtransmission/variant.cc
@@ -18,7 +18,7 @@
 #include <share.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <small/vector.hpp>
 
diff --git a/libtransmission/watchdir-inotify.cc b/libtransmission/watchdir-inotify.cc
index 889c27bf8..2bedcd323 100644
--- a/libtransmission/watchdir-inotify.cc
+++ b/libtransmission/watchdir-inotify.cc
@@ -18,7 +18,7 @@
 #include <event2/bufferevent.h>
 #include <event2/event.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #define LIBTRANSMISSION_WATCHDIR_MODULE
 
diff --git a/libtransmission/watchdir-kqueue.cc b/libtransmission/watchdir-kqueue.cc
index ac726792b..3771cc47f 100644
--- a/libtransmission/watchdir-kqueue.cc
+++ b/libtransmission/watchdir-kqueue.cc
@@ -19,7 +19,7 @@
 
 #include <event2/event.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #define LIBTRANSMISSION_WATCHDIR_MODULE
 #include "libtransmission/transmission.h"
diff --git a/libtransmission/watchdir.cc b/libtransmission/watchdir.cc
index 760d36659..181174ada 100644
--- a/libtransmission/watchdir.cc
+++ b/libtransmission/watchdir.cc
@@ -7,7 +7,7 @@
 #include <string>
 #include <string_view>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #define LIBTRANSMISSION_WATCHDIR_MODULE
 
diff --git a/libtransmission/web-utils.cc b/libtransmission/web-utils.cc
index ab7b1c287..626f73d02 100644
--- a/libtransmission/web-utils.cc
+++ b/libtransmission/web-utils.cc
@@ -14,7 +14,7 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #define PSL_STATIC
 #include <libpsl.h>
diff --git a/libtransmission/web-utils.h b/libtransmission/web-utils.h
index de15b8a8a..1ca601c6b 100644
--- a/libtransmission/web-utils.h
+++ b/libtransmission/web-utils.h
@@ -11,7 +11,7 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "libtransmission/tr-macros.h" // tr_sha1_digest_t
 
diff --git a/libtransmission/web.cc b/libtransmission/web.cc
index 12d085294..6543afee0 100644
--- a/libtransmission/web.cc
+++ b/libtransmission/web.cc
@@ -35,7 +35,7 @@
 
 #include <event2/buffer.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #ifdef _WIN32
 #include "libtransmission/crypto-utils.h"
diff --git a/qt/RpcClient.cc b/qt/RpcClient.cc
index bb0be68db..4a3db302e 100644
--- a/qt/RpcClient.cc
+++ b/qt/RpcClient.cc
@@ -5,7 +5,7 @@
 
 #include <string_view>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "RpcClient.h"
 
diff --git a/qt/main.cc b/qt/main.cc
index b31e1db5b..808fe9b63 100644
--- a/qt/main.cc
+++ b/qt/main.cc
@@ -7,7 +7,7 @@
 #include <memory>
 #include <string_view>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/tests/libtransmission/announce-list-test.cc b/tests/libtransmission/announce-list-test.cc
index ce3f1f605..f01669a13 100644
--- a/tests/libtransmission/announce-list-test.cc
+++ b/tests/libtransmission/announce-list-test.cc
@@ -11,7 +11,7 @@
 #include <string_view>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/tests/libtransmission/benc-test.cc b/tests/libtransmission/benc-test.cc
index 905e9b1f9..966c90cf3 100644
--- a/tests/libtransmission/benc-test.cc
+++ b/tests/libtransmission/benc-test.cc
@@ -6,7 +6,7 @@
 #include <cstdint> // int64_t
 #include <string_view>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/benc.h>
 #include <libtransmission/error.h>
diff --git a/tests/libtransmission/dht-test.cc b/tests/libtransmission/dht-test.cc
index ef41e51d5..aa1a26ddf 100644
--- a/tests/libtransmission/dht-test.cc
+++ b/tests/libtransmission/dht-test.cc
@@ -30,7 +30,7 @@
 
 #include <event2/event.h>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/tests/libtransmission/file-test.cc b/tests/libtransmission/file-test.cc
index 2f041cbbe..f2db1a4d4 100644
--- a/tests/libtransmission/file-test.cc
+++ b/tests/libtransmission/file-test.cc
@@ -23,7 +23,7 @@
 #include <windows.h>
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/error.h>
 #include <libtransmission/file.h>
diff --git a/tests/libtransmission/open-files-test.cc b/tests/libtransmission/open-files-test.cc
index be94973da..7d4cbaebf 100644
--- a/tests/libtransmission/open-files-test.cc
+++ b/tests/libtransmission/open-files-test.cc
@@ -10,7 +10,7 @@
 #include <cstdint> // uint64_t
 #include <string_view>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/tests/libtransmission/platform-test.cc b/tests/libtransmission/platform-test.cc
index 1e98ec842..9b2c49229 100644
--- a/tests/libtransmission/platform-test.cc
+++ b/tests/libtransmission/platform-test.cc
@@ -6,7 +6,7 @@
 #include <cstdlib>
 #include <string_view>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/tests/libtransmission/subprocess-test-program.cc b/tests/libtransmission/subprocess-test-program.cc
index 04b477e8e..8d73a266d 100644
--- a/tests/libtransmission/subprocess-test-program.cc
+++ b/tests/libtransmission/subprocess-test-program.cc
@@ -6,7 +6,7 @@
 #include <libtransmission/file.h> // tr_sys_dir_get_current()
 #include <libtransmission/utils.h> // tr_env_get_string()
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 
 #include <fstream>
diff --git a/tests/libtransmission/utils-test.cc b/tests/libtransmission/utils-test.cc
index 2e4c7b020..6081a0e31 100644
--- a/tests/libtransmission/utils-test.cc
+++ b/tests/libtransmission/utils-test.cc
@@ -19,7 +19,7 @@
 #define unsetenv(key) SetEnvironmentVariableA(key, nullptr)
 #endif
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/utils/create.cc b/utils/create.cc
index 52bbaa34e..1670f5fc2 100644
--- a/utils/create.cc
+++ b/utils/create.cc
@@ -15,7 +15,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/utils/edit.cc b/utils/edit.cc
index 8491368d1..ab2c5baaf 100644
--- a/utils/edit.cc
+++ b/utils/edit.cc
@@ -10,7 +10,7 @@
 #include <string_view>
 #include <vector>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/error.h>
 #include <libtransmission/log.h>
diff --git a/utils/remote.cc b/utils/remote.cc
index 535ec6072..344ee35e6 100644
--- a/utils/remote.cc
+++ b/utils/remote.cc
@@ -24,7 +24,7 @@
 #include <event2/buffer.h>
 
 #include <fmt/chrono.h>
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/utils/show.cc b/utils/show.cc
index c16e5e796..60eac16ec 100644
--- a/utils/show.cc
+++ b/utils/show.cc
@@ -19,7 +19,7 @@
 #include <vector>
 
 #include <fmt/chrono.h>
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <libtransmission/transmission.h>