diff --git a/common/audio/audio_formats.cpp b/common/audio/audio_formats.cpp
index 998070219a..180746dea1 100644
--- a/common/audio/audio_formats.cpp
+++ b/common/audio/audio_formats.cpp
@@ -3,7 +3,7 @@
 #include "common/log/log.h"
 #include "common/util/BinaryWriter.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Write a wave file from a vector of samples.
diff --git a/common/cross_os_debug/xdbg.cpp b/common/cross_os_debug/xdbg.cpp
index ec8586d6e9..c70e6bbd68 100644
--- a/common/cross_os_debug/xdbg.cpp
+++ b/common/cross_os_debug/xdbg.cpp
@@ -11,7 +11,7 @@
 #include "common/goal_constants.h"
 #include "common/util/Timer.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef __linux
 #include <fcntl.h>
diff --git a/common/cross_sockets/XSocket.cpp b/common/cross_sockets/XSocket.cpp
index 5bdd6bd71a..f297b79e66 100644
--- a/common/cross_sockets/XSocket.cpp
+++ b/common/cross_sockets/XSocket.cpp
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "common/log/log.h"
 // clang-format on
 
diff --git a/common/cross_sockets/XSocketClient.cpp b/common/cross_sockets/XSocketClient.cpp
index 57d01eeffa..d6299903b4 100644
--- a/common/cross_sockets/XSocketClient.cpp
+++ b/common/cross_sockets/XSocketClient.cpp
@@ -5,7 +5,7 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/log/log.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 // clang-format off
 #ifdef _WIN32
diff --git a/common/cross_sockets/XSocketServer.cpp b/common/cross_sockets/XSocketServer.cpp
index bd563b91d1..f0c68cebb6 100644
--- a/common/cross_sockets/XSocketServer.cpp
+++ b/common/cross_sockets/XSocketServer.cpp
@@ -4,7 +4,7 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/common_types.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define NOMINMAX
diff --git a/common/dma/dma.cpp b/common/dma/dma.cpp
index 3eebab72ea..b491cfa4c7 100644
--- a/common/dma/dma.cpp
+++ b/common/dma/dma.cpp
@@ -2,7 +2,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 std::string DmaTag::print() const {
   std::string result;
diff --git a/common/dma/dma.h b/common/dma/dma.h
index 027cf7c332..fb593af23e 100644
--- a/common/dma/dma.h
+++ b/common/dma/dma.h
@@ -11,7 +11,7 @@
 #include "common/common_types.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 struct DmaStats {
   double sync_time_ms = 0;
diff --git a/common/dma/dma_copy.cpp b/common/dma/dma_copy.cpp
index 9e10e02906..1f2353a34e 100644
--- a/common/dma/dma_copy.cpp
+++ b/common/dma/dma_copy.cpp
@@ -6,7 +6,7 @@
 #include "common/log/log.h"
 #include "common/util/Timer.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Convert a DMA chain to an array of bytes that can be directly fed to VIF.
diff --git a/common/dma/gs.cpp b/common/dma/gs.cpp
index dac1087ccd..594929cfc1 100644
--- a/common/dma/gs.cpp
+++ b/common/dma/gs.cpp
@@ -2,7 +2,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "fmt/format.h"
 
 std::string reg_descriptor_name(GifTag::RegisterDescriptor reg) {
diff --git a/common/formatter/formatter.cpp b/common/formatter/formatter.cpp
index 30353ff597..dc98f4503c 100644
--- a/common/formatter/formatter.cpp
+++ b/common/formatter/formatter.cpp
@@ -11,7 +11,7 @@
 
 #include "tree_sitter/api.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 // Declare the `tree_sitter_opengoal` function, which is
 // implemented by the `tree-sitter-opengoal` library.
diff --git a/common/formatter/formatter_tree.cpp b/common/formatter/formatter_tree.cpp
index a249675108..13fdade1bb 100644
--- a/common/formatter/formatter_tree.cpp
+++ b/common/formatter/formatter_tree.cpp
@@ -2,7 +2,7 @@
 
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 std::string get_source_code(const std::string& source, const TSNode& node) {
   uint32_t start = ts_node_start_byte(node);
diff --git a/common/formatter/rules/formatting_rules.cpp b/common/formatter/rules/formatting_rules.cpp
index ea8fc52b03..d951912d93 100644
--- a/common/formatter/rules/formatting_rules.cpp
+++ b/common/formatter/rules/formatting_rules.cpp
@@ -4,7 +4,7 @@
 
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace formatter_rules {
 
diff --git a/common/global_profiler/GlobalProfiler.cpp b/common/global_profiler/GlobalProfiler.cpp
index cdbed8af67..2ce52cacef 100644
--- a/common/global_profiler/GlobalProfiler.cpp
+++ b/common/global_profiler/GlobalProfiler.cpp
@@ -9,7 +9,7 @@
 #include "common/util/FileUtil.h"
 #include "common/common_types.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/json.hpp"
 
 #ifdef OS_POSIX
diff --git a/common/goos/Interpreter.cpp b/common/goos/Interpreter.cpp
index 40a4103620..86dfc0f45e 100644
--- a/common/goos/Interpreter.cpp
+++ b/common/goos/Interpreter.cpp
@@ -16,7 +16,7 @@
 #include "common/util/string_util.h"
 #include "common/util/unicode_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 Interpreter::Interpreter(const std::string& username) {
diff --git a/common/goos/Object.cpp b/common/goos/Object.cpp
index b619a9b481..f0d57318a2 100644
--- a/common/goos/Object.cpp
+++ b/common/goos/Object.cpp
@@ -47,7 +47,7 @@
 #include "common/util/crc32.h"
 #include "common/util/print_float.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 
diff --git a/common/goos/Object.h b/common/goos/Object.h
index 673a0cee9c..58470114d1 100644
--- a/common/goos/Object.h
+++ b/common/goos/Object.h
@@ -57,7 +57,7 @@
 #include "common/util/Assert.h"
 #include "common/util/crc32.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 
diff --git a/common/goos/ParseHelpers.cpp b/common/goos/ParseHelpers.cpp
index 78d0c3c32c..2cd31b121a 100644
--- a/common/goos/ParseHelpers.cpp
+++ b/common/goos/ParseHelpers.cpp
@@ -1,6 +1,6 @@
 #include "ParseHelpers.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 
diff --git a/common/goos/PrettyPrinter.cpp b/common/goos/PrettyPrinter.cpp
index 5f7b7eb735..17f2e3a921 100644
--- a/common/goos/PrettyPrinter.cpp
+++ b/common/goos/PrettyPrinter.cpp
@@ -15,7 +15,7 @@
 #include "common/goos/PrettyPrinter2.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace pretty_print {
 
diff --git a/common/goos/PrettyPrinter2.cpp b/common/goos/PrettyPrinter2.cpp
index f12e4828e5..6ae54f350b 100644
--- a/common/goos/PrettyPrinter2.cpp
+++ b/common/goos/PrettyPrinter2.cpp
@@ -3,7 +3,7 @@
 #include "common/common_types.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "fmt/format.h"
 
 namespace pretty_print {
diff --git a/common/goos/Printer.cpp b/common/goos/Printer.cpp
index fc5281da62..139f63c9fa 100644
--- a/common/goos/Printer.cpp
+++ b/common/goos/Printer.cpp
@@ -6,7 +6,7 @@
 #include "common/goos/Object.h"
 #include "common/util/print_float.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace pretty_print {
 namespace {
diff --git a/common/goos/Reader.cpp b/common/goos/Reader.cpp
index f438a410d0..4d2f56a5e4 100644
--- a/common/goos/Reader.cpp
+++ b/common/goos/Reader.cpp
@@ -15,7 +15,8 @@
 #include "common/util/FileUtil.h"
 #include "common/util/FontUtils.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
+#include "fmt/ranges.h"
 
 namespace goos {
 
diff --git a/common/goos/TextDB.cpp b/common/goos/TextDB.cpp
index 4d15bac663..45f8f7b9e8 100644
--- a/common/goos/TextDB.cpp
+++ b/common/goos/TextDB.cpp
@@ -15,7 +15,7 @@
 
 #include "common/util/FileUtil.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace goos {
 
diff --git a/common/log/log.h b/common/log/log.h
index 2c9df82d77..7ce37db5af 100644
--- a/common/log/log.h
+++ b/common/log/log.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace lg {
 
diff --git a/common/math/Vector.h b/common/math/Vector.h
index e185522163..130339f2f5 100644
--- a/common/math/Vector.h
+++ b/common/math/Vector.h
@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace math {
 
diff --git a/common/repl/config.cpp b/common/repl/config.cpp
index 57274ef96e..14aea63aa0 100644
--- a/common/repl/config.cpp
+++ b/common/repl/config.cpp
@@ -2,7 +2,7 @@
 
 #include "common/versions/versions.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace REPL {
 void to_json(json& j, const Config& obj) {
diff --git a/common/repl/nrepl/ReplClient.cpp b/common/repl/nrepl/ReplClient.cpp
index b0fa0b35a4..773f43449e 100644
--- a/common/repl/nrepl/ReplClient.cpp
+++ b/common/repl/nrepl/ReplClient.cpp
@@ -4,7 +4,7 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/versions/versions.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define NOMINMAX
diff --git a/common/repl/nrepl/ReplServer.cpp b/common/repl/nrepl/ReplServer.cpp
index b2274a4f5f..0354efa92b 100644
--- a/common/repl/nrepl/ReplServer.cpp
+++ b/common/repl/nrepl/ReplServer.cpp
@@ -4,7 +4,7 @@
 #include "common/cross_sockets/XSocket.h"
 #include "common/versions/versions.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define NOMINMAX
diff --git a/common/repl/repl_wrapper.cpp b/common/repl/repl_wrapper.cpp
index d85be66fdb..3370a3d9ee 100644
--- a/common/repl/repl_wrapper.cpp
+++ b/common/repl/repl_wrapper.cpp
@@ -6,7 +6,7 @@
 #include "common/versions/versions.h"
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/replxx/include/replxx.hxx"
 
 namespace REPL {
diff --git a/common/serialization/subtitles/subtitles.cpp b/common/serialization/subtitles/subtitles.cpp
index 4ad154b83e..0f501d1565 100644
--- a/common/serialization/subtitles/subtitles.cpp
+++ b/common/serialization/subtitles/subtitles.cpp
@@ -5,7 +5,7 @@
 #include "common/util/FileUtil.h"
 #include "common/util/json_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 void open_subtitle_project(const std::string& project_kind,
                            const std::string& file_path,
diff --git a/common/serialization/subtitles/subtitles_v1.cpp b/common/serialization/subtitles/subtitles_v1.cpp
index fd9b2092b9..5db51b07bf 100644
--- a/common/serialization/subtitles/subtitles_v1.cpp
+++ b/common/serialization/subtitles/subtitles_v1.cpp
@@ -5,7 +5,7 @@
 
 #include "subtitles_v2.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 void to_json(json& j, const SubtitleCutsceneLineMetadataV1& obj) {
   json_serialize(frame_start);
diff --git a/common/serialization/subtitles/subtitles_v2.cpp b/common/serialization/subtitles/subtitles_v2.cpp
index e78b321031..84dbde76d6 100644
--- a/common/serialization/subtitles/subtitles_v2.cpp
+++ b/common/serialization/subtitles/subtitles_v2.cpp
@@ -5,7 +5,7 @@
 
 #include "subtitles_v1.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 void to_json(json& j, const SubtitleLineMetadata& obj) {
   json_serialize(frame_start);
diff --git a/common/type_system/Type.cpp b/common/type_system/Type.cpp
index 5eec0cb1ae..71b7b8376d 100644
--- a/common/type_system/Type.cpp
+++ b/common/type_system/Type.cpp
@@ -10,7 +10,7 @@
 #include "common/log/log.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 std::string reg_kind_to_string(RegClass kind) {
diff --git a/common/type_system/TypeFieldLookup.cpp b/common/type_system/TypeFieldLookup.cpp
index 4f3ccc78af..432e00698f 100644
--- a/common/type_system/TypeFieldLookup.cpp
+++ b/common/type_system/TypeFieldLookup.cpp
@@ -9,7 +9,7 @@
 
 #include "common/log/log.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 // debug prints for the reverse lookup
diff --git a/common/type_system/TypeSpec.cpp b/common/type_system/TypeSpec.cpp
index 5eba6f0378..21b1b49ff0 100644
--- a/common/type_system/TypeSpec.cpp
+++ b/common/type_system/TypeSpec.cpp
@@ -7,7 +7,7 @@
 
 #include <stdexcept>
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 bool TypeTag::operator==(const TypeTag& other) const {
   return name == other.name && value == other.value;
diff --git a/common/type_system/TypeSystem.cpp b/common/type_system/TypeSystem.cpp
index 999db34b82..1b8855f514 100644
--- a/common/type_system/TypeSystem.cpp
+++ b/common/type_system/TypeSystem.cpp
@@ -15,7 +15,7 @@
 #include "common/util/math_util.h"
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 template <typename... Args>
diff --git a/common/type_system/defenum.cpp b/common/type_system/defenum.cpp
index e59302e90f..a0f2a8cc3b 100644
--- a/common/type_system/defenum.cpp
+++ b/common/type_system/defenum.cpp
@@ -13,7 +13,7 @@
 #include "common/util/BitUtils.h"
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 const goos::Object& car(const goos::Object* x) {
diff --git a/common/type_system/deftype.cpp b/common/type_system/deftype.cpp
index 6c844025f2..731d40f7c1 100644
--- a/common/type_system/deftype.cpp
+++ b/common/type_system/deftype.cpp
@@ -13,7 +13,7 @@
 #include "common/type_system/state.h"
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Missing Features
diff --git a/common/util/FileUtil.cpp b/common/util/FileUtil.cpp
index f150801cc1..932a34f4b1 100644
--- a/common/util/FileUtil.cpp
+++ b/common/util/FileUtil.cpp
@@ -22,7 +22,7 @@
 // This disables the use of PCLMULQDQ which is probably ok, but let's just be safe and disable it
 // because nobody will care if png compression is 10% slower.
 #define FPNG_NO_SSE 1
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/fpng/fpng.cpp"
 #include "third-party/fpng/fpng.h"
 #include "third-party/lzokay/lzokay.hpp"
diff --git a/common/util/FontUtils.cpp b/common/util/FontUtils.cpp
index b1503997ec..252c845cba 100644
--- a/common/util/FontUtils.cpp
+++ b/common/util/FontUtils.cpp
@@ -16,7 +16,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "fmt/format.h"
 
 const std::unordered_map<std::string, GameTextVersion> sTextVerEnumMap = {
diff --git a/common/util/compress.cpp b/common/util/compress.cpp
index ec61030a94..d5bff3f0ef 100644
--- a/common/util/compress.cpp
+++ b/common/util/compress.cpp
@@ -5,7 +5,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/zstd/lib/zstd.h"
 
 namespace compression {
diff --git a/common/util/dgo_util.cpp b/common/util/dgo_util.cpp
index ed4f784f7f..116f38b829 100644
--- a/common/util/dgo_util.cpp
+++ b/common/util/dgo_util.cpp
@@ -5,7 +5,7 @@
 #include "common/util/Assert.h"
 #include "common/versions/versions.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Assert false if the char[] has non-null data after the null terminated string.
diff --git a/common/util/print_float.cpp b/common/util/print_float.cpp
index d7ece1b272..8ed0705791 100644
--- a/common/util/print_float.cpp
+++ b/common/util/print_float.cpp
@@ -5,7 +5,7 @@
 #include "common/goal_constants.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/dragonbox.h"
 
 /*!
diff --git a/common/versions/versions.cpp b/common/versions/versions.cpp
index cbb94c5fb9..be0f3179ae 100644
--- a/common/versions/versions.cpp
+++ b/common/versions/versions.cpp
@@ -3,7 +3,7 @@
 #include "common/util/Assert.h"
 #include "common/versions/revision.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "fmt/format.h"
 
 GameVersion game_name_to_version(const std::string& name) {
diff --git a/decompiler/Disasm/Instruction.cpp b/decompiler/Disasm/Instruction.cpp
index 593ccc8970..d69b2a8483 100644
--- a/decompiler/Disasm/Instruction.cpp
+++ b/decompiler/Disasm/Instruction.cpp
@@ -10,7 +10,7 @@
 
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 /*!
diff --git a/decompiler/Disasm/InstructionDecode.cpp b/decompiler/Disasm/InstructionDecode.cpp
index 14c887120c..6631472c5f 100644
--- a/decompiler/Disasm/InstructionDecode.cpp
+++ b/decompiler/Disasm/InstructionDecode.cpp
@@ -10,7 +10,7 @@
 
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 // utility class to extract fields of an opcode.
diff --git a/decompiler/Disasm/InstructionParser.cpp b/decompiler/Disasm/InstructionParser.cpp
index d34c4b2309..18a5aadfb5 100644
--- a/decompiler/Disasm/InstructionParser.cpp
+++ b/decompiler/Disasm/InstructionParser.cpp
@@ -7,7 +7,7 @@
 #include "common/common_types.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 InstructionParser::InstructionParser() {
diff --git a/decompiler/Function/Warnings.h b/decompiler/Function/Warnings.h
index 04a86959e6..f47f5459d0 100644
--- a/decompiler/Function/Warnings.h
+++ b/decompiler/Function/Warnings.h
@@ -7,7 +7,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 class DecompWarnings {
diff --git a/decompiler/IR2/AtomicOp.cpp b/decompiler/IR2/AtomicOp.cpp
index 7801ffc164..a43bb2fa07 100644
--- a/decompiler/IR2/AtomicOp.cpp
+++ b/decompiler/IR2/AtomicOp.cpp
@@ -12,7 +12,7 @@
 
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 /////////////////////////////
diff --git a/decompiler/IR2/AtomicOpTypeAnalysis.cpp b/decompiler/IR2/AtomicOpTypeAnalysis.cpp
index b13f50d6e7..64b5c9a3b6 100644
--- a/decompiler/IR2/AtomicOpTypeAnalysis.cpp
+++ b/decompiler/IR2/AtomicOpTypeAnalysis.cpp
@@ -10,7 +10,7 @@
 #include "decompiler/util/TP_Type.h"
 #include "decompiler/util/type_utils.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 
diff --git a/decompiler/IR2/IR2_common.h b/decompiler/IR2/IR2_common.h
index 589c34a969..86200c6856 100644
--- a/decompiler/IR2/IR2_common.h
+++ b/decompiler/IR2/IR2_common.h
@@ -8,7 +8,7 @@
 #include "decompiler/Function/Warnings.h"
 #include "decompiler/util/TP_Type.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 enum class AccessMode : u8 {
diff --git a/decompiler/IR2/LabelDB.cpp b/decompiler/IR2/LabelDB.cpp
index c49639cc02..47130473e0 100644
--- a/decompiler/IR2/LabelDB.cpp
+++ b/decompiler/IR2/LabelDB.cpp
@@ -1,6 +1,6 @@
 #include "LabelDB.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 
diff --git a/decompiler/ObjectFile/LinkedObjectFile.cpp b/decompiler/ObjectFile/LinkedObjectFile.cpp
index f6cf4f617c..3b50f7e7b1 100644
--- a/decompiler/ObjectFile/LinkedObjectFile.cpp
+++ b/decompiler/ObjectFile/LinkedObjectFile.cpp
@@ -16,7 +16,7 @@
 #include "decompiler/Disasm/InstructionDecode.h"
 #include "decompiler/config.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/json.hpp"
 
 namespace decompiler {
diff --git a/decompiler/ObjectFile/ObjectFileDB.h b/decompiler/ObjectFile/ObjectFileDB.h
index e55604870a..09a1a1ece8 100644
--- a/decompiler/ObjectFile/ObjectFileDB.h
+++ b/decompiler/ObjectFile/ObjectFileDB.h
@@ -21,7 +21,7 @@
 #include "decompiler/data/TextureDB.h"
 #include "decompiler/util/DecompilerTypeSystem.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 /*!
diff --git a/decompiler/VuDisasm/VuDisassembler.cpp b/decompiler/VuDisasm/VuDisassembler.cpp
index b9241b76cb..26447b3ad2 100644
--- a/decompiler/VuDisasm/VuDisassembler.cpp
+++ b/decompiler/VuDisasm/VuDisassembler.cpp
@@ -7,7 +7,7 @@
 #include "common/util/Assert.h"
 #include "common/util/print_float.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 
diff --git a/decompiler/VuDisasm/VuInstruction.cpp b/decompiler/VuDisasm/VuInstruction.cpp
index 12a0827ac4..a97c1e8519 100644
--- a/decompiler/VuDisasm/VuInstruction.cpp
+++ b/decompiler/VuDisasm/VuInstruction.cpp
@@ -2,7 +2,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 VuInstructionAtom VuInstructionAtom::make_vf(int idx) {
diff --git a/decompiler/analysis/stack_spill.cpp b/decompiler/analysis/stack_spill.cpp
index 4ce2bc170e..f6f470f364 100644
--- a/decompiler/analysis/stack_spill.cpp
+++ b/decompiler/analysis/stack_spill.cpp
@@ -4,7 +4,7 @@
 
 #include "decompiler/Disasm/DecompilerLabel.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 
diff --git a/decompiler/analysis/variable_naming.cpp b/decompiler/analysis/variable_naming.cpp
index bb26f9d259..d3bdbce0fb 100644
--- a/decompiler/analysis/variable_naming.cpp
+++ b/decompiler/analysis/variable_naming.cpp
@@ -10,7 +10,7 @@
 #include "decompiler/IR2/Env.h"
 #include "decompiler/util/DecompilerTypeSystem.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 
diff --git a/decompiler/config.cpp b/decompiler/config.cpp
index a47df7c4b6..47f7ab6f81 100644
--- a/decompiler/config.cpp
+++ b/decompiler/config.cpp
@@ -6,7 +6,7 @@
 
 #include "decompiler/util/config_parsers.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 
diff --git a/decompiler/data/TextureDB.cpp b/decompiler/data/TextureDB.cpp
index f9d1db6ef4..8bf45b2563 100644
--- a/decompiler/data/TextureDB.cpp
+++ b/decompiler/data/TextureDB.cpp
@@ -3,7 +3,7 @@
 #include "common/log/log.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #define STBI_WINDOWS_UTF8
 #include "third-party/stb_image/stb_image.h"
 
diff --git a/decompiler/data/dir_tpages.cpp b/decompiler/data/dir_tpages.cpp
index 47932cfd2a..b0e2f5814a 100644
--- a/decompiler/data/dir_tpages.cpp
+++ b/decompiler/data/dir_tpages.cpp
@@ -2,7 +2,7 @@
 
 #include "decompiler/ObjectFile/ObjectFileDB.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 std::string DirTpageResult::to_source() const {
diff --git a/decompiler/data/game_count.cpp b/decompiler/data/game_count.cpp
index 83d13be2c0..13a48e02e3 100644
--- a/decompiler/data/game_count.cpp
+++ b/decompiler/data/game_count.cpp
@@ -4,7 +4,7 @@
 
 #include "decompiler/ObjectFile/ObjectFileDB.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 GameCountResult process_game_count(ObjectFileData& data) {
diff --git a/decompiler/data/game_text.cpp b/decompiler/data/game_text.cpp
index 294b335a78..1407dcb641 100644
--- a/decompiler/data/game_text.cpp
+++ b/decompiler/data/game_text.cpp
@@ -14,7 +14,7 @@
 
 #include "decompiler/ObjectFile/ObjectFileDB.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 namespace {
diff --git a/decompiler/data/streamed_audio.cpp b/decompiler/data/streamed_audio.cpp
index f285164a2b..12335f0658 100644
--- a/decompiler/data/streamed_audio.cpp
+++ b/decompiler/data/streamed_audio.cpp
@@ -7,7 +7,7 @@
 #include "common/util/FileUtil.h"
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/json.hpp"
 
 namespace decompiler {
diff --git a/decompiler/data/tpage.cpp b/decompiler/data/tpage.cpp
index d5319488cf..aeb4185ba6 100644
--- a/decompiler/data/tpage.cpp
+++ b/decompiler/data/tpage.cpp
@@ -23,7 +23,7 @@
 
 #include "decompiler/ObjectFile/ObjectFileDB.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 namespace {
diff --git a/decompiler/level_extractor/MercData.cpp b/decompiler/level_extractor/MercData.cpp
index 8709262830..66b27181ff 100644
--- a/decompiler/level_extractor/MercData.cpp
+++ b/decompiler/level_extractor/MercData.cpp
@@ -6,7 +6,7 @@
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 #include "decompiler/util/DecompilerTypeSystem.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 
diff --git a/decompiler/level_extractor/extract_actors.cpp b/decompiler/level_extractor/extract_actors.cpp
index 7e3ed03442..fd2d1a822a 100644
--- a/decompiler/level_extractor/extract_actors.cpp
+++ b/decompiler/level_extractor/extract_actors.cpp
@@ -2,7 +2,7 @@
 
 #include "common/goos/PrettyPrinter2.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/json.hpp"
 
 namespace decompiler {
diff --git a/decompiler/util/DataParser.cpp b/decompiler/util/DataParser.cpp
index 7175ea3361..e55d64c887 100644
--- a/decompiler/util/DataParser.cpp
+++ b/decompiler/util/DataParser.cpp
@@ -5,7 +5,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*
  * Allowable lines:
diff --git a/decompiler/util/Error.h b/decompiler/util/Error.h
index ce61aa5241..e03992d76e 100644
--- a/decompiler/util/Error.h
+++ b/decompiler/util/Error.h
@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 class Error : public std::runtime_error {
  public:
diff --git a/decompiler/util/TP_Type.cpp b/decompiler/util/TP_Type.cpp
index f9925ea49a..939584b6dc 100644
--- a/decompiler/util/TP_Type.cpp
+++ b/decompiler/util/TP_Type.cpp
@@ -1,6 +1,6 @@
 #include "TP_Type.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 u32 regs_to_gpr_mask(const std::vector<Register>& regs) {
diff --git a/decompiler/util/data_decompile.cpp b/decompiler/util/data_decompile.cpp
index 45c9d58e5d..f197c876fc 100644
--- a/decompiler/util/data_decompile.cpp
+++ b/decompiler/util/data_decompile.cpp
@@ -13,7 +13,7 @@
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 #include "decompiler/analysis/final_output.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace decompiler {
 
diff --git a/game/graphics/opengl_renderer/BucketRenderer.cpp b/game/graphics/opengl_renderer/BucketRenderer.cpp
index db4a2c0d44..a7e51f9a60 100644
--- a/game/graphics/opengl_renderer/BucketRenderer.cpp
+++ b/game/graphics/opengl_renderer/BucketRenderer.cpp
@@ -1,6 +1,6 @@
 #include "BucketRenderer.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 std::string BucketRenderer::name() const {
diff --git a/game/graphics/opengl_renderer/DepthCue.cpp b/game/graphics/opengl_renderer/DepthCue.cpp
index d15c4748f9..5e63c56e81 100644
--- a/game/graphics/opengl_renderer/DepthCue.cpp
+++ b/game/graphics/opengl_renderer/DepthCue.cpp
@@ -2,7 +2,7 @@
 
 #include "game/graphics/opengl_renderer/dma_helpers.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 namespace {
diff --git a/game/graphics/opengl_renderer/DirectRenderer.cpp b/game/graphics/opengl_renderer/DirectRenderer.cpp
index d92e5a81ad..9f1590fe5f 100644
--- a/game/graphics/opengl_renderer/DirectRenderer.cpp
+++ b/game/graphics/opengl_renderer/DirectRenderer.cpp
@@ -6,7 +6,7 @@
 
 #include "game/graphics/pipelines/opengl.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 DirectRenderer::ScissorState DirectRenderer::m_scissor;
diff --git a/game/graphics/opengl_renderer/Profiler.cpp b/game/graphics/opengl_renderer/Profiler.cpp
index 5ce3ff86d6..69feba4e0e 100644
--- a/game/graphics/opengl_renderer/Profiler.cpp
+++ b/game/graphics/opengl_renderer/Profiler.cpp
@@ -5,7 +5,7 @@
 #include "common/log/log.h"
 #include "common/util/colors.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 ProfilerNode::ProfilerNode(const std::string& name) : m_name(name) {}
diff --git a/game/graphics/opengl_renderer/TextureUploadHandler.cpp b/game/graphics/opengl_renderer/TextureUploadHandler.cpp
index 2b619709bf..d95dd8e13d 100644
--- a/game/graphics/opengl_renderer/TextureUploadHandler.cpp
+++ b/game/graphics/opengl_renderer/TextureUploadHandler.cpp
@@ -6,7 +6,7 @@
 #include "game/graphics/opengl_renderer/EyeRenderer.h"
 #include "game/graphics/pipelines/opengl.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 TextureUploadHandler::TextureUploadHandler(const std::string& name,
diff --git a/game/graphics/opengl_renderer/debug_gui.cpp b/game/graphics/opengl_renderer/debug_gui.cpp
index eb9360f0c8..c87fa892ff 100644
--- a/game/graphics/opengl_renderer/debug_gui.cpp
+++ b/game/graphics/opengl_renderer/debug_gui.cpp
@@ -9,7 +9,7 @@
 #include "game/overlord/jak3/dma.h"
 #include "game/system/hid/sdl_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 #include "third-party/imgui/imgui_style.h"
 
diff --git a/game/graphics/opengl_renderer/sprite/Sprite3.cpp b/game/graphics/opengl_renderer/sprite/Sprite3.cpp
index ebdbea0a31..67a8477a9e 100644
--- a/game/graphics/opengl_renderer/sprite/Sprite3.cpp
+++ b/game/graphics/opengl_renderer/sprite/Sprite3.cpp
@@ -5,7 +5,7 @@
 #include "game/graphics/opengl_renderer/background/background_common.h"
 #include "game/graphics/opengl_renderer/dma_helpers.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 namespace {
diff --git a/game/graphics/pipelines/opengl.cpp b/game/graphics/pipelines/opengl.cpp
index 5ba316dfb8..2411066b25 100644
--- a/game/graphics/pipelines/opengl.cpp
+++ b/game/graphics/pipelines/opengl.cpp
@@ -30,7 +30,7 @@
 #include "game/system/hid/input_manager.h"
 #include "game/system/hid/sdl_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/SDL/include/SDL3/SDL.h"
 #include "third-party/SDL/include/SDL3/SDL_hints.h"
 #include "third-party/SDL/include/SDL3/SDL_version.h"
diff --git a/game/graphics/texture/TextureConverter.cpp b/game/graphics/texture/TextureConverter.cpp
index f1fa144fb1..01253cb5dc 100644
--- a/game/graphics/texture/TextureConverter.cpp
+++ b/game/graphics/texture/TextureConverter.cpp
@@ -4,7 +4,7 @@
 #include "common/util/Assert.h"
 #include "common/util/FileUtil.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 TextureConverter::TextureConverter() {
   m_vram.resize(4 * 1024 * 1024);
diff --git a/game/graphics/texture/TexturePool.cpp b/game/graphics/texture/TexturePool.cpp
index ae596ecacf..e25ee14f2b 100644
--- a/game/graphics/texture/TexturePool.cpp
+++ b/game/graphics/texture/TexturePool.cpp
@@ -12,7 +12,7 @@
 #include "game/graphics/texture/jak2_tpage_dir.h"
 #include "game/graphics/texture/jak3_tpage_dir.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 
 namespace {
diff --git a/game/kernel/common/klink.cpp b/game/kernel/common/klink.cpp
index 37b92c5afb..b8a96e57b5 100644
--- a/game/kernel/common/klink.cpp
+++ b/game/kernel/common/klink.cpp
@@ -6,7 +6,7 @@
 #include "game/kernel/common/fileio.h"
 #include "game/kernel/common/kscheme.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 // turn on printf's for debugging linking issues.
diff --git a/game/kernel/common/kmemcard.cpp b/game/kernel/common/kmemcard.cpp
index 63dd55be36..61ecde6f84 100644
--- a/game/kernel/common/kmemcard.cpp
+++ b/game/kernel/common/kmemcard.cpp
@@ -19,7 +19,7 @@
 #include "game/sce/sif_ee.h"
 #include "game/sce/sif_ee_memcard.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 static constexpr bool memcard_debug = false;
 
diff --git a/game/kernel/jak1/klink.cpp b/game/kernel/jak1/klink.cpp
index 97be859dde..fd71999592 100644
--- a/game/kernel/jak1/klink.cpp
+++ b/game/kernel/jak1/klink.cpp
@@ -12,7 +12,7 @@
 #include "game/kernel/jak1/kscheme.h"
 #include "game/mips2c/mips2c_table.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 static constexpr bool link_debug_printfs = false;
 /*!
diff --git a/game/kernel/jak2/klink.cpp b/game/kernel/jak2/klink.cpp
index d0112d0898..5f00d652d4 100644
--- a/game/kernel/jak2/klink.cpp
+++ b/game/kernel/jak2/klink.cpp
@@ -13,7 +13,7 @@
 #include "game/kernel/jak2/kscheme.h"
 #include "game/mips2c/mips2c_table.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 static constexpr bool link_debug_printfs = false;
 
diff --git a/game/kernel/jak3/klink.cpp b/game/kernel/jak3/klink.cpp
index 928422b13a..4a703abbfa 100644
--- a/game/kernel/jak3/klink.cpp
+++ b/game/kernel/jak3/klink.cpp
@@ -12,7 +12,7 @@
 #include "game/kernel/jak3/kscheme.h"
 #include "game/mips2c/mips2c_table.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 bool is_opengoal_object(void* data) {
diff --git a/game/mips2c/mips2c_private.h b/game/mips2c/mips2c_private.h
index fbe8daa85f..f3124154e0 100644
--- a/game/mips2c/mips2c_private.h
+++ b/game/mips2c/mips2c_private.h
@@ -12,7 +12,7 @@
 #include "game/common/vu.h"
 #include "game/mips2c/mips2c_table.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 // This file contains utility functions for code generated by the mips2c pass.
 // This is only useful for
diff --git a/game/overlord/jak1/srpc.cpp b/game/overlord/jak1/srpc.cpp
index 6b14a5e757..377aab01d6 100644
--- a/game/overlord/jak1/srpc.cpp
+++ b/game/overlord/jak1/srpc.cpp
@@ -24,7 +24,7 @@
 #include "game/sce/iop.h"
 #include "game/sound/sndshim.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/magic_enum.hpp"
 
 using namespace iop;
diff --git a/game/sound/989snd/loader.cpp b/game/sound/989snd/loader.cpp
index 8a6182ae00..e3b8a76cdb 100644
--- a/game/sound/989snd/loader.cpp
+++ b/game/sound/989snd/loader.cpp
@@ -12,7 +12,7 @@
 
 #include "game/sound/989snd/musicbank.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace snd {
 
diff --git a/game/sound/989snd/midi_handler.cpp b/game/sound/989snd/midi_handler.cpp
index 6c161e155e..576280e27e 100644
--- a/game/sound/989snd/midi_handler.cpp
+++ b/game/sound/989snd/midi_handler.cpp
@@ -8,7 +8,7 @@
 
 #include "game/sound/989snd/util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace snd {
 /*
diff --git a/game/sound/989snd/player.cpp b/game/sound/989snd/player.cpp
index 6655c47a92..361b41bd3c 100644
--- a/game/sound/989snd/player.cpp
+++ b/game/sound/989snd/player.cpp
@@ -6,7 +6,7 @@
 
 #include "sfxblock.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
diff --git a/game/sound/sdshim.cpp b/game/sound/sdshim.cpp
index 251c9fb00e..ff575c9c59 100644
--- a/game/sound/sdshim.cpp
+++ b/game/sound/sdshim.cpp
@@ -7,7 +7,7 @@
 
 #include "game/sound/common/voice.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 std::shared_ptr<snd::Voice> voices[kNVoices];
 u8 spu_memory[0x15160 * 10];
diff --git a/game/system/Deci2Server.cpp b/game/system/Deci2Server.cpp
index 0fda482acf..12594f18ef 100644
--- a/game/system/Deci2Server.cpp
+++ b/game/system/Deci2Server.cpp
@@ -12,7 +12,7 @@
 #include "common/listener_common.h"
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 #ifdef _WIN32
 #define NOMINMAX
diff --git a/game/system/hid/devices/game_controller.cpp b/game/system/hid/devices/game_controller.cpp
index 8ac408ee88..54f98c4cb6 100644
--- a/game/system/hid/devices/game_controller.cpp
+++ b/game/system/hid/devices/game_controller.cpp
@@ -7,7 +7,7 @@
 
 #include "game/system/hid/sdl_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 GameController::GameController(int sdl_device_id,
                                std::shared_ptr<game_settings::InputSettings> settings)
diff --git a/game/system/hid/display_manager.cpp b/game/system/hid/display_manager.cpp
index 6626003ed7..fcf2c53c4d 100644
--- a/game/system/hid/display_manager.cpp
+++ b/game/system/hid/display_manager.cpp
@@ -4,7 +4,7 @@
 
 #include "common/global_profiler/GlobalProfiler.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "fmt/format.h"
 
 DisplayManager::DisplayManager(SDL_Window* window) : m_window(window) {
diff --git a/game/tools/filter_menu/filter_menu.cpp b/game/tools/filter_menu/filter_menu.cpp
index 5175bbb8e3..00a8f48553 100644
--- a/game/tools/filter_menu/filter_menu.cpp
+++ b/game/tools/filter_menu/filter_menu.cpp
@@ -2,7 +2,7 @@
 
 #include "game/graphics/gfx.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 #include "third-party/imgui/imgui_stdlib.h"
 
diff --git a/game/tools/subtitle_editor/subtitle_editor.cpp b/game/tools/subtitle_editor/subtitle_editor.cpp
index c500c28be1..7e111d3765 100644
--- a/game/tools/subtitle_editor/subtitle_editor.cpp
+++ b/game/tools/subtitle_editor/subtitle_editor.cpp
@@ -10,7 +10,7 @@
 
 #include "game/runtime.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/imgui/imgui.h"
 #include "third-party/imgui/imgui_stdlib.h"
 
diff --git a/game/tools/subtitle_editor/subtitle_editor_db.cpp b/game/tools/subtitle_editor/subtitle_editor_db.cpp
index c17cafca75..a581c7e250 100644
--- a/game/tools/subtitle_editor/subtitle_editor_db.cpp
+++ b/game/tools/subtitle_editor/subtitle_editor_db.cpp
@@ -5,7 +5,7 @@
 
 #include "game/runtime.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 void Jak1SubtitleEditorDB::update() {
   if (g_game_version != GameVersion::Jak1) {
diff --git a/game/tools/subtitle_editor/subtitle_editor_repl_client.cpp b/game/tools/subtitle_editor/subtitle_editor_repl_client.cpp
index 57b3c83706..25f3e8fe09 100644
--- a/game/tools/subtitle_editor/subtitle_editor_repl_client.cpp
+++ b/game/tools/subtitle_editor/subtitle_editor_repl_client.cpp
@@ -4,7 +4,7 @@
 
 #include "game/runtime.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 SubtitleEditorReplClient::SubtitleEditorReplClient() {
   int port = 8181;
diff --git a/goalc/build_level/common/ResLump.cpp b/goalc/build_level/common/ResLump.cpp
index 36310570a4..91b97ba2d9 100644
--- a/goalc/build_level/common/ResLump.cpp
+++ b/goalc/build_level/common/ResLump.cpp
@@ -6,7 +6,7 @@
 
 #include "goalc/data_compiler/DataObjectGenerator.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*
  *  name: crate-3141
diff --git a/goalc/compiler/CodeGenerator.cpp b/goalc/compiler/CodeGenerator.cpp
index cc6b3285fb..b6430987b7 100644
--- a/goalc/compiler/CodeGenerator.cpp
+++ b/goalc/compiler/CodeGenerator.cpp
@@ -14,7 +14,7 @@
 #include "goalc/debugger/DebugInfo.h"
 #include "goalc/emitter/IGen.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 using namespace emitter;
 
diff --git a/goalc/compiler/Compiler.cpp b/goalc/compiler/Compiler.cpp
index e0905d2a19..88587a34a6 100644
--- a/goalc/compiler/Compiler.cpp
+++ b/goalc/compiler/Compiler.cpp
@@ -14,7 +14,7 @@
 #include "goalc/regalloc/Allocator.h"
 #include "goalc/regalloc/Allocator_v2.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 using namespace goos;
 
diff --git a/goalc/compiler/Compiler.h b/goalc/compiler/Compiler.h
index 8038605e1e..14bf27a146 100644
--- a/goalc/compiler/Compiler.h
+++ b/goalc/compiler/Compiler.h
@@ -21,7 +21,7 @@
 #include "goalc/make/MakeSystem.h"
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 enum MathMode { MATH_INT, MATH_BINT, MATH_FLOAT, MATH_INVALID };
 
diff --git a/goalc/compiler/ConstantValue.h b/goalc/compiler/ConstantValue.h
index 09f9af4f8d..9a6477233f 100644
--- a/goalc/compiler/ConstantValue.h
+++ b/goalc/compiler/ConstantValue.h
@@ -6,7 +6,7 @@
 #include "common/util/Assert.h"
 #include "common/util/BitUtils.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 struct U128 {
   U128() = default;
diff --git a/goalc/compiler/Env.cpp b/goalc/compiler/Env.cpp
index 3b0cbb7c93..4f179c8acd 100644
--- a/goalc/compiler/Env.cpp
+++ b/goalc/compiler/Env.cpp
@@ -7,7 +7,7 @@
 #include "common/goos/Reader.h"
 #include "common/log/log.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 ///////////////////
 // Env
diff --git a/goalc/compiler/IR.cpp b/goalc/compiler/IR.cpp
index 52f8a4efef..24a0607da1 100644
--- a/goalc/compiler/IR.cpp
+++ b/goalc/compiler/IR.cpp
@@ -6,7 +6,7 @@
 
 #include "goalc/emitter/IGen.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "fmt/format.h"
 
 using namespace emitter;
diff --git a/goalc/compiler/StaticObject.cpp b/goalc/compiler/StaticObject.cpp
index cf671730c8..76ed059f81 100644
--- a/goalc/compiler/StaticObject.cpp
+++ b/goalc/compiler/StaticObject.cpp
@@ -5,7 +5,7 @@
 #include "goalc/compiler/Env.h"
 #include "goalc/compiler/IR.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 template <typename T>
diff --git a/goalc/compiler/Val.cpp b/goalc/compiler/Val.cpp
index a3d71554cd..2ae85f0281 100644
--- a/goalc/compiler/Val.cpp
+++ b/goalc/compiler/Val.cpp
@@ -3,7 +3,7 @@
 #include "Env.h"
 #include "IR.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Fallback to_gpr if a more optimized one is not provided.
diff --git a/goalc/compiler/compilation/Debug.cpp b/goalc/compiler/compilation/Debug.cpp
index e60c0fe476..edc602ae4d 100644
--- a/goalc/compiler/compilation/Debug.cpp
+++ b/goalc/compiler/compilation/Debug.cpp
@@ -4,7 +4,7 @@
 #include "goalc/compiler/Compiler.h"
 #include "goalc/debugger/disassemble.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 u32 Compiler::parse_address_spec(const goos::Object& form) {
   if (form.is_int()) {
diff --git a/goalc/compiler/compilation/Function.cpp b/goalc/compiler/compilation/Function.cpp
index 7f81586d54..bca1aecebe 100644
--- a/goalc/compiler/compilation/Function.cpp
+++ b/goalc/compiler/compilation/Function.cpp
@@ -8,7 +8,7 @@
 #include "goalc/compiler/Compiler.h"
 #include "goalc/emitter/CallingConvention.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 
diff --git a/goalc/compiler/compilation/Macro.cpp b/goalc/compiler/compilation/Macro.cpp
index 6d21de2ee3..73426b1ca1 100644
--- a/goalc/compiler/compilation/Macro.cpp
+++ b/goalc/compiler/compilation/Macro.cpp
@@ -3,7 +3,7 @@
 
 #include "goalc/compiler/Compiler.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 using namespace goos;
 
diff --git a/goalc/compiler/compilation/Static.cpp b/goalc/compiler/compilation/Static.cpp
index 5d9dfe87a9..c06b9a2829 100644
--- a/goalc/compiler/compilation/Static.cpp
+++ b/goalc/compiler/compilation/Static.cpp
@@ -9,7 +9,7 @@
 
 #include "goalc/compiler/Compiler.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Compile the fields of a static structure into the given StaticStructure*, applying an offset.
diff --git a/goalc/compiler/compilation/Type.cpp b/goalc/compiler/compilation/Type.cpp
index 6d34341219..5453a30be2 100644
--- a/goalc/compiler/compilation/Type.cpp
+++ b/goalc/compiler/compilation/Type.cpp
@@ -8,7 +8,7 @@
 #include "goalc/compiler/Compiler.h"
 #include "goalc/emitter/CallingConvention.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 
diff --git a/goalc/data_compiler/game_text_common.cpp b/goalc/data_compiler/game_text_common.cpp
index 1282af22a4..91213a3399 100644
--- a/goalc/data_compiler/game_text_common.cpp
+++ b/goalc/data_compiler/game_text_common.cpp
@@ -26,7 +26,7 @@
 
 #include "game/runtime.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace {
 
diff --git a/goalc/debugger/DebugInfo.cpp b/goalc/debugger/DebugInfo.cpp
index be5f062db6..89d06354b4 100644
--- a/goalc/debugger/DebugInfo.cpp
+++ b/goalc/debugger/DebugInfo.cpp
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 DebugInfo::DebugInfo(std::string obj_name) : m_obj_name(std::move(obj_name)) {}
 
diff --git a/goalc/debugger/Debugger.cpp b/goalc/debugger/Debugger.cpp
index 946a7773d4..2cfa62113d 100644
--- a/goalc/debugger/Debugger.cpp
+++ b/goalc/debugger/Debugger.cpp
@@ -17,7 +17,7 @@
 #include "goalc/emitter/Register.h"
 #include "goalc/listener/Listener.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  * Is the target halted? If we don't know or aren't connected, returns false.
diff --git a/goalc/debugger/disassemble.cpp b/goalc/debugger/disassemble.cpp
index 6427d6242e..3d567ce1a3 100644
--- a/goalc/debugger/disassemble.cpp
+++ b/goalc/debugger/disassemble.cpp
@@ -7,7 +7,7 @@
 #include "goalc/compiler/IR.h"
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 std::string disassemble_x86(u8* data, int len, u64 base_addr) {
   std::string result;
diff --git a/goalc/emitter/CodeTester.cpp b/goalc/emitter/CodeTester.cpp
index d8aa1032ba..64f9da3fd8 100644
--- a/goalc/emitter/CodeTester.cpp
+++ b/goalc/emitter/CodeTester.cpp
@@ -18,7 +18,7 @@
 #include "CodeTester.h"
 #include "IGen.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace emitter {
 
diff --git a/goalc/emitter/ObjectGenerator.cpp b/goalc/emitter/ObjectGenerator.cpp
index ec622e160c..a2e11a0df5 100644
--- a/goalc/emitter/ObjectGenerator.cpp
+++ b/goalc/emitter/ObjectGenerator.cpp
@@ -21,7 +21,7 @@
 
 #include "goalc/debugger/DebugInfo.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace emitter {
 
diff --git a/goalc/listener/Listener.cpp b/goalc/listener/Listener.cpp
index 3167f67ce1..412433c47d 100644
--- a/goalc/listener/Listener.cpp
+++ b/goalc/listener/Listener.cpp
@@ -33,7 +33,7 @@
 
 #include "Listener.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 // clang-format on
 
 using namespace versions;
diff --git a/goalc/listener/MemoryMap.cpp b/goalc/listener/MemoryMap.cpp
index 9d57c56454..e4c6e16346 100644
--- a/goalc/listener/MemoryMap.cpp
+++ b/goalc/listener/MemoryMap.cpp
@@ -7,7 +7,7 @@
 #include "common/util/Assert.h"
 #include "common/util/BitUtils.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace listener {
 std::string LoadEntry::print() const {
diff --git a/goalc/main.cpp b/goalc/main.cpp
index 77fe79bfbd..c9c54f5c62 100644
--- a/goalc/main.cpp
+++ b/goalc/main.cpp
@@ -14,7 +14,7 @@
 #include "goalc/compiler/Compiler.h"
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/CLI11.hpp"
 
 void setup_logging(const bool disable_ansi_colors) {
diff --git a/goalc/make/MakeSystem.cpp b/goalc/make/MakeSystem.cpp
index b999b12734..152cfdc722 100644
--- a/goalc/make/MakeSystem.cpp
+++ b/goalc/make/MakeSystem.cpp
@@ -10,7 +10,7 @@
 #include "goalc/make/Tools.h"
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 std::string MakeStep::print() const {
   std::string result = fmt::format("Tool {} with inputs", tool);
diff --git a/goalc/make/Tool.cpp b/goalc/make/Tool.cpp
index de8fd9e1f2..9f45dbd623 100644
--- a/goalc/make/Tool.cpp
+++ b/goalc/make/Tool.cpp
@@ -5,7 +5,7 @@
 
 #include "common/util/FileUtil.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 Tool::Tool(const std::string& name) : m_name(name) {}
 
diff --git a/goalc/make/Tools.cpp b/goalc/make/Tools.cpp
index 7bcb4e8ad6..8ba8c29e17 100644
--- a/goalc/make/Tools.cpp
+++ b/goalc/make/Tools.cpp
@@ -13,7 +13,7 @@
 #include "goalc/data_compiler/game_count.h"
 #include "goalc/data_compiler/game_text_common.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 CompilerTool::CompilerTool(Compiler* compiler) : Tool("goalc"), m_compiler(compiler) {}
 
diff --git a/goalc/regalloc/Allocator.cpp b/goalc/regalloc/Allocator.cpp
index c76b9e7114..26fe260fe6 100644
--- a/goalc/regalloc/Allocator.cpp
+++ b/goalc/regalloc/Allocator.cpp
@@ -11,7 +11,7 @@
 
 #include "goalc/regalloc/allocator_interface.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 std::string LiveInfo::print_assignment() {
   std::string result = "Assignment for var " + std::to_string(var) + "\n";
diff --git a/goalc/regalloc/Allocator_v2.cpp b/goalc/regalloc/Allocator_v2.cpp
index 178037f106..20e0788d23 100644
--- a/goalc/regalloc/Allocator_v2.cpp
+++ b/goalc/regalloc/Allocator_v2.cpp
@@ -7,7 +7,7 @@
 #include "common/log/log.h"
 #include "common/util/Range.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 /*!
  Documentation:
diff --git a/goalc/regalloc/IRegister.cpp b/goalc/regalloc/IRegister.cpp
index fd101e44f7..706383a688 100644
--- a/goalc/regalloc/IRegister.cpp
+++ b/goalc/regalloc/IRegister.cpp
@@ -2,7 +2,7 @@
 
 #include "common/util/Assert.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 std::string IRegister::to_string() const {
   //  if (with_constraints) {
diff --git a/goalc/regalloc/allocator_interface.cpp b/goalc/regalloc/allocator_interface.cpp
index c24cb5c2c8..b2fb38a831 100644
--- a/goalc/regalloc/allocator_interface.cpp
+++ b/goalc/regalloc/allocator_interface.cpp
@@ -9,7 +9,7 @@
 
 #include "common/log/log.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 /*!
  * Print out the input data for debugging.
  */
diff --git a/lsp/handlers/lsp_router.cpp b/lsp/handlers/lsp_router.cpp
index 8d744f6760..06cd6c1701 100644
--- a/lsp/handlers/lsp_router.cpp
+++ b/lsp/handlers/lsp_router.cpp
@@ -13,7 +13,7 @@
 #include "text_document/go_to.h"
 #include "text_document/hover.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 json error_resp(ErrorCodes error_code, const std::string& error_message) {
   json error{
diff --git a/lsp/lsp_util.cpp b/lsp/lsp_util.cpp
index 98bc715422..c64ddef1ad 100644
--- a/lsp/lsp_util.cpp
+++ b/lsp/lsp_util.cpp
@@ -4,7 +4,7 @@
 
 #include "common/util/string_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 namespace lsp_util {
 
diff --git a/test/common/formatter/test_formatter.cpp b/test/common/formatter/test_formatter.cpp
index b058627339..303a53309e 100644
--- a/test/common/formatter/test_formatter.cpp
+++ b/test/common/formatter/test_formatter.cpp
@@ -27,7 +27,7 @@ EXPECTED OUTPUT
 #include "gtest/gtest.h"
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 struct TestDefinition {
   std::string name;
diff --git a/test/decompiler/test_AtomicOpBuilder.cpp b/test/decompiler/test_AtomicOpBuilder.cpp
index 0e0fbd97ea..133e1cb4b2 100644
--- a/test/decompiler/test_AtomicOpBuilder.cpp
+++ b/test/decompiler/test_AtomicOpBuilder.cpp
@@ -6,7 +6,7 @@
 #include "decompiler/analysis/atomic_op_builder.h"
 #include "gtest/gtest.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "fmt/format.h"
 
 using namespace decompiler;
diff --git a/test/decompiler/test_DataParser.cpp b/test/decompiler/test_DataParser.cpp
index 5aa87a0336..d5f85ab966 100644
--- a/test/decompiler/test_DataParser.cpp
+++ b/test/decompiler/test_DataParser.cpp
@@ -7,7 +7,7 @@
 #include "decompiler/util/data_decompile.h"
 #include "gtest/gtest.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 using namespace decompiler;
 
diff --git a/test/decompiler/test_VuDisasm.cpp b/test/decompiler/test_VuDisasm.cpp
index 9161c1baae..13e55a3671 100644
--- a/test/decompiler/test_VuDisasm.cpp
+++ b/test/decompiler/test_VuDisasm.cpp
@@ -5,7 +5,7 @@
 #include "decompiler/util/DataParser.h"
 #include "gtest/gtest.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 using namespace decompiler;
 
diff --git a/test/goalc/framework/test_runner.cpp b/test/goalc/framework/test_runner.cpp
index 8f68e64e13..087e67304e 100644
--- a/test/goalc/framework/test_runner.cpp
+++ b/test/goalc/framework/test_runner.cpp
@@ -12,7 +12,7 @@
 #include "goalc/listener/Listener.h"
 #include "gtest/gtest.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/json.hpp"
 
 namespace GoalTest {
diff --git a/test/goalc/test_vector_float.cpp b/test/goalc/test_vector_float.cpp
index b3ba41ea9f..842d89a355 100644
--- a/test/goalc/test_vector_float.cpp
+++ b/test/goalc/test_vector_float.cpp
@@ -9,7 +9,7 @@
 #include "gtest/gtest.h"
 #include "test/goalc/framework/test_runner.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/json.hpp"
 
 class WithMinimalGameTests : public ::testing::Test {
diff --git a/test/goalc/test_with_game.cpp b/test/goalc/test_with_game.cpp
index de6cd6a684..d5ee5985dc 100644
--- a/test/goalc/test_with_game.cpp
+++ b/test/goalc/test_with_game.cpp
@@ -12,7 +12,7 @@
 #include "gtest/gtest.h"
 #include "test/goalc/framework/test_runner.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 class WithGameTests : public ::testing::Test {
  public:
diff --git a/test/offline/framework/file_management.cpp b/test/offline/framework/file_management.cpp
index 156f4db0b0..42b68c27dc 100644
--- a/test/offline/framework/file_management.cpp
+++ b/test/offline/framework/file_management.cpp
@@ -6,7 +6,8 @@
 #include "common/log/log.h"
 #include "common/util/json_util.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
+#include "fmt/ranges.h"
 
 std::vector<OfflineTestSourceFile> find_source_files(const std::string& game_name,
                                                      const std::vector<std::string>& dgos,
diff --git a/test/offline/framework/orchestration.cpp b/test/offline/framework/orchestration.cpp
index 1ce36e67cd..eebcf16385 100644
--- a/test/offline/framework/orchestration.cpp
+++ b/test/offline/framework/orchestration.cpp
@@ -13,7 +13,7 @@
 #include "test/offline/config/config.h"
 
 #include "fmt/color.h"
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "fmt/ranges.h"
 
 OfflineTestThreadManager g_offline_test_thread_manager;
diff --git a/test/test_common_util.cpp b/test/test_common_util.cpp
index 883b42fb8b..faf7d5cf64 100644
--- a/test/test_common_util.cpp
+++ b/test/test_common_util.cpp
@@ -18,7 +18,7 @@
 #include "gtest/gtest.h"
 #include "test/all_jak1_symbols.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 TEST(CommonUtil, CpuInfo) {
   setup_cpu_info();
diff --git a/test/test_pretty_print.cpp b/test/test_pretty_print.cpp
index 9a555c2120..5765e3cf2d 100644
--- a/test/test_pretty_print.cpp
+++ b/test/test_pretty_print.cpp
@@ -5,7 +5,7 @@
 
 #include "gtest/gtest.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 using namespace goos;
 
diff --git a/tools/formatter/main.cpp b/tools/formatter/main.cpp
index a3f227d10e..7ba9f8c0c2 100644
--- a/tools/formatter/main.cpp
+++ b/tools/formatter/main.cpp
@@ -17,7 +17,7 @@
 #include "decompiler/util/DecompilerTypeSystem.h"
 #include "tree_sitter/api.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/CLI11.hpp"
 #include "third-party/json.hpp"
 
diff --git a/tools/level_tools/level_dump/main.cpp b/tools/level_tools/level_dump/main.cpp
index 98b3be5129..465089ca82 100644
--- a/tools/level_tools/level_dump/main.cpp
+++ b/tools/level_tools/level_dump/main.cpp
@@ -8,7 +8,7 @@
 #include "decompiler/level_extractor/BspHeader.h"
 #include "decompiler/util/goal_data_reader.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 constexpr GameVersion kGameVersion = GameVersion::Jak1;
 
diff --git a/tools/memory_dump_tool/main.cpp b/tools/memory_dump_tool/main.cpp
index de99f171f6..0dc2b3844f 100644
--- a/tools/memory_dump_tool/main.cpp
+++ b/tools/memory_dump_tool/main.cpp
@@ -13,7 +13,7 @@
 
 #include "decompiler/util/DecompilerTypeSystem.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/CLI11.hpp"
 #include "third-party/json.hpp"
 
diff --git a/tools/type_searcher/main.cpp b/tools/type_searcher/main.cpp
index 192a97b6fa..1ab6a4d37a 100644
--- a/tools/type_searcher/main.cpp
+++ b/tools/type_searcher/main.cpp
@@ -12,7 +12,7 @@
 
 #include "decompiler/util/DecompilerTypeSystem.h"
 
-#include "fmt/core.h"
+#include "fmt/format.h"
 #include "third-party/CLI11.hpp"
 #include "third-party/json.hpp"