diff --git a/api/audio_options.cc b/api/audio_options.cc
index 8d231330dc..a8929b9734 100644
--- a/api/audio_options.cc
+++ b/api/audio_options.cc
@@ -10,6 +10,7 @@
 
 #include "api/audio_options.h"
 
+#include <optional>
 #include <string>
 
 #include "api/array_view.h"
diff --git a/api/data_channel_interface.cc b/api/data_channel_interface.cc
index 05c7a1a2c7..062a592fcf 100644
--- a/api/data_channel_interface.cc
+++ b/api/data_channel_interface.cc
@@ -11,6 +11,7 @@
 #include "api/data_channel_interface.h"
 
 #include <cstdint>
+#include <optional>
 #include <string>
 
 #include "absl/functional/any_invocable.h"
diff --git a/api/jsep.cc b/api/jsep.cc
index c35d9bb227..894ef58f40 100644
--- a/api/jsep.cc
+++ b/api/jsep.cc
@@ -11,6 +11,7 @@
 #include "api/jsep.h"
 
 #include <cstddef>
+#include <optional>
 #include <string>
 #include <vector>
 
diff --git a/api/rtp_transceiver_interface.cc b/api/rtp_transceiver_interface.cc
index a5e53f53d2..dea2e9c1f3 100644
--- a/api/rtp_transceiver_interface.cc
+++ b/api/rtp_transceiver_interface.cc
@@ -10,6 +10,8 @@
 
 #include "api/rtp_transceiver_interface.h"
 
+#include <optional>
+
 #include "api/rtc_error.h"
 #include "api/rtp_transceiver_direction.h"
 #include "rtc_base/checks.h"
diff --git a/api/sctp_transport_interface.cc b/api/sctp_transport_interface.cc
index 5ca57f1783..8126efa60e 100644
--- a/api/sctp_transport_interface.cc
+++ b/api/sctp_transport_interface.cc
@@ -10,6 +10,7 @@
 
 #include "api/sctp_transport_interface.h"
 
+#include <optional>
 #include <utility>
 
 #include "api/dtls_transport_interface.h"
diff --git a/api/webrtc_key_value_config.h b/api/webrtc_key_value_config.h
index e3cac59698..0648a7f593 100644
--- a/api/webrtc_key_value_config.h
+++ b/api/webrtc_key_value_config.h
@@ -12,6 +12,6 @@
 
 // TODO(bugs.webrtc.org/10335): Remove once all migrated to
 // api/field_trials_view.h
-#include "api/field_trials_view.h"
+#include "api/field_trials_view.h"  // IWYU pragma: keep
 
 #endif  // API_WEBRTC_KEY_VALUE_CONFIG_H_