diff --git a/filament/src/fg/FrameGraphPass.h b/filament/src/fg/FrameGraphPass.h
index 4bb884dc16..3f36bdc3f8 100644
--- a/filament/src/fg/FrameGraphPass.h
+++ b/filament/src/fg/FrameGraphPass.h
@@ -20,6 +20,7 @@
 #include "driver/DriverApiForward.h"
 
 #include <limits>
+#include <utility>
 
 #include <stdint.h>
 
diff --git a/libs/filaflat/src/BlobDictionary.h b/libs/filaflat/src/BlobDictionary.h
index fdfaae8fab..29984649da 100644
--- a/libs/filaflat/src/BlobDictionary.h
+++ b/libs/filaflat/src/BlobDictionary.h
@@ -17,6 +17,7 @@
 #ifndef TNT_FILAFLAT_BLOBDICTIONARY_H
 #define TNT_FILAFLAT_BLOBDICTIONARY_H
 
+#include <cstdint>
 #include <vector>
 
 #include <stddef.h>
diff --git a/libs/image/include/image/ImageOps.h b/libs/image/include/image/ImageOps.h
index 5d1cd28a14..0701ff9d80 100644
--- a/libs/image/include/image/ImageOps.h
+++ b/libs/image/include/image/ImageOps.h
@@ -19,6 +19,7 @@
 
 #include <image/LinearImage.h>
 
+#include <cstddef>
 #include <initializer_list>
 
 namespace image {
diff --git a/libs/utils/include/utils/linux/Condition.h b/libs/utils/include/utils/linux/Condition.h
index cf9d6c8316..7772adbbff 100644
--- a/libs/utils/include/utils/linux/Condition.h
+++ b/libs/utils/include/utils/linux/Condition.h
@@ -19,6 +19,7 @@
 
 #include <atomic>
 #include <chrono>
+#include <condition_variable> // for cv_status
 #include <limits>
 #include <mutex> // for unique_lock
 
diff --git a/libs/utils/src/Panic.cpp b/libs/utils/src/Panic.cpp
index f2e009a058..64603aea84 100644
--- a/libs/utils/src/Panic.cpp
+++ b/libs/utils/src/Panic.cpp
@@ -19,6 +19,7 @@
 #include <atomic>
 #include <cstdarg>
 #include <cstdlib>
+#include <cstring>
 
 #include <utils/Log.h>