diff --git a/src/libspdl/core/adaptor/bytes.cpp b/src/libspdl/core/adaptor/bytes.cpp
index ceaff6829..26c153516 100644
--- a/src/libspdl/core/adaptor/bytes.cpp
+++ b/src/libspdl/core/adaptor/bytes.cpp
@@ -11,6 +11,7 @@
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 #include <glog/logging.h>
 
 extern "C" {
diff --git a/src/libspdl/core/detail/ffmpeg/compat.h b/src/libspdl/core/detail/ffmpeg/compat.h
index a83ea59d9..d5c023d1c 100644
--- a/src/libspdl/core/detail/ffmpeg/compat.h
+++ b/src/libspdl/core/detail/ffmpeg/compat.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
diff --git a/src/libspdl/core/detail/ffmpeg/decoder.cpp b/src/libspdl/core/detail/ffmpeg/decoder.cpp
index bb3bdabce..a9b0dc2f6 100644
--- a/src/libspdl/core/detail/ffmpeg/decoder.cpp
+++ b/src/libspdl/core/detail/ffmpeg/decoder.cpp
@@ -15,6 +15,7 @@
 #include "libspdl/core/detail/ffmpeg/logging.h"
 #include "libspdl/core/detail/tracing.h"
 
+#include <fmt/format.h>
 #include <glog/logging.h>
 
 namespace spdl::core::detail {
diff --git a/src/libspdl/core/detail/ffmpeg/logging.h b/src/libspdl/core/detail/ffmpeg/logging.h
index 7399d5aaf..80c9c8581 100644
--- a/src/libspdl/core/detail/ffmpeg/logging.h
+++ b/src/libspdl/core/detail/ffmpeg/logging.h
@@ -11,6 +11,7 @@
 #include "libspdl/core/detail/logging.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 extern "C" {
 #include <libavutil/attributes.h>
diff --git a/src/libspdl/core/detail/ffmpeg/muxer.cpp b/src/libspdl/core/detail/ffmpeg/muxer.cpp
index defdcb980..e8e96f575 100644
--- a/src/libspdl/core/detail/ffmpeg/muxer.cpp
+++ b/src/libspdl/core/detail/ffmpeg/muxer.cpp
@@ -17,6 +17,7 @@
 #include <fmt/core.h>
 #include <fmt/format.h>
 
+#include <cstring>
 #include <filesystem>
 #include <set>
 
diff --git a/src/libspdl/core/detail/ffmpeg/wrappers.cpp b/src/libspdl/core/detail/ffmpeg/wrappers.cpp
index 99877777e..3aa95ff94 100644
--- a/src/libspdl/core/detail/ffmpeg/wrappers.cpp
+++ b/src/libspdl/core/detail/ffmpeg/wrappers.cpp
@@ -97,6 +97,7 @@ OptionDict parse_dict(const AVDictionary* metadata) {
 #ifdef SPDL_DEBUG_REFCOUNT
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 #include <glog/logging.h>
 
 extern "C" {
diff --git a/src/libspdl/core/detail/logging.cpp b/src/libspdl/core/detail/logging.cpp
index 5401a85b5..96361a8e6 100644
--- a/src/libspdl/core/detail/logging.cpp
+++ b/src/libspdl/core/detail/logging.cpp
@@ -9,6 +9,7 @@
 #include "libspdl/core/detail/logging.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 namespace spdl::core::detail {
 
diff --git a/src/libspdl/core/frames.cpp b/src/libspdl/core/frames.cpp
index 05ca3df04..fc5b2a67f 100644
--- a/src/libspdl/core/frames.cpp
+++ b/src/libspdl/core/frames.cpp
@@ -17,6 +17,8 @@
 #include "libspdl/core/detail/ffmpeg/wrappers.h"
 #include "libspdl/core/detail/tracing.h"
 
+#include <fmt/format.h>
+
 #include <algorithm>
 #include <cassert>
 
diff --git a/src/libspdl/core/muxer.cpp b/src/libspdl/core/muxer.cpp
index e490c2598..d060c90d3 100644
--- a/src/libspdl/core/muxer.cpp
+++ b/src/libspdl/core/muxer.cpp
@@ -12,6 +12,7 @@
 #include "libspdl/core/detail/logging.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 namespace spdl::core {
 
diff --git a/src/libspdl/core/packets.cpp b/src/libspdl/core/packets.cpp
index 4e23f6fbe..d493d4f0d 100644
--- a/src/libspdl/core/packets.cpp
+++ b/src/libspdl/core/packets.cpp
@@ -16,6 +16,7 @@
 #include "libspdl/core/detail/tracing.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/libspdl/core/utils.cpp b/src/libspdl/core/utils.cpp
index 31ac9e092..767dc0fa3 100644
--- a/src/libspdl/core/utils.cpp
+++ b/src/libspdl/core/utils.cpp
@@ -14,6 +14,7 @@
 #include "libspdl/core/detail/tracing.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 #include <glog/logging.h>
 
 #include <cstdint>
diff --git a/src/libspdl/cuda/color_conversion.cpp b/src/libspdl/cuda/color_conversion.cpp
index 28408935d..ec3c09eb8 100644
--- a/src/libspdl/cuda/color_conversion.cpp
+++ b/src/libspdl/cuda/color_conversion.cpp
@@ -15,6 +15,7 @@
 #include "libspdl/cuda/detail/utils.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 #include <fmt/ranges.h>
 
 #include <vector>
diff --git a/src/libspdl/cuda/detail/utils.h b/src/libspdl/cuda/detail/utils.h
index 9d72b9d9d..09cd0da1f 100644
--- a/src/libspdl/cuda/detail/utils.h
+++ b/src/libspdl/cuda/detail/utils.h
@@ -11,6 +11,7 @@
 #include "libspdl/core/detail/logging.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 // Make sure CUDA_API_PER_THREAD_DEFAULT_STREAM is defined by compiler
 // so that it is applied globally
diff --git a/src/libspdl/cuda/npp/detail/resize.cpp b/src/libspdl/cuda/npp/detail/resize.cpp
index 33c39a614..f09d6c6a3 100644
--- a/src/libspdl/cuda/npp/detail/resize.cpp
+++ b/src/libspdl/cuda/npp/detail/resize.cpp
@@ -14,6 +14,7 @@
 #include "libspdl/cuda/nvjpeg/detail/utils.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <nppi.h>
 
diff --git a/src/libspdl/cuda/npp/detail/utils.h b/src/libspdl/cuda/npp/detail/utils.h
index ad7b5a779..88aa39fcb 100644
--- a/src/libspdl/cuda/npp/detail/utils.h
+++ b/src/libspdl/cuda/npp/detail/utils.h
@@ -11,6 +11,7 @@
 #include <nppdefs.h>
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 #include <glog/logging.h>
 
 namespace spdl::cuda::detail {
diff --git a/src/libspdl/cuda/nvdec/decoder.cpp b/src/libspdl/cuda/nvdec/decoder.cpp
index f874ee5bc..645ea572b 100644
--- a/src/libspdl/cuda/nvdec/decoder.cpp
+++ b/src/libspdl/cuda/nvdec/decoder.cpp
@@ -14,6 +14,7 @@
 #include "libspdl/cuda/nvdec/detail/decoder.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 // Macro for hiding argument names if not using this module.
 // So as to workaround -Werror=unused-variable
diff --git a/src/libspdl/cuda/nvdec/detail/buffer.cpp b/src/libspdl/cuda/nvdec/detail/buffer.cpp
index 151e18ed6..a01261227 100644
--- a/src/libspdl/cuda/nvdec/detail/buffer.cpp
+++ b/src/libspdl/cuda/nvdec/detail/buffer.cpp
@@ -14,6 +14,7 @@
 #include <cuda.h>
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 namespace spdl::cuda::detail {
 
diff --git a/src/libspdl/cuda/nvdec/detail/decoder.cpp b/src/libspdl/cuda/nvdec/detail/decoder.cpp
index 687fa9a6c..e37b465f8 100644
--- a/src/libspdl/cuda/nvdec/detail/decoder.cpp
+++ b/src/libspdl/cuda/nvdec/detail/decoder.cpp
@@ -18,6 +18,7 @@
 #include "libspdl/cuda/nvdec/detail/utils.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 #include <glog/logging.h>
 
 #include <sys/types.h>
diff --git a/src/libspdl/cuda/nvdec/detail/wrapper.cpp b/src/libspdl/cuda/nvdec/detail/wrapper.cpp
index 1271d1e4b..d20ade4b0 100644
--- a/src/libspdl/cuda/nvdec/detail/wrapper.cpp
+++ b/src/libspdl/cuda/nvdec/detail/wrapper.cpp
@@ -12,6 +12,7 @@
 #include "libspdl/cuda/detail/utils.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 #include <glog/logging.h>
 
 #include <cuda.h>
diff --git a/src/libspdl/cuda/storage.cpp b/src/libspdl/cuda/storage.cpp
index af59e2546..8e97d2ca5 100644
--- a/src/libspdl/cuda/storage.cpp
+++ b/src/libspdl/cuda/storage.cpp
@@ -12,6 +12,7 @@
 #include "libspdl/cuda/detail/utils.h"
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 #include <glog/logging.h>
 
 namespace spdl::cuda {
diff --git a/src/spdl/io/lib/archive/register_tar.cpp b/src/spdl/io/lib/archive/register_tar.cpp
index 045bb9d44..f3019eeda 100644
--- a/src/spdl/io/lib/archive/register_tar.cpp
+++ b/src/spdl/io/lib/archive/register_tar.cpp
@@ -8,6 +8,7 @@
 
 #include "register_tar.h"
 #include <fmt/core.h>
+#include <fmt/format.h>
 #include "tar_iterator.h"
 
 #include <nanobind/make_iterator.h>
diff --git a/src/spdl/io/lib/core/buffer.cpp b/src/spdl/io/lib/core/buffer.cpp
index 306c3879c..781ea36b0 100644
--- a/src/spdl/io/lib/core/buffer.cpp
+++ b/src/spdl/io/lib/core/buffer.cpp
@@ -11,6 +11,7 @@
 #include <libspdl/core/buffer.h>
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <nanobind/nanobind.h>
 #include <nanobind/stl/string.h>
diff --git a/src/spdl/io/lib/core/demuxing.cpp b/src/spdl/io/lib/core/demuxing.cpp
index ed6b6798a..0e8350c9a 100644
--- a/src/spdl/io/lib/core/demuxing.cpp
+++ b/src/spdl/io/lib/core/demuxing.cpp
@@ -12,6 +12,7 @@
 #include <libspdl/core/rational_utils.h>
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <nanobind/nanobind.h>
 #include <nanobind/stl/function.h>
diff --git a/src/spdl/io/lib/core/frames.cpp b/src/spdl/io/lib/core/frames.cpp
index 2244c5876..1af5d9d6b 100644
--- a/src/spdl/io/lib/core/frames.cpp
+++ b/src/spdl/io/lib/core/frames.cpp
@@ -11,6 +11,7 @@
 #include <libspdl/core/frames.h>
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <nanobind/nanobind.h>
 #include <nanobind/stl/map.h>
diff --git a/src/spdl/io/lib/cuda/buffer.cpp b/src/spdl/io/lib/cuda/buffer.cpp
index 9202fd4df..d6721e501 100644
--- a/src/spdl/io/lib/cuda/buffer.cpp
+++ b/src/spdl/io/lib/cuda/buffer.cpp
@@ -12,6 +12,7 @@
 #include <libspdl/cuda/buffer.h>
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <nanobind/nanobind.h>
 #include <nanobind/stl/string.h>
diff --git a/src/spdl/io/lib/cuda/transfer.cpp b/src/spdl/io/lib/cuda/transfer.cpp
index df88951e8..e17993878 100644
--- a/src/spdl/io/lib/cuda/transfer.cpp
+++ b/src/spdl/io/lib/cuda/transfer.cpp
@@ -18,6 +18,7 @@
 #include <nanobind/stl/unique_ptr.h>
 
 #include <fmt/core.h>
+#include <fmt/format.h>
 
 namespace nb = nanobind;