diff --git a/cli/cli.cc b/cli/cli.cc
index 48106e234..decf13b2b 100644
--- a/cli/cli.cc
+++ b/cli/cli.cc
@@ -10,7 +10,7 @@
 
 #include <signal.h>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/daemon/daemon-posix.cc b/daemon/daemon-posix.cc
index a621e03eb..3c227e6a7 100644
--- a/daemon/daemon-posix.cc
+++ b/daemon/daemon-posix.cc
@@ -17,7 +17,7 @@
 
 #include <string_view>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "daemon.h"
 
diff --git a/daemon/daemon-win32.cc b/daemon/daemon-win32.cc
index 0c846ca09..87d68e8f8 100644
--- a/daemon/daemon-win32.cc
+++ b/daemon/daemon-win32.cc
@@ -8,7 +8,7 @@
 
 #include <algorithm> /* std::max() */
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "daemon.h"
 
diff --git a/gtk/DetailsDialog.cc b/gtk/DetailsDialog.cc
index 8140cc9b5..553491db1 100644
--- a/gtk/DetailsDialog.cc
+++ b/gtk/DetailsDialog.cc
@@ -49,7 +49,6 @@
 
 #include <fmt/chrono.h>
 #include <fmt/core.h>
-#include <fmt/format.h>
 
 #include <algorithm>
 #include <array>
diff --git a/gtk/Utils.h b/gtk/Utils.h
index 4f340739a..7e04f6e8b 100644
--- a/gtk/Utils.h
+++ b/gtk/Utils.h
@@ -23,7 +23,6 @@
 #include <gtkmm/window.h>
 
 #include <fmt/core.h>
-#include <fmt/format.h>
 
 #include <cstddef>
 #include <ctime>
diff --git a/libtransmission/announcer-udp.cc b/libtransmission/announcer-udp.cc
index d6bad6289..67b79648d 100644
--- a/libtransmission/announcer-udp.cc
+++ b/libtransmission/announcer-udp.cc
@@ -21,7 +21,6 @@
 #endif
 
 #include <fmt/core.h>
-#include <fmt/format.h>
 
 #define LIBTRANSMISSION_ANNOUNCER_MODULE
 
diff --git a/libtransmission/clients.cc b/libtransmission/clients.cc
index e1c83d773..3e6646404 100644
--- a/libtransmission/clients.cc
+++ b/libtransmission/clients.cc
@@ -14,7 +14,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/crypto-utils.cc b/libtransmission/crypto-utils.cc
index e20d0bdaf..643c6a5c7 100644
--- a/libtransmission/crypto-utils.cc
+++ b/libtransmission/crypto-utils.cc
@@ -20,7 +20,7 @@ extern "C"
 #include <b64/cencode.h>
 }
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/error.cc b/libtransmission/error.cc
index aa3bced31..a51c70ea7 100644
--- a/libtransmission/error.cc
+++ b/libtransmission/error.cc
@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <string_view>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/file-posix.cc b/libtransmission/file-posix.cc
index 273f861ca..dee289bd0 100644
--- a/libtransmission/file-posix.cc
+++ b/libtransmission/file-posix.cc
@@ -49,7 +49,7 @@
 #define USE_COPY_FILE_RANGE
 #endif /* __linux__ */
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/file-win32.cc b/libtransmission/file-win32.cc
index ecd3838a0..8ad6004a2 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/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/handshake.cc b/libtransmission/handshake.cc
index 139387672..c0c874b00 100644
--- a/libtransmission/handshake.cc
+++ b/libtransmission/handshake.cc
@@ -10,7 +10,7 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/interned-string.h b/libtransmission/interned-string.h
index 35c4431e9..dcad9d759 100644
--- a/libtransmission/interned-string.h
+++ b/libtransmission/interned-string.h
@@ -7,7 +7,7 @@
 
 #include <string_view>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "quark.h"
 
diff --git a/libtransmission/log.cc b/libtransmission/log.cc
index 3b24742ae..38199396b 100644
--- a/libtransmission/log.cc
+++ b/libtransmission/log.cc
@@ -18,7 +18,7 @@
 #endif
 
 #include <fmt/chrono.h>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/magnet-metainfo.cc b/libtransmission/magnet-metainfo.cc
index 2dfa3b2c4..1e53af7dd 100644
--- a/libtransmission/magnet-metainfo.cc
+++ b/libtransmission/magnet-metainfo.cc
@@ -10,7 +10,7 @@
 #include <string>
 #include <string_view>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/makemeta.cc b/libtransmission/makemeta.cc
index f74b27735..df1c66d18 100644
--- a/libtransmission/makemeta.cc
+++ b/libtransmission/makemeta.cc
@@ -13,7 +13,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/peer-io.cc b/libtransmission/peer-io.cc
index a8181f4d9..64549bb7b 100644
--- a/libtransmission/peer-io.cc
+++ b/libtransmission/peer-io.cc
@@ -15,7 +15,7 @@
 
 #include <libutp/utp.h>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/peer-mgr.cc b/libtransmission/peer-mgr.cc
index 23d36cb31..0b7063c3e 100644
--- a/libtransmission/peer-mgr.cc
+++ b/libtransmission/peer-mgr.cc
@@ -20,7 +20,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #define LIBTRANSMISSION_PEER_MODULE
 #include "libtransmission/transmission.h"
diff --git a/libtransmission/peer-msgs.cc b/libtransmission/peer-msgs.cc
index 2ec890276..8edef65f5 100644
--- a/libtransmission/peer-msgs.cc
+++ b/libtransmission/peer-msgs.cc
@@ -16,7 +16,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/peer-socket.cc b/libtransmission/peer-socket.cc
index 7863fec6f..c56fa2738 100644
--- a/libtransmission/peer-socket.cc
+++ b/libtransmission/peer-socket.cc
@@ -3,7 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include <libutp/utp.h>
 
diff --git a/libtransmission/platform.cc b/libtransmission/platform.cc
index 3880620b5..0c665f933 100644
--- a/libtransmission/platform.cc
+++ b/libtransmission/platform.cc
@@ -32,7 +32,7 @@
 #include <FindDirectory.h>
 #endif
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/port-forwarding-upnp.cc b/libtransmission/port-forwarding-upnp.cc
index 1b7939676..9b274d7a9 100644
--- a/libtransmission/port-forwarding-upnp.cc
+++ b/libtransmission/port-forwarding-upnp.cc
@@ -13,7 +13,6 @@
 #include <utility>
 
 #include <fmt/core.h>
-#include <fmt/format.h>
 
 #ifdef SYSTEM_MINIUPNP
 #include <miniupnpc/miniupnpc.h>
diff --git a/libtransmission/resume.cc b/libtransmission/resume.cc
index 0220a3b68..d8cadd73a 100644
--- a/libtransmission/resume.cc
+++ b/libtransmission/resume.cc
@@ -9,7 +9,6 @@
 #include <string_view>
 #include <vector>
 
-#include <fmt/core.h>
 #include <fmt/format.h> // fmt::ptr
 
 #include "libtransmission/transmission.h"
diff --git a/libtransmission/session-id.cc b/libtransmission/session-id.cc
index 5a4ace357..122fe122c 100644
--- a/libtransmission/session-id.cc
+++ b/libtransmission/session-id.cc
@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 #endif
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/session-settings.cc b/libtransmission/session-settings.cc
index 5c381e3c2..41b4cb818 100644
--- a/libtransmission/session-settings.cc
+++ b/libtransmission/session-settings.cc
@@ -3,7 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/session.cc b/libtransmission/session.cc
index 3f745ab31..7d78b6260 100644
--- a/libtransmission/session.cc
+++ b/libtransmission/session.cc
@@ -29,7 +29,6 @@
 #include <event2/event.h>
 
 #include <fmt/chrono.h>
-#include <fmt/core.h>
 #include <fmt/format.h> // fmt::ptr
 
 #include "libtransmission/transmission.h"
diff --git a/libtransmission/subprocess-posix.cc b/libtransmission/subprocess-posix.cc
index ac30d1e81..ba0e769ff 100644
--- a/libtransmission/subprocess-posix.cc
+++ b/libtransmission/subprocess-posix.cc
@@ -14,7 +14,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/subprocess-win32.cc b/libtransmission/subprocess-win32.cc
index 41dcf8caf..c81bdf554 100644
--- a/libtransmission/subprocess-win32.cc
+++ b/libtransmission/subprocess-win32.cc
@@ -12,7 +12,7 @@
 #include <string>
 #include <string_view>
 
-#include <fmt/format.h>
+#include <fmt/core.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 a3c42b5a6..475b7d78a 100644
--- a/libtransmission/torrent-files.cc
+++ b/libtransmission/torrent-files.cc
@@ -13,7 +13,7 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/torrent-metainfo.cc b/libtransmission/torrent-metainfo.cc
index 6d1c57739..0c24a7c6b 100644
--- a/libtransmission/torrent-metainfo.cc
+++ b/libtransmission/torrent-metainfo.cc
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include <fmt/core.h>
-#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/tr-assert.mm b/libtransmission/tr-assert.mm
index 18073bb7b..7ec465484 100644
--- a/libtransmission/tr-assert.mm
+++ b/libtransmission/tr-assert.mm
@@ -7,7 +7,7 @@
 
 #include <cstdlib> // for abort()
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "tr-assert.h"
 
diff --git a/libtransmission/tr-dht.cc b/libtransmission/tr-dht.cc
index 931d15ed7..c9a844033 100644
--- a/libtransmission/tr-dht.cc
+++ b/libtransmission/tr-dht.cc
@@ -30,7 +30,7 @@
 #include <netinet/in.h> /* sockaddr_in */
 #endif
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/tr-getopt.cc b/libtransmission/tr-getopt.cc
index 1eabe7820..a17cea421 100644
--- a/libtransmission/tr-getopt.cc
+++ b/libtransmission/tr-getopt.cc
@@ -8,7 +8,7 @@
 #include <cstring>
 #include <string_view>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/tr-lpd.cc b/libtransmission/tr-lpd.cc
index b5a8554cd..a6d5c9b23 100644
--- a/libtransmission/tr-lpd.cc
+++ b/libtransmission/tr-lpd.cc
@@ -20,7 +20,7 @@
 
 #include <event2/event.h>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/tr-strbuf.h b/libtransmission/tr-strbuf.h
index 1d74cd997..56cd98870 100644
--- a/libtransmission/tr-strbuf.h
+++ b/libtransmission/tr-strbuf.h
@@ -9,7 +9,7 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 /**
  * A memory buffer which uses a builtin array of N bytes, using heap
diff --git a/libtransmission/tr-utp.cc b/libtransmission/tr-utp.cc
index a5b1cedd0..55edf979e 100644
--- a/libtransmission/tr-utp.cc
+++ b/libtransmission/tr-utp.cc
@@ -6,7 +6,6 @@
 #include <chrono>
 
 #include <fmt/core.h>
-#include <fmt/format.h>
 
 #include <libutp/utp.h>
 
diff --git a/libtransmission/utils.cc b/libtransmission/utils.cc
index 29bee1c6f..6182ce393 100644
--- a/libtransmission/utils.cc
+++ b/libtransmission/utils.cc
@@ -35,7 +35,7 @@
 #define UTF_CPP_CPLUSPLUS 201703L
 #include <utf8.h>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include <fast_float/fast_float.h>
 #include <wildmat.h>
diff --git a/libtransmission/variant-benc.cc b/libtransmission/variant-benc.cc
index 950dc8ad5..4ff4bf088 100644
--- a/libtransmission/variant-benc.cc
+++ b/libtransmission/variant-benc.cc
@@ -9,8 +9,8 @@
 #include <string_view>
 #include <optional>
 
+#include <fmt/core.h>
 #include <fmt/compile.h>
-#include <fmt/format.h>
 
 #define LIBTRANSMISSION_VARIANT_MODULE
 
diff --git a/libtransmission/variant-converters.cc b/libtransmission/variant-converters.cc
index a5f0dabdb..1ed893623 100644
--- a/libtransmission/variant-converters.cc
+++ b/libtransmission/variant-converters.cc
@@ -3,7 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/variant-json.cc b/libtransmission/variant-json.cc
index 1fcb86115..42073be8d 100644
--- a/libtransmission/variant-json.cc
+++ b/libtransmission/variant-json.cc
@@ -17,8 +17,9 @@
 #define UTF_CPP_CPLUSPLUS 201703L
 #include <utf8.h>
 
+#include <fmt/core.h>
 #include <fmt/compile.h>
-#include <fmt/format.h>
+
 #include <jsonsl.h>
 
 #define LIBTRANSMISSION_VARIANT_MODULE
diff --git a/libtransmission/web-utils.cc b/libtransmission/web-utils.cc
index 3c495ab7f..53227c607 100644
--- a/libtransmission/web-utils.cc
+++ b/libtransmission/web-utils.cc
@@ -14,7 +14,7 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #define PSL_STATIC
 #include <libpsl.h>
diff --git a/libtransmission/web-utils.h b/libtransmission/web-utils.h
index 087a16e24..fb2b8e273 100644
--- a/libtransmission/web-utils.h
+++ b/libtransmission/web-utils.h
@@ -11,7 +11,7 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "tr-macros.h" // tr_sha1_digest_t
 
diff --git a/libtransmission/web.cc b/libtransmission/web.cc
index 99d117823..162143b5e 100644
--- a/libtransmission/web.cc
+++ b/libtransmission/web.cc
@@ -24,7 +24,6 @@
 #include <curl/curl.h>
 
 #include <fmt/core.h>
-#include <fmt/format.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/libtransmission/webseed.cc b/libtransmission/webseed.cc
index c0e17a1cd..b6a821620 100644
--- a/libtransmission/webseed.cc
+++ b/libtransmission/webseed.cc
@@ -13,7 +13,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "libtransmission/transmission.h"
 
diff --git a/qt/RpcClient.cc b/qt/RpcClient.cc
index cfb9209b0..8e7dd8f5b 100644
--- a/qt/RpcClient.cc
+++ b/qt/RpcClient.cc
@@ -5,7 +5,7 @@
 
 #include <string_view>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "RpcClient.h"
 
diff --git a/tests/libtransmission/announcer-udp-test.cc b/tests/libtransmission/announcer-udp-test.cc
index 41e44eb5e..46ca4b613 100644
--- a/tests/libtransmission/announcer-udp-test.cc
+++ b/tests/libtransmission/announcer-udp-test.cc
@@ -8,7 +8,7 @@
 #include <memory>
 #include <vector>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #define LIBTRANSMISSION_ANNOUNCER_MODULE
 
diff --git a/tests/libtransmission/benc-test.cc b/tests/libtransmission/benc-test.cc
index 7a736557e..0208b2e13 100644
--- a/tests/libtransmission/benc-test.cc
+++ b/tests/libtransmission/benc-test.cc
@@ -3,7 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/tests/libtransmission/makemeta-test.cc b/tests/libtransmission/makemeta-test.cc
index af4c95768..47710de54 100644
--- a/tests/libtransmission/makemeta-test.cc
+++ b/tests/libtransmission/makemeta-test.cc
@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/utils/create.cc b/utils/create.cc
index 4f12290d5..a0fe61569 100644
--- a/utils/create.cc
+++ b/utils/create.cc
@@ -11,7 +11,7 @@
 #include <string>
 #include <string_view>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/utils/edit.cc b/utils/edit.cc
index 5b4fef5fc..396348c88 100644
--- a/utils/edit.cc
+++ b/utils/edit.cc
@@ -9,7 +9,7 @@
 #include <string_view>
 #include <vector>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include <libtransmission/transmission.h>
 
diff --git a/utils/remote.cc b/utils/remote.cc
index 753b93851..0f96d3078 100644
--- a/utils/remote.cc
+++ b/utils/remote.cc
@@ -21,7 +21,7 @@
 #include <event2/buffer.h>
 
 #include <fmt/chrono.h>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include <libtransmission/transmission.h>
 #include <libtransmission/crypto-utils.h>
diff --git a/utils/show.cc b/utils/show.cc
index c258e1f9f..761ad71cd 100644
--- a/utils/show.cc
+++ b/utils/show.cc
@@ -14,7 +14,6 @@
 
 #include <fmt/chrono.h>
 #include <fmt/core.h>
-#include <fmt/format.h>
 
 #include <libtransmission/transmission.h>