diff --git a/Common/CPUDetect.cpp b/Common/CPUDetect.cpp
index d6531cb96e..d148200911 100644
--- a/Common/CPUDetect.cpp
+++ b/Common/CPUDetect.cpp
@@ -32,7 +32,6 @@
 #include <sys/sysctl.h>
 #endif
 
-#include <algorithm>
 #include <cstdint>
 #include <memory.h>
 #include <set>
diff --git a/Common/Data/Encoding/Utf8.cpp b/Common/Data/Encoding/Utf8.cpp
index 4e9d4ddccc..eb4eb1b082 100644
--- a/Common/Data/Encoding/Utf8.cpp
+++ b/Common/Data/Encoding/Utf8.cpp
@@ -23,7 +23,6 @@
 #include <cstdarg>
 #include <cstdint>
 
-#include <algorithm>
 #include <string>
 
 #include "Common/Data/Encoding/Utf8.h"
diff --git a/Common/Data/Format/IniFile.cpp b/Common/Data/Format/IniFile.cpp
index 3ec00e5e36..23c79d4e3d 100644
--- a/Common/Data/Format/IniFile.cpp
+++ b/Common/Data/Format/IniFile.cpp
@@ -4,6 +4,7 @@
 
 #include <cstdlib>
 #include <cstdio>
+#include <algorithm>  // for sort
 
 #include <inttypes.h>
 
@@ -12,7 +13,6 @@
 #include <strings.h>
 #endif
 
-#include <algorithm>
 #include <iostream>
 #include <fstream>
 #include <sstream>
diff --git a/Common/File/DirListing.cpp b/Common/File/DirListing.cpp
index fbc776b6d0..d870ea22df 100644
--- a/Common/File/DirListing.cpp
+++ b/Common/File/DirListing.cpp
@@ -14,13 +14,14 @@
 #include <unistd.h>
 #include <errno.h>
 #endif
+
 #include <cstring>
 #include <string>
 #include <set>
-#include <algorithm>
 #include <cstdio>
 #include <sys/stat.h>
-#include <ctype.h>
+#include <cctype>
+#include <algorithm>  // remove_if
 
 #include "Common/Data/Encoding/Utf8.h"
 #include "Common/StringUtils.h"
diff --git a/Common/File/Path.cpp b/Common/File/Path.cpp
index 8592ed401c..445b941a9e 100644
--- a/Common/File/Path.cpp
+++ b/Common/File/Path.cpp
@@ -1,5 +1,6 @@
 #include "ppsspp_config.h"
-#include <algorithm>
+
+#include <algorithm>  // for std::search
 #include <cctype>
 #include <cstring>
 
diff --git a/Common/File/PathBrowser.cpp b/Common/File/PathBrowser.cpp
index 399110d34b..8a4d71c11d 100644
--- a/Common/File/PathBrowser.cpp
+++ b/Common/File/PathBrowser.cpp
@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <cstring>
 #include <set>
 
diff --git a/Common/File/VFS/ZipFileReader.cpp b/Common/File/VFS/ZipFileReader.cpp
index 1efc6eca97..0c4de001fc 100644
--- a/Common/File/VFS/ZipFileReader.cpp
+++ b/Common/File/VFS/ZipFileReader.cpp
@@ -1,6 +1,6 @@
-#include <algorithm>
-#include <ctype.h>
+#include <cctype>
 #include <set>
+#include <algorithm>  // for sort
 #include <cstdio>
 #include <cstring>
 
diff --git a/Common/GPU/OpenGL/GLQueueRunner.cpp b/Common/GPU/OpenGL/GLQueueRunner.cpp
index 36a391302f..1c4aa9efe3 100644
--- a/Common/GPU/OpenGL/GLQueueRunner.cpp
+++ b/Common/GPU/OpenGL/GLQueueRunner.cpp
@@ -1,5 +1,4 @@
 #include "ppsspp_config.h"
-#include <algorithm>
 
 #include "Common/GPU/OpenGL/GLCommon.h"
 #include "Common/GPU/OpenGL/GLDebugLog.h"
diff --git a/Common/GPU/OpenGL/thin3d_gl.cpp b/Common/GPU/OpenGL/thin3d_gl.cpp
index 83e9a59f6d..fdf8afd571 100644
--- a/Common/GPU/OpenGL/thin3d_gl.cpp
+++ b/Common/GPU/OpenGL/thin3d_gl.cpp
@@ -1,7 +1,6 @@
 #include <cstdio>
 #include <vector>
 #include <string>
-#include <algorithm>
 #include <map>
 
 #include "ppsspp_config.h"
diff --git a/Common/GPU/Vulkan/VulkanImage.cpp b/Common/GPU/Vulkan/VulkanImage.cpp
index b44300f53a..35da86c073 100644
--- a/Common/GPU/Vulkan/VulkanImage.cpp
+++ b/Common/GPU/Vulkan/VulkanImage.cpp
@@ -1,5 +1,3 @@
-#include <algorithm>
-
 #include "Common/Log.h"
 #include "Common/GPU/Vulkan/VulkanContext.h"
 #include "Common/GPU/Vulkan/VulkanAlloc.h"
diff --git a/Common/GPU/Vulkan/VulkanMemory.cpp b/Common/GPU/Vulkan/VulkanMemory.cpp
index 5482f8026e..252777d343 100644
--- a/Common/GPU/Vulkan/VulkanMemory.cpp
+++ b/Common/GPU/Vulkan/VulkanMemory.cpp
@@ -18,7 +18,6 @@
 // Additionally, Common/Vulkan/* , including this file, are also licensed
 // under the public domain.
 
-#include <algorithm>
 #include <set>
 #include <mutex>
 
diff --git a/Common/GPU/Vulkan/VulkanRenderManager.cpp b/Common/GPU/Vulkan/VulkanRenderManager.cpp
index 57e4f199eb..9639650c95 100644
--- a/Common/GPU/Vulkan/VulkanRenderManager.cpp
+++ b/Common/GPU/Vulkan/VulkanRenderManager.cpp
@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <cstdint>
 
 #include <map>
diff --git a/Common/GPU/Vulkan/VulkanRenderManager.h b/Common/GPU/Vulkan/VulkanRenderManager.h
index e68f521faf..ee6f043561 100644
--- a/Common/GPU/Vulkan/VulkanRenderManager.h
+++ b/Common/GPU/Vulkan/VulkanRenderManager.h
@@ -4,7 +4,6 @@
 // Only draws and binds are handled here, resource creation and allocations are handled as normal -
 // that's the nice thing with Vulkan.
 
-#include <algorithm>
 #include <atomic>
 #include <condition_variable>
 #include <cstdint>
diff --git a/Common/Log/ConsoleListener.cpp b/Common/Log/ConsoleListener.cpp
index 231309eb2b..a27f922585 100644
--- a/Common/Log/ConsoleListener.cpp
+++ b/Common/Log/ConsoleListener.cpp
@@ -19,7 +19,6 @@
 
 #if PPSSPP_PLATFORM(WINDOWS) && !PPSSPP_PLATFORM(UWP)
 #include <atomic>
-#include <algorithm>  // min
 #include <array>
 #include <cstring>
 #include <string> // System: To be able to add strings with "+"
diff --git a/Common/Net/HTTPHeaders.cpp b/Common/Net/HTTPHeaders.cpp
index 7111898548..98792f1136 100644
--- a/Common/Net/HTTPHeaders.cpp
+++ b/Common/Net/HTTPHeaders.cpp
@@ -1,8 +1,8 @@
 #include "Common/Net/HTTPHeaders.h"
 
-#include <algorithm>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
+#include <algorithm>  // std::transform
 
 #include "Common/Net/Sinks.h"
 
diff --git a/Common/Net/HTTPServer.cpp b/Common/Net/HTTPServer.cpp
index 5d2f85c98e..b6ee5e7a90 100644
--- a/Common/Net/HTTPServer.cpp
+++ b/Common/Net/HTTPServer.cpp
@@ -28,7 +28,6 @@
 #define in6addr_any IN6ADDR_ANY_INIT
 #endif
 
-#include <algorithm>
 #include <functional>
 
 #include <cstdio>
diff --git a/Common/Profiler/Profiler.cpp b/Common/Profiler/Profiler.cpp
index c5829ea980..0b41fa9c3a 100644
--- a/Common/Profiler/Profiler.cpp
+++ b/Common/Profiler/Profiler.cpp
@@ -1,6 +1,5 @@
 // Ultra-lightweight category profiler with history.
 
-#include <algorithm>
 #include <mutex>
 #include <vector>
 #include <cstring>
diff --git a/Common/Render/DrawBuffer.cpp b/Common/Render/DrawBuffer.cpp
index a6503d3236..f077409205 100644
--- a/Common/Render/DrawBuffer.cpp
+++ b/Common/Render/DrawBuffer.cpp
@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <cmath>
 #include <vector>
 #include <stddef.h>
diff --git a/Core/Core.h b/Core/Core.h
index 88b9f282b3..da08238533 100644
--- a/Core/Core.h
+++ b/Core/Core.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 #include <string_view>
 
diff --git a/Core/Debugger/WebSocket/InputSubscriber.cpp b/Core/Debugger/WebSocket/InputSubscriber.cpp
index 256ce61ed4..218ddb13a5 100644
--- a/Core/Debugger/WebSocket/InputSubscriber.cpp
+++ b/Core/Debugger/WebSocket/InputSubscriber.cpp
@@ -17,6 +17,7 @@
 
 #include <algorithm>
 #include <unordered_map>
+
 #include "Common/StringUtils.h"
 #include "Core/Debugger/WebSocket/InputSubscriber.h"
 #include "Core/Debugger/WebSocket/WebSocketUtils.h"
diff --git a/Core/HLE/KernelWaitHelpers.h b/Core/HLE/KernelWaitHelpers.h
index f2abe17c2d..3828691f80 100644
--- a/Core/HLE/KernelWaitHelpers.h
+++ b/Core/HLE/KernelWaitHelpers.h
@@ -19,7 +19,7 @@
 
 #include <vector>
 #include <map>
-#include <algorithm>
+#include <algorithm> // std::erase/remove
 
 #include "Common/CommonTypes.h"
 #include "Core/CoreTiming.h"
diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp
index 90117ebdd3..56b37965d9 100644
--- a/Core/HLE/sceIo.cpp
+++ b/Core/HLE/sceIo.cpp
@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm> // std::remove
 #include <cstdlib>
 #include <set>
 #include <thread>
diff --git a/Core/MIPS/MIPSTables.h b/Core/MIPS/MIPSTables.h
index 5eb0630bf2..0a3c39519b 100644
--- a/Core/MIPS/MIPSTables.h
+++ b/Core/MIPS/MIPSTables.h
@@ -18,6 +18,8 @@
 #pragma once
 
 #include <string>
+#include <cstdint>
+
 #include "Common/CommonTypes.h"
 #include "Core/MIPS/MIPS.h"
 
diff --git a/Core/TiltEventProcessor.cpp b/Core/TiltEventProcessor.cpp
index 5e352a5996..15e7c49321 100644
--- a/Core/TiltEventProcessor.cpp
+++ b/Core/TiltEventProcessor.cpp
@@ -1,6 +1,5 @@
 #define _USE_MATH_DEFINES
 
-#include <algorithm>
 #include <cmath>
 #include <mutex>
 
diff --git a/Core/Util/PPGeDraw.cpp b/Core/Util/PPGeDraw.cpp
index 94ca1c6af9..4d8121a105 100644
--- a/Core/Util/PPGeDraw.cpp
+++ b/Core/Util/PPGeDraw.cpp
@@ -15,7 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include <algorithm>
+#include <algorithm>  // std::remove
 
 #include "ext/xxhash.h"
 
diff --git a/Core/Util/PortManager.cpp b/Core/Util/PortManager.cpp
index 77143280d1..a552a89d2c 100644
--- a/Core/Util/PortManager.cpp
+++ b/Core/Util/PortManager.cpp
@@ -25,6 +25,7 @@
 // All credit goes to him and the official miniupnp project! http://miniupnp.free.fr/
 
 
+#include <algorithm>  // find_if
 #include <cstring>
 #include <string>
 #include <thread>
diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp
index fdf5abfe2b..f75ab4db31 100644
--- a/GPU/GPUCommon.cpp
+++ b/GPU/GPUCommon.cpp
@@ -1,5 +1,7 @@
 #include "ppsspp_config.h"
 
+#include <algorithm>  // std::remove
+
 #include "Common/Profiler/Profiler.h"
 
 #include "Common/GraphicsContext.h"
diff --git a/Windows/W32Util/DialogManager.cpp b/Windows/W32Util/DialogManager.cpp
index ee5526f45b..d0f83c9866 100644
--- a/Windows/W32Util/DialogManager.cpp
+++ b/Windows/W32Util/DialogManager.cpp
@@ -1,8 +1,8 @@
-#include "Common/CommonWindows.h"
 #include <vector>
 #include <algorithm>
-#include "Windows/W32Util/DialogManager.h"
 
+#include "Common/CommonWindows.h"
+#include "Windows/W32Util/DialogManager.h"
 
 Dialog::Dialog(LPCSTR res, HINSTANCE _hInstance, HWND _hParent) 
 {