Clean up includes in goog_cc/

Bug: None Change-Id: I5388bc018d7ddd285d154436b5fc52a15469a97d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/319220 Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Per Kjellander <perkj@webrtc.org> Commit-Queue: Björn Terelius <terelius@webrtc.org> Cr-Commit-Position: refs/heads/main@{#40710}
2025-05-12 21:30:45 +01:00 · 2023-09-06 13:22:20 +02:00 · 2023-09-06 13:22:20 +02:00 · c4a205c7fa
commit c4a205c7fa
parent 446dbc66fd
40 changed files with 181 additions and 41 deletions
--- a/modules/congestion_controller/DEPS
+++ b/modules/congestion_controller/DEPS
@ -3,3 +3,9 @@ include_rules = [
  "+system_wrappers",
  "+video",
 ]
+specific_include_rules = {
+  "goog_cc_network_control_unittest.cc": [
+    "+call/video_receive_stream.h",
+  ],
+}
+
--- a/modules/congestion_controller/goog_cc/BUILD.gn
+++ b/modules/congestion_controller/goog_cc/BUILD.gn
@ -231,10 +231,13 @@ rtc_library("delay_based_bwe") {

  deps = [
    ":estimators",
+    ":link_capacity_estimator",
    "../../../api:field_trials_view",
    "../../../api:network_state_predictor_api",
    "../../../api/rtc_event_log",
    "../../../api/transport:network_control",
+    "../../../api/units:data_rate",
+    "../../../api/units:data_size",
    "../../../api/units:time_delta",
    "../../../api/units:timestamp",
    "../../../logging:rtc_event_bwe",
@ -347,6 +350,7 @@ if (rtc_include_tests) {
        "../../../api/units:data_size",
        "../../../api/units:time_delta",
        "../../../api/units:timestamp",
+        "../../../call:video_stream_api",
        "../../../logging:mocks",
        "../../../logging:rtc_event_bwe",
        "../../../rtc_base:checks",
@ -360,10 +364,14 @@ if (rtc_include_tests) {
        "../../../test:field_trial",
        "../../../test:test_support",
        "../../../test/scenario",
+        "../../../test/scenario:column_printer",
        "../../pacing",
        "//testing/gmock",
      ]
-      absl_deps = [ "//third_party/abseil-cpp/absl/strings:strings" ]
+      absl_deps = [
+        "//third_party/abseil-cpp/absl/strings:strings",
+        "//third_party/abseil-cpp/absl/types:optional",
+      ]
    }
  }
 }
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc
+++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc
@ -10,14 +10,19 @@

 #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h"

-#include <stddef.h>
-
 #include <algorithm>
 #include <memory>
 #include <utility>
+#include <vector>

+#include "absl/types/optional.h"
+#include "api/field_trials_view.h"
+#include "api/transport/network_types.h"
+#include "api/units/data_rate.h"
+#include "api/units/data_size.h"
+#include "api/units/timestamp.h"
+#include "modules/congestion_controller/goog_cc/bitrate_estimator.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_conversions.h"

 namespace webrtc {

--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h
+++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h
@ -18,6 +18,7 @@
 #include "api/field_trials_view.h"
 #include "api/transport/network_types.h"
 #include "api/units/data_rate.h"
+#include "api/units/timestamp.h"
 #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h"
 #include "modules/congestion_controller/goog_cc/bitrate_estimator.h"

--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.cc
+++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.cc
@ -11,10 +11,13 @@
 #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h"

 #include <algorithm>
+#include <memory>

+#include "api/field_trials_view.h"
 #include "api/units/time_delta.h"
 #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h"
 #include "modules/congestion_controller/goog_cc/robust_throughput_estimator.h"
+#include "rtc_base/experiments/struct_parameters_parser.h"
 #include "rtc_base/logging.h"

 namespace webrtc {
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h
+++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h
@ -11,7 +11,6 @@
 #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_INTERFACE_H_
 #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_INTERFACE_H_

-#include <stddef.h>

 #include <memory>
 #include <vector>
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
+++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
@ -10,11 +10,19 @@

 #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h"

+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <utility>
+#include <vector>

+#include "absl/types/optional.h"
 #include "api/transport/field_trial_based_config.h"
-#include "rtc_base/fake_clock.h"
+#include "api/transport/network_types.h"
+#include "api/units/data_rate.h"
+#include "api/units/data_size.h"
+#include "api/units/timestamp.h"
+#include "modules/congestion_controller/goog_cc/bitrate_estimator.h"
 #include "test/gmock.h"
 #include "test/gtest.h"

--- a/modules/congestion_controller/goog_cc/alr_detector_unittest.cc
+++ b/modules/congestion_controller/goog_cc/alr_detector_unittest.cc
@ -10,6 +10,9 @@

 #include "modules/congestion_controller/goog_cc/alr_detector.h"

+#include <cstdint>
+
+#include "absl/types/optional.h"
 #include "api/transport/field_trial_based_config.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/experiments/alr_experiment.h"
--- a/modules/congestion_controller/goog_cc/bitrate_estimator.cc
+++ b/modules/congestion_controller/goog_cc/bitrate_estimator.cc
@ -10,15 +10,19 @@

 #include "modules/congestion_controller/goog_cc/bitrate_estimator.h"

-#include <stdio.h>
-
 #include <algorithm>
 #include <cmath>
-#include <string>
+#include <cstdint>

+#include "absl/types/optional.h"
+#include "api/field_trials_view.h"
 #include "api/units/data_rate.h"
+#include "api/units/data_size.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
 #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
-#include "rtc_base/logging.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/experiments/field_trial_parser.h"

 namespace webrtc {

--- a/modules/congestion_controller/goog_cc/bitrate_estimator.h
+++ b/modules/congestion_controller/goog_cc/bitrate_estimator.h
@ -16,6 +16,7 @@
 #include "absl/types/optional.h"
 #include "api/field_trials_view.h"
 #include "api/units/data_rate.h"
+#include "api/units/data_size.h"
 #include "api/units/timestamp.h"
 #include "rtc_base/experiments/field_trial_parser.h"

--- a/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.cc
+++ b/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.cc
@ -10,14 +10,12 @@

 #include "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h"

-#include <inttypes.h>
-#include <stdio.h>
-
 #include <algorithm>
-#include <string>
+#include <cstdint>

 #include "absl/strings/match.h"
-#include "rtc_base/checks.h"
+#include "api/field_trials_view.h"
+#include "api/units/data_size.h"
 #include "rtc_base/experiments/rate_control_settings.h"

 namespace webrtc {
--- a/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h
+++ b/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h
@ -11,7 +11,6 @@
 #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_CONGESTION_WINDOW_PUSHBACK_CONTROLLER_H_
 #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_CONGESTION_WINDOW_PUSHBACK_CONTROLLER_H_

-#include <stddef.h>
 #include <stdint.h>

 #include "absl/types/optional.h"
--- a/modules/congestion_controller/goog_cc/congestion_window_pushback_controller_unittest.cc
+++ b/modules/congestion_controller/goog_cc/congestion_window_pushback_controller_unittest.cc
@ -10,9 +10,11 @@

 #include "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h"

+#include <cstdint>
 #include <memory>

 #include "api/transport/field_trial_based_config.h"
+#include "api/units/data_size.h"
 #include "test/field_trial.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
--- a/modules/congestion_controller/goog_cc/delay_based_bwe.cc
+++ b/modules/congestion_controller/goog_cc/delay_based_bwe.cc
@ -12,21 +12,29 @@

 #include <algorithm>
 #include <cstdint>
-#include <cstdio>
 #include <memory>
-#include <string>
 #include <utility>
+#include <vector>

-#include "absl/strings/match.h"
-#include "api/rtc_event_log/rtc_event.h"
+#include "absl/types/optional.h"
+#include "api/field_trials_view.h"
+#include "api/network_state_predictor.h"
 #include "api/rtc_event_log/rtc_event_log.h"
+#include "api/transport/network_types.h"
+#include "api/units/data_rate.h"
+#include "api/units/data_size.h"
 #include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
 #include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h"
+#include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h"
+#include "modules/congestion_controller/goog_cc/inter_arrival_delta.h"
 #include "modules/congestion_controller/goog_cc/trendline_estimator.h"
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 #include "rtc_base/checks.h"
+#include "rtc_base/experiments/struct_parameters_parser.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/race_checker.h"
 #include "system_wrappers/include/metrics.h"

 namespace webrtc {
--- a/modules/congestion_controller/goog_cc/delay_based_bwe.h
+++ b/modules/congestion_controller/goog_cc/delay_based_bwe.h
@ -11,7 +11,6 @@
 #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_
 #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_

-#include <stddef.h>
 #include <stdint.h>

 #include <memory>
@ -21,8 +20,12 @@
 #include "api/field_trials_view.h"
 #include "api/network_state_predictor.h"
 #include "api/transport/network_types.h"
+#include "api/units/data_rate.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
 #include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h"
 #include "modules/congestion_controller/goog_cc/inter_arrival_delta.h"
+#include "modules/congestion_controller/goog_cc/link_capacity_estimator.h"
 #include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h"
 #include "modules/remote_bitrate_estimator/aimd_rate_control.h"
 #include "modules/remote_bitrate_estimator/inter_arrival.h"
--- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc
+++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc
@ -10,10 +10,12 @@

 #include "modules/congestion_controller/goog_cc/delay_based_bwe.h"

-#include <string>
+#include <cstdint>

+#include "api/network_state_predictor.h"
 #include "api/transport/network_types.h"
-#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h"
+#include "api/units/data_rate.h"
+#include "api/units/time_delta.h"
 #include "modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gtest.h"
--- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc
+++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc
@ -10,12 +10,22 @@
 #include "modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h"

 #include <algorithm>
+#include <cstddef>
 #include <cstdint>
 #include <memory>
+#include <vector>

-#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+#include "api/transport/network_types.h"
+#include "api/units/data_rate.h"
+#include "api/units/data_size.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
+#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h"
 #include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
+#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h"
 #include "rtc_base/checks.h"
+#include "test/field_trial.h"

 namespace webrtc {
 constexpr size_t kMtu = 1200;
--- a/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h
+++ b/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h
@ -12,6 +12,8 @@

 #include <stdint.h>

+#include <cstddef>
+
 #include "api/network_state_predictor.h"

 namespace webrtc {
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
+++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
@ -10,30 +10,40 @@

 #include "modules/congestion_controller/goog_cc/goog_cc_network_control.h"

-#include <inttypes.h>
 #include <stdio.h>

 #include <algorithm>
 #include <cstdint>
 #include <memory>
 #include <numeric>
-#include <string>
 #include <utility>
 #include <vector>

 #include "absl/strings/match.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+#include "api/field_trials_view.h"
 #include "api/network_state_predictor.h"
+#include "api/transport/network_control.h"
+#include "api/transport/network_types.h"
 #include "api/units/data_rate.h"
+#include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
 #include "logging/rtc_event_log/events/rtc_event_remote_estimate.h"
+#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h"
 #include "modules/congestion_controller/goog_cc/alr_detector.h"
+#include "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h"
+#include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
 #include "modules/congestion_controller/goog_cc/loss_based_bwe_v2.h"
+#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h"
 #include "modules/congestion_controller/goog_cc/probe_controller.h"
 #include "modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h"
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 #include "rtc_base/checks.h"
+#include "rtc_base/experiments/field_trial_parser.h"
+#include "rtc_base/experiments/rate_control_settings.h"
 #include "rtc_base/logging.h"

 namespace webrtc {
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control.h
+++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.h
@ -26,11 +26,13 @@
 #include "api/transport/network_types.h"
 #include "api/units/data_rate.h"
 #include "api/units/data_size.h"
+#include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
 #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h"
 #include "modules/congestion_controller/goog_cc/alr_detector.h"
 #include "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h"
 #include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
+#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h"
 #include "modules/congestion_controller/goog_cc/probe_controller.h"
 #include "modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h"
 #include "rtc_base/experiments/field_trial_parser.h"
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc
+++ b/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc
@ -8,20 +8,34 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <queue>
+#include <string>
+#include <utility>
+#include <vector>

 #include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
 #include "api/test/network_emulation/create_cross_traffic.h"
 #include "api/test/network_emulation/cross_traffic.h"
 #include "api/transport/goog_cc_factory.h"
+#include "api/transport/network_control.h"
 #include "api/transport/network_types.h"
 #include "api/units/data_rate.h"
+#include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
+#include "call/video_receive_stream.h"
 #include "logging/rtc_event_log/mock/mock_rtc_event_log.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
+#include "test/scenario/call_client.h"
+#include "test/scenario/column_printer.h"
 #include "test/scenario/scenario.h"
+#include "test/scenario/scenario_config.h"

 using ::testing::IsEmpty;
 using ::testing::NiceMock;
--- a/modules/congestion_controller/goog_cc/inter_arrival_delta.cc
+++ b/modules/congestion_controller/goog_cc/inter_arrival_delta.cc
@ -11,9 +11,11 @@
 #include "modules/congestion_controller/goog_cc/inter_arrival_delta.h"

 #include <algorithm>
+#include <cstddef>

 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
+#include "rtc_base/checks.h"
 #include "rtc_base/logging.h"

 namespace webrtc {
--- a/modules/congestion_controller/goog_cc/inter_arrival_delta.h
+++ b/modules/congestion_controller/goog_cc/inter_arrival_delta.h
@ -11,6 +11,8 @@
 #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_INTER_ARRIVAL_DELTA_H_
 #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_INTER_ARRIVAL_DELTA_H_

+#include <cstddef>
+
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"

--- a/modules/congestion_controller/goog_cc/link_capacity_estimator.cc
+++ b/modules/congestion_controller/goog_cc/link_capacity_estimator.cc
@ -10,7 +10,9 @@
 #include "modules/congestion_controller/goog_cc/link_capacity_estimator.h"

 #include <algorithm>
+#include <cmath>

+#include "api/units/data_rate.h"
 #include "rtc_base/numerics/safe_minmax.h"

 namespace webrtc {
--- a/modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.cc
+++ b/modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.cc
@ -11,12 +11,17 @@
 #include "modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.h"

 #include <algorithm>
-#include <string>
 #include <vector>

 #include "absl/strings/match.h"
+#include "absl/strings/string_view.h"
+#include "api/field_trials_view.h"
+#include "api/transport/network_types.h"
 #include "api/units/data_rate.h"
 #include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/experiments/field_trial_parser.h"

 namespace webrtc {
 namespace {
--- a/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc
+++ b/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc
@ -12,11 +12,9 @@

 #include <algorithm>
 #include <cmath>
-#include <complex>
 #include <cstddef>
 #include <cstdlib>
 #include <limits>
-#include <utility>
 #include <vector>

 #include "absl/algorithm/container.h"
--- a/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h
+++ b/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h
@ -11,7 +11,6 @@
 #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_LOSS_BASED_BWE_V2_H_
 #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_LOSS_BASED_BWE_V2_H_

-#include <cstddef>
 #include <deque>
 #include <vector>

--- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
+++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
@ -13,12 +13,17 @@
 #include <algorithm>
 #include <memory>

+#include "absl/types/optional.h"
 #include "api/rtc_event_log/rtc_event_log.h"
+#include "api/transport/network_types.h"
+#include "api/units/data_rate.h"
+#include "api/units/data_size.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
 #include "logging/rtc_event_log/events/rtc_event_probe_result_failure.h"
 #include "logging/rtc_event_log/events/rtc_event_probe_result_success.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/numerics/safe_conversions.h"

 namespace webrtc {
 namespace {
--- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h
+++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h
@ -11,12 +11,13 @@
 #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_
 #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_

-#include <limits>
 #include <map>

 #include "absl/types/optional.h"
 #include "api/transport/network_types.h"
 #include "api/units/data_rate.h"
+#include "api/units/data_size.h"
+#include "api/units/timestamp.h"

 namespace webrtc {
 class RtcEventLog;
--- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc
+++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc
@ -12,7 +12,14 @@

 #include <stddef.h>

+#include <cstdint>
+
+#include "absl/types/optional.h"
 #include "api/transport/network_types.h"
+#include "api/units/data_rate.h"
+#include "api/units/data_size.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
 #include "test/gtest.h"

 namespace webrtc {
--- a/modules/congestion_controller/goog_cc/probe_controller.cc
+++ b/modules/congestion_controller/goog_cc/probe_controller.cc
@ -11,18 +11,23 @@
 #include "modules/congestion_controller/goog_cc/probe_controller.h"

 #include <algorithm>
+#include <cstdint>
 #include <initializer_list>
 #include <memory>
-#include <string>
+#include <vector>

 #include "absl/strings/match.h"
 #include "absl/types/optional.h"
+#include "api/field_trials_view.h"
+#include "api/rtc_event_log/rtc_event_log.h"
+#include "api/transport/network_types.h"
 #include "api/units/data_rate.h"
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
 #include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h"
 #include "rtc_base/checks.h"
+#include "rtc_base/experiments/field_trial_parser.h"
 #include "rtc_base/logging.h"
 #include "system_wrappers/include/metrics.h"

--- a/modules/congestion_controller/goog_cc/probe_controller.h
+++ b/modules/congestion_controller/goog_cc/probe_controller.h
@ -13,16 +13,15 @@

 #include <stdint.h>

-#include <initializer_list>
 #include <vector>

 #include "absl/base/attributes.h"
 #include "absl/types/optional.h"
 #include "api/field_trials_view.h"
 #include "api/rtc_event_log/rtc_event_log.h"
-#include "api/transport/network_control.h"
 #include "api/transport/network_types.h"
 #include "api/units/data_rate.h"
+#include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
 #include "rtc_base/experiments/field_trial_parser.h"

--- a/modules/congestion_controller/goog_cc/probe_controller_unittest.cc
+++ b/modules/congestion_controller/goog_cc/probe_controller_unittest.cc
@ -10,12 +10,14 @@
 #include "modules/congestion_controller/goog_cc/probe_controller.h"

 #include <memory>
+#include <vector>

+#include "absl/strings/string_view.h"
+#include "api/transport/network_types.h"
 #include "api/units/data_rate.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
 #include "logging/rtc_event_log/mock/mock_rtc_event_log.h"
-#include "rtc_base/logging.h"
 #include "system_wrappers/include/clock.h"
 #include "test/explicit_key_value_config.h"
 #include "test/gmock.h"
--- a/modules/congestion_controller/goog_cc/robust_throughput_estimator.cc
+++ b/modules/congestion_controller/goog_cc/robust_throughput_estimator.cc
@ -14,11 +14,15 @@

 #include <algorithm>
 #include <utility>
+#include <vector>

+#include "absl/types/optional.h"
+#include "api/transport/network_types.h"
 #include "api/units/data_rate.h"
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
+#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"

--- a/modules/congestion_controller/goog_cc/robust_throughput_estimator_unittest.cc
+++ b/modules/congestion_controller/goog_cc/robust_throughput_estimator_unittest.cc
@ -14,12 +14,15 @@
 #include <stdint.h>

 #include <algorithm>
-#include <memory>
+#include <vector>

 #include "absl/strings/string_view.h"
+#include "api/transport/network_types.h"
+#include "api/units/data_rate.h"
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
+#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h"
 #include "test/explicit_key_value_config.h"
 #include "test/gtest.h"

--- a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc
+++ b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc
@ -11,22 +11,27 @@
 #include "modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h"

 #include <algorithm>
+#include <cstdint>
 #include <cstdio>
 #include <limits>
 #include <memory>
 #include <string>
+#include <utility>

 #include "absl/strings/match.h"
+#include "absl/types/optional.h"
 #include "api/field_trials_view.h"
 #include "api/network_state_predictor.h"
-#include "api/rtc_event_log/rtc_event.h"
 #include "api/rtc_event_log/rtc_event_log.h"
+#include "api/transport/network_types.h"
 #include "api/units/data_rate.h"
 #include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
 #include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h"
 #include "modules/congestion_controller/goog_cc/loss_based_bwe_v2.h"
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "rtc_base/checks.h"
+#include "rtc_base/experiments/field_trial_parser.h"
 #include "rtc_base/logging.h"
 #include "system_wrappers/include/field_trial.h"
 #include "system_wrappers/include/metrics.h"
--- a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation_unittest.cc
+++ b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation_unittest.cc
@ -10,7 +10,12 @@

 #include "modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h"

+#include <cstdint>
+
 #include "api/rtc_event_log/rtc_event.h"
+#include "api/units/data_rate.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
 #include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h"
 #include "logging/rtc_event_log/mock/mock_rtc_event_log.h"
 #include "test/explicit_key_value_config.h"
--- a/modules/congestion_controller/goog_cc/trendline_estimator.cc
+++ b/modules/congestion_controller/goog_cc/trendline_estimator.cc
@ -13,10 +13,17 @@
 #include <math.h>

 #include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <deque>
+#include <memory>
 #include <string>
+#include <utility>

 #include "absl/strings/match.h"
 #include "absl/types/optional.h"
+#include "api/field_trials_view.h"
 #include "api/network_state_predictor.h"
 #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 #include "rtc_base/checks.h"
--- a/modules/congestion_controller/goog_cc/trendline_estimator.h
+++ b/modules/congestion_controller/goog_cc/trendline_estimator.h
@ -15,7 +15,6 @@

 #include <deque>
 #include <memory>
-#include <utility>

 #include "api/field_trials_view.h"
 #include "api/network_state_predictor.h"
--- a/modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc
+++ b/modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc
@ -11,11 +11,13 @@
 #include "modules/congestion_controller/goog_cc/trendline_estimator.h"

 #include <algorithm>
-#include <numeric>
+#include <cstddef>
+#include <cstdint>
 #include <vector>

+#include "api/network_state_predictor.h"
 #include "api/transport/field_trial_based_config.h"
-#include "rtc_base/random.h"
+#include "rtc_base/checks.h"
 #include "test/gtest.h"

 namespace webrtc {