diff --git a/src/common/cstring.h b/src/common/cstring.h
index 45c291c14..14c508f1e 100644
--- a/src/common/cstring.h
+++ b/src/common/cstring.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <algorithm>
+#include <ranges>
 #include <string_view>
 
 #include "assert.h"
diff --git a/src/core/file_format/psf.cpp b/src/core/file_format/psf.cpp
index c5be7410a..40df570d4 100644
--- a/src/core/file_format/psf.cpp
+++ b/src/core/file_format/psf.cpp
@@ -1,7 +1,9 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <algorithm>
 #include <cstring>
+#include <ranges>
 
 #include "common/assert.h"
 #include "common/io_file.h"
diff --git a/src/core/libraries/network/net_epoll.cpp b/src/core/libraries/network/net_epoll.cpp
index 4f1b521ce..f151d0b55 100644
--- a/src/core/libraries/network/net_epoll.cpp
+++ b/src/core/libraries/network/net_epoll.cpp
@@ -1,6 +1,9 @@
 // SPDX-FileCopyrightText: Copyright 2025 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <algorithm>
+#include <ranges>
+
 #include "common/assert.h"
 #include "common/types.h"
 #include "net_epoll.h"
diff --git a/src/core/libraries/network/net_upnp.cpp b/src/core/libraries/network/net_upnp.cpp
index c2684ac69..de54cc830 100644
--- a/src/core/libraries/network/net_upnp.cpp
+++ b/src/core/libraries/network/net_upnp.cpp
@@ -12,6 +12,7 @@
 #include <ws2tcpip.h>
 #else
 #include <arpa/inet.h>
+#include <net/if.h>
 #endif
 
 namespace Libraries::Net {
diff --git a/src/core/libraries/np/object_manager.h b/src/core/libraries/np/object_manager.h
index 5f6ed9663..6ffa855c5 100644
--- a/src/core/libraries/np/object_manager.h
+++ b/src/core/libraries/np/object_manager.h
@@ -1,8 +1,10 @@
 // SPDX-FileCopyrightText: Copyright 2025 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <algorithm>
 #include <array>
 #include <mutex>
+#include <ranges>
 
 template <typename T, size_t N, int INVALID_OBJECT_ID_ERROR, int OBJECT_NOT_FOUND_ERROR,
           int MAX_OBJECTS_ERROR>
diff --git a/src/core/libraries/save_data/save_backup.cpp b/src/core/libraries/save_data/save_backup.cpp
index 3e0e34400..fcc122219 100644
--- a/src/core/libraries/save_data/save_backup.cpp
+++ b/src/core/libraries/save_data/save_backup.cpp
@@ -1,8 +1,10 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <algorithm>
 #include <deque>
 #include <mutex>
+#include <ranges>
 #include <semaphore>
 
 #include <magic_enum/magic_enum.hpp>
diff --git a/src/shader_recompiler/runtime_info.h b/src/shader_recompiler/runtime_info.h
index b5110a354..81b902d0c 100644
--- a/src/shader_recompiler/runtime_info.h
+++ b/src/shader_recompiler/runtime_info.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <algorithm>
+#include <ranges>
 #include <span>
 #include "common/types.h"
 #include "shader_recompiler/frontend/tessellation.h"
diff --git a/src/video_core/renderer_vulkan/vk_presenter.cpp b/src/video_core/renderer_vulkan/vk_presenter.cpp
index 584cba904..e53f2749d 100644
--- a/src/video_core/renderer_vulkan/vk_presenter.cpp
+++ b/src/video_core/renderer_vulkan/vk_presenter.cpp
@@ -33,6 +33,7 @@
 #include <cstring>
 #include <ctime>
 #include <filesystem>
+#include <fstream>
 #include <iomanip>
 #include <limits>
 #include <memory>