diff --git a/api/jsep_ice_candidate.h b/api/jsep_ice_candidate.h
index f0a41be..6bc5d82 100644
--- a/api/jsep_ice_candidate.h
+++ b/api/jsep_ice_candidate.h
@@ -12,6 +12,6 @@
 #define API_JSEP_ICE_CANDIDATE_H_
 
 // TODO: webrtc:406795492 - Delete file once no longer #included.
-#include "api/jsep.h"
+#include "api/jsep.h"  // IWYU pragma: keep
 
 #endif  // API_JSEP_ICE_CANDIDATE_H_
diff --git a/modules/BUILD.gn b/modules/BUILD.gn
index cefed31..2264302 100644
--- a/modules/BUILD.gn
+++ b/modules/BUILD.gn
@@ -79,7 +79,7 @@
   rtc_test("modules_unittests") {
     testonly = true
     defines = []
-    sources = [ "module_common_types_unittest.cc" ]
+    sources = [ "module_common_types_public_unittest.cc" ]
 
     deps = [
       ":module_api",
diff --git a/modules/include/module_common_types.h b/modules/include/module_common_types.h
index 8e4e546..48e2359 100644
--- a/modules/include/module_common_types.h
+++ b/modules/include/module_common_types.h
@@ -11,8 +11,7 @@
 #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_H_
 #define MODULES_INCLUDE_MODULE_COMMON_TYPES_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 namespace webrtc {
diff --git a/modules/include/module_common_types_public.h b/modules/include/module_common_types_public.h
index 289b5d0..712ecab 100644
--- a/modules/include/module_common_types_public.h
+++ b/modules/include/module_common_types_public.h
@@ -11,8 +11,8 @@
 #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
 #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
 
+#include <cstdint>
 #include <limits>
-#include <optional>
 
 namespace webrtc {
 
diff --git a/modules/module_common_types_unittest.cc b/modules/module_common_types_public_unittest.cc
similarity index 98%
rename from modules/module_common_types_unittest.cc
rename to modules/module_common_types_public_unittest.cc
index bec3b5d..e101780 100644
--- a/modules/module_common_types_unittest.cc
+++ b/modules/module_common_types_public_unittest.cc
@@ -8,9 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/include/module_common_types.h"
-
 #include "modules/include/module_common_types_public.h"
+
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/rtc_tools/rtc_event_log_visualizer/analyzer_bindings.cc b/rtc_tools/rtc_event_log_visualizer/analyzer_bindings.cc
index a50e0fbf..fa93031 100644
--- a/rtc_tools/rtc_event_log_visualizer/analyzer_bindings.cc
+++ b/rtc_tools/rtc_event_log_visualizer/analyzer_bindings.cc
@@ -22,7 +22,6 @@
 #include "api/units/time_delta.h"
 #include "logging/rtc_event_log/rtc_event_log_parser.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/protobuf_utils.h"
 #include "rtc_tools/rtc_event_log_visualizer/analyzer.h"
 #include "rtc_tools/rtc_event_log_visualizer/analyzer_common.h"
 #include "rtc_tools/rtc_event_log_visualizer/plot_base.h"
diff --git a/rtc_tools/rtc_event_log_visualizer/analyzer_bindings_unittest.cc b/rtc_tools/rtc_event_log_visualizer/analyzer_bindings_unittest.cc
index cb9f76a..8b536cc 100644
--- a/rtc_tools/rtc_event_log_visualizer/analyzer_bindings_unittest.cc
+++ b/rtc_tools/rtc_event_log_visualizer/analyzer_bindings_unittest.cc
@@ -17,7 +17,6 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/protobuf_utils.h"
 #include "rtc_base/system/file_wrapper.h"
 #include "test/gtest.h"
 #include "test/testsupport/file_utils.h"
diff --git a/test/testsupport/jpeg_frame_writer.cc b/test/testsupport/jpeg_frame_writer.cc
index 3b6e417..bb3e17f 100644
--- a/test/testsupport/jpeg_frame_writer.cc
+++ b/test/testsupport/jpeg_frame_writer.cc
@@ -24,6 +24,7 @@
 #else
 // Include directory supplied by gn
 #include "jpeglib.h"  // NOLINT
+#include "jpeglibmangler.h"
 #endif
 }