diff --git a/src/amd/compiler/aco_util.h b/src/amd/compiler/aco_util.h
index 82d754f155a..9f20e80a554 100644
--- a/src/amd/compiler/aco_util.h
+++ b/src/amd/compiler/aco_util.h
@@ -12,6 +12,7 @@
 #include "util/macros.h"
 #include "util/u_math.h"
 
+#include <algorithm>
 #include <array>
 #include <cassert>
 #include <cstddef>
diff --git a/src/freedreno/common/freedreno_common.h b/src/freedreno/common/freedreno_common.h
index 36dea4e12b5..cfa243c270f 100644
--- a/src/freedreno/common/freedreno_common.h
+++ b/src/freedreno/common/freedreno_common.h
@@ -12,6 +12,7 @@
 #ifdef __cplusplus
 
 #include <tuple>
+#include <type_traits>
 
 #define __FD_GPU_GENS A6XX, A7XX, A8XX
 
diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.h b/src/gfxstream/guest/vulkan_enc/ResourceTracker.h
index f739749e27d..aaa9e39eabe 100644
--- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.h
+++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.h
@@ -13,6 +13,7 @@
 #include <optional>
 #include <set>
 #include <unordered_map>
+#include <vector>
 
 #include "CommandBufferStagingStream.h"
 #include "GfxStreamConnectionManager.h"