Some header include cleanup

GPU/Common/DrawEngineCommon.h

@@ -18,7 +18,6 @@
 #pragma once
 
 #include <vector>
-#include <unordered_map>
 
 #include "Common/CommonTypes.h"
 #include "Common/Hashmaps.h"

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] = {

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"

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"

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>
 

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"

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>
 

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"

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"

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"

GPU/GPUState.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <cmath>
-
 #include "Common/Common.h"
 #include "Common/Swap.h"
 #include "GPU/GPU.h"

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"

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"

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_;
 };

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"

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"
 

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"

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"

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"

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();
-}
+}