Run clang-format on the entire repo

This patch clang-formats the entire repo. Third-party code is
excluded.

I needed to fix up the .clang-format file so that all the header
includes are ordered properly. I could have sworn that it used to work
without the extra modification, but I guess not.

Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: I64bb9f2c795401393f9dfe2fefc4f04cb36b52f6
diff --git a/aos/events/aos_timing_report_streamer.cc b/aos/events/aos_timing_report_streamer.cc
index 35a78b9..58b44e6 100644
--- a/aos/events/aos_timing_report_streamer.cc
+++ b/aos/events/aos_timing_report_streamer.cc
@@ -1,9 +1,10 @@
+#include "gflags/gflags.h"
+
 #include "aos/configuration.h"
 #include "aos/events/shm_event_loop.h"
 #include "aos/events/timing_report_dump_lib.h"
 #include "aos/init.h"
 #include "aos/json_to_flatbuffer.h"
-#include "gflags/gflags.h"
 
 DEFINE_string(config, "aos_config.json", "The path to the config to use.");
 DEFINE_string(application, "",
diff --git a/aos/events/channel_preallocated_allocator.h b/aos/events/channel_preallocated_allocator.h
index 76fb694..49eafef 100644
--- a/aos/events/channel_preallocated_allocator.h
+++ b/aos/events/channel_preallocated_allocator.h
@@ -1,9 +1,10 @@
 #ifndef AOS_EVENTS_CHANNEL_PREALLOCATED_ALLOCATOR_
 #define AOS_EVENTS_CHANNEL_PREALLOCATED_ALLOCATOR_
 
+#include "flatbuffers/flatbuffers.h"
+
 #include "aos/configuration.h"
 #include "aos/configuration_generated.h"
-#include "flatbuffers/flatbuffers.h"
 
 namespace aos {
 
diff --git a/aos/events/epoll.cc b/aos/events/epoll.cc
index 71e3c9b..9a11197 100644
--- a/aos/events/epoll.cc
+++ b/aos/events/epoll.cc
@@ -8,9 +8,10 @@
 #include <atomic>
 #include <vector>
 
-#include "aos/time/time.h"
 #include "glog/logging.h"
 
+#include "aos/time/time.h"
+
 namespace aos {
 namespace internal {
 
diff --git a/aos/events/event_loop.cc b/aos/events/event_loop.cc
index 2d932cc..8a5774f 100644
--- a/aos/events/event_loop.cc
+++ b/aos/events/event_loop.cc
@@ -1,10 +1,11 @@
 #include "aos/events/event_loop.h"
 
+#include "glog/logging.h"
+
 #include "aos/configuration.h"
 #include "aos/configuration_generated.h"
 #include "aos/logging/implementations.h"
 #include "aos/realtime.h"
-#include "glog/logging.h"
 
 DEFINE_bool(timing_reports, true, "Publish timing reports.");
 DEFINE_int32(timing_report_ms, 1000,
diff --git a/aos/events/event_loop.h b/aos/events/event_loop.h
index 8825464..5eaaf22 100644
--- a/aos/events/event_loop.h
+++ b/aos/events/event_loop.h
@@ -9,6 +9,9 @@
 #include <string_view>
 
 #include "absl/container/btree_set.h"
+#include "flatbuffers/flatbuffers.h"
+#include "glog/logging.h"
+
 #include "aos/configuration.h"
 #include "aos/configuration_generated.h"
 #include "aos/events/channel_preallocated_allocator.h"
@@ -22,8 +25,6 @@
 #include "aos/time/time.h"
 #include "aos/util/phased_loop.h"
 #include "aos/uuid.h"
-#include "flatbuffers/flatbuffers.h"
-#include "glog/logging.h"
 
 DECLARE_bool(timing_reports);
 DECLARE_int32(timing_report_ms);
diff --git a/aos/events/event_loop_event.h b/aos/events/event_loop_event.h
index a86f670..588b851 100644
--- a/aos/events/event_loop_event.h
+++ b/aos/events/event_loop_event.h
@@ -1,9 +1,10 @@
 #ifndef AOS_EVENTS_EVENT_LOOP_EVENT_H
 #define AOS_EVENTS_EVENT_LOOP_EVENT_H
 
-#include "aos/time/time.h"
 #include "glog/logging.h"
 
+#include "aos/time/time.h"
+
 namespace aos {
 
 // Common interface to track when callbacks and timers should have happened.
diff --git a/aos/events/event_loop_param_test.cc b/aos/events/event_loop_param_test.cc
index 2076467..beb5e78 100644
--- a/aos/events/event_loop_param_test.cc
+++ b/aos/events/event_loop_param_test.cc
@@ -4,14 +4,15 @@
 #include <unordered_map>
 #include <unordered_set>
 
+#include "glog/logging.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
 #include "aos/events/test_message_generated.h"
 #include "aos/flatbuffer_merge.h"
 #include "aos/logging/log_message_generated.h"
 #include "aos/logging/logging.h"
 #include "aos/realtime.h"
-#include "glog/logging.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
 
 namespace aos {
 namespace testing {
diff --git a/aos/events/event_loop_param_test.h b/aos/events/event_loop_param_test.h
index fad8dea..d795a13 100644
--- a/aos/events/event_loop_param_test.h
+++ b/aos/events/event_loop_param_test.h
@@ -5,6 +5,8 @@
 #include <string_view>
 #include <vector>
 
+#include "gtest/gtest.h"
+
 #include "aos/events/event_loop.h"
 #include "aos/events/test_message_generated.h"
 #include "aos/events/test_message_schema.h"
@@ -15,7 +17,6 @@
 #include "aos/network/message_bridge_client_schema.h"
 #include "aos/network/message_bridge_server_schema.h"
 #include "aos/network/timestamp_schema.h"
-#include "gtest/gtest.h"
 
 namespace aos {
 namespace testing {
diff --git a/aos/events/event_loop_runtime_test.cc b/aos/events/event_loop_runtime_test.cc
index 8557e55..7a49fe1 100644
--- a/aos/events/event_loop_runtime_test.cc
+++ b/aos/events/event_loop_runtime_test.cc
@@ -1,10 +1,11 @@
+#include "glog/logging.h"
+#include "gtest/gtest.h"
+
 #include "aos/events/event_loop_runtime_test_lib_rs_cxxgen.h"
 #include "aos/events/ping_generated.h"
 #include "aos/events/pong_generated.h"
 #include "aos/events/simulated_event_loop.h"
 #include "aos/testing/path.h"
-#include "glog/logging.h"
-#include "gtest/gtest.h"
 
 namespace aos::events::testing {
 namespace {
diff --git a/aos/events/event_loop_tmpl.h b/aos/events/event_loop_tmpl.h
index 39ab43e..6c132b2 100644
--- a/aos/events/event_loop_tmpl.h
+++ b/aos/events/event_loop_tmpl.h
@@ -5,9 +5,10 @@
 #include <cstdint>
 #include <type_traits>
 
-#include "aos/events/event_loop.h"
 #include "glog/logging.h"
 
+#include "aos/events/event_loop.h"
+
 namespace aos {
 namespace event_loop_internal {
 
@@ -36,9 +37,8 @@
 
 template <typename Watch>
 void EventLoop::MakeWatcher(const std::string_view channel_name, Watch &&w) {
-  using MessageType =
-      typename event_loop_internal::watch_message_type_trait<decltype(
-          &Watch::operator())>::message_type;
+  using MessageType = typename event_loop_internal::watch_message_type_trait<
+      decltype(&Watch::operator())>::message_type;
   const Channel *channel = configuration::GetChannel(
       configuration_, channel_name, MessageType::GetFullyQualifiedName(),
       name(), node());
diff --git a/aos/events/event_scheduler.cc b/aos/events/event_scheduler.cc
index 2bd7cef..115b2c7 100644
--- a/aos/events/event_scheduler.cc
+++ b/aos/events/event_scheduler.cc
@@ -51,7 +51,8 @@
                           monotonic_clock::max_time);
   }
 
-  const monotonic_clock::time_point monotonic_time = events_list_.begin()->first;
+  const monotonic_clock::time_point monotonic_time =
+      events_list_.begin()->first;
   if (cached_event_list_monotonic_time_ != monotonic_time) {
     cached_event_list_time_ = ToDistributedClock(monotonic_time);
     cached_event_list_monotonic_time_ = monotonic_time;
diff --git a/aos/events/event_scheduler.h b/aos/events/event_scheduler.h
index c508140..848a1cf 100644
--- a/aos/events/event_scheduler.h
+++ b/aos/events/event_scheduler.h
@@ -8,12 +8,13 @@
 #include <utility>
 #include <vector>
 
+#include "glog/logging.h"
+
 #include "aos/events/epoll.h"
 #include "aos/events/event_loop.h"
 #include "aos/events/logging/boot_timestamp.h"
 #include "aos/logging/implementations.h"
 #include "aos/time/time.h"
-#include "glog/logging.h"
 
 namespace aos {
 
diff --git a/aos/events/event_scheduler_test.cc b/aos/events/event_scheduler_test.cc
index c32399c..d328552 100644
--- a/aos/events/event_scheduler_test.cc
+++ b/aos/events/event_scheduler_test.cc
@@ -2,9 +2,10 @@
 
 #include <chrono>
 
-#include "aos/network/testing_time_converter.h"
 #include "gtest/gtest.h"
 
+#include "aos/network/testing_time_converter.h"
+
 namespace aos {
 
 namespace chrono = std::chrono;
diff --git a/aos/events/glib_main_loop_test.cc b/aos/events/glib_main_loop_test.cc
index 9f72e54..43f7c7a 100644
--- a/aos/events/glib_main_loop_test.cc
+++ b/aos/events/glib_main_loop_test.cc
@@ -2,13 +2,14 @@
 
 #include <thread>
 
-#include "aos/configuration.h"
-#include "aos/events/shm_event_loop.h"
-#include "aos/testing/path.h"
 #include "glib-2.0/glib.h"
 #include "glog/logging.h"
 #include "gtest/gtest.h"
 
+#include "aos/configuration.h"
+#include "aos/events/shm_event_loop.h"
+#include "aos/testing/path.h"
+
 namespace aos {
 namespace testing {
 using aos::testing::ArtifactPath;
diff --git a/aos/events/logging/boot_timestamp.h b/aos/events/logging/boot_timestamp.h
index bd9b357..e9c7877 100644
--- a/aos/events/logging/boot_timestamp.h
+++ b/aos/events/logging/boot_timestamp.h
@@ -3,9 +3,10 @@
 
 #include <iostream>
 
-#include "aos/time/time.h"
 #include "glog/logging.h"
 
+#include "aos/time/time.h"
+
 namespace aos::logger {
 
 // Simple class representing a duration in time and a boot it is from.  This
diff --git a/aos/events/logging/buffer_encoder.cc b/aos/events/logging/buffer_encoder.cc
index 5c1d4b2..6aba79a 100644
--- a/aos/events/logging/buffer_encoder.cc
+++ b/aos/events/logging/buffer_encoder.cc
@@ -4,9 +4,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "aos/flatbuffers.h"
 #include "glog/logging.h"
 
+#include "aos/flatbuffers.h"
+
 namespace aos::logger {
 
 DummyEncoder::DummyEncoder(size_t /*max_message_size*/, size_t buffer_size) {
diff --git a/aos/events/logging/buffer_encoder.h b/aos/events/logging/buffer_encoder.h
index ed5bef6..394992c 100644
--- a/aos/events/logging/buffer_encoder.h
+++ b/aos/events/logging/buffer_encoder.h
@@ -2,11 +2,12 @@
 #define AOS_EVENTS_LOGGING_BUFFER_ENCODER_H_
 
 #include "absl/types/span.h"
-#include "aos/containers/resizeable_buffer.h"
-#include "aos/events/logging/logger_generated.h"
 #include "flatbuffers/flatbuffers.h"
 #include "glog/logging.h"
 
+#include "aos/containers/resizeable_buffer.h"
+#include "aos/events/logging/logger_generated.h"
+
 namespace aos::logger {
 
 // Interface to encode data as it is written to a file.
diff --git a/aos/events/logging/buffer_encoder_param_test.h b/aos/events/logging/buffer_encoder_param_test.h
index 6085779..8b6648d 100644
--- a/aos/events/logging/buffer_encoder_param_test.h
+++ b/aos/events/logging/buffer_encoder_param_test.h
@@ -6,11 +6,12 @@
 #include <random>
 #include <vector>
 
+#include "glog/logging.h"
+#include "gtest/gtest.h"
+
 #include "aos/events/logging/logfile_utils.h"
 #include "aos/events/logging/logger_generated.h"
 #include "aos/testing/random_seed.h"
-#include "glog/logging.h"
-#include "gtest/gtest.h"
 
 namespace aos::logger::testing {
 
diff --git a/aos/events/logging/buffer_encoder_test.cc b/aos/events/logging/buffer_encoder_test.cc
index d5e2e5d..7dda300 100644
--- a/aos/events/logging/buffer_encoder_test.cc
+++ b/aos/events/logging/buffer_encoder_test.cc
@@ -4,11 +4,12 @@
 #include <fstream>
 #include <string>
 
-#include "aos/events/logging/buffer_encoder_param_test.h"
 #include "glog/logging.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include "aos/events/logging/buffer_encoder_param_test.h"
+
 namespace aos::logger::testing {
 
 class DummyEncoderTest : public BufferEncoderBaseTest {};
diff --git a/aos/events/logging/log_backend.cc b/aos/events/logging/log_backend.cc
index 07bb780..918a6e6 100644
--- a/aos/events/logging/log_backend.cc
+++ b/aos/events/logging/log_backend.cc
@@ -5,9 +5,10 @@
 #include <filesystem>
 
 #include "absl/strings/str_cat.h"
-#include "aos/util/file.h"
 #include "glog/logging.h"
 
+#include "aos/util/file.h"
+
 DEFINE_bool(direct, false,
             "If true, write using O_DIRECT and write 512 byte aligned blocks "
             "whenever possible.");
diff --git a/aos/events/logging/log_backend.h b/aos/events/logging/log_backend.h
index 1b1417e..6f79bc3 100644
--- a/aos/events/logging/log_backend.h
+++ b/aos/events/logging/log_backend.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "absl/types/span.h"
+
 #include "aos/time/time.h"
 
 namespace aos::logger {
diff --git a/aos/events/logging/log_backend_test.cc b/aos/events/logging/log_backend_test.cc
index 928bb24..4e6987f 100644
--- a/aos/events/logging/log_backend_test.cc
+++ b/aos/events/logging/log_backend_test.cc
@@ -7,12 +7,13 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-#include "aos/containers/resizeable_buffer.h"
-#include "aos/testing/tmpdir.h"
 #include "glog/logging.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include "aos/containers/resizeable_buffer.h"
+#include "aos/testing/tmpdir.h"
+
 namespace aos::logger::testing {
 namespace {
 // Helper to write simple string to the log sink
diff --git a/aos/events/logging/log_cat.cc b/aos/events/logging/log_cat.cc
index b06cf20..31d12be 100644
--- a/aos/events/logging/log_cat.cc
+++ b/aos/events/logging/log_cat.cc
@@ -7,6 +7,8 @@
 #include <vector>
 
 #include "absl/strings/escaping.h"
+#include "gflags/gflags.h"
+
 #include "aos/aos_cli_utils.h"
 #include "aos/configuration.h"
 #include "aos/events/logging/log_reader.h"
@@ -14,7 +16,6 @@
 #include "aos/init.h"
 #include "aos/json_to_flatbuffer.h"
 #include "aos/sha256.h"
-#include "gflags/gflags.h"
 
 DEFINE_string(
     name, "",
diff --git a/aos/events/logging/log_config_extractor.cc b/aos/events/logging/log_config_extractor.cc
index aa2eed0..da0c65f 100644
--- a/aos/events/logging/log_config_extractor.cc
+++ b/aos/events/logging/log_config_extractor.cc
@@ -1,16 +1,17 @@
-#include <iostream>
 #include <filesystem>
+#include <iostream>
 #include <vector>
 
+#include "flatbuffers/flatbuffers.h"
+#include "gflags/gflags.h"
+#include "glog/logging.h"
+
 #include "aos/configuration_generated.h"
 #include "aos/events/logging/log_reader.h"
 #include "aos/events/logging/logfile_sorting.h"
 #include "aos/flatbuffer_merge.h"
 #include "aos/init.h"
 #include "aos/json_to_flatbuffer.h"
-#include "flatbuffers/flatbuffers.h"
-#include "gflags/gflags.h"
-#include "glog/logging.h"
 
 DEFINE_string(output_path, "/tmp/",
               "Destination folder for output files. If this flag is not used, "
diff --git a/aos/events/logging/log_edit.cc b/aos/events/logging/log_edit.cc
index 7e822ca..7d3ba2f 100644
--- a/aos/events/logging/log_edit.cc
+++ b/aos/events/logging/log_edit.cc
@@ -1,12 +1,13 @@
 #include <iostream>
 
+#include "gflags/gflags.h"
+
 #include "aos/configuration.h"
 #include "aos/events/logging/log_reader.h"
 #include "aos/events/simulated_event_loop.h"
 #include "aos/init.h"
 #include "aos/json_to_flatbuffer.h"
 #include "aos/util/file.h"
-#include "gflags/gflags.h"
 
 DEFINE_string(logfile, "/tmp/logfile.bfbs",
               "Name of the logfile to read from.");
diff --git a/aos/events/logging/log_namer.cc b/aos/events/logging/log_namer.cc
index 4b23268..0e914d9 100644
--- a/aos/events/logging/log_namer.cc
+++ b/aos/events/logging/log_namer.cc
@@ -7,12 +7,13 @@
 #include <vector>
 
 #include "absl/strings/str_cat.h"
+#include "flatbuffers/flatbuffers.h"
+#include "glog/logging.h"
+
 #include "aos/events/logging/logfile_utils.h"
 #include "aos/events/logging/logger_generated.h"
 #include "aos/flatbuffer_merge.h"
 #include "aos/uuid.h"
-#include "flatbuffers/flatbuffers.h"
-#include "glog/logging.h"
 
 DECLARE_int32(flush_size);
 
diff --git a/aos/events/logging/log_namer.h b/aos/events/logging/log_namer.h
index 8842f4e..89a9319 100644
--- a/aos/events/logging/log_namer.h
+++ b/aos/events/logging/log_namer.h
@@ -8,10 +8,11 @@
 #include <vector>
 
 #include "absl/container/btree_map.h"
+#include "flatbuffers/flatbuffers.h"
+
 #include "aos/events/logging/logfile_utils.h"
 #include "aos/events/logging/logger_generated.h"
 #include "aos/uuid.h"
-#include "flatbuffers/flatbuffers.h"
 
 namespace aos {
 namespace logger {
diff --git a/aos/events/logging/log_reader.cc b/aos/events/logging/log_reader.cc
index cbe37d5..f805c66 100644
--- a/aos/events/logging/log_reader.cc
+++ b/aos/events/logging/log_reader.cc
@@ -11,6 +11,9 @@
 
 #include "absl/strings/escaping.h"
 #include "absl/types/span.h"
+#include "flatbuffers/flatbuffers.h"
+#include "openssl/sha.h"
+
 #include "aos/events/event_loop.h"
 #include "aos/events/logging/boot_timestamp.h"
 #include "aos/events/logging/logfile_sorting.h"
@@ -25,8 +28,6 @@
 #include "aos/time/time.h"
 #include "aos/util/file.h"
 #include "aos/uuid.h"
-#include "flatbuffers/flatbuffers.h"
-#include "openssl/sha.h"
 
 DEFINE_bool(skip_missing_forwarding_entries, false,
             "If true, drop any forwarding entries with missing data.  If "
@@ -2340,7 +2341,8 @@
   // handlers that would've happened before requested start time until that
   // start time.
   if (start_event_notifier_) {
-    // Only call OnStart() if the start time for this node (realtime_start_time())
+    // Only call OnStart() if the start time for this node
+    // (realtime_start_time())
     if (start_event_notifier_->realtime_event_time() >
         realtime_start_time(boot_count())) {
       VLOG(1) << "Skipping, " << start_event_notifier_->realtime_event_time()
diff --git a/aos/events/logging/log_reader.h b/aos/events/logging/log_reader.h
index 49babe5..3bdfca4 100644
--- a/aos/events/logging/log_reader.h
+++ b/aos/events/logging/log_reader.h
@@ -8,6 +8,8 @@
 #include <tuple>
 #include <vector>
 
+#include "flatbuffers/flatbuffers.h"
+
 #include "aos/condition.h"
 #include "aos/events/event_loop.h"
 #include "aos/events/logging/logfile_sorting.h"
@@ -24,7 +26,6 @@
 #include "aos/time/time.h"
 #include "aos/util/threaded_queue.h"
 #include "aos/uuid.h"
-#include "flatbuffers/flatbuffers.h"
 
 namespace aos {
 namespace logger {
diff --git a/aos/events/logging/log_replayer.cc b/aos/events/logging/log_replayer.cc
index c91464c..7231a91 100644
--- a/aos/events/logging/log_replayer.cc
+++ b/aos/events/logging/log_replayer.cc
@@ -7,6 +7,10 @@
 #include <string_view>
 #include <vector>
 
+#include "flatbuffers/flatbuffers.h"
+#include "gflags/gflags.h"
+#include "glog/logging.h"
+
 #include "aos/configuration_generated.h"
 #include "aos/events/event_loop.h"
 #include "aos/events/logging/log_reader.h"
@@ -21,9 +25,6 @@
 #include "aos/init.h"
 #include "aos/json_to_flatbuffer.h"
 #include "aos/util/file.h"
-#include "flatbuffers/flatbuffers.h"
-#include "gflags/gflags.h"
-#include "glog/logging.h"
 
 DEFINE_string(config, "", "If specified, overrides logged configuration.");
 DEFINE_bool(
diff --git a/aos/events/logging/log_stats.cc b/aos/events/logging/log_stats.cc
index 8e3d451..ea265b5 100644
--- a/aos/events/logging/log_stats.cc
+++ b/aos/events/logging/log_stats.cc
@@ -3,12 +3,13 @@
 #include <queue>
 
 #include "absl/strings/str_format.h"
+#include "gflags/gflags.h"
+
 #include "aos/events/logging/log_reader.h"
 #include "aos/events/simulated_event_loop.h"
 #include "aos/init.h"
 #include "aos/json_to_flatbuffer.h"
 #include "aos/time/time.h"
-#include "gflags/gflags.h"
 
 DEFINE_string(
     name, "",
diff --git a/aos/events/logging/log_writer.h b/aos/events/logging/log_writer.h
index 65c68f4..f63ac3e 100644
--- a/aos/events/logging/log_writer.h
+++ b/aos/events/logging/log_writer.h
@@ -5,6 +5,8 @@
 #include <string_view>
 #include <vector>
 
+#include "flatbuffers/flatbuffers.h"
+
 #include "aos/events/event_loop.h"
 #include "aos/events/logging/log_namer.h"
 #include "aos/events/logging/logfile_utils.h"
@@ -14,7 +16,6 @@
 #include "aos/network/remote_message_generated.h"
 #include "aos/time/time.h"
 #include "aos/uuid.h"
-#include "flatbuffers/flatbuffers.h"
 
 namespace aos {
 namespace logger {
diff --git a/aos/events/logging/logfile_sorting.cc b/aos/events/logging/logfile_sorting.cc
index f0161c9..f6d12da 100644
--- a/aos/events/logging/logfile_sorting.cc
+++ b/aos/events/logging/logfile_sorting.cc
@@ -1,5 +1,7 @@
 #include "aos/events/logging/logfile_sorting.h"
 
+#include <dirent.h>
+
 #include <algorithm>
 #include <map>
 #include <string>
@@ -8,12 +10,12 @@
 
 #include "absl/container/btree_map.h"
 #include "absl/strings/str_join.h"
+
 #include "aos/events/logging/logfile_utils.h"
 #include "aos/flatbuffer_merge.h"
 #include "aos/flatbuffers.h"
 #include "aos/sha256.h"
 #include "aos/time/time.h"
-#include "dirent.h"
 #include "sys/stat.h"
 
 #if ENABLE_S3
diff --git a/aos/events/logging/logfile_utils.cc b/aos/events/logging/logfile_utils.cc
index 490393d..304b3b3 100644
--- a/aos/events/logging/logfile_utils.cc
+++ b/aos/events/logging/logfile_utils.cc
@@ -10,13 +10,14 @@
 #include <filesystem>
 
 #include "absl/strings/escaping.h"
+#include "flatbuffers/flatbuffers.h"
+#include "gflags/gflags.h"
+#include "glog/logging.h"
+
 #include "aos/configuration.h"
 #include "aos/events/logging/snappy_encoder.h"
 #include "aos/flatbuffer_merge.h"
 #include "aos/util/file.h"
-#include "flatbuffers/flatbuffers.h"
-#include "gflags/gflags.h"
-#include "glog/logging.h"
 
 #if defined(__x86_64__)
 #define ENABLE_LZMA (!__has_feature(memory_sanitizer))
diff --git a/aos/events/logging/logfile_utils.h b/aos/events/logging/logfile_utils.h
index 0bf60a0..5d5d344 100644
--- a/aos/events/logging/logfile_utils.h
+++ b/aos/events/logging/logfile_utils.h
@@ -16,6 +16,8 @@
 
 #include "absl/container/btree_set.h"
 #include "absl/types/span.h"
+#include "flatbuffers/flatbuffers.h"
+
 #include "aos/containers/resizeable_buffer.h"
 #include "aos/events/event_loop.h"
 #include "aos/events/logging/boot_timestamp.h"
@@ -25,7 +27,6 @@
 #include "aos/events/logging/logger_generated.h"
 #include "aos/flatbuffers.h"
 #include "aos/network/remote_message_generated.h"
-#include "flatbuffers/flatbuffers.h"
 
 namespace aos::logger {
 
diff --git a/aos/events/logging/logfile_utils_out_of_space_test_runner.cc b/aos/events/logging/logfile_utils_out_of_space_test_runner.cc
index 71c537f..65591ba 100644
--- a/aos/events/logging/logfile_utils_out_of_space_test_runner.cc
+++ b/aos/events/logging/logfile_utils_out_of_space_test_runner.cc
@@ -2,11 +2,12 @@
 
 #include <array>
 
-#include "aos/events/logging/logfile_utils.h"
-#include "aos/init.h"
 #include "gflags/gflags.h"
 #include "glog/logging.h"
 
+#include "aos/events/logging/logfile_utils.h"
+#include "aos/init.h"
+
 DECLARE_int32(flush_size);
 DEFINE_string(tmpfs, "", "tmpfs with the desired size");
 
diff --git a/aos/events/logging/logfile_utils_test.cc b/aos/events/logging/logfile_utils_test.cc
index 8d5b0fb..eaeb4b7 100644
--- a/aos/events/logging/logfile_utils_test.cc
+++ b/aos/events/logging/logfile_utils_test.cc
@@ -6,6 +6,12 @@
 #include <string>
 
 #include "absl/strings/escaping.h"
+#include "external/com_github_google_flatbuffers/src/annotated_binary_text_gen.h"
+#include "external/com_github_google_flatbuffers/src/binary_annotator.h"
+#include "flatbuffers/reflection_generated.h"
+#include "gflags/gflags.h"
+#include "gtest/gtest.h"
+
 #include "aos/events/logging/logfile_sorting.h"
 #include "aos/events/logging/test_message_generated.h"
 #include "aos/flatbuffer_merge.h"
@@ -15,11 +21,6 @@
 #include "aos/testing/random_seed.h"
 #include "aos/testing/tmpdir.h"
 #include "aos/util/file.h"
-#include "external/com_github_google_flatbuffers/src/annotated_binary_text_gen.h"
-#include "external/com_github_google_flatbuffers/src/binary_annotator.h"
-#include "flatbuffers/reflection_generated.h"
-#include "gflags/gflags.h"
-#include "gtest/gtest.h"
 
 namespace aos {
 namespace logger {
diff --git a/aos/events/logging/logger_main.cc b/aos/events/logging/logger_main.cc
index 0dbfc8d..631f41f 100644
--- a/aos/events/logging/logger_main.cc
+++ b/aos/events/logging/logger_main.cc
@@ -6,12 +6,13 @@
 #ifdef LZMA
 #include "aos/events/logging/lzma_encoder.h"
 #endif
+#include "gflags/gflags.h"
+#include "glog/logging.h"
+
 #include "aos/events/logging/snappy_encoder.h"
 #include "aos/events/shm_event_loop.h"
 #include "aos/init.h"
 #include "aos/logging/log_namer.h"
-#include "gflags/gflags.h"
-#include "glog/logging.h"
 
 DEFINE_string(config, "aos_config.json", "Config file to use.");
 
diff --git a/aos/events/logging/logger_test.cc b/aos/events/logging/logger_test.cc
index 7214a36..8b1b7fa 100644
--- a/aos/events/logging/logger_test.cc
+++ b/aos/events/logging/logger_test.cc
@@ -3,6 +3,10 @@
 #include <filesystem>
 
 #include "absl/strings/str_format.h"
+#include "glog/logging.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
 #include "aos/events/event_loop.h"
 #include "aos/events/logging/log_reader.h"
 #include "aos/events/logging/log_writer.h"
@@ -17,9 +21,6 @@
 #include "aos/testing/path.h"
 #include "aos/testing/tmpdir.h"
 #include "aos/util/file.h"
-#include "glog/logging.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
 
 #ifdef LZMA
 #include "aos/events/logging/lzma_encoder.h"
diff --git a/aos/events/logging/lzma_encoder.h b/aos/events/logging/lzma_encoder.h
index 3136d93..93508ca 100644
--- a/aos/events/logging/lzma_encoder.h
+++ b/aos/events/logging/lzma_encoder.h
@@ -7,10 +7,11 @@
 #include <thread>
 
 #include "absl/types/span.h"
+#include "flatbuffers/flatbuffers.h"
+
 #include "aos/containers/resizeable_buffer.h"
 #include "aos/events/logging/buffer_encoder.h"
 #include "aos/events/logging/logger_generated.h"
-#include "flatbuffers/flatbuffers.h"
 #include "lzma.h"
 
 namespace aos::logger {
diff --git a/aos/events/logging/lzma_encoder_test.cc b/aos/events/logging/lzma_encoder_test.cc
index 1e814ff..60444d3 100644
--- a/aos/events/logging/lzma_encoder_test.cc
+++ b/aos/events/logging/lzma_encoder_test.cc
@@ -1,10 +1,11 @@
 #include "aos/events/logging/lzma_encoder.h"
 
-#include "aos/events/logging/buffer_encoder_param_test.h"
-#include "aos/util/file.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include "aos/events/logging/buffer_encoder_param_test.h"
+#include "aos/util/file.h"
+
 DECLARE_int32(lzma_threads);
 
 namespace aos::logger::testing {
diff --git a/aos/events/logging/multinode_logger_test.cc b/aos/events/logging/multinode_logger_test.cc
index f9eb11e..44736a5 100644
--- a/aos/events/logging/multinode_logger_test.cc
+++ b/aos/events/logging/multinode_logger_test.cc
@@ -1,5 +1,8 @@
 #include <algorithm>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
 #include "aos/events/logging/log_reader.h"
 #include "aos/events/logging/multinode_logger_test_lib.h"
 #include "aos/events/message_counter.h"
@@ -8,8 +11,6 @@
 #include "aos/network/remote_message_generated.h"
 #include "aos/network/timestamp_generated.h"
 #include "aos/testing/tmpdir.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
 
 namespace aos {
 namespace logger {
diff --git a/aos/events/logging/multinode_logger_test_lib.h b/aos/events/logging/multinode_logger_test_lib.h
index 7502e4d..f95c6cc 100644
--- a/aos/events/logging/multinode_logger_test_lib.h
+++ b/aos/events/logging/multinode_logger_test_lib.h
@@ -2,6 +2,9 @@
 #define AOS_EVENTS_LOGGING_MULTINODE_LOGGER_TEST_LIB_H
 
 #include "absl/strings/str_format.h"
+#include "glog/logging.h"
+#include "gmock/gmock.h"
+
 #include "aos/events/event_loop.h"
 #include "aos/events/logging/log_writer.h"
 #include "aos/events/logging/snappy_encoder.h"
@@ -9,8 +12,6 @@
 #include "aos/network/testing_time_converter.h"
 #include "aos/testing/path.h"
 #include "aos/util/file.h"
-#include "glog/logging.h"
-#include "gmock/gmock.h"
 
 #ifdef LZMA
 #include "aos/events/logging/lzma_encoder.h"
diff --git a/aos/events/logging/realtime_replay_test.cc b/aos/events/logging/realtime_replay_test.cc
index 2d02766..a04da49 100644
--- a/aos/events/logging/realtime_replay_test.cc
+++ b/aos/events/logging/realtime_replay_test.cc
@@ -1,3 +1,5 @@
+#include "gtest/gtest.h"
+
 #include "aos/events/logging/log_reader.h"
 #include "aos/events/logging/log_writer.h"
 #include "aos/events/ping_lib.h"
@@ -6,7 +8,6 @@
 #include "aos/json_to_flatbuffer.h"
 #include "aos/testing/path.h"
 #include "aos/testing/tmpdir.h"
-#include "gtest/gtest.h"
 
 DECLARE_string(override_hostname);
 
diff --git a/aos/events/logging/s3_fetcher.h b/aos/events/logging/s3_fetcher.h
index cf00226..41bc114 100644
--- a/aos/events/logging/s3_fetcher.h
+++ b/aos/events/logging/s3_fetcher.h
@@ -45,7 +45,7 @@
   void StartRequest();
 };
 
-Aws::S3::S3Client& GetS3Client();
+Aws::S3::S3Client &GetS3Client();
 
 struct ObjectName {
   std::string bucket, key;
diff --git a/aos/events/logging/single_node_merge.cc b/aos/events/logging/single_node_merge.cc
index ec22b82..cc78c2b 100644
--- a/aos/events/logging/single_node_merge.cc
+++ b/aos/events/logging/single_node_merge.cc
@@ -2,11 +2,12 @@
 #include <string>
 #include <vector>
 
+#include "gflags/gflags.h"
+
 #include "aos/events/logging/logfile_sorting.h"
 #include "aos/events/logging/logfile_utils.h"
 #include "aos/init.h"
 #include "aos/network/multinode_timestamp_filter.h"
-#include "gflags/gflags.h"
 
 // This is a simple application to match up data with timestamps for a node in a
 // log.  It doesn't solve the timestamp problem, but is still quite useful for
diff --git a/aos/events/logging/snappy_encoder.h b/aos/events/logging/snappy_encoder.h
index d698ee1..4b6130c 100644
--- a/aos/events/logging/snappy_encoder.h
+++ b/aos/events/logging/snappy_encoder.h
@@ -4,10 +4,11 @@
 #include <string_view>
 
 #include "absl/types/span.h"
+#include "flatbuffers/flatbuffers.h"
+
 #include "aos/containers/resizeable_buffer.h"
 #include "aos/events/logging/buffer_encoder.h"
 #include "aos/events/logging/logger_generated.h"
-#include "flatbuffers/flatbuffers.h"
 #include "snappy-sinksource.h"
 #include "snappy.h"
 
@@ -16,7 +17,8 @@
 // Encodes buffers using snappy.
 class SnappyEncoder final : public DataEncoder {
  public:
-  explicit SnappyEncoder(size_t max_message_size, size_t chunk_size = 128 * 1024);
+  explicit SnappyEncoder(size_t max_message_size,
+                         size_t chunk_size = 128 * 1024);
 
   size_t Encode(Copier *copy, size_t start_byte) final;
 
diff --git a/aos/events/logging/snappy_encoder_test.cc b/aos/events/logging/snappy_encoder_test.cc
index 7e61f3f..505a315 100644
--- a/aos/events/logging/snappy_encoder_test.cc
+++ b/aos/events/logging/snappy_encoder_test.cc
@@ -1,16 +1,18 @@
 #include "aos/events/logging/snappy_encoder.h"
 
-#include "aos/events/logging/buffer_encoder_param_test.h"
-#include "aos/util/file.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
+#include "aos/events/logging/buffer_encoder_param_test.h"
+#include "aos/util/file.h"
+
 namespace aos::logger::testing {
 
 INSTANTIATE_TEST_SUITE_P(
     Snappy, BufferEncoderTest,
     ::testing::Combine(::testing::Values([](size_t max_message_size) {
-                         return std::make_unique<SnappyEncoder>(max_message_size);
+                         return std::make_unique<SnappyEncoder>(
+                             max_message_size);
                        }),
                        ::testing::Values([](std::string_view filename) {
                          return std::make_unique<SnappyDecoder>(filename);
diff --git a/aos/events/logging/timestamp_extractor.cc b/aos/events/logging/timestamp_extractor.cc
index ed319db..67cbc44 100644
--- a/aos/events/logging/timestamp_extractor.cc
+++ b/aos/events/logging/timestamp_extractor.cc
@@ -2,11 +2,12 @@
 #include <string>
 #include <vector>
 
+#include "gflags/gflags.h"
+
 #include "aos/events/logging/logfile_sorting.h"
 #include "aos/events/logging/logfile_utils.h"
 #include "aos/init.h"
 #include "aos/network/multinode_timestamp_filter.h"
-#include "gflags/gflags.h"
 
 DECLARE_bool(timestamps_to_csv);
 DEFINE_bool(skip_order_validation, false,
diff --git a/aos/events/logging/timestamp_plot.cc b/aos/events/logging/timestamp_plot.cc
index ddc8381..e266716 100644
--- a/aos/events/logging/timestamp_plot.cc
+++ b/aos/events/logging/timestamp_plot.cc
@@ -1,5 +1,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
+
 #include "aos/init.h"
 #include "aos/util/file.h"
 #include "frc971/analysis/in_process_plotter.h"
@@ -157,7 +158,8 @@
     std::string_view node1, std::string_view node2, bool flip) {
   std::vector<double> samplefile12_t;
   std::vector<double> samplefile12_o;
-  const std::string path = absl::StrCat("/tmp/timestamp_noncausal_", node1, "_", node2, ".csv");
+  const std::string path =
+      absl::StrCat("/tmp/timestamp_noncausal_", node1, "_", node2, ".csv");
 
   if (!aos::util::PathExists(path)) {
     return {};
diff --git a/aos/events/ping.cc b/aos/events/ping.cc
index 9333b61..83a066b 100644
--- a/aos/events/ping.cc
+++ b/aos/events/ping.cc
@@ -1,10 +1,11 @@
+#include "gflags/gflags.h"
+#include "glog/logging.h"
+
 #include "aos/configuration.h"
 #include "aos/events/ping_lib.h"
 #include "aos/events/shm_event_loop.h"
 #include "aos/init.h"
 #include "aos/json_to_flatbuffer.h"
-#include "gflags/gflags.h"
-#include "glog/logging.h"
 
 DEFINE_string(config, "pingpong_config.json", "Path to the config.");
 
diff --git a/aos/events/ping_lib.cc b/aos/events/ping_lib.cc
index e80fd75..8e7136d 100644
--- a/aos/events/ping_lib.cc
+++ b/aos/events/ping_lib.cc
@@ -1,10 +1,11 @@
 #include "aos/events/ping_lib.h"
 
+#include "gflags/gflags.h"
+#include "glog/logging.h"
+
 #include "aos/events/ping_generated.h"
 #include "aos/events/pong_generated.h"
 #include "aos/json_to_flatbuffer.h"
-#include "gflags/gflags.h"
-#include "glog/logging.h"
 
 DEFINE_int32(sleep_ms, 10, "Time to sleep between pings");
 
diff --git a/aos/events/pingpong_test.cc b/aos/events/pingpong_test.cc
index 9c874ef..d35192a 100644
--- a/aos/events/pingpong_test.cc
+++ b/aos/events/pingpong_test.cc
@@ -1,10 +1,11 @@
+#include "glog/logging.h"
+#include "gtest/gtest.h"
+
 #include "aos/events/ping_lib.h"
 #include "aos/events/pong_lib.h"
 #include "aos/events/simulated_event_loop.h"
 #include "aos/json_to_flatbuffer.h"
 #include "aos/testing/path.h"
-#include "glog/logging.h"
-#include "gtest/gtest.h"
 
 namespace aos {
 namespace testing {
diff --git a/aos/events/pong.cc b/aos/events/pong.cc
index 59ddf5d..6a22b6b 100644
--- a/aos/events/pong.cc
+++ b/aos/events/pong.cc
@@ -1,10 +1,11 @@
+#include "glog/logging.h"
+
 #include "aos/configuration.h"
 #include "aos/events/ping_generated.h"
 #include "aos/events/pong_generated.h"
 #include "aos/events/pong_lib.h"
 #include "aos/events/shm_event_loop.h"
 #include "aos/init.h"
-#include "glog/logging.h"
 
 DEFINE_string(config, "pingpong_config.json", "Path to the config.");
 
diff --git a/aos/events/pong_lib.cc b/aos/events/pong_lib.cc
index b274e58..93a551e 100644
--- a/aos/events/pong_lib.cc
+++ b/aos/events/pong_lib.cc
@@ -1,9 +1,10 @@
 #include "aos/events/pong_lib.h"
 
+#include "glog/logging.h"
+
 #include "aos/events/event_loop.h"
 #include "aos/events/ping_generated.h"
 #include "aos/events/pong_generated.h"
-#include "glog/logging.h"
 
 namespace aos {
 
diff --git a/aos/events/shm_event_loop.cc b/aos/events/shm_event_loop.cc
index 89d0a9c..3e1be99 100644
--- a/aos/events/shm_event_loop.cc
+++ b/aos/events/shm_event_loop.cc
@@ -10,6 +10,8 @@
 #include <iterator>
 #include <stdexcept>
 
+#include "glog/logging.h"
+
 #include "aos/events/aos_logging.h"
 #include "aos/events/epoll.h"
 #include "aos/events/event_loop_generated.h"
@@ -21,7 +23,6 @@
 #include "aos/stl_mutex/stl_mutex.h"
 #include "aos/util/file.h"
 #include "aos/util/phased_loop.h"
-#include "glog/logging.h"
 
 namespace {
 
diff --git a/aos/events/shm_event_loop.h b/aos/events/shm_event_loop.h
index eb69f3d..7b7e68f 100644
--- a/aos/events/shm_event_loop.h
+++ b/aos/events/shm_event_loop.h
@@ -4,6 +4,7 @@
 #include <vector>
 
 #include "absl/types/span.h"
+
 #include "aos/events/epoll.h"
 #include "aos/events/event_loop.h"
 #include "aos/events/event_loop_generated.h"
diff --git a/aos/events/shm_event_loop_test.cc b/aos/events/shm_event_loop_test.cc
index 132ef20..55c4f03 100644
--- a/aos/events/shm_event_loop_test.cc
+++ b/aos/events/shm_event_loop_test.cc
@@ -2,12 +2,13 @@
 
 #include <string_view>
 
+#include "glog/logging.h"
+#include "gtest/gtest.h"
+
 #include "aos/events/event_loop_param_test.h"
 #include "aos/events/test_message_generated.h"
 #include "aos/network/team_number.h"
 #include "aos/realtime.h"
-#include "glog/logging.h"
-#include "gtest/gtest.h"
 
 namespace aos {
 namespace testing {
diff --git a/aos/events/simulated_event_loop.cc b/aos/events/simulated_event_loop.cc
index c021a84..44b30f1 100644
--- a/aos/events/simulated_event_loop.cc
+++ b/aos/events/simulated_event_loop.cc
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "absl/container/btree_map.h"
+
 #include "aos/events/aos_logging.h"
 #include "aos/events/simulated_network_bridge.h"
 #include "aos/init.h"
diff --git a/aos/events/simulated_event_loop.h b/aos/events/simulated_event_loop.h
index 8242d6c..6d88aa6 100644
--- a/aos/events/simulated_event_loop.h
+++ b/aos/events/simulated_event_loop.h
@@ -11,6 +11,8 @@
 #include <vector>
 
 #include "absl/container/btree_map.h"
+#include "glog/logging.h"
+
 #include "aos/events/event_loop.h"
 #include "aos/events/event_scheduler.h"
 #include "aos/events/simple_channel.h"
@@ -18,7 +20,6 @@
 #include "aos/flatbuffers.h"
 #include "aos/ipc_lib/index.h"
 #include "aos/uuid.h"
-#include "glog/logging.h"
 
 namespace aos {
 
@@ -236,13 +237,13 @@
   // args for the Main class.  Returns a pointer to the class that was started
   // if it was started, or nullptr.
   template <class Main, class... Args>
-  Main *MaybeStart(std::string_view name, Args &&... args);
+  Main *MaybeStart(std::string_view name, Args &&...args);
 
   // Starts an application regardless of if the config says to or not.  name is
   // the name of the application, and args are the constructor args for the
   // application.  Returns a pointer to the class that was started.
   template <class Main, class... Args>
-  Main *AlwaysStart(std::string_view name, Args &&... args);
+  Main *AlwaysStart(std::string_view name, Args &&...args);
 
   // Returns the simulated network delay for messages forwarded between nodes.
   std::chrono::nanoseconds network_delay() const {
@@ -352,7 +353,7 @@
     // application.
     template <class... Args>
     TypedApplication(NodeEventLoopFactory *node_factory, std::string_view name,
-                     Args &&... args)
+                     Args &&...args)
         : Application(node_factory, name),
           main(event_loop.get(), std::forward<Args>(args)...) {
       VLOG(1) << node_factory->scheduler_.distributed_now() << " "
@@ -371,7 +372,7 @@
 };
 
 template <class Main, class... Args>
-Main *NodeEventLoopFactory::MaybeStart(std::string_view name, Args &&... args) {
+Main *NodeEventLoopFactory::MaybeStart(std::string_view name, Args &&...args) {
   const aos::Application *application =
       configuration::GetApplication(configuration(), node(), name);
 
@@ -382,8 +383,7 @@
 }
 
 template <class Main, class... Args>
-Main *NodeEventLoopFactory::AlwaysStart(std::string_view name,
-                                        Args &&... args) {
+Main *NodeEventLoopFactory::AlwaysStart(std::string_view name, Args &&...args) {
   std::unique_ptr<TypedApplication<Main>> app =
       std::make_unique<TypedApplication<Main>>(this, name,
                                                std::forward<Args>(args)...);
diff --git a/aos/events/simulated_event_loop_test.cc b/aos/events/simulated_event_loop_test.cc
index 2922460..c5daa7e 100644
--- a/aos/events/simulated_event_loop_test.cc
+++ b/aos/events/simulated_event_loop_test.cc
@@ -4,6 +4,8 @@
 #include <functional>
 #include <string_view>
 
+#include "gtest/gtest.h"
+
 #include "aos/events/event_loop_param_test.h"
 #include "aos/events/logging/logger_generated.h"
 #include "aos/events/message_counter.h"
@@ -16,7 +18,6 @@
 #include "aos/network/testing_time_converter.h"
 #include "aos/network/timestamp_generated.h"
 #include "aos/testing/path.h"
-#include "gtest/gtest.h"
 
 namespace aos {
 namespace testing {
diff --git a/aos/events/simulated_network_bridge.cc b/aos/events/simulated_network_bridge.cc
index 31f3f0e..682ec7b 100644
--- a/aos/events/simulated_network_bridge.cc
+++ b/aos/events/simulated_network_bridge.cc
@@ -1,6 +1,7 @@
 #include "aos/events/simulated_network_bridge.h"
 
 #include "absl/strings/str_cat.h"
+
 #include "aos/configuration.h"
 #include "aos/events/event_loop.h"
 #include "aos/events/simulated_event_loop.h"
diff --git a/aos/events/timing_report_dump.cc b/aos/events/timing_report_dump.cc
index c71dcf5..bd80a04 100644
--- a/aos/events/timing_report_dump.cc
+++ b/aos/events/timing_report_dump.cc
@@ -1,10 +1,11 @@
+#include "gflags/gflags.h"
+#include "glog/logging.h"
+
 #include "aos/configuration.h"
 #include "aos/events/logging/log_reader.h"
 #include "aos/events/timing_report_dump_lib.h"
 #include "aos/init.h"
 #include "aos/json_to_flatbuffer.h"
-#include "gflags/gflags.h"
-#include "glog/logging.h"
 
 DEFINE_string(application, "",
               "Application filter to use. Empty for no filter.");
diff --git a/aos/events/timing_report_dump_lib.cc b/aos/events/timing_report_dump_lib.cc
index 94a979b..86936f1 100644
--- a/aos/events/timing_report_dump_lib.cc
+++ b/aos/events/timing_report_dump_lib.cc
@@ -56,7 +56,7 @@
 const std::string kIndent = "  ";
 
 std::string MaybeNodeName(std::string_view prefix_if_node,
-                               const aos::Node *node) {
+                          const aos::Node *node) {
   if (node == nullptr) {
     return "";
   }
diff --git a/aos/events/timing_report_dump_lib.h b/aos/events/timing_report_dump_lib.h
index 93163a1..02bfb54 100644
--- a/aos/events/timing_report_dump_lib.h
+++ b/aos/events/timing_report_dump_lib.h
@@ -3,12 +3,13 @@
 #include <map>
 #include <string>
 
+#include "gflags/gflags.h"
+#include "glog/logging.h"
+
 #include "aos/configuration.h"
 #include "aos/events/event_loop.h"
 #include "aos/events/event_loop_generated.h"
 #include "aos/json_to_flatbuffer.h"
-#include "gflags/gflags.h"
-#include "glog/logging.h"
 
 namespace aos {
 // A class to handle printing timing report statistics in a useful format on the
diff --git a/aos/events/timing_statistics.cc b/aos/events/timing_statistics.cc
index c89bebd..caf71da 100644
--- a/aos/events/timing_statistics.cc
+++ b/aos/events/timing_statistics.cc
@@ -1,8 +1,9 @@
 #include "aos/events/timing_statistics.h"
 
-#include "aos/events/event_loop_generated.h"
 #include "glog/logging.h"
 
+#include "aos/events/event_loop_generated.h"
+
 namespace aos {
 namespace internal {
 
diff --git a/aos/events/timing_statistics_test.cc b/aos/events/timing_statistics_test.cc
index 480cce3..9a7fefc 100644
--- a/aos/events/timing_statistics_test.cc
+++ b/aos/events/timing_statistics_test.cc
@@ -1,8 +1,9 @@
 #include "aos/events/timing_statistics.h"
 
-#include "aos/flatbuffers.h"
 #include "gtest/gtest.h"
 
+#include "aos/flatbuffers.h"
+
 namespace aos {
 namespace internal {
 namespace testing {