Format almost everything.

This CL was generated by running

git ls-files | grep -P "(\.h|\.cc)$" | grep -v 'sdk/' | grep -v 'rtc_base/ssl_' | \
grep -v 'fake_rtc_certificate_generator.h' | grep -v 'modules/audio_device/win/' | \
grep -v 'system_wrappers/source/clock.cc' | grep -v 'rtc_base/trace_event.h' | \
grep -v 'modules/audio_coding/codecs/ilbc/' | grep -v 'screen_capturer_mac.h' | \
grep -v 'spl_inl_mips.h' | grep -v 'data_size_unittest.cc' | grep -v 'timestamp_unittest.cc' \
| xargs clang-format -i ; git cl format

Most of these changes are clang-format grouping and reordering includes
differently.

Bug: webrtc:9340
Change-Id: Ic83ddbc169bfacd21883e381b5181c3dd4fe8a63
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144051
Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28505}
diff --git a/api/array_view_unittest.cc b/api/array_view_unittest.cc
index 18d0e6c..6fdd516 100644
--- a/api/array_view_unittest.cc
+++ b/api/array_view_unittest.cc
@@ -8,13 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/array_view.h"
+
 #include <algorithm>
 #include <array>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "api/array_view.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/gunit.h"
diff --git a/api/audio/echo_canceller3_config_json.cc b/api/audio/echo_canceller3_config_json.cc
index 8c698fa..b7b385d 100644
--- a/api/audio/echo_canceller3_config_json.cc
+++ b/api/audio/echo_canceller3_config_json.cc
@@ -10,6 +10,7 @@
 #include "api/audio/echo_canceller3_config_json.h"
 
 #include <stddef.h>
+
 #include <string>
 #include <vector>
 
diff --git a/api/audio/test/audio_frame_unittest.cc b/api/audio/test/audio_frame_unittest.cc
index 3e62a57..dbf45ce 100644
--- a/api/audio/test/audio_frame_unittest.cc
+++ b/api/audio/test/audio_frame_unittest.cc
@@ -8,10 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/audio/audio_frame.h"
+
 #include <stdint.h>
 #include <string.h>  // memcmp
 
-#include "api/audio/audio_frame.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/api/audio/test/echo_canceller3_config_json_unittest.cc b/api/audio/test/echo_canceller3_config_json_unittest.cc
index 7c3a445..5e98426 100644
--- a/api/audio/test/echo_canceller3_config_json_unittest.cc
+++ b/api/audio/test/echo_canceller3_config_json_unittest.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/audio/echo_canceller3_config_json.h"
+
 #include "api/audio/echo_canceller3_config.h"
 #include "test/gtest.h"
 
diff --git a/api/audio/test/echo_canceller3_config_unittest.cc b/api/audio/test/echo_canceller3_config_unittest.cc
index b717192..91312a0 100644
--- a/api/audio/test/echo_canceller3_config_unittest.cc
+++ b/api/audio/test/echo_canceller3_config_unittest.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/audio/echo_canceller3_config.h"
+
 #include "api/audio/echo_canceller3_config_json.h"
 #include "test/gtest.h"
 
diff --git a/api/audio_codecs/audio_decoder.cc b/api/audio_codecs/audio_decoder.cc
index 5a9ba56..7bf3036 100644
--- a/api/audio_codecs/audio_decoder.cc
+++ b/api/audio_codecs/audio_decoder.cc
@@ -11,6 +11,7 @@
 #include "api/audio_codecs/audio_decoder.h"
 
 #include <assert.h>
+
 #include <memory>
 #include <utility>
 
diff --git a/api/audio_codecs/audio_decoder.h b/api/audio_codecs/audio_decoder.h
index e4e5e1e..a3b6a31 100644
--- a/api/audio_codecs/audio_decoder.h
+++ b/api/audio_codecs/audio_decoder.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
diff --git a/api/audio_codecs/audio_format.h b/api/audio_codecs/audio_format.h
index 053c067..9f61729 100644
--- a/api/audio_codecs/audio_format.h
+++ b/api/audio_codecs/audio_format.h
@@ -12,6 +12,7 @@
 #define API_AUDIO_CODECS_AUDIO_FORMAT_H_
 
 #include <stddef.h>
+
 #include <map>
 #include <string>
 
diff --git a/api/audio_codecs/g711/audio_encoder_g711.cc b/api/audio_codecs/g711/audio_encoder_g711.cc
index 0cc8dc4..f40cd6e 100644
--- a/api/audio_codecs/g711/audio_encoder_g711.cc
+++ b/api/audio_codecs/g711/audio_encoder_g711.cc
@@ -79,7 +79,9 @@
       impl_config.payload_type = payload_type;
       return absl::make_unique<AudioEncoderPcmA>(impl_config);
     }
-    default: { return nullptr; }
+    default: {
+      return nullptr;
+    }
   }
 }
 
diff --git a/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc b/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
index 99a9e29..fc7cc7f 100644
--- a/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
+++ b/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/audio_codecs/audio_decoder_factory_template.h"
+
 #include "absl/memory/memory.h"
 #include "api/audio_codecs/L16/audio_decoder_L16.h"
 #include "api/audio_codecs/g711/audio_decoder_g711.h"
diff --git a/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc b/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
index 4188c8c..b1a5a51 100644
--- a/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
+++ b/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/audio_codecs/audio_encoder_factory_template.h"
+
 #include "absl/memory/memory.h"
 #include "api/audio_codecs/L16/audio_encoder_L16.h"
 #include "api/audio_codecs/g711/audio_encoder_g711.h"
diff --git a/api/audio_options.h b/api/audio_options.h
index 478bff6..acc19f0 100644
--- a/api/audio_options.h
+++ b/api/audio_options.h
@@ -12,6 +12,7 @@
 #define API_AUDIO_OPTIONS_H_
 
 #include <stdint.h>
+
 #include <string>
 
 #include "absl/types/optional.h"
diff --git a/api/call/transport.h b/api/call/transport.h
index 32e5ddf..2a2a87a 100644
--- a/api/call/transport.h
+++ b/api/call/transport.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <vector>
 
 namespace webrtc {
diff --git a/api/crypto/crypto_options.cc b/api/crypto/crypto_options.cc
index 9a3de2c..7892b2e 100644
--- a/api/crypto/crypto_options.cc
+++ b/api/crypto/crypto_options.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/crypto/crypto_options.h"
+
 #include "rtc_base/ssl_stream_adapter.h"
 
 namespace webrtc {
diff --git a/api/data_channel_interface.h b/api/data_channel_interface.h
index f7032ec..fc47dbb 100644
--- a/api/data_channel_interface.h
+++ b/api/data_channel_interface.h
@@ -16,6 +16,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <string>
 
 #include "absl/types/optional.h"
diff --git a/api/function_view_unittest.cc b/api/function_view_unittest.cc
index 3abf0e3..156ea5c 100644
--- a/api/function_view_unittest.cc
+++ b/api/function_view_unittest.cc
@@ -8,10 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/function_view.h"
+
 #include <memory>
 #include <utility>
 
-#include "api/function_view.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/api/jsep_ice_candidate.h b/api/jsep_ice_candidate.h
index 890c486..651aa7c 100644
--- a/api/jsep_ice_candidate.h
+++ b/api/jsep_ice_candidate.h
@@ -15,6 +15,7 @@
 #define API_JSEP_ICE_CANDIDATE_H_
 
 #include <stddef.h>
+
 #include <string>
 #include <vector>
 
diff --git a/api/media_transport_interface.cc b/api/media_transport_interface.cc
index f46c8ec..69f993e 100644
--- a/api/media_transport_interface.cc
+++ b/api/media_transport_interface.cc
@@ -15,11 +15,12 @@
 // enable different media transport implementations, including QUIC-based
 // media transport.
 
+#include "api/media_transport_interface.h"
+
 #include <cstdint>
 #include <utility>
 
 #include "api/datagram_transport_interface.h"
-#include "api/media_transport_interface.h"
 
 namespace webrtc {
 
@@ -30,7 +31,6 @@
     const MediaTransportSettings&) = default;
 MediaTransportSettings::~MediaTransportSettings() = default;
 
-
 SendDataParams::SendDataParams() = default;
 SendDataParams::SendDataParams(const SendDataParams&) = default;
 
diff --git a/api/peer_connection_interface.cc b/api/peer_connection_interface.cc
index 588a021..6512457 100644
--- a/api/peer_connection_interface.cc
+++ b/api/peer_connection_interface.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/peer_connection_interface.h"
+
 #include "api/dtls_transport_interface.h"
 #include "api/sctp_transport_interface.h"
 
diff --git a/api/rtc_error_unittest.cc b/api/rtc_error_unittest.cc
index e9beb00..ba307d8 100644
--- a/api/rtc_error_unittest.cc
+++ b/api/rtc_error_unittest.cc
@@ -8,9 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/rtc_error.h"
+
 #include <utility>
 
-#include "api/rtc_error.h"
 #include "test/gtest.h"
 
 namespace {
diff --git a/api/rtc_event_log_output_file.cc b/api/rtc_event_log_output_file.cc
index 404eb31..2e31c2d 100644
--- a/api/rtc_event_log_output_file.cc
+++ b/api/rtc_event_log_output_file.cc
@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/rtc_event_log_output_file.h"
+
 #include <limits>
 #include <utility>
 
 #include "api/rtc_event_log/rtc_event_log.h"
-#include "api/rtc_event_log_output_file.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 
diff --git a/api/rtc_event_log_output_file.h b/api/rtc_event_log_output_file.h
index e1d18e08..d2901be 100644
--- a/api/rtc_event_log_output_file.h
+++ b/api/rtc_event_log_output_file.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdio.h>
+
 #include <string>
 
 #include "api/rtc_event_log_output.h"
diff --git a/api/rtp_headers.h b/api/rtp_headers.h
index 9a2d840..e5155f0 100644
--- a/api/rtp_headers.h
+++ b/api/rtp_headers.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <string>
 
 #include "absl/types/optional.h"
diff --git a/api/rtp_packet_info_unittest.cc b/api/rtp_packet_info_unittest.cc
index ee8766a..66cc2ed 100644
--- a/api/rtp_packet_info_unittest.cc
+++ b/api/rtp_packet_info_unittest.cc
@@ -9,7 +9,6 @@
  */
 
 #include "api/rtp_packet_infos.h"
-
 #include "test/gmock.h"
 #include "test/gtest.h"
 
diff --git a/api/rtp_parameters.h b/api/rtp_parameters.h
index 29b8d7a..fe2ec80 100644
--- a/api/rtp_parameters.h
+++ b/api/rtp_parameters.h
@@ -12,6 +12,7 @@
 #define API_RTP_PARAMETERS_H_
 
 #include <stdint.h>
+
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/api/rtp_parameters_unittest.cc b/api/rtp_parameters_unittest.cc
index b6f2482..5928cbd 100644
--- a/api/rtp_parameters_unittest.cc
+++ b/api/rtp_parameters_unittest.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/rtp_parameters.h"
+
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/api/sctp_transport_interface.cc b/api/sctp_transport_interface.cc
index c6c1fbe..8a0a866 100644
--- a/api/sctp_transport_interface.cc
+++ b/api/sctp_transport_interface.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include <utility>
-
 #include "api/sctp_transport_interface.h"
 
+#include <utility>
+
 namespace webrtc {
 
 SctpTransportInformation::SctpTransportInformation(SctpTransportState state)
diff --git a/api/stats/rtc_stats.h b/api/stats/rtc_stats.h
index 4361163..0cfbc06 100644
--- a/api/stats/rtc_stats.h
+++ b/api/stats/rtc_stats.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/api/stats/rtc_stats_report.h b/api/stats/rtc_stats_report.h
index 85da197..6b013bf 100644
--- a/api/stats/rtc_stats_report.h
+++ b/api/stats/rtc_stats_report.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <map>
 #include <memory>
 #include <string>
diff --git a/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h
index ebd79f4..8955c4e 100644
--- a/api/stats/rtcstats_objects.h
+++ b/api/stats/rtcstats_objects.h
@@ -12,6 +12,7 @@
 #define API_STATS_RTCSTATS_OBJECTS_H_
 
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <vector>
@@ -376,7 +377,7 @@
   RTCStatsMember<std::string> associate_stats_id;
   // TODO(hbos): Remote case not supported by |RTCStatsCollector|.
   // crbug.com/657855, 657856
-  RTCStatsMember<bool> is_remote;  // = false
+  RTCStatsMember<bool> is_remote;          // = false
   RTCStatsMember<std::string> media_type;  // renamed to kind.
   RTCStatsMember<std::string> kind;
   RTCStatsMember<std::string> track_id;
diff --git a/api/test/create_video_quality_test_fixture.cc b/api/test/create_video_quality_test_fixture.cc
index f317ed7..ee63435 100644
--- a/api/test/create_video_quality_test_fixture.cc
+++ b/api/test/create_video_quality_test_fixture.cc
@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/test/create_video_quality_test_fixture.h"
+
 #include <memory>
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "api/test/create_video_quality_test_fixture.h"
 #include "video/video_quality_test.h"
 
 namespace webrtc {
@@ -23,8 +24,7 @@
   return absl::make_unique<VideoQualityTest>(nullptr);
 }
 
-std::unique_ptr<VideoQualityTestFixtureInterface>
-CreateVideoQualityTestFixture(
+std::unique_ptr<VideoQualityTestFixtureInterface> CreateVideoQualityTestFixture(
     std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory) {
   auto components = absl::make_unique<
       VideoQualityTestFixtureInterface::InjectionComponents>();
@@ -39,5 +39,3 @@
 }
 
 }  // namespace webrtc
-
-
diff --git a/api/test/create_video_quality_test_fixture.h b/api/test/create_video_quality_test_fixture.h
index 1358199..ed618fe 100644
--- a/api/test/create_video_quality_test_fixture.h
+++ b/api/test/create_video_quality_test_fixture.h
@@ -20,8 +20,7 @@
 std::unique_ptr<VideoQualityTestFixtureInterface>
 CreateVideoQualityTestFixture();
 
-std::unique_ptr<VideoQualityTestFixtureInterface>
-CreateVideoQualityTestFixture(
+std::unique_ptr<VideoQualityTestFixtureInterface> CreateVideoQualityTestFixture(
     std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory);
 
 std::unique_ptr<VideoQualityTestFixtureInterface> CreateVideoQualityTestFixture(
diff --git a/api/test/fake_frame_decryptor.cc b/api/test/fake_frame_decryptor.cc
index 4af42a6..16cb1bd 100644
--- a/api/test/fake_frame_decryptor.cc
+++ b/api/test/fake_frame_decryptor.cc
@@ -9,7 +9,9 @@
  */
 
 #include "api/test/fake_frame_decryptor.h"
+
 #include <vector>
+
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/api/test/fake_frame_decryptor.h b/api/test/fake_frame_decryptor.h
index 05813db..bfd0e69 100644
--- a/api/test/fake_frame_decryptor.h
+++ b/api/test/fake_frame_decryptor.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <vector>
 
 #include "api/array_view.h"
diff --git a/api/test/fake_frame_encryptor.cc b/api/test/fake_frame_encryptor.cc
index edf3cc2..89d14aa 100644
--- a/api/test/fake_frame_encryptor.cc
+++ b/api/test/fake_frame_encryptor.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/test/fake_frame_encryptor.h"
+
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/api/test/loopback_media_transport_unittest.cc b/api/test/loopback_media_transport_unittest.cc
index afd544f..d1351c5 100644
--- a/api/test/loopback_media_transport_unittest.cc
+++ b/api/test/loopback_media_transport_unittest.cc
@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/test/loopback_media_transport.h"
+
 #include <algorithm>
 #include <memory>
 #include <vector>
 
-#include "api/test/loopback_media_transport.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_audio_mixer.h b/api/test/mock_audio_mixer.h
index 7a6c742..bb303e2 100644
--- a/api/test/mock_audio_mixer.h
+++ b/api/test/mock_audio_mixer.h
@@ -12,7 +12,6 @@
 #define API_TEST_MOCK_AUDIO_MIXER_H_
 
 #include "api/audio/audio_mixer.h"
-
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_frame_encryptor.cc b/api/test/mock_frame_encryptor.cc
index 0972259..6c05efd 100644
--- a/api/test/mock_frame_encryptor.cc
+++ b/api/test/mock_frame_encryptor.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/test/mock_frame_encryptor.h"
+
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/neteq_simulator.h b/api/test/neteq_simulator.h
index 8ef6731..a826ca5 100644
--- a/api/test/neteq_simulator.h
+++ b/api/test/neteq_simulator.h
@@ -12,6 +12,7 @@
 #define API_TEST_NETEQ_SIMULATOR_H_
 
 #include <stdint.h>
+
 #include <map>
 #include <vector>
 
diff --git a/api/test/simulated_network.h b/api/test/simulated_network.h
index c5273c3..9b20c9c 100644
--- a/api/test/simulated_network.h
+++ b/api/test/simulated_network.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <deque>
 #include <queue>
 #include <vector>
diff --git a/api/test/test_dependency_factory.cc b/api/test/test_dependency_factory.cc
index d343bee..4294b1b 100644
--- a/api/test/test_dependency_factory.cc
+++ b/api/test/test_dependency_factory.cc
@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/test/test_dependency_factory.h"
+
 #include <memory>
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "api/test/test_dependency_factory.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/thread_checker.h"
 
diff --git a/api/test/videocodec_test_stats.h b/api/test/videocodec_test_stats.h
index 620f764..5249c7a 100644
--- a/api/test/videocodec_test_stats.h
+++ b/api/test/videocodec_test_stats.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <string>
 #include <vector>
 
diff --git a/api/transport/field_trial_based_config.cc b/api/transport/field_trial_based_config.cc
index 7e6764f..4a3a179 100644
--- a/api/transport/field_trial_based_config.cc
+++ b/api/transport/field_trial_based_config.cc
@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "api/transport/field_trial_based_config.h"
+
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
diff --git a/api/transport/field_trial_based_config.h b/api/transport/field_trial_based_config.h
index e0989db..0754570 100644
--- a/api/transport/field_trial_based_config.h
+++ b/api/transport/field_trial_based_config.h
@@ -11,6 +11,7 @@
 #define API_TRANSPORT_FIELD_TRIAL_BASED_CONFIG_H_
 
 #include <string>
+
 #include "absl/strings/string_view.h"
 #include "api/transport/webrtc_key_value_config.h"
 
diff --git a/api/transport/media/audio_transport.cc b/api/transport/media/audio_transport.cc
index 7285ad4..0f5fe8b 100644
--- a/api/transport/media/audio_transport.cc
+++ b/api/transport/media/audio_transport.cc
@@ -15,10 +15,10 @@
 // enable different media transport implementations, including QUIC-based
 // media transport.
 
-#include <utility>
-
 #include "api/transport/media/audio_transport.h"
 
+#include <utility>
+
 namespace webrtc {
 
 MediaTransportEncodedAudioFrame::~MediaTransportEncodedAudioFrame() {}
diff --git a/api/transport/media/video_transport.cc b/api/transport/media/video_transport.cc
index 1831991..a6f5304 100644
--- a/api/transport/media/video_transport.cc
+++ b/api/transport/media/video_transport.cc
@@ -15,10 +15,10 @@
 // enable different media transport implementations, including QUIC-based
 // media transport.
 
-#include <utility>
-
 #include "api/transport/media/video_transport.h"
 
+#include <utility>
+
 namespace webrtc {
 
 MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame() = default;
diff --git a/api/transport/network_control.h b/api/transport/network_control.h
index 11cda46..8efb1fc 100644
--- a/api/transport/network_control.h
+++ b/api/transport/network_control.h
@@ -11,6 +11,7 @@
 #ifndef API_TRANSPORT_NETWORK_CONTROL_H_
 #define API_TRANSPORT_NETWORK_CONTROL_H_
 #include <stdint.h>
+
 #include <memory>
 
 #include "api/transport/network_types.h"
diff --git a/api/transport/network_types.h b/api/transport/network_types.h
index df046db..45b651e 100644
--- a/api/transport/network_types.h
+++ b/api/transport/network_types.h
@@ -11,6 +11,7 @@
 #ifndef API_TRANSPORT_NETWORK_TYPES_H_
 #define API_TRANSPORT_NETWORK_TYPES_H_
 #include <stdint.h>
+
 #include <vector>
 
 #include "absl/types/optional.h"
diff --git a/api/transport/test/create_feedback_generator.cc b/api/transport/test/create_feedback_generator.cc
index 9eb54ea..01e0fae 100644
--- a/api/transport/test/create_feedback_generator.cc
+++ b/api/transport/test/create_feedback_generator.cc
@@ -10,7 +10,6 @@
 #include "api/transport/test/create_feedback_generator.h"
 
 #include "absl/memory/memory.h"
-
 #include "test/network/feedback_generator.h"
 
 namespace webrtc {
diff --git a/api/transport/webrtc_key_value_config.h b/api/transport/webrtc_key_value_config.h
index c6376a9..0522629 100644
--- a/api/transport/webrtc_key_value_config.h
+++ b/api/transport/webrtc_key_value_config.h
@@ -11,6 +11,7 @@
 #define API_TRANSPORT_WEBRTC_KEY_VALUE_CONFIG_H_
 
 #include <string>
+
 #include "absl/strings/string_view.h"
 
 namespace webrtc {
diff --git a/api/units/data_rate_unittest.cc b/api/units/data_rate_unittest.cc
index a56ccb2..d887107 100644
--- a/api/units/data_rate_unittest.cc
+++ b/api/units/data_rate_unittest.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/units/data_rate.h"
+
 #include "rtc_base/logging.h"
 #include "test/gtest.h"
 
diff --git a/api/units/frequency.cc b/api/units/frequency.cc
index f7e38ca..2d938a2 100644
--- a/api/units/frequency.cc
+++ b/api/units/frequency.cc
@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "api/units/frequency.h"
+
 #include "rtc_base/strings/string_builder.h"
 
 namespace webrtc {
diff --git a/api/video/encoded_frame.h b/api/video/encoded_frame.h
index 1b2e531..f0a67a1 100644
--- a/api/video/encoded_frame.h
+++ b/api/video/encoded_frame.h
@@ -11,11 +11,11 @@
 #ifndef API_VIDEO_ENCODED_FRAME_H_
 #define API_VIDEO_ENCODED_FRAME_H_
 
-#include "modules/video_coding/encoded_frame.h"
-
 #include <stddef.h>
 #include <stdint.h>
 
+#include "modules/video_coding/encoded_frame.h"
+
 namespace webrtc {
 namespace video_coding {
 
diff --git a/api/video/encoded_image.h b/api/video/encoded_image.h
index 754b58b..9aa5046 100644
--- a/api/video/encoded_image.h
+++ b/api/video/encoded_image.h
@@ -12,6 +12,7 @@
 #define API_VIDEO_ENCODED_IMAGE_H_
 
 #include <stdint.h>
+
 #include <map>
 #include <utility>
 
@@ -95,9 +96,7 @@
 
   void SetEncodeTime(int64_t encode_start_ms, int64_t encode_finish_ms);
 
-  absl::optional<int> SpatialIndex() const {
-    return spatial_index_;
-  }
+  absl::optional<int> SpatialIndex() const { return spatial_index_; }
   void SetSpatialIndex(absl::optional<int> spatial_index) {
     RTC_DCHECK_GE(spatial_index.value_or(0), 0);
     RTC_DCHECK_LT(spatial_index.value_or(0), kMaxSpatialLayers);
@@ -208,7 +207,7 @@
   // TODO(bugs.webrtc.org/9378): We're transitioning to always owning the
   // encoded data.
   rtc::scoped_refptr<EncodedImageBufferInterface> encoded_data_;
-  size_t size_;      // Size of encoded frame data.
+  size_t size_;  // Size of encoded frame data.
   // Non-null when used with an un-owned buffer.
   uint8_t* buffer_;
   // Allocated size of _buffer; relevant only if it's non-null.
diff --git a/api/video/i010_buffer.h b/api/video/i010_buffer.h
index 4b35ca3..6299927 100644
--- a/api/video/i010_buffer.h
+++ b/api/video/i010_buffer.h
@@ -12,6 +12,7 @@
 #define API_VIDEO_I010_BUFFER_H_
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "api/scoped_refptr.h"
diff --git a/api/video/i420_buffer.cc b/api/video/i420_buffer.cc
index 46de581..62fa183 100644
--- a/api/video/i420_buffer.cc
+++ b/api/video/i420_buffer.cc
@@ -10,6 +10,7 @@
 #include "api/video/i420_buffer.h"
 
 #include <string.h>
+
 #include <algorithm>
 #include <utility>
 
diff --git a/api/video/i420_buffer.h b/api/video/i420_buffer.h
index b76a507..251eb93 100644
--- a/api/video/i420_buffer.h
+++ b/api/video/i420_buffer.h
@@ -12,6 +12,7 @@
 #define API_VIDEO_I420_BUFFER_H_
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "api/scoped_refptr.h"
diff --git a/api/video/test/color_space_unittest.cc b/api/video/test/color_space_unittest.cc
index e1318ce..1d8b3a8 100644
--- a/api/video/test/color_space_unittest.cc
+++ b/api/video/test/color_space_unittest.cc
@@ -8,9 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/video/color_space.h"
+
 #include <stdint.h>
 
-#include "api/video/color_space.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/api/video/test/video_bitrate_allocation_unittest.cc b/api/video/test/video_bitrate_allocation_unittest.cc
index d96ce1c..8e66d4b 100644
--- a/api/video/test/video_bitrate_allocation_unittest.cc
+++ b/api/video/test/video_bitrate_allocation_unittest.cc
@@ -8,10 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/video/video_bitrate_allocation.h"
+
 #include <vector>
 
 #include "absl/types/optional.h"
-#include "api/video/video_bitrate_allocation.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/api/video/video_bitrate_allocation.h b/api/video/video_bitrate_allocation.h
index d335a55..da58a5b 100644
--- a/api/video/video_bitrate_allocation.h
+++ b/api/video/video_bitrate_allocation.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <limits>
 #include <string>
 #include <vector>
diff --git a/api/video/video_bitrate_allocator_factory.h b/api/video/video_bitrate_allocator_factory.h
index 897c34f..cb34ebb 100644
--- a/api/video/video_bitrate_allocator_factory.h
+++ b/api/video/video_bitrate_allocator_factory.h
@@ -12,6 +12,7 @@
 #define API_VIDEO_VIDEO_BITRATE_ALLOCATOR_FACTORY_H_
 
 #include <memory>
+
 #include "api/video/video_bitrate_allocator.h"
 #include "api/video_codecs/video_codec.h"
 
diff --git a/api/video/video_frame.h b/api/video/video_frame.h
index e86e5a2..127e62f 100644
--- a/api/video/video_frame.h
+++ b/api/video/video_frame.h
@@ -12,6 +12,7 @@
 #define API_VIDEO_VIDEO_FRAME_H_
 
 #include <stdint.h>
+
 #include <utility>
 
 #include "absl/types/optional.h"
diff --git a/api/video/video_stream_encoder_create.h b/api/video/video_stream_encoder_create.h
index 2d8f29a..3946b95 100644
--- a/api/video/video_stream_encoder_create.h
+++ b/api/video/video_stream_encoder_create.h
@@ -12,6 +12,7 @@
 #define API_VIDEO_VIDEO_STREAM_ENCODER_CREATE_H_
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "api/task_queue/task_queue_factory.h"
diff --git a/api/video_codecs/sdp_video_format.cc b/api/video_codecs/sdp_video_format.cc
index 167d26a..f890149 100644
--- a/api/video_codecs/sdp_video_format.cc
+++ b/api/video_codecs/sdp_video_format.cc
@@ -9,6 +9,7 @@
  */
 
 #include "api/video_codecs/sdp_video_format.h"
+
 #include "rtc_base/strings/string_builder.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
index 4c2599c..32205fa 100644
--- a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
+++ b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
@@ -8,8 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/video_codecs/video_encoder_software_fallback_wrapper.h"
+
 #include <stddef.h>
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <vector>
@@ -27,7 +30,6 @@
 #include "api/video/video_rotation.h"
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_encoder.h"
-#include "api/video_codecs/video_encoder_software_fallback_wrapper.h"
 #include "modules/include/module_common_types.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/include/video_codec_interface.h"
diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc
index 3566aef..b841575 100644
--- a/api/video_codecs/video_codec.cc
+++ b/api/video_codecs/video_codec.cc
@@ -11,6 +11,7 @@
 #include "api/video_codecs/video_codec.h"
 
 #include <string.h>
+
 #include <string>
 
 #include "absl/strings/match.h"
diff --git a/api/video_codecs/video_codec.h b/api/video_codecs/video_codec.h
index d014e7c..a248d19 100644
--- a/api/video_codecs/video_codec.h
+++ b/api/video_codecs/video_codec.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <string>
 
 #include "api/video/video_bitrate_allocation.h"
@@ -107,9 +108,9 @@
   uint16_t width;
   uint16_t height;
 
-  unsigned int startBitrate;   // kilobits/sec.
-  unsigned int maxBitrate;     // kilobits/sec.
-  unsigned int minBitrate;     // kilobits/sec.
+  unsigned int startBitrate;  // kilobits/sec.
+  unsigned int maxBitrate;    // kilobits/sec.
+  unsigned int minBitrate;    // kilobits/sec.
 
   uint32_t maxFramerate;
 
diff --git a/api/video_codecs/video_decoder_software_fallback_wrapper.cc b/api/video_codecs/video_decoder_software_fallback_wrapper.cc
index 9bf1dfd..329fdfb 100644
--- a/api/video_codecs/video_decoder_software_fallback_wrapper.cc
+++ b/api/video_codecs/video_decoder_software_fallback_wrapper.cc
@@ -11,6 +11,7 @@
 #include "api/video_codecs/video_decoder_software_fallback_wrapper.h"
 
 #include <stdint.h>
+
 #include <string>
 #include <utility>
 
diff --git a/api/video_codecs/video_encoder_config.h b/api/video_codecs/video_encoder_config.h
index 0c69b93..399b3cc 100644
--- a/api/video_codecs/video_encoder_config.h
+++ b/api/video_codecs/video_encoder_config.h
@@ -12,6 +12,7 @@
 #define API_VIDEO_CODECS_VIDEO_ENCODER_CONFIG_H_
 
 #include <stddef.h>
+
 #include <string>
 #include <vector>
 
diff --git a/api/video_codecs/video_encoder_software_fallback_wrapper.cc b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
index 1a683eb..4d7e6f0 100644
--- a/api/video_codecs/video_encoder_software_fallback_wrapper.cc
+++ b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
@@ -11,6 +11,7 @@
 #include "api/video_codecs/video_encoder_software_fallback_wrapper.h"
 
 #include <stdint.h>
+
 #include <cstdio>
 #include <string>
 #include <utility>