Modernize deprecated headers in modules/
Done using
tools/clang/scripts/build_clang_tools_extra.py \
--fetch out/Default clang-tidy clang-apply-replacements
ninja -C out/Default
gn gen out/Default --export-compile-commands
cd out/Default
tools/clang/third_party/llvm/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -p . \
-clang-tidy-binary out/Default/tools/clang/third_party/llvm/build/bin/clang-tidy \
-clang-apply-replacements-binary \
out/Default/tools/clang/third_party/llvm/build/bin/clang-apply-replacements \
-checks='-*,modernize-deprecated-headers' \
-fix modules/
followed by
git cl format
and a round of IWYU followed by more git cl format
Bug: webrtc:424706384
Change-Id: I9277f055c78a16117a5c88a8b77bbb587f0fba82
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/401100
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@meta.com>
Cr-Commit-Position: refs/heads/main@{#45187}
diff --git a/modules/audio_device/fine_audio_buffer_unittest.cc b/modules/audio_device/fine_audio_buffer_unittest.cc
index beb6ae3..2916909 100644
--- a/modules/audio_device/fine_audio_buffer_unittest.cc
+++ b/modules/audio_device/fine_audio_buffer_unittest.cc
@@ -10,8 +10,7 @@
#include "modules/audio_device/fine_audio_buffer.h"
-#include <limits.h>
-
+#include <climits>
#include <cstdint>
#include <memory>
diff --git a/modules/audio_device/include/test_audio_device_unittest.cc b/modules/audio_device/include/test_audio_device_unittest.cc
index 5e4888b..923d8de 100644
--- a/modules/audio_device/include/test_audio_device_unittest.cc
+++ b/modules/audio_device/include/test_audio_device_unittest.cc
@@ -15,6 +15,7 @@
#include <algorithm>
#include <cstddef>
#include <cstdint>
+#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <memory>
diff --git a/modules/audio_processing/aec3/aec3_common.cc b/modules/audio_processing/aec3/aec3_common.cc
index 4fb1f54..a55d361 100644
--- a/modules/audio_processing/aec3/aec3_common.cc
+++ b/modules/audio_processing/aec3/aec3_common.cc
@@ -10,7 +10,7 @@
#include "modules/audio_processing/aec3/aec3_common.h"
-#include <stdint.h>
+#include <cstdint>
#include "rtc_base/checks.h"
#include "rtc_base/cpu_info.h"
diff --git a/modules/audio_processing/aec3/aec_state.cc b/modules/audio_processing/aec3/aec_state.cc
index 8856c4e..08c3e76 100644
--- a/modules/audio_processing/aec3/aec_state.cc
+++ b/modules/audio_processing/aec3/aec_state.cc
@@ -10,11 +10,10 @@
#include "modules/audio_processing/aec3/aec_state.h"
-#include <math.h>
-
#include <algorithm>
#include <array>
#include <atomic>
+#include <cmath>
#include <cstddef>
#include <numeric>
#include <optional>
diff --git a/modules/audio_processing/aec3/block_processor.cc b/modules/audio_processing/aec3/block_processor.cc
index e92b8ed..488f4dd 100644
--- a/modules/audio_processing/aec3/block_processor.cc
+++ b/modules/audio_processing/aec3/block_processor.cc
@@ -9,9 +9,8 @@
*/
#include "modules/audio_processing/aec3/block_processor.h"
-#include <stddef.h>
-
#include <atomic>
+#include <cstddef>
#include <memory>
#include <optional>
#include <utility>
diff --git a/modules/audio_processing/aec3/decimator_unittest.cc b/modules/audio_processing/aec3/decimator_unittest.cc
index 69785c1..2adb46f 100644
--- a/modules/audio_processing/aec3/decimator_unittest.cc
+++ b/modules/audio_processing/aec3/decimator_unittest.cc
@@ -10,8 +10,6 @@
#include "modules/audio_processing/aec3/decimator.h"
-#include <math.h>
-
#include <algorithm>
#include <array>
#include <cmath>
diff --git a/modules/audio_processing/aec3/filter_analyzer.cc b/modules/audio_processing/aec3/filter_analyzer.cc
index 8147a21..cf64737 100644
--- a/modules/audio_processing/aec3/filter_analyzer.cc
+++ b/modules/audio_processing/aec3/filter_analyzer.cc
@@ -10,11 +10,10 @@
#include "modules/audio_processing/aec3/filter_analyzer.h"
-#include <math.h>
-
#include <algorithm>
#include <array>
#include <atomic>
+#include <cmath>
#include <cstddef>
#include <numeric>
#include <vector>
diff --git a/modules/audio_processing/aec3/render_delay_buffer.cc b/modules/audio_processing/aec3/render_delay_buffer.cc
index 0f72be4..072785d 100644
--- a/modules/audio_processing/aec3/render_delay_buffer.cc
+++ b/modules/audio_processing/aec3/render_delay_buffer.cc
@@ -10,13 +10,12 @@
#include "modules/audio_processing/aec3/render_delay_buffer.h"
-#include <string.h>
-
#include <algorithm>
#include <array>
#include <atomic>
#include <cmath>
#include <cstdint>
+#include <cstring>
#include <memory>
#include <numeric>
#include <optional>
diff --git a/modules/audio_processing/aec3/reverb_frequency_response.cc b/modules/audio_processing/aec3/reverb_frequency_response.cc
index 3006af8..c375ad1 100644
--- a/modules/audio_processing/aec3/reverb_frequency_response.cc
+++ b/modules/audio_processing/aec3/reverb_frequency_response.cc
@@ -10,10 +10,9 @@
#include "modules/audio_processing/aec3/reverb_frequency_response.h"
-#include <stddef.h>
-
#include <algorithm>
#include <array>
+#include <cstddef>
#include <numeric>
#include <optional>
#include <vector>
diff --git a/modules/audio_processing/aec3/vector_math_avx2.cc b/modules/audio_processing/aec3/vector_math_avx2.cc
index 63b9c1e4..da4dd6e 100644
--- a/modules/audio_processing/aec3/vector_math_avx2.cc
+++ b/modules/audio_processing/aec3/vector_math_avx2.cc
@@ -9,7 +9,8 @@
*/
#include <immintrin.h>
-#include <math.h>
+
+#include <cmath>
#include "api/array_view.h"
#include "modules/audio_processing/aec3/vector_math.h"
diff --git a/modules/audio_processing/aecm/aecm_core_c.cc b/modules/audio_processing/aecm/aecm_core_c.cc
index 439481c..f1921b8 100644
--- a/modules/audio_processing/aecm/aecm_core_c.cc
+++ b/modules/audio_processing/aecm/aecm_core_c.cc
@@ -8,10 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stddef.h>
-#include <stdlib.h>
-
+#include <cstddef>
#include <cstdint>
+#include <cstdlib>
#include <cstring>
#include "common_audio/signal_processing/include/signal_processing_library.h"
diff --git a/modules/audio_processing/agc/loudness_histogram_unittest.cc b/modules/audio_processing/agc/loudness_histogram_unittest.cc
index 6e2157b..63c4432 100644
--- a/modules/audio_processing/agc/loudness_histogram_unittest.cc
+++ b/modules/audio_processing/agc/loudness_histogram_unittest.cc
@@ -12,10 +12,9 @@
#include "modules/audio_processing/agc/loudness_histogram.h"
-#include <stdio.h>
-
#include <algorithm>
#include <cmath>
+#include <cstdio>
#include <memory>
#include <string>
diff --git a/modules/audio_processing/agc/utility.cc b/modules/audio_processing/agc/utility.cc
index b8fa360..dd860f7 100644
--- a/modules/audio_processing/agc/utility.cc
+++ b/modules/audio_processing/agc/utility.cc
@@ -10,8 +10,7 @@
#include "modules/audio_processing/agc/utility.h"
-#include <math.h>
-
+#include <cmath>
#include <numbers>
namespace webrtc {
diff --git a/modules/audio_processing/agc2/gain_applier_unittest.cc b/modules/audio_processing/agc2/gain_applier_unittest.cc
index 4c8860d..692a300 100644
--- a/modules/audio_processing/agc2/gain_applier_unittest.cc
+++ b/modules/audio_processing/agc2/gain_applier_unittest.cc
@@ -10,9 +10,8 @@
#include "modules/audio_processing/agc2/gain_applier.h"
-#include <math.h>
-
#include <algorithm>
+#include <cmath>
#include <cstddef>
#include <cstdint>
#include <limits>
diff --git a/modules/audio_processing/agc2/noise_level_estimator.cc b/modules/audio_processing/agc2/noise_level_estimator.cc
index 76e7bfb..7c0c97a 100644
--- a/modules/audio_processing/agc2/noise_level_estimator.cc
+++ b/modules/audio_processing/agc2/noise_level_estimator.cc
@@ -10,10 +10,9 @@
#include "modules/audio_processing/agc2/noise_level_estimator.h"
-#include <stddef.h>
-
#include <algorithm>
#include <cmath>
+#include <cstddef>
#include <memory>
#include <numeric>
diff --git a/modules/audio_processing/echo_detector/mean_variance_estimator.cc b/modules/audio_processing/echo_detector/mean_variance_estimator.cc
index a857403..ab744c3 100644
--- a/modules/audio_processing/echo_detector/mean_variance_estimator.cc
+++ b/modules/audio_processing/echo_detector/mean_variance_estimator.cc
@@ -10,7 +10,7 @@
#include "modules/audio_processing/echo_detector/mean_variance_estimator.h"
-#include <math.h>
+#include <cmath>
#include "rtc_base/checks.h"
diff --git a/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc b/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc
index 8ec9fe9..fa1573b 100644
--- a/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc
+++ b/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc
@@ -10,7 +10,7 @@
#include "modules/audio_processing/echo_detector/normalized_covariance_estimator.h"
-#include <math.h>
+#include <cmath>
#include "rtc_base/checks.h"
diff --git a/modules/audio_processing/ns/noise_suppressor.cc b/modules/audio_processing/ns/noise_suppressor.cc
index c86ddfd..47030c2 100644
--- a/modules/audio_processing/ns/noise_suppressor.cc
+++ b/modules/audio_processing/ns/noise_suppressor.cc
@@ -10,12 +10,11 @@
#include "modules/audio_processing/ns/noise_suppressor.h"
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
#include <algorithm>
#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
#include <memory>
#include "api/array_view.h"
diff --git a/modules/audio_processing/post_filter_unittest.cc b/modules/audio_processing/post_filter_unittest.cc
index ecb7536..cc62f13 100644
--- a/modules/audio_processing/post_filter_unittest.cc
+++ b/modules/audio_processing/post_filter_unittest.cc
@@ -9,8 +9,6 @@
*/
#include "modules/audio_processing/post_filter.h"
-#include <math.h>
-
#include <algorithm>
#include <cmath>
#include <memory>
diff --git a/modules/audio_processing/test/performance_timer.cc b/modules/audio_processing/test/performance_timer.cc
index 42e915b..3cb7a43 100644
--- a/modules/audio_processing/test/performance_timer.cc
+++ b/modules/audio_processing/test/performance_timer.cc
@@ -10,8 +10,7 @@
#include "modules/audio_processing/test/performance_timer.h"
-#include <math.h>
-
+#include <cmath>
#include <cstddef>
#include <cstdint>
#include <numeric>
diff --git a/modules/audio_processing/test/wav_based_simulator.cc b/modules/audio_processing/test/wav_based_simulator.cc
index 24d68b6..3dda649 100644
--- a/modules/audio_processing/test/wav_based_simulator.cc
+++ b/modules/audio_processing/test/wav_based_simulator.cc
@@ -10,8 +10,7 @@
#include "modules/audio_processing/test/wav_based_simulator.h"
-#include <stdio.h>
-
+#include <cstdio>
#include <iostream>
#include <memory>
#include <utility>
diff --git a/modules/audio_processing/utility/delay_estimator.cc b/modules/audio_processing/utility/delay_estimator.cc
index 20609fb..45ef77e 100644
--- a/modules/audio_processing/utility/delay_estimator.cc
+++ b/modules/audio_processing/utility/delay_estimator.cc
@@ -10,11 +10,10 @@
#include "modules/audio_processing/utility/delay_estimator.h"
-#include <stdlib.h>
-#include <string.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstdlib>
+#include <cstring>
#include "rtc_base/checks.h"
diff --git a/modules/audio_processing/utility/delay_estimator_wrapper.cc b/modules/audio_processing/utility/delay_estimator_wrapper.cc
index 05e4b74..f962f41 100644
--- a/modules/audio_processing/utility/delay_estimator_wrapper.cc
+++ b/modules/audio_processing/utility/delay_estimator_wrapper.cc
@@ -10,10 +10,9 @@
#include "modules/audio_processing/utility/delay_estimator_wrapper.h"
-#include <stdlib.h>
-#include <string.h>
-
#include <cstdint>
+#include <cstdlib>
+#include <cstring>
#include "modules/audio_processing/utility/delay_estimator.h"
#include "modules/audio_processing/utility/delay_estimator_internal.h"
diff --git a/modules/audio_processing/vad/gmm.cc b/modules/audio_processing/vad/gmm.cc
index 3b8764c..03615c0 100644
--- a/modules/audio_processing/vad/gmm.cc
+++ b/modules/audio_processing/vad/gmm.cc
@@ -10,7 +10,7 @@
#include "modules/audio_processing/vad/gmm.h"
-#include <math.h>
+#include <cmath>
namespace webrtc {
diff --git a/modules/audio_processing/vad/gmm_unittest.cc b/modules/audio_processing/vad/gmm_unittest.cc
index d895afa..9acae43 100644
--- a/modules/audio_processing/vad/gmm_unittest.cc
+++ b/modules/audio_processing/vad/gmm_unittest.cc
@@ -10,7 +10,7 @@
#include "modules/audio_processing/vad/gmm.h"
-#include <math.h>
+#include <cmath>
#include "modules/audio_processing/vad/noise_gmm_tables.h"
#include "modules/audio_processing/vad/voice_gmm_tables.h"
diff --git a/modules/audio_processing/vad/pitch_internal_unittest.cc b/modules/audio_processing/vad/pitch_internal_unittest.cc
index c851421..c4374a1 100644
--- a/modules/audio_processing/vad/pitch_internal_unittest.cc
+++ b/modules/audio_processing/vad/pitch_internal_unittest.cc
@@ -10,7 +10,7 @@
#include "modules/audio_processing/vad/pitch_internal.h"
-#include <math.h>
+#include <cmath>
#include "test/gtest.h"
diff --git a/modules/audio_processing/vad/vad_circular_buffer.cc b/modules/audio_processing/vad/vad_circular_buffer.cc
index e05b0a5..57b64de 100644
--- a/modules/audio_processing/vad/vad_circular_buffer.cc
+++ b/modules/audio_processing/vad/vad_circular_buffer.cc
@@ -10,7 +10,7 @@
#include "modules/audio_processing/vad/vad_circular_buffer.h"
-#include <stdlib.h>
+#include <cstdlib>
namespace webrtc {
diff --git a/modules/audio_processing/vad/vad_circular_buffer_unittest.cc b/modules/audio_processing/vad/vad_circular_buffer_unittest.cc
index efbd70d..4ddc937 100644
--- a/modules/audio_processing/vad/vad_circular_buffer_unittest.cc
+++ b/modules/audio_processing/vad/vad_circular_buffer_unittest.cc
@@ -10,8 +10,6 @@
#include "modules/audio_processing/vad/vad_circular_buffer.h"
-#include <stdio.h>
-
#include <memory>
#include "test/gtest.h"
diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
index d4c9202..f2f751e 100644
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
+++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
@@ -10,10 +10,9 @@
#include "modules/congestion_controller/goog_cc/goog_cc_network_control.h"
-#include <stdio.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstdio>
#include <memory>
#include <optional>
#include <utility>
diff --git a/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc b/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc
index a8113c9..1d53290 100644
--- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc
+++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc
@@ -10,8 +10,7 @@
#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <optional>
diff --git a/modules/congestion_controller/goog_cc/robust_throughput_estimator.cc b/modules/congestion_controller/goog_cc/robust_throughput_estimator.cc
index 3aad0c9..ed021e7 100644
--- a/modules/congestion_controller/goog_cc/robust_throughput_estimator.cc
+++ b/modules/congestion_controller/goog_cc/robust_throughput_estimator.cc
@@ -10,9 +10,8 @@
#include "modules/congestion_controller/goog_cc/robust_throughput_estimator.h"
-#include <stddef.h>
-
#include <algorithm>
+#include <cstddef>
#include <optional>
#include <utility>
#include <vector>
diff --git a/modules/congestion_controller/goog_cc/robust_throughput_estimator_unittest.cc b/modules/congestion_controller/goog_cc/robust_throughput_estimator_unittest.cc
index 6d5a742..2a0879c 100644
--- a/modules/congestion_controller/goog_cc/robust_throughput_estimator_unittest.cc
+++ b/modules/congestion_controller/goog_cc/robust_throughput_estimator_unittest.cc
@@ -10,10 +10,9 @@
#include "modules/congestion_controller/goog_cc/robust_throughput_estimator.h"
-#include <stddef.h>
-#include <stdint.h>
-
#include <algorithm>
+#include <cstddef>
+#include <cstdint>
#include <vector>
#include "absl/strings/string_view.h"
diff --git a/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc b/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc
index 60d30b6..d156581 100644
--- a/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc
+++ b/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc
@@ -9,8 +9,7 @@
*/
#include "modules/congestion_controller/goog_cc/test/goog_cc_printer.h"
-#include <math.h>
-
+#include <cmath>
#include <deque>
#include <memory>
#include <optional>
diff --git a/modules/congestion_controller/goog_cc/trendline_estimator.cc b/modules/congestion_controller/goog_cc/trendline_estimator.cc
index 35ec139..b8c14f0 100644
--- a/modules/congestion_controller/goog_cc/trendline_estimator.cc
+++ b/modules/congestion_controller/goog_cc/trendline_estimator.cc
@@ -10,9 +10,8 @@
#include "modules/congestion_controller/goog_cc/trendline_estimator.h"
-#include <math.h>
-
#include <algorithm>
+#include <cmath>
#include <cstddef>
#include <cstdint>
#include <cstdio>
diff --git a/modules/congestion_controller/pcc/monitor_interval.cc b/modules/congestion_controller/pcc/monitor_interval.cc
index 116dda6..7417ee2 100644
--- a/modules/congestion_controller/pcc/monitor_interval.cc
+++ b/modules/congestion_controller/pcc/monitor_interval.cc
@@ -10,9 +10,8 @@
#include "modules/congestion_controller/pcc/monitor_interval.h"
-#include <stddef.h>
-
#include <cmath>
+#include <cstddef>
#include <vector>
#include "api/transport/network_types.h"
diff --git a/modules/congestion_controller/pcc/monitor_interval_unittest.cc b/modules/congestion_controller/pcc/monitor_interval_unittest.cc
index 9326dd0..272dac7 100644
--- a/modules/congestion_controller/pcc/monitor_interval_unittest.cc
+++ b/modules/congestion_controller/pcc/monitor_interval_unittest.cc
@@ -10,8 +10,7 @@
#include "modules/congestion_controller/pcc/monitor_interval.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <vector>
#include "api/transport/network_types.h"
diff --git a/modules/congestion_controller/pcc/utility_function_unittest.cc b/modules/congestion_controller/pcc/utility_function_unittest.cc
index 9092c89..ab5bd7f 100644
--- a/modules/congestion_controller/pcc/utility_function_unittest.cc
+++ b/modules/congestion_controller/pcc/utility_function_unittest.cc
@@ -10,9 +10,8 @@
#include "modules/congestion_controller/pcc/utility_function.h"
-#include <stddef.h>
-
#include <cmath>
+#include <cstddef>
#include <vector>
#include "api/transport/network_types.h"
diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter.cc b/modules/congestion_controller/rtp/transport_feedback_adapter.cc
index 3b38b6d..01dd43d 100644
--- a/modules/congestion_controller/rtp/transport_feedback_adapter.cc
+++ b/modules/congestion_controller/rtp/transport_feedback_adapter.cc
@@ -10,10 +10,9 @@
#include "modules/congestion_controller/rtp/transport_feedback_adapter.h"
-#include <stdlib.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstdlib>
#include <optional>
#include <utility>
#include <vector>
diff --git a/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc b/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc
index 7d74adf..ad48cbb 100644
--- a/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc
+++ b/modules/desktop_capture/blank_detector_desktop_capturer_wrapper.cc
@@ -10,8 +10,7 @@
#include "modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <memory>
#include <utility>
diff --git a/modules/desktop_capture/cropping_window_capturer.cc b/modules/desktop_capture/cropping_window_capturer.cc
index b0aa492..87420ad 100644
--- a/modules/desktop_capture/cropping_window_capturer.cc
+++ b/modules/desktop_capture/cropping_window_capturer.cc
@@ -10,8 +10,7 @@
#include "modules/desktop_capture/cropping_window_capturer.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <memory>
#include <utility>
diff --git a/modules/desktop_capture/screen_capturer_integration_test.cc b/modules/desktop_capture/screen_capturer_integration_test.cc
index 76e0102..a1f61e3 100644
--- a/modules/desktop_capture/screen_capturer_integration_test.cc
+++ b/modules/desktop_capture/screen_capturer_integration_test.cc
@@ -8,10 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <string.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstring>
#include <initializer_list>
#include <iostream> // TODO(zijiehe): Remove once flaky has been resolved.
#include <memory>
diff --git a/modules/desktop_capture/screen_drawer_linux.cc b/modules/desktop_capture/screen_drawer_linux.cc
index 5a04d37..6ff2880 100644
--- a/modules/desktop_capture/screen_drawer_linux.cc
+++ b/modules/desktop_capture/screen_drawer_linux.cc
@@ -10,8 +10,8 @@
#include <X11/X.h>
#include <X11/Xlib.h>
-#include <string.h>
+#include <cstring>
#include <memory>
#include "api/scoped_refptr.h"
diff --git a/modules/desktop_capture/window_finder_unittest.cc b/modules/desktop_capture/window_finder_unittest.cc
index ebceac4..f4f5d88 100644
--- a/modules/desktop_capture/window_finder_unittest.cc
+++ b/modules/desktop_capture/window_finder_unittest.cc
@@ -10,8 +10,7 @@
#include "modules/desktop_capture/window_finder.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <memory>
#include "api/scoped_refptr.h"
diff --git a/modules/remote_bitrate_estimator/overuse_detector.cc b/modules/remote_bitrate_estimator/overuse_detector.cc
index 33996ad..121ec22 100644
--- a/modules/remote_bitrate_estimator/overuse_detector.cc
+++ b/modules/remote_bitrate_estimator/overuse_detector.cc
@@ -10,10 +10,8 @@
#include "modules/remote_bitrate_estimator/overuse_detector.h"
-#include <math.h>
-#include <stdio.h>
-
#include <algorithm>
+#include <cmath>
#include <cstdint>
#include "api/transport/bandwidth_usage.h"
diff --git a/modules/remote_bitrate_estimator/overuse_detector_unittest.cc b/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
index 7e7a328..d893b4c 100644
--- a/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
+++ b/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
@@ -10,12 +10,11 @@
#include "modules/remote_bitrate_estimator/overuse_detector.h"
-#include <stdio.h>
-#include <string.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstdio>
#include <cstdlib>
+#include <cstring>
#include "api/transport/bandwidth_usage.h"
#include "modules/remote_bitrate_estimator/inter_arrival.h"
diff --git a/modules/remote_bitrate_estimator/overuse_estimator.cc b/modules/remote_bitrate_estimator/overuse_estimator.cc
index f02ebca..8d4efaf 100644
--- a/modules/remote_bitrate_estimator/overuse_estimator.cc
+++ b/modules/remote_bitrate_estimator/overuse_estimator.cc
@@ -10,9 +10,8 @@
#include "modules/remote_bitrate_estimator/overuse_estimator.h"
-#include <math.h>
-
#include <algorithm>
+#include <cmath>
#include <cstdint>
#include "api/transport/bandwidth_usage.h"
diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
index 5847b08..e1e55dd 100644
--- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
+++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
@@ -10,8 +10,6 @@
#include "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h"
-#include <math.h>
-
#include <algorithm>
#include <cstdint>
#include <list>
diff --git a/modules/remote_bitrate_estimator/tools/bwe_rtp.cc b/modules/remote_bitrate_estimator/tools/bwe_rtp.cc
index 539cadb..c38f510 100644
--- a/modules/remote_bitrate_estimator/tools/bwe_rtp.cc
+++ b/modules/remote_bitrate_estimator/tools/bwe_rtp.cc
@@ -10,9 +10,8 @@
#include "modules/remote_bitrate_estimator/tools/bwe_rtp.h"
-#include <stdio.h>
-
#include <cstdint>
+#include <cstdio>
#include <ios>
#include <memory>
#include <set>
diff --git a/modules/remote_bitrate_estimator/tools/rtp_to_text.cc b/modules/remote_bitrate_estimator/tools/rtp_to_text.cc
index d2cc762..43e8521 100644
--- a/modules/remote_bitrate_estimator/tools/rtp_to_text.cc
+++ b/modules/remote_bitrate_estimator/tools/rtp_to_text.cc
@@ -8,9 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdio.h>
-
#include <cstdint>
+#include <cstdio>
#include <cstring>
#include <memory>
diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.cc b/modules/rtp_rtcp/include/rtp_rtcp_defines.cc
index 1e11367..cc06d1b 100644
--- a/modules/rtp_rtcp/include/rtp_rtcp_defines.cc
+++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include <string.h>
-
#include <cctype>
+#include <cstring>
#include "absl/algorithm/container.h"
#include "absl/strings/string_view.h"
diff --git a/modules/rtp_rtcp/source/active_decode_targets_helper.cc b/modules/rtp_rtcp/source/active_decode_targets_helper.cc
index d158532..c1150a5 100644
--- a/modules/rtp_rtcp/source/active_decode_targets_helper.cc
+++ b/modules/rtp_rtcp/source/active_decode_targets_helper.cc
@@ -10,10 +10,9 @@
#include "modules/rtp_rtcp/source/active_decode_targets_helper.h"
-#include <stdint.h>
-
#include <bitset>
#include <cstddef>
+#include <cstdint>
#include "api/array_view.h"
#include "rtc_base/checks.h"
diff --git a/modules/rtp_rtcp/source/dtmf_queue.cc b/modules/rtp_rtcp/source/dtmf_queue.cc
index 9b9b98a..3f054c7 100644
--- a/modules/rtp_rtcp/source/dtmf_queue.cc
+++ b/modules/rtp_rtcp/source/dtmf_queue.cc
@@ -10,7 +10,7 @@
#include "modules/rtp_rtcp/source/dtmf_queue.h"
-#include <stddef.h>
+#include <cstddef>
#include "rtc_base/checks.h"
#include "rtc_base/synchronization/mutex.h"
diff --git a/modules/rtp_rtcp/source/flexfec_03_header_reader_writer.cc b/modules/rtp_rtcp/source/flexfec_03_header_reader_writer.cc
index 3ecbec9..f05f926 100644
--- a/modules/rtp_rtcp/source/flexfec_03_header_reader_writer.cc
+++ b/modules/rtp_rtcp/source/flexfec_03_header_reader_writer.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/flexfec_03_header_reader_writer.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include "api/array_view.h"
#include "api/scoped_refptr.h"
diff --git a/modules/rtp_rtcp/source/flexfec_03_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/flexfec_03_header_reader_writer_unittest.cc
index 80b4ba3..862cbdc 100644
--- a/modules/rtp_rtcp/source/flexfec_03_header_reader_writer_unittest.cc
+++ b/modules/rtp_rtcp/source/flexfec_03_header_reader_writer_unittest.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/flexfec_03_header_reader_writer.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <memory>
#include <utility>
diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc
index d1e0b99..d467d53 100644
--- a/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc
+++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include "api/array_view.h"
#include "api/scoped_refptr.h"
diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
index 241675a..baeea9d 100644
--- a/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
+++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <vector>
#include "api/array_view.h"
diff --git a/modules/rtp_rtcp/source/flexfec_receiver.cc b/modules/rtp_rtcp/source/flexfec_receiver.cc
index c6465fb..bde365f 100644
--- a/modules/rtp_rtcp/source/flexfec_receiver.cc
+++ b/modules/rtp_rtcp/source/flexfec_receiver.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/include/flexfec_receiver.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <memory>
#include "api/scoped_refptr.h"
diff --git a/modules/rtp_rtcp/source/flexfec_sender.cc b/modules/rtp_rtcp/source/flexfec_sender.cc
index 90a0f20..32328fb 100644
--- a/modules/rtp_rtcp/source/flexfec_sender.cc
+++ b/modules/rtp_rtcp/source/flexfec_sender.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/include/flexfec_sender.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <list>
#include <memory>
#include <optional>
diff --git a/modules/rtp_rtcp/source/forward_error_correction.cc b/modules/rtp_rtcp/source/forward_error_correction.cc
index 39c098a..0bb81a8 100644
--- a/modules/rtp_rtcp/source/forward_error_correction.cc
+++ b/modules/rtp_rtcp/source/forward_error_correction.cc
@@ -10,10 +10,9 @@
#include "modules/rtp_rtcp/source/forward_error_correction.h"
-#include <string.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstring>
#include <list>
#include <memory>
#include <utility>
diff --git a/modules/rtp_rtcp/source/forward_error_correction_internal.cc b/modules/rtp_rtcp/source/forward_error_correction_internal.cc
index 98aa2b3..d2f3b59 100644
--- a/modules/rtp_rtcp/source/forward_error_correction_internal.cc
+++ b/modules/rtp_rtcp/source/forward_error_correction_internal.cc
@@ -10,10 +10,9 @@
#include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
-#include <string.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstring>
#include "api/array_view.h"
#include "modules/include/module_fec_types.h"
diff --git a/modules/rtp_rtcp/source/rtcp_packet/app.cc b/modules/rtp_rtcp/source/rtcp_packet/app.cc
index f90c84e..3d44b83 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/app.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/app.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/rtcp_packet/app.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include "modules/rtp_rtcp/source/byte_io.h"
#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"
diff --git a/modules/rtp_rtcp/source/rtcp_packet/bye.cc b/modules/rtp_rtcp/source/rtcp_packet/bye.cc
index d4c9107..767edbb 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/bye.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/bye.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/rtcp_packet/bye.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <string>
#include <utility>
#include <vector>
diff --git a/modules/rtp_rtcp/source/rtcp_packet/sdes.cc b/modules/rtp_rtcp/source/rtcp_packet/sdes.cc
index d58ff62..2d28e51 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/sdes.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/sdes.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <string>
#include <utility>
#include <vector>
diff --git a/modules/rtp_rtcp/source/rtcp_receiver.cc b/modules/rtp_rtcp/source/rtcp_receiver.cc
index cf9975e..d58823b 100644
--- a/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -10,11 +10,10 @@
#include "modules/rtp_rtcp/source/rtcp_receiver.h"
-#include <string.h>
-
#include <algorithm>
#include <cstddef>
#include <cstdint>
+#include <cstring>
#include <iterator>
#include <limits>
#include <map>
diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc
index e06698e..4038902 100644
--- a/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -10,10 +10,9 @@
#include "modules/rtp_rtcp/source/rtcp_sender.h"
-#include <string.h> // memcpy
-
-#include <algorithm> // std::min
+#include <algorithm>
#include <cstdint>
+#include <cstring>
#include <memory>
#include <optional>
#include <string>
diff --git a/modules/rtp_rtcp/source/rtp_format_h264.cc b/modules/rtp_rtcp/source/rtp_format_h264.cc
index c36a56d..b779859 100644
--- a/modules/rtp_rtcp/source/rtp_format_h264.cc
+++ b/modules/rtp_rtcp/source/rtp_format_h264.cc
@@ -10,10 +10,9 @@
#include "modules/rtp_rtcp/source/rtp_format_h264.h"
-#include <string.h>
-
#include <cstddef>
#include <cstdint>
+#include <cstring>
#include <vector>
#include "absl/algorithm/container.h"
diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.cc b/modules/rtp_rtcp/source/rtp_format_video_generic.cc
index db64feb..53c549e 100644
--- a/modules/rtp_rtcp/source/rtp_format_video_generic.cc
+++ b/modules/rtp_rtcp/source/rtp_format_video_generic.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/rtp_format_video_generic.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <variant>
#include "api/array_view.h"
diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.cc b/modules/rtp_rtcp/source/rtp_format_vp8.cc
index 5550f48..717d746 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp8.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/rtp_format_vp8.h"
-#include <stdint.h>
-#include <string.h> // memcpy
-
+#include <cstdint>
+#include <cstring>
#include <vector>
#include "api/array_view.h"
diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.cc b/modules/rtp_rtcp/source/rtp_format_vp9.cc
index 4e8237e..661065c 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp9.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp9.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/rtp_format_vp9.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include "api/array_view.h"
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.cc b/modules/rtp_rtcp/source/rtp_header_extensions.cc
index 3f9a852..2c31b17 100644
--- a/modules/rtp_rtcp/source/rtp_header_extensions.cc
+++ b/modules/rtp_rtcp/source/rtp_header_extensions.cc
@@ -15,6 +15,7 @@
#include <cmath>
#include <cstddef>
#include <cstdint>
+#include <cstring>
#include <limits>
#include <optional>
#include <string>
diff --git a/modules/rtp_rtcp/source/rtp_packet_received.cc b/modules/rtp_rtcp/source/rtp_packet_received.cc
index f56c31a..22b1c51 100644
--- a/modules/rtp_rtcp/source/rtp_packet_received.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_received.cc
@@ -10,8 +10,7 @@
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <vector>
diff --git a/modules/rtp_rtcp/source/rtp_packetizer_av1.cc b/modules/rtp_rtcp/source/rtp_packetizer_av1.cc
index e5293a9..e96460e 100644
--- a/modules/rtp_rtcp/source/rtp_packetizer_av1.cc
+++ b/modules/rtp_rtcp/source/rtp_packetizer_av1.cc
@@ -9,10 +9,9 @@
*/
#include "modules/rtp_rtcp/source/rtp_packetizer_av1.h"
-#include <stddef.h>
-#include <stdint.h>
-
#include <algorithm>
+#include <cstddef>
+#include <cstdint>
#include <cstring>
#include <vector>
diff --git a/modules/rtp_rtcp/source/rtp_packetizer_av1_test_helper.cc b/modules/rtp_rtcp/source/rtp_packetizer_av1_test_helper.cc
index 1e38352..80bf92f 100644
--- a/modules/rtp_rtcp/source/rtp_packetizer_av1_test_helper.cc
+++ b/modules/rtp_rtcp/source/rtp_packetizer_av1_test_helper.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/rtp_packetizer_av1_test_helper.h"
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <initializer_list>
#include <utility>
#include <vector>
diff --git a/modules/rtp_rtcp/source/rtp_packetizer_av1_unittest.cc b/modules/rtp_rtcp/source/rtp_packetizer_av1_unittest.cc
index bb46fcd..a7e6513 100644
--- a/modules/rtp_rtcp/source/rtp_packetizer_av1_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_packetizer_av1_unittest.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/rtp_packetizer_av1.h"
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <initializer_list>
#include <utility>
#include <vector>
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index bc9ccfc..5750a70 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/rtp_rtcp_impl.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <memory>
#include <optional>
#include <utility>
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
index f9952a0..3e90e25 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/rtp_rtcp_impl2.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <functional>
#include <memory>
#include <optional>
diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.cc b/modules/rtp_rtcp/source/rtp_sender_audio.cc
index 51c47cd..2b829a4 100644
--- a/modules/rtp_rtcp/source/rtp_sender_audio.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_audio.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/rtp_sender_audio.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <memory>
#include <optional>
#include <utility>
diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc
index 6bcd874..82e8b16 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_video.cc
@@ -10,10 +10,9 @@
#include "modules/rtp_rtcp/source/rtp_sender_video.h"
-#include <stdlib.h>
-#include <string.h>
-
#include <cstdint>
+#include <cstdlib>
+#include <cstring>
#include <memory>
#include <optional>
#include <utility>
diff --git a/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc b/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc
index 57e0925..d509020 100644
--- a/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc
+++ b/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.h"
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <tuple>
#include "absl/algorithm/container.h"
diff --git a/modules/rtp_rtcp/source/tmmbr_help.cc b/modules/rtp_rtcp/source/tmmbr_help.cc
index 0eb7d60..9c0d410 100644
--- a/modules/rtp_rtcp/source/tmmbr_help.cc
+++ b/modules/rtp_rtcp/source/tmmbr_help.cc
@@ -10,8 +10,7 @@
#include "modules/rtp_rtcp/source/tmmbr_help.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <limits>
#include <vector>
diff --git a/modules/rtp_rtcp/source/ulpfec_generator.cc b/modules/rtp_rtcp/source/ulpfec_generator.cc
index a29aeb5..56c8ee3 100644
--- a/modules/rtp_rtcp/source/ulpfec_generator.cc
+++ b/modules/rtp_rtcp/source/ulpfec_generator.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/ulpfec_generator.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <memory>
#include <utility>
#include <vector>
diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc
index 5bd4488..95f3a2a 100644
--- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc
+++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include "api/array_view.h"
#include "api/scoped_refptr.h"
diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
index 99ac112..3ca4cce 100644
--- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
+++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <memory>
#include "api/scoped_refptr.h"
diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc
index d36ebf5..03282af 100644
--- a/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/ulpfec_receiver.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <iterator>
#include <list>
#include <memory>
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer.cc
index 74a7522..d44e38f 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/video_rtp_depacketizer.h"
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <cstring>
#include "api/array_view.h"
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc
index fd8d647..9324851 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc
@@ -10,10 +10,9 @@
#include "modules/rtp_rtcp/source/video_rtp_depacketizer_av1.h"
-#include <stddef.h>
-#include <stdint.h>
-
#include <array>
+#include <cstddef>
+#include <cstdint>
#include <cstring>
#include <iterator>
#include <optional>
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.cc
index 1ac96a2..2f8f7fd 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/video_rtp_depacketizer_generic.h"
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <optional>
#include <utility>
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_generic_unittest.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_generic_unittest.cc
index e808eff..fe9a1d0 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_generic_unittest.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_generic_unittest.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/video_rtp_depacketizer_generic.h"
-#include <stdint.h>
-
#include <cstddef>
+#include <cstdint>
#include <optional>
#include <variant>
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc
index 8d9bf6d..f3f4fb5 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.h"
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <optional>
#include <utility>
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc
index a0d21f4..c69f48f 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc
@@ -10,9 +10,8 @@
#include "modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <optional>
#include <utility>
diff --git a/modules/rtp_rtcp/test/testFec/test_fec.cc b/modules/rtp_rtcp/test/testFec/test_fec.cc
index 4a7ceab..067fa0c 100644
--- a/modules/rtp_rtcp/test/testFec/test_fec.cc
+++ b/modules/rtp_rtcp/test/testFec/test_fec.cc
@@ -13,11 +13,10 @@
* functions in ForwardErrorCorrection directly.
*/
-#include <string.h>
-#include <time.h>
-
#include <cstdint>
#include <cstdio>
+#include <cstring>
+#include <ctime>
#include <list>
#include <memory>
#include <string>
diff --git a/modules/video_coding/chain_diff_calculator.cc b/modules/video_coding/chain_diff_calculator.cc
index d8ce44a..0674a84 100644
--- a/modules/video_coding/chain_diff_calculator.cc
+++ b/modules/video_coding/chain_diff_calculator.cc
@@ -9,10 +9,9 @@
*/
#include "modules/video_coding/chain_diff_calculator.h"
-#include <stddef.h>
-#include <stdint.h>
-
#include <algorithm>
+#include <cstddef>
+#include <cstdint>
#include <optional>
#include <vector>
diff --git a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
index 1ebfe0d..6f4aa40 100644
--- a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
+++ b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
@@ -9,9 +9,8 @@
*/
#include "modules/video_coding/codecs/av1/libaom_av1_encoder.h"
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <memory>
#include <numeric>
#include <optional>
diff --git a/modules/video_coding/codecs/av1/libaom_av1_unittest.cc b/modules/video_coding/codecs/av1/libaom_av1_unittest.cc
index 2993e39..cae31d5 100644
--- a/modules/video_coding/codecs/av1/libaom_av1_unittest.cc
+++ b/modules/video_coding/codecs/av1/libaom_av1_unittest.cc
@@ -8,9 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <map>
#include <memory>
#include <optional>
diff --git a/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
index 6e01376..3d2dd3d 100644
--- a/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
+++ b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
@@ -8,8 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdint.h>
-
+#include <cstdint>
#include <memory>
#include <optional>
diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc
index 60c8ff3..251428f 100644
--- a/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stddef.h>
+#include <cstddef>
#include "api/test/videocodec_test_fixture.h"
#include "api/video/video_codec_type.h"
diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
index 39e7af4..66e0c2f 100644
--- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
@@ -10,11 +10,10 @@
#include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h"
-#include <stdint.h>
-#include <stdio.h>
-
#include <algorithm>
#include <cmath>
+#include <cstdint>
+#include <cstdio>
#include <iterator>
#include <memory>
#include <optional>
diff --git a/modules/video_coding/codecs/test/videoprocessor.cc b/modules/video_coding/codecs/test/videoprocessor.cc
index bec0e35..5a89cad 100644
--- a/modules/video_coding/codecs/test/videoprocessor.cc
+++ b/modules/video_coding/codecs/test/videoprocessor.cc
@@ -10,11 +10,10 @@
#include "modules/video_coding/codecs/test/videoprocessor.h"
-#include <string.h>
-
#include <algorithm>
#include <cstddef>
#include <cstdint>
+#include <cstring>
#include <iterator>
#include <limits>
#include <memory>
diff --git a/modules/video_coding/codecs/vp8/default_temporal_layers.cc b/modules/video_coding/codecs/vp8/default_temporal_layers.cc
index 0ad4bb8f..651e990 100644
--- a/modules/video_coding/codecs/vp8/default_temporal_layers.cc
+++ b/modules/video_coding/codecs/vp8/default_temporal_layers.cc
@@ -9,12 +9,11 @@
#include "modules/video_coding/codecs/vp8/default_temporal_layers.h"
-#include <stdlib.h>
-
#include <algorithm>
#include <array>
#include <bitset>
#include <cstdint>
+#include <cstdlib>
#include <limits>
#include <memory>
#include <set>
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
index c05a91d..453a2c2 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
@@ -10,11 +10,10 @@
#include "modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h"
-#include <stdio.h>
-#include <string.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstdio>
+#include <cstring>
#include <memory>
#include <optional>
#include <string>
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
index 9e533cf..5446d83 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
@@ -10,11 +10,10 @@
#include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h"
-#include <string.h>
-
#include <algorithm>
#include <cmath>
#include <cstdint>
+#include <cstring>
#include <iterator>
#include <memory>
#include <optional>
diff --git a/modules/video_coding/codecs/vp8/screenshare_layers.cc b/modules/video_coding/codecs/vp8/screenshare_layers.cc
index 215a257..e12ebc1 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers.cc
@@ -9,10 +9,9 @@
#include "modules/video_coding/codecs/vp8/screenshare_layers.h"
-#include <stdlib.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstdlib>
#include <memory>
#include <optional>
#include <vector>
diff --git a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
index dda4a70..0d3d517 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
@@ -11,9 +11,10 @@
#include "modules/video_coding/codecs/vp8/screenshare_layers.h"
#include <stdlib.h>
-#include <string.h>
#include <cstdint>
+#include <cstdlib>
+#include <cstring>
#include <memory>
#include <optional>
#include <vector>
diff --git a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
index f129cbc6..a8cb3ba 100644
--- a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
+++ b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
@@ -8,10 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdio.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstdio>
#include <memory>
#include <optional>
#include <string>
diff --git a/modules/video_coding/deprecated/frame_buffer.cc b/modules/video_coding/deprecated/frame_buffer.cc
index 0b7b2a9..84511bb 100644
--- a/modules/video_coding/deprecated/frame_buffer.cc
+++ b/modules/video_coding/deprecated/frame_buffer.cc
@@ -10,9 +10,8 @@
#include "modules/video_coding/deprecated/frame_buffer.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <vector>
#include "api/video/encoded_image.h"
diff --git a/modules/video_coding/deprecated/receiver_unittest.cc b/modules/video_coding/deprecated/receiver_unittest.cc
index 1221b4e..f6e30d84 100644
--- a/modules/video_coding/deprecated/receiver_unittest.cc
+++ b/modules/video_coding/deprecated/receiver_unittest.cc
@@ -9,9 +9,8 @@
#include "modules/video_coding/deprecated/receiver.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <memory>
#include <queue>
#include <vector>
diff --git a/modules/video_coding/deprecated/session_info.cc b/modules/video_coding/deprecated/session_info.cc
index 0c937a4..19a93b4 100644
--- a/modules/video_coding/deprecated/session_info.cc
+++ b/modules/video_coding/deprecated/session_info.cc
@@ -10,9 +10,8 @@
#include "modules/video_coding/deprecated/session_info.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <iterator>
#include <variant>
#include <vector>
diff --git a/modules/video_coding/deprecated/session_info_unittest.cc b/modules/video_coding/deprecated/session_info_unittest.cc
index e648b77..b965fb1 100644
--- a/modules/video_coding/deprecated/session_info_unittest.cc
+++ b/modules/video_coding/deprecated/session_info_unittest.cc
@@ -10,9 +10,8 @@
#include "modules/video_coding/deprecated/session_info.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include "api/video/video_codec_type.h"
#include "api/video/video_frame_type.h"
diff --git a/modules/video_coding/deprecated/stream_generator.cc b/modules/video_coding/deprecated/stream_generator.cc
index 2870991..d9e5cce 100644
--- a/modules/video_coding/deprecated/stream_generator.cc
+++ b/modules/video_coding/deprecated/stream_generator.cc
@@ -10,9 +10,8 @@
#include "modules/video_coding/deprecated/stream_generator.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <list>
#include "api/video/video_frame_type.h"
diff --git a/modules/video_coding/encoded_frame.cc b/modules/video_coding/encoded_frame.cc
index e79e3f6..c69e67a 100644
--- a/modules/video_coding/encoded_frame.cc
+++ b/modules/video_coding/encoded_frame.cc
@@ -10,9 +10,8 @@
#include "modules/video_coding/encoded_frame.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <optional>
#include "api/video/encoded_image.h"
diff --git a/modules/video_coding/fec_controller_default.cc b/modules/video_coding/fec_controller_default.cc
index 31c5f09..6ca9724 100644
--- a/modules/video_coding/fec_controller_default.cc
+++ b/modules/video_coding/fec_controller_default.cc
@@ -10,10 +10,9 @@
#include "modules/video_coding/fec_controller_default.h" // NOLINT
-#include <stdlib.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstdlib>
#include <string>
#include <vector>
diff --git a/modules/video_coding/fec_controller_unittest.cc b/modules/video_coding/fec_controller_unittest.cc
index 4a162e2..88579af 100644
--- a/modules/video_coding/fec_controller_unittest.cc
+++ b/modules/video_coding/fec_controller_unittest.cc
@@ -10,8 +10,7 @@
#include "api/fec_controller.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <vector>
#include "api/environment/environment_factory.h"
diff --git a/modules/video_coding/frame_dependencies_calculator.cc b/modules/video_coding/frame_dependencies_calculator.cc
index 64a4476..ca046f2 100644
--- a/modules/video_coding/frame_dependencies_calculator.cc
+++ b/modules/video_coding/frame_dependencies_calculator.cc
@@ -9,9 +9,8 @@
*/
#include "modules/video_coding/frame_dependencies_calculator.h"
-#include <stdint.h>
-
#include <cstddef>
+#include <cstdint>
#include <iterator>
#include <optional>
#include <set>
diff --git a/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc
index 14b5a92..88c9317 100644
--- a/modules/video_coding/generic_decoder.cc
+++ b/modules/video_coding/generic_decoder.cc
@@ -10,9 +10,8 @@
#include "modules/video_coding/generic_decoder.h"
-#include <stddef.h>
-
#include <algorithm>
+#include <cstddef>
#include <cstdint>
#include <iterator>
#include <optional>
diff --git a/modules/video_coding/h264_sprop_parameter_sets.cc b/modules/video_coding/h264_sprop_parameter_sets.cc
index 4d398c7..9c8e382f 100644
--- a/modules/video_coding/h264_sprop_parameter_sets.cc
+++ b/modules/video_coding/h264_sprop_parameter_sets.cc
@@ -10,9 +10,8 @@
#include "modules/video_coding/h264_sprop_parameter_sets.h"
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <optional>
#include <string>
#include <vector>
diff --git a/modules/video_coding/loss_notification_controller.cc b/modules/video_coding/loss_notification_controller.cc
index 43d4b19..97f86dc 100644
--- a/modules/video_coding/loss_notification_controller.cc
+++ b/modules/video_coding/loss_notification_controller.cc
@@ -10,9 +10,8 @@
#include "modules/video_coding/loss_notification_controller.h"
-#include <stdint.h>
-
#include <cstddef>
+#include <cstdint>
#include "api/array_view.h"
#include "api/sequence_checker.h"
diff --git a/modules/video_coding/loss_notification_controller_unittest.cc b/modules/video_coding/loss_notification_controller_unittest.cc
index aba0933..a5cc634 100644
--- a/modules/video_coding/loss_notification_controller_unittest.cc
+++ b/modules/video_coding/loss_notification_controller_unittest.cc
@@ -10,9 +10,8 @@
#include "modules/video_coding/loss_notification_controller.h"
-#include <stdint.h>
-
#include <cstddef>
+#include <cstdint>
#include <limits>
#include <optional>
#include <string>
diff --git a/modules/video_coding/media_opt_util.cc b/modules/video_coding/media_opt_util.cc
index 1a7ba66..6b68a2c 100644
--- a/modules/video_coding/media_opt_util.cc
+++ b/modules/video_coding/media_opt_util.cc
@@ -10,9 +10,8 @@
#include "modules/video_coding/media_opt_util.h"
-#include <math.h>
-
#include <algorithm>
+#include <cmath>
#include <cstddef>
#include <cstdint>
#include <memory>
diff --git a/modules/video_coding/packet_buffer.cc b/modules/video_coding/packet_buffer.cc
index cfc16d5..961b41e 100644
--- a/modules/video_coding/packet_buffer.cc
+++ b/modules/video_coding/packet_buffer.cc
@@ -10,10 +10,9 @@
#include "modules/video_coding/packet_buffer.h"
-#include <string.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstring>
#include <memory>
#include <utility>
#include <variant>
diff --git a/modules/video_coding/svc/scalability_structure_test_helpers.cc b/modules/video_coding/svc/scalability_structure_test_helpers.cc
index e5cb1ef..004b7d2 100644
--- a/modules/video_coding/svc/scalability_structure_test_helpers.cc
+++ b/modules/video_coding/svc/scalability_structure_test_helpers.cc
@@ -9,10 +9,9 @@
*/
#include "modules/video_coding/svc/scalability_structure_test_helpers.h"
-#include <stdint.h>
-
#include <bitset>
#include <cstddef>
+#include <cstdint>
#include <utility>
#include <vector>
diff --git a/modules/video_coding/svc/scalability_structure_unittest.cc b/modules/video_coding/svc/scalability_structure_unittest.cc
index 9a66df3..849f08f 100644
--- a/modules/video_coding/svc/scalability_structure_unittest.cc
+++ b/modules/video_coding/svc/scalability_structure_unittest.cc
@@ -8,9 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <memory>
#include <optional>
#include <ostream>
diff --git a/modules/video_coding/timing/jitter_estimator.cc b/modules/video_coding/timing/jitter_estimator.cc
index 7b394d1..0786a3e 100644
--- a/modules/video_coding/timing/jitter_estimator.cc
+++ b/modules/video_coding/timing/jitter_estimator.cc
@@ -10,10 +10,9 @@
#include "modules/video_coding/timing/jitter_estimator.h"
-#include <math.h>
-#include <string.h>
-
#include <algorithm>
+#include <cmath>
+#include <cstring>
#include <optional>
#include "absl/strings/string_view.h"
diff --git a/modules/video_coding/timing/jitter_estimator_unittest.cc b/modules/video_coding/timing/jitter_estimator_unittest.cc
index f12e49e..f30ab2c 100644
--- a/modules/video_coding/timing/jitter_estimator_unittest.cc
+++ b/modules/video_coding/timing/jitter_estimator_unittest.cc
@@ -9,8 +9,7 @@
#include "modules/video_coding/timing/jitter_estimator.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
#include <utility>
diff --git a/modules/video_coding/timing/rtt_filter.cc b/modules/video_coding/timing/rtt_filter.cc
index 6dd42af..6bc361f 100644
--- a/modules/video_coding/timing/rtt_filter.cc
+++ b/modules/video_coding/timing/rtt_filter.cc
@@ -10,11 +10,10 @@
#include "modules/video_coding/timing/rtt_filter.h"
-#include <math.h>
-#include <stdlib.h>
-
#include <algorithm>
+#include <cmath>
#include <cstdint>
+#include <cstdlib>
#include "absl/algorithm/container.h"
#include "api/units/time_delta.h"
diff --git a/modules/video_coding/timing/timestamp_extrapolator_unittest.cc b/modules/video_coding/timing/timestamp_extrapolator_unittest.cc
index 9678486..5f932ad 100644
--- a/modules/video_coding/timing/timestamp_extrapolator_unittest.cc
+++ b/modules/video_coding/timing/timestamp_extrapolator_unittest.cc
@@ -10,8 +10,7 @@
#include "modules/video_coding/timing/timestamp_extrapolator.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <cstdlib>
#include <limits>
#include <optional>
diff --git a/modules/video_coding/utility/framerate_controller_deprecated.cc b/modules/video_coding/utility/framerate_controller_deprecated.cc
index 56fd631..4e41442 100644
--- a/modules/video_coding/utility/framerate_controller_deprecated.cc
+++ b/modules/video_coding/utility/framerate_controller_deprecated.cc
@@ -10,8 +10,7 @@
#include "modules/video_coding/utility/framerate_controller_deprecated.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <optional>
diff --git a/modules/video_coding/utility/framerate_controller_deprecated_unittest.cc b/modules/video_coding/utility/framerate_controller_deprecated_unittest.cc
index dc4d45b..544bdbb 100644
--- a/modules/video_coding/utility/framerate_controller_deprecated_unittest.cc
+++ b/modules/video_coding/utility/framerate_controller_deprecated_unittest.cc
@@ -10,8 +10,7 @@
#include "modules/video_coding/utility/framerate_controller_deprecated.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include "test/gtest.h"
diff --git a/modules/video_coding/utility/ivf_file_writer_unittest.cc b/modules/video_coding/utility/ivf_file_writer_unittest.cc
index 3038d87..2b79182 100644
--- a/modules/video_coding/utility/ivf_file_writer_unittest.cc
+++ b/modules/video_coding/utility/ivf_file_writer_unittest.cc
@@ -10,9 +10,8 @@
#include "modules/video_coding/utility/ivf_file_writer.h"
-#include <string.h>
-
#include <cstdint>
+#include <cstring>
#include <memory>
#include <string>
diff --git a/modules/video_coding/utility/qp_parser_unittest.cc b/modules/video_coding/utility/qp_parser_unittest.cc
index 2e5b3ba..2facc5b 100644
--- a/modules/video_coding/utility/qp_parser_unittest.cc
+++ b/modules/video_coding/utility/qp_parser_unittest.cc
@@ -10,8 +10,7 @@
#include "modules/video_coding/utility/qp_parser.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <optional>
diff --git a/modules/video_coding/utility/simulcast_rate_allocator.cc b/modules/video_coding/utility/simulcast_rate_allocator.cc
index 5083d1b..400ea6f 100644
--- a/modules/video_coding/utility/simulcast_rate_allocator.cc
+++ b/modules/video_coding/utility/simulcast_rate_allocator.cc
@@ -10,10 +10,9 @@
#include "modules/video_coding/utility/simulcast_rate_allocator.h"
-#include <stdio.h>
-
#include <algorithm>
#include <cstdint>
+#include <cstdio>
#include <numeric>
#include <tuple>
#include <vector>
diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc
index 4ad2060..c6f9b5a 100644
--- a/modules/video_coding/video_codec_initializer.cc
+++ b/modules/video_coding/video_codec_initializer.cc
@@ -10,10 +10,9 @@
#include "modules/video_coding/include/video_codec_initializer.h"
-#include <stdint.h>
-#include <string.h>
-
#include <algorithm>
+#include <cstdint>
+#include <cstring>
#include <optional>
#include <vector>
diff --git a/modules/video_coding/video_codec_initializer_unittest.cc b/modules/video_coding/video_codec_initializer_unittest.cc
index 6688050..6c827b7 100644
--- a/modules/video_coding/video_codec_initializer_unittest.cc
+++ b/modules/video_coding/video_codec_initializer_unittest.cc
@@ -10,9 +10,8 @@
#include "modules/video_coding/include/video_codec_initializer.h"
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <memory>
#include <optional>
#include <vector>
diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc
index dce294e..53b922a 100644
--- a/modules/video_coding/video_receiver.cc
+++ b/modules/video_coding/video_receiver.cc
@@ -8,8 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <vector>
diff --git a/modules/video_coding/video_receiver2.cc b/modules/video_coding/video_receiver2.cc
index 75b5b1d..0549b7a 100644
--- a/modules/video_coding/video_receiver2.cc
+++ b/modules/video_coding/video_receiver2.cc
@@ -10,8 +10,7 @@
#include "modules/video_coding/video_receiver2.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <memory>
#include <utility>
