diff --git a/src/flutter/common/constants.h b/src/flutter/common/constants.h
index 668aa4f6..51fb17ec 100644
--- a/src/flutter/common/constants.h
+++ b/src/flutter/common/constants.h
@@ -5,6 +5,8 @@
 #ifndef FLUTTER_COMMON_CONSTANTS_H_
 #define FLUTTER_COMMON_CONSTANTS_H_
 
+#include <cstdint>
+
 namespace flutter {
 constexpr double kMegaByteSizeInBytes = (1 << 20);
 
diff --git a/src/flutter/shell/platform/common/client_wrapper/include/flutter/byte_streams.h b/src/flutter/shell/platform/common/client_wrapper/include/flutter/byte_streams.h
index 3360bab9..8b413a45 100644
--- a/src/flutter/shell/platform/common/client_wrapper/include/flutter/byte_streams.h
+++ b/src/flutter/shell/platform/common/client_wrapper/include/flutter/byte_streams.h
@@ -5,6 +5,9 @@
 #ifndef FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_BYTE_STREAMS_H_
 #define FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_BYTE_STREAMS_H_
 
+#include <cstddef>
+#include <cstdint>
+
 // Interfaces for interacting with a stream of bytes, for use in codecs.
 
 namespace flutter {
diff --git a/src/flutter/shell/platform/common/client_wrapper/include/flutter/event_sink.h b/src/flutter/shell/platform/common/client_wrapper/include/flutter/event_sink.h
index 789be1eb..f94ccce1 100644
--- a/src/flutter/shell/platform/common/client_wrapper/include/flutter/event_sink.h
+++ b/src/flutter/shell/platform/common/client_wrapper/include/flutter/event_sink.h
@@ -5,6 +5,9 @@
 #ifndef FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_EVENT_SINK_H_
 #define FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_EVENT_SINK_H_
 
+#include <cstring>
+#include <string>
+
 namespace flutter {
 
 class EncodableValue;
diff --git a/src/flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h b/src/flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h
index fde4ce44..fe23e7e2 100644
--- a/src/flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h
+++ b/src/flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h
@@ -5,6 +5,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_EVENT_STREAM_HANDLER_FUNCTIONS_H_
 #define FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_EVENT_STREAM_HANDLER_FUNCTIONS_H_
 
+#include <functional>
 #include <memory>
 
 #include "event_sink.h"
diff --git a/src/flutter/shell/platform/common/client_wrapper/include/flutter/method_codec.h b/src/flutter/shell/platform/common/client_wrapper/include/flutter/method_codec.h
index b40fa640..0721367e 100644
--- a/src/flutter/shell/platform/common/client_wrapper/include/flutter/method_codec.h
+++ b/src/flutter/shell/platform/common/client_wrapper/include/flutter/method_codec.h
@@ -5,6 +5,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_METHOD_CODEC_H_
 #define FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_METHOD_CODEC_H_
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/flutter/shell/platform/linux_embedded/public/flutter_platform_views.h b/src/flutter/shell/platform/linux_embedded/public/flutter_platform_views.h
index 0e7c9d52..d67a6147 100644
--- a/src/flutter/shell/platform/linux_embedded/public/flutter_platform_views.h
+++ b/src/flutter/shell/platform/linux_embedded/public/flutter_platform_views.h
@@ -5,9 +5,8 @@
 #ifndef FLUTTER_SHELL_PLATFORM_LINUX_EMBEDDED_PUBLIC_FLUTTER_PLATFORM_VIEWS_H_
 #define FLUTTER_SHELL_PLATFORM_LINUX_EMBEDDED_PUBLIC_FLUTTER_PLATFORM_VIEWS_H_
 
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <vector>
 
diff --git a/src/flutter/shell/platform/linux_embedded/surface/cursor_data.h b/src/flutter/shell/platform/linux_embedded/surface/cursor_data.h
index 4a7f6663..c2089735 100644
--- a/src/flutter/shell/platform/linux_embedded/surface/cursor_data.h
+++ b/src/flutter/shell/platform/linux_embedded/surface/cursor_data.h
@@ -28,6 +28,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_LINUX_EMBEDDED_SURFACE_CURSOR_DATA_H_
 #define FLUTTER_SHELL_PLATFORM_LINUX_EMBEDDED_SURFACE_CURSOR_DATA_H_
 
+#include <cstdint>
 #include <unordered_map>
 
 namespace flutter {
@@ -2326,4 +2327,4 @@ const std::unordered_map<const uint32_t*, std::pair<int32_t, int32_t>>
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_LINUX_EMBEDDED_SURFACE_CURSOR_DATA_H_
\ No newline at end of file
+#endif  // FLUTTER_SHELL_PLATFORM_LINUX_EMBEDDED_SURFACE_CURSOR_DATA_H_
diff --git a/src/flutter/shell/platform/linux_embedded/window/elinux_window_drm.h b/src/flutter/shell/platform/linux_embedded/window/elinux_window_drm.h
index 628ce7e4..4d4f2cdf 100644
--- a/src/flutter/shell/platform/linux_embedded/window/elinux_window_drm.h
+++ b/src/flutter/shell/platform/linux_embedded/window/elinux_window_drm.h
@@ -17,6 +17,7 @@
 #endif
 
 #include <chrono>
+#include <cstring>
 #include <memory>
 #include <optional>
 #include <string>