diff --git a/GPU/Common/DrawEngineCommon.h b/GPU/Common/DrawEngineCommon.h
index 0aa5f36b42..bf2f3968e4 100644
--- a/GPU/Common/DrawEngineCommon.h
+++ b/GPU/Common/DrawEngineCommon.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include <vector>
-#include <unordered_map>
 
 #include "Common/CommonTypes.h"
 #include "Common/Hashmaps.h"
diff --git a/GPU/Common/IndexGenerator.cpp b/GPU/Common/IndexGenerator.cpp
index d339fb4790..1f2c7e4674 100644
--- a/GPU/Common/IndexGenerator.cpp
+++ b/GPU/Common/IndexGenerator.cpp
@@ -16,9 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <cstring>
-#include "IndexGenerator.h"
 
-#include "Common/Common.h"
+#include "IndexGenerator.h"
 
 // Points don't need indexing...
 const u8 IndexGenerator::indexedPrimitiveType[7] = {
diff --git a/GPU/Common/IndexGenerator.h b/GPU/Common/IndexGenerator.h
index 6fb24930ee..dd983536f8 100644
--- a/GPU/Common/IndexGenerator.h
+++ b/GPU/Common/IndexGenerator.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include <algorithm>
 #include "Common/CommonTypes.h"
 #include "Common/Swap.h"
 #include "GPU/ge_constants.h"
diff --git a/GPU/D3D11/StateMappingD3D11.cpp b/GPU/D3D11/StateMappingD3D11.cpp
index 5f8e0d4ae4..fc2fd6971e 100644
--- a/GPU/D3D11/StateMappingD3D11.cpp
+++ b/GPU/D3D11/StateMappingD3D11.cpp
@@ -18,6 +18,8 @@
 #include <d3d11.h>
 #include <d3d11_1.h>
 
+#include <algorithm>
+
 #include "math/dataconv.h"
 
 #include "GPU/Math3D.h"
diff --git a/GPU/D3D11/TextureCacheD3D11.cpp b/GPU/D3D11/TextureCacheD3D11.cpp
index 2d3ec0f29f..e8d288d192 100644
--- a/GPU/D3D11/TextureCacheD3D11.cpp
+++ b/GPU/D3D11/TextureCacheD3D11.cpp
@@ -15,7 +15,6 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include <map>
 #include <algorithm>
 #include <cstring>
 
diff --git a/GPU/Directx9/DrawEngineDX9.cpp b/GPU/Directx9/DrawEngineDX9.cpp
index 66f269ff58..9c59f01f20 100644
--- a/GPU/Directx9/DrawEngineDX9.cpp
+++ b/GPU/Directx9/DrawEngineDX9.cpp
@@ -15,6 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
+
 #include "Common/Log.h"
 #include "Common/MemoryUtil.h"
 #include "Common/TimeUtil.h"
diff --git a/GPU/Directx9/TextureCacheDX9.cpp b/GPU/Directx9/TextureCacheDX9.cpp
index 65480a8520..f2557ab92d 100644
--- a/GPU/Directx9/TextureCacheDX9.cpp
+++ b/GPU/Directx9/TextureCacheDX9.cpp
@@ -15,7 +15,6 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include <map>
 #include <algorithm>
 #include <cstring>
 
diff --git a/GPU/GLES/DepthBufferGLES.cpp b/GPU/GLES/DepthBufferGLES.cpp
index 145963cd7b..13ec48128c 100644
--- a/GPU/GLES/DepthBufferGLES.cpp
+++ b/GPU/GLES/DepthBufferGLES.cpp
@@ -16,6 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <algorithm>
+
 #include "gfx_es2/gpu_features.h"
 #include "Core/ConfigValues.h"
 #include "Core/Reporting.h"
diff --git a/GPU/GLES/DrawEngineGLES.cpp b/GPU/GLES/DrawEngineGLES.cpp
index cd8a7910a9..c97bf558de 100644
--- a/GPU/GLES/DrawEngineGLES.cpp
+++ b/GPU/GLES/DrawEngineGLES.cpp
@@ -15,6 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
+
 #include "Common/MemoryUtil.h"
 #include "Common/TimeUtil.h"
 #include "Core/MemMap.h"
diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp
index 3d28e9bc98..51bd76da3d 100644
--- a/GPU/GLES/FramebufferManagerGLES.cpp
+++ b/GPU/GLES/FramebufferManagerGLES.cpp
@@ -15,7 +15,6 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include <set>
 #include <algorithm>
 
 #include "profiler/profiler.h"
diff --git a/GPU/GPUState.h b/GPU/GPUState.h
index 4aac1e9907..2eac6bcef1 100644
--- a/GPU/GPUState.h
+++ b/GPU/GPUState.h
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <cmath>
-
 #include "Common/Common.h"
 #include "Common/Swap.h"
 #include "GPU/GPU.h"
diff --git a/GPU/Software/TransformUnit.cpp b/GPU/Software/TransformUnit.cpp
index a30f7f875f..6a5819bdfa 100644
--- a/GPU/Software/TransformUnit.cpp
+++ b/GPU/Software/TransformUnit.cpp
@@ -16,6 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <cmath>
+#include <algorithm>
+
 #include "math/math_util.h"
 #include "Common/MemoryUtil.h"
 #include "Core/Config.h"
diff --git a/GPU/Vulkan/DepalettizeShaderVulkan.cpp b/GPU/Vulkan/DepalettizeShaderVulkan.cpp
index f0ab47eb1c..42fe013372 100644
--- a/GPU/Vulkan/DepalettizeShaderVulkan.cpp
+++ b/GPU/Vulkan/DepalettizeShaderVulkan.cpp
@@ -16,7 +16,10 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "Common/ColorConv.h"
+#include "Common/Vulkan/VulkanImage.h"
+#include "Common/Vulkan/VulkanMemory.h"
 #include "Common/Vulkan/VulkanContext.h"
+#include "GPU/ge_constants.h"
 #include "GPU/GPUState.h"
 #include "GPU/Common/DepalettizeShaderCommon.h"
 #include "GPU/Vulkan/DepalettizeShaderVulkan.h"
diff --git a/GPU/Vulkan/DepalettizeShaderVulkan.h b/GPU/Vulkan/DepalettizeShaderVulkan.h
index ec01a17b96..86cd6e615f 100644
--- a/GPU/Vulkan/DepalettizeShaderVulkan.h
+++ b/GPU/Vulkan/DepalettizeShaderVulkan.h
@@ -21,9 +21,6 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/Vulkan/VulkanContext.h"
-#include "Common/Vulkan/VulkanImage.h"
-#include "Common/Vulkan/VulkanMemory.h"
-#include "GPU/ge_constants.h"
 #include "thin3d/thin3d.h"
 #include "GPU/Common/DepalettizeShaderCommon.h"
 
@@ -45,6 +42,7 @@ public:
 
 class VulkanTexture;
 class Vulkan2D;
+class VulkanPushBuffer;
 
 // Caches both shaders and palette textures.
 // Could even avoid bothering with palette texture and just use uniform data...
@@ -74,7 +72,6 @@ private:
 	VkShaderModule vshader_ = VK_NULL_HANDLE;
 	Vulkan2D *vulkan2D_ = nullptr;
 
-	// GLuint vertexShader_;
 	std::map<u32, DepalShaderVulkan *> cache_;
 	std::map<u32, DepalTextureVulkan *> texCache_;
 };
diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp
index b89ac08892..4ac47d392e 100644
--- a/GPU/Vulkan/DrawEngineVulkan.cpp
+++ b/GPU/Vulkan/DrawEngineVulkan.cpp
@@ -15,6 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
+
 #include "math/dataconv.h"
 #include "profiler/profiler.h"
 #include "thin3d/VulkanRenderManager.h"
diff --git a/GPU/Vulkan/DrawEngineVulkan.h b/GPU/Vulkan/DrawEngineVulkan.h
index 0cb4a5bdcd..4b807315d0 100644
--- a/GPU/Vulkan/DrawEngineVulkan.h
+++ b/GPU/Vulkan/DrawEngineVulkan.h
@@ -31,11 +31,7 @@
 // The format of the various uniform buffers may vary though - vertex shaders that don't skin
 // won't get any bone data, etc.
 
-#include <map>
-#include <unordered_map>
-
 #include "Common/Hashmaps.h"
-#include "Common/Vulkan/VulkanMemory.h"
 
 #include "GPU/Vulkan/VulkanUtil.h"
 
diff --git a/GPU/Vulkan/FramebufferManagerVulkan.cpp b/GPU/Vulkan/FramebufferManagerVulkan.cpp
index 17ad7045d0..9d57f8b85e 100644
--- a/GPU/Vulkan/FramebufferManagerVulkan.cpp
+++ b/GPU/Vulkan/FramebufferManagerVulkan.cpp
@@ -15,7 +15,6 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include <set>
 #include <algorithm>
 
 #include "profiler/profiler.h"
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 99888d9e3a..d5763142d7 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -17,6 +17,8 @@
 
 #include "ppsspp_config.h"
 
+#include <algorithm>
+
 #include "base/display.h"  // Only to check screen aspect ratio with pixel_yres/pixel_xres
 
 #include "base/colorutil.h"
diff --git a/UWP/UWPHost.cpp b/UWP/UWPHost.cpp
index 5edd05cd3b..b78e8ac055 100644
--- a/UWP/UWPHost.cpp
+++ b/UWP/UWPHost.cpp
@@ -17,6 +17,8 @@
 
 #include "ppsspp_config.h"
 
+#include <algorithm>
+
 #include "file/file_util.h"
 #include "base/NativeApp.h"
 #include "input/input_state.h"
diff --git a/UWP/XAudioSoundStream.cpp b/UWP/XAudioSoundStream.cpp
index ad82c1e93f..8932b298a0 100644
--- a/UWP/XAudioSoundStream.cpp
+++ b/UWP/XAudioSoundStream.cpp
@@ -1,4 +1,6 @@
 #include "pch.h"
+
+#include <algorithm>
 #include <XAudio2.h>
 
 #include "thread/threadutil.h"
@@ -187,4 +189,4 @@ void XAudioBackend::PollLoop()
 
 WindowsAudioBackend *CreateAudioBackend( AudioBackendType type ) {
   return new XAudioBackend();
-}
\ No newline at end of file
+}