From 45cf6d423e519fc7d1ca6737ab5490c7cc7e1b77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 18 Dec 2024 12:28:05 +0100
Subject: [PATCH] Buildfixes

---
 Common/Math/CrossSIMD.h        | 2 ++
 Core/Core.cpp                  | 2 ++
 Core/Debugger/MemBlockInfo.cpp | 1 +
 Core/Debugger/MemBlockInfo.h   | 2 ++
 Core/Debugger/WebSocket.cpp    | 2 ++
 Core/MIPS/IR/IRInst.cpp        | 2 ++
 GPU/GPU.cpp                    | 3 +++
 GPU/Math3D.h                   | 1 +
 GPU/Software/BinManager.cpp    | 2 ++
 9 files changed, 17 insertions(+)

diff --git a/Common/Math/CrossSIMD.h b/Common/Math/CrossSIMD.h
index 3d171bb1a8..408f93fe48 100644
--- a/Common/Math/CrossSIMD.h
+++ b/Common/Math/CrossSIMD.h
@@ -6,6 +6,8 @@
 // of defines that translate to either NEON or SSE. It would be possible to write quite a lot of
 // our various color conversion functions and so on in a pretty generic manner.
 
+#pragma once
+
 #include "ppsspp_config.h"
 
 #include "stdint.h"
diff --git a/Core/Core.cpp b/Core/Core.cpp
index 5a87a26609..c0b4ee853c 100644
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@@ -19,6 +19,8 @@
 
 #include <cstdint>
 #include <mutex>
+#include <set>
+#include <condition_variable>
 
 #include "Common/System/System.h"
 #include "Common/Profiler/Profiler.h"
diff --git a/Core/Debugger/MemBlockInfo.cpp b/Core/Debugger/MemBlockInfo.cpp
index b13762b9e4..fbdb81b96c 100644
--- a/Core/Debugger/MemBlockInfo.cpp
+++ b/Core/Debugger/MemBlockInfo.cpp
@@ -18,6 +18,7 @@
 #include <atomic>
 #include <cstring>
 #include <mutex>
+#include <condition_variable>
 #include <thread>
 
 #include "Common/Log.h"
diff --git a/Core/Debugger/MemBlockInfo.h b/Core/Debugger/MemBlockInfo.h
index 5a7ccafd4c..872d98cadc 100644
--- a/Core/Debugger/MemBlockInfo.h
+++ b/Core/Debugger/MemBlockInfo.h
@@ -20,6 +20,8 @@
 #include <cstdint>
 #include <string>
 #include <vector>
+#include <cstring>
+
 #include "Common/Common.h"
 
 class PointerWrap;
diff --git a/Core/Debugger/WebSocket.cpp b/Core/Debugger/WebSocket.cpp
index 77377613da..0d975cb340 100644
--- a/Core/Debugger/WebSocket.cpp
+++ b/Core/Debugger/WebSocket.cpp
@@ -16,6 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <mutex>
+#include <condition_variable>
+
 #include "Common/Thread/ThreadUtil.h"
 #include "Core/Debugger/WebSocket.h"
 #include "Core/Debugger/WebSocket/WebSocketUtils.h"
diff --git a/Core/MIPS/IR/IRInst.cpp b/Core/MIPS/IR/IRInst.cpp
index 13eb16a52f..62f6375751 100644
--- a/Core/MIPS/IR/IRInst.cpp
+++ b/Core/MIPS/IR/IRInst.cpp
@@ -1,3 +1,5 @@
+#include <cstring>
+
 #include "Common/CommonFuncs.h"
 #include "Common/Log.h"
 #include "Core/MIPS/IR/IRInst.h"
diff --git a/GPU/GPU.cpp b/GPU/GPU.cpp
index ec2938b679..742d3705bf 100644
--- a/GPU/GPU.cpp
+++ b/GPU/GPU.cpp
@@ -20,6 +20,7 @@
 #include "Common/TimeUtil.h"
 #include "Common/GraphicsContext.h"
 #include "Core/Core.h"
+#include "Core/System.h"
 
 #include "GPU/GPU.h"
 #include "GPU/GPUCommon.h"
@@ -108,6 +109,8 @@ bool GPU_Init(GraphicsContext *ctx, Draw::DrawContext *draw) {
 		SetGPU(new GPU_Vulkan(ctx, draw));
 		break;
 #endif
+	default:
+		break;
 	}
 
 	if (gpu && !gpu->IsStarted())
diff --git a/GPU/Math3D.h b/GPU/Math3D.h
index 0fa5ed78af..15ec3ef990 100644
--- a/GPU/Math3D.h
+++ b/GPU/Math3D.h
@@ -19,6 +19,7 @@
 
 #include "ppsspp_config.h"
 #include <cmath>
+#include <cstring>
 
 #include "Common/Common.h"
 #include "Core/Util/AudioFormat.h"  // for clamp_u8
diff --git a/GPU/Software/BinManager.cpp b/GPU/Software/BinManager.cpp
index ba66476e1c..301ece06d3 100644
--- a/GPU/Software/BinManager.cpp
+++ b/GPU/Software/BinManager.cpp
@@ -17,6 +17,8 @@
 
 #include <atomic>
 #include <mutex>
+#include <condition_variable>
+
 #include "Common/Profiler/Profiler.h"
 #include "Common/Thread/ThreadManager.h"
 #include "Common/TimeUtil.h"