diff --git a/Common/Data/Text/I18n.cpp b/Common/Data/Text/I18n.cpp
index e94685d300..0bbb070c89 100644
--- a/Common/Data/Text/I18n.cpp
+++ b/Common/Data/Text/I18n.cpp
@@ -1,3 +1,5 @@
+#include <map>
+#include <string_view>
 #include <cstring>
 
 #include "Common/Data/Text/I18n.h"
diff --git a/Common/GPU/Vulkan/VulkanRenderManager.cpp b/Common/GPU/Vulkan/VulkanRenderManager.cpp
index 728d9b5921..7ec13ee5bc 100644
--- a/Common/GPU/Vulkan/VulkanRenderManager.cpp
+++ b/Common/GPU/Vulkan/VulkanRenderManager.cpp
@@ -1,3 +1,4 @@
+#include <deque>
 #include <cstdint>
 
 #include <map>
diff --git a/Common/Net/HTTPServer.cpp b/Common/Net/HTTPServer.cpp
index 13cc23a063..07d6f10dbb 100644
--- a/Common/Net/HTTPServer.cpp
+++ b/Common/Net/HTTPServer.cpp
@@ -1,6 +1,8 @@
 #include "Common/TimeUtil.h"
 #include "ppsspp_config.h"
 
+#include <memory>
+
 #ifdef _WIN32
 
 #ifndef NOMINMAX
diff --git a/Common/System/OSD.cpp b/Common/System/OSD.cpp
index 891b7a8e6e..106e23f35f 100644
--- a/Common/System/OSD.cpp
+++ b/Common/System/OSD.cpp
@@ -1,3 +1,5 @@
+#include <functional>
+#include <string_view>
 #include <cstring>
 #include <algorithm>
 // for std::min
diff --git a/Common/System/Request.cpp b/Common/System/Request.cpp
index 580ad8535e..c9033ccbc7 100644
--- a/Common/System/Request.cpp
+++ b/Common/System/Request.cpp
@@ -1,5 +1,6 @@
 #include "ppsspp_config.h"
 
+#include <string_view>
 #include <cstring>
 
 #include "Common/System/Request.h"
diff --git a/Common/Thread/Thread.cpp b/Common/Thread/Thread.cpp
index 01c4726887..b49594d4c7 100644
--- a/Common/Thread/Thread.cpp
+++ b/Common/Thread/Thread.cpp
@@ -1,3 +1,4 @@
+#include <functional>
 #include <rthreads/rthreads.h>
 
 #include "Common/Log.h"
diff --git a/Core/Core.cpp b/Core/Core.cpp
index 8d4aa8b1e9..ee0c99b915 100644
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@@ -17,6 +17,7 @@
 
 #include "ppsspp_config.h"
 
+#include <functional>
 #include <cstdint>
 #include <deque>
 #include <set>
diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp
index 9c03176dc9..c7972476fe 100755
--- a/Core/Dialog/PSPOskDialog.cpp
+++ b/Core/Dialog/PSPOskDialog.cpp
@@ -17,6 +17,7 @@
 
 #include "ppsspp_config.h"
 
+#include <string_view>
 #include <cctype>
 #include <cmath>
 #include <algorithm>
diff --git a/Core/EmuThread.cpp b/Core/EmuThread.cpp
index 03ea7135d3..c0d6d83f1b 100644
--- a/Core/EmuThread.cpp
+++ b/Core/EmuThread.cpp
@@ -1,5 +1,6 @@
 #include "ppsspp_config.h"
 
+#include <functional>
 #include <retro_atomic.h>
 
 #include "Common/System/System.h"