diff --git a/filament/src/PostProcessManager.h b/filament/src/PostProcessManager.h
index 33d5f1b2c5..bc0eb64d29 100644
--- a/filament/src/PostProcessManager.h
+++ b/filament/src/PostProcessManager.h
@@ -53,6 +53,7 @@
 #include <array>
 #include <random>
 #include <string_view>
+#include <optional>
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/libs/filamat/src/ShaderMinifier.cpp b/libs/filamat/src/ShaderMinifier.cpp
index 1d99bd5fd9..a6ac367daf 100644
--- a/libs/filamat/src/ShaderMinifier.cpp
+++ b/libs/filamat/src/ShaderMinifier.cpp
@@ -18,6 +18,7 @@
 #include "ShaderMinifier.h"
 
 #include <utils/Log.h>
+#include <cstring>
 
 namespace filamat {