diff --git a/src/audio_core/hle/wmf_decoder_utils.h b/src/audio_core/hle/wmf_decoder_utils.h
index 9925b83ab..77a12bef5 100644
--- a/src/audio_core/hle/wmf_decoder_utils.h
+++ b/src/audio_core/hle/wmf_decoder_utils.h
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 #pragma once
 
+#include <memory>
 #include <optional>
 #include <string>
 #include <tuple>
diff --git a/src/common/dynamic_library/fdk-aac.cpp b/src/common/dynamic_library/fdk-aac.cpp
index 20dedfd07..48f8ca2cc 100644
--- a/src/common/dynamic_library/fdk-aac.cpp
+++ b/src/common/dynamic_library/fdk-aac.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <memory>
+
 #include "common/dynamic_library/dynamic_library.h"
 #include "common/dynamic_library/fdk-aac.h"
 #include "common/logging/log.h"
diff --git a/src/common/dynamic_library/ffmpeg.cpp b/src/common/dynamic_library/ffmpeg.cpp
index c9c1af33a..709f887a5 100644
--- a/src/common/dynamic_library/ffmpeg.cpp
+++ b/src/common/dynamic_library/ffmpeg.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <memory>
+
 #include "common/dynamic_library/dynamic_library.h"
 #include "common/dynamic_library/ffmpeg.h"
 #include "common/logging/log.h"
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 3a68e7349..11ff6bcf5 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -8,6 +8,7 @@
 #include <memory>
 #include <sstream>
 #include <unordered_map>
+#include <fmt/format.h>
 #include <boost/iostreams/device/file_descriptor.hpp>
 #include <boost/iostreams/stream.hpp>
 #include "common/assert.h"
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 55bf4c0f5..deb20bb3b 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -3,8 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <chrono>
-#include <exception>
-#include <vector>
 
 #include <fmt/format.h>
 
diff --git a/src/common/logging/backend.h b/src/common/logging/backend.h
index bf785f402..a0e80fe3c 100644
--- a/src/common/logging/backend.h
+++ b/src/common/logging/backend.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <filesystem>
 #include "common/logging/filter.h"
 
 namespace Common::Log {
diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp
index 6213e3f49..c469993e8 100644
--- a/src/common/logging/filter.cpp
+++ b/src/common/logging/filter.cpp
@@ -3,6 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
+
+#include "common/assert.h"
 #include "common/logging/filter.h"
 #include "common/string_util.h"
 
diff --git a/src/common/logging/text_formatter.cpp b/src/common/logging/text_formatter.cpp
index 27ec5164b..753e5003e 100644
--- a/src/common/logging/text_formatter.cpp
+++ b/src/common/logging/text_formatter.cpp
@@ -12,12 +12,10 @@
 #endif
 
 #include "common/assert.h"
-#include "common/common_funcs.h"
 #include "common/logging/filter.h"
 #include "common/logging/log.h"
 #include "common/logging/log_entry.h"
 #include "common/logging/text_formatter.h"
-#include "common/string_util.h"
 
 namespace Common::Log {
 
diff --git a/src/common/logging/text_formatter.h b/src/common/logging/text_formatter.h
index a15b41c42..4ab9e18f9 100644
--- a/src/common/logging/text_formatter.h
+++ b/src/common/logging/text_formatter.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <cstddef>
 #include <string>
 
 namespace Common::Log {
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index 3b2c6e113..43d2e9ed8 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -9,6 +9,7 @@
 #include <boost/serialization/unique_ptr.hpp>
 #include <cryptopp/osrng.h>
 #include <cryptopp/sha.h>
+#include <fmt/format.h>
 #include "common/archives.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
diff --git a/src/core/hle/service/ir/extra_hid.cpp b/src/core/hle/service/ir/extra_hid.cpp
index eff81c711..4709f70cf 100644
--- a/src/core/hle/service/ir/extra_hid.cpp
+++ b/src/core/hle/service/ir/extra_hid.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <fmt/format.h>
 #include "common/alignment.h"
 #include "common/settings.h"
 #include "common/string_util.h"
diff --git a/src/core/hle/service/ir/ir_user.cpp b/src/core/hle/service/ir/ir_user.cpp
index 1900db902..81d631f94 100644
--- a/src/core/hle/service/ir/ir_user.cpp
+++ b/src/core/hle/service/ir/ir_user.cpp
@@ -7,6 +7,7 @@
 #include <boost/serialization/base_object.hpp>
 #include <boost/serialization/shared_ptr.hpp>
 #include <boost/serialization/unique_ptr.hpp>
+#include <fmt/format.h>
 #include "common/string_util.h"
 #include "common/swap.h"
 #include "core/core.h"
diff --git a/src/core/movie.cpp b/src/core/movie.cpp
index c2d085d29..83264ea35 100644
--- a/src/core/movie.cpp
+++ b/src/core/movie.cpp
@@ -10,6 +10,7 @@
 #include <boost/optional.hpp>
 #include <cryptopp/hex.h>
 #include <cryptopp/osrng.h>
+#include <fmt/format.h>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/file_util.h"
diff --git a/src/core/savestate.cpp b/src/core/savestate.cpp
index 4c88eade4..e791a27f7 100644
--- a/src/core/savestate.cpp
+++ b/src/core/savestate.cpp
@@ -4,6 +4,7 @@
 
 #include <chrono>
 #include <cryptopp/hex.h>
+#include <fmt/format.h>
 #include "common/archives.h"
 #include "common/logging/log.h"
 #include "common/scm_rev.h"