diff --git a/packager/app/crypto_flags.cc b/packager/app/crypto_flags.cc
index 4377d2d603..f97dfed77f 100644
--- a/packager/app/crypto_flags.cc
+++ b/packager/app/crypto_flags.cc
@@ -4,11 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <absl/flags/flag.h>
 #include <packager/app/crypto_flags.h>
 
 #include <cstdio>
 
+#include <absl/flags/flag.h>
+
 ABSL_FLAG(std::string,
           protection_scheme,
           "cenc",
diff --git a/packager/app/job_manager.h b/packager/app/job_manager.h
index 2293ce7fe1..9637a0e296 100644
--- a/packager/app/job_manager.h
+++ b/packager/app/job_manager.h
@@ -14,6 +14,7 @@
 #include <vector>
 
 #include <absl/synchronization/mutex.h>
+
 #include <packager/status/status.h>
 
 namespace shaka {
diff --git a/packager/app/mpd_generator.cc b/packager/app/mpd_generator.cc
index c4cc89088e..f50df3af5a 100644
--- a/packager/app/mpd_generator.cc
+++ b/packager/app/mpd_generator.cc
@@ -6,23 +6,24 @@
 
 #include <iostream>
 
+#if defined(OS_WIN)
+#include <codecvt>
+#include <functional>
+#endif  // defined(OS_WIN)
+
 #include <absl/flags/parse.h>
 #include <absl/flags/usage.h>
 #include <absl/flags/usage_config.h>
 #include <absl/strings/str_format.h>
 #include <absl/strings/str_split.h>
 #include <glog/logging.h>
+
 #include <packager/app/mpd_generator_flags.h>
 #include <packager/app/vlog_flags.h>
 #include <packager/mpd/util/mpd_writer.h>
 #include <packager/tools/license_notice.h>
 #include <packager/version/version.h>
 
-#if defined(OS_WIN)
-#include <codecvt>
-#include <functional>
-#endif  // defined(OS_WIN)
-
 ABSL_FLAG(bool, licenses, false, "Dump licenses.");
 ABSL_FLAG(std::string,
           test_packager_version,
diff --git a/packager/app/packager_main.cc b/packager/app/packager_main.cc
index 6b9910af86..d3fb4d333e 100644
--- a/packager/app/packager_main.cc
+++ b/packager/app/packager_main.cc
@@ -4,9 +4,15 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <absl/flags/flag.h>
 #include <iostream>
+#include <optional>
 
+#if defined(OS_WIN)
+#include <codecvt>
+#include <functional>
+#endif  // defined(OS_WIN)
+
+#include <absl/flags/flag.h>
 #include <absl/flags/parse.h>
 #include <absl/flags/usage.h>
 #include <absl/flags/usage_config.h>
@@ -14,6 +20,7 @@
 #include <absl/strings/str_format.h>
 #include <absl/strings/str_split.h>
 #include <glog/logging.h>
+
 #include <packager/app/ad_cue_generator_flags.h>
 #include <packager/app/crypto_flags.h>
 #include <packager/app/hls_flags.h>
@@ -31,12 +38,6 @@
 #include <packager/kv_pairs/kv_pairs.h>
 #include <packager/tools/license_notice.h>
 #include <packager/utils/string_trim_split.h>
-#include <optional>
-
-#if defined(OS_WIN)
-#include <codecvt>
-#include <functional>
-#endif  // defined(OS_WIN)
 
 ABSL_FLAG(bool, dump_stream_info, false, "Dump demuxed stream info.");
 ABSL_FLAG(bool, licenses, false, "Dump licenses.");
diff --git a/packager/app/packager_util.cc b/packager/app/packager_util.cc
index c84a1b085e..428cac9232 100644
--- a/packager/app/packager_util.cc
+++ b/packager/app/packager_util.cc
@@ -7,6 +7,7 @@
 #include <packager/app/packager_util.h>
 
 #include <glog/logging.h>
+
 #include <packager/file/file.h>
 #include <packager/media/base/media_handler.h>
 #include <packager/media/base/muxer_options.h>
diff --git a/packager/app/raw_key_encryption_flags.cc b/packager/app/raw_key_encryption_flags.cc
index 7229f60769..c78534a395 100644
--- a/packager/app/raw_key_encryption_flags.cc
+++ b/packager/app/raw_key_encryption_flags.cc
@@ -6,9 +6,8 @@
 //
 // Defines command line flags for raw key encryption/decryption.
 
-#include <packager/utils/absl_flag_hexbytes.h>
-
 #include <packager/app/validate_flag.h>
+#include <packager/utils/absl_flag_hexbytes.h>
 
 ABSL_FLAG(bool,
           enable_fixed_key_encryption,
diff --git a/packager/app/stream_descriptor.cc b/packager/app/stream_descriptor.cc
index 50ac47a597..c968ee0846 100644
--- a/packager/app/stream_descriptor.cc
+++ b/packager/app/stream_descriptor.cc
@@ -5,13 +5,14 @@
 // https://developers.google.com/open-source/licenses/bsd
 
 #include <packager/app/stream_descriptor.h>
-#include <packager/kv_pairs/kv_pairs.h>
-#include <packager/utils/string_trim_split.h>
 
 #include <absl/strings/numbers.h>
 #include <absl/strings/str_split.h>
 #include <glog/logging.h>
 
+#include <packager/kv_pairs/kv_pairs.h>
+#include <packager/utils/string_trim_split.h>
+
 namespace shaka {
 
 namespace {
diff --git a/packager/app/stream_descriptor.h b/packager/app/stream_descriptor.h
index 4ae83c275d..5a9a877f0d 100644
--- a/packager/app/stream_descriptor.h
+++ b/packager/app/stream_descriptor.h
@@ -7,6 +7,7 @@
 #ifndef APP_STREAM_DESCRIPTOR_H_
 #define APP_STREAM_DESCRIPTOR_H_
 
+#include <optional>
 #include <string>
 
 #include <packager/packager.h>
diff --git a/packager/app/validate_flag.h b/packager/app/validate_flag.h
index e818d9227e..1e53fac3f4 100644
--- a/packager/app/validate_flag.h
+++ b/packager/app/validate_flag.h
@@ -6,8 +6,8 @@
 //
 // Flag validation help functions.
 
-#ifndef APP_VALIDATE_FLAG_H_
-#define APP_VALIDATE_FLAG_H_
+#ifndef PACKAGER_APP_VALIDATE_FLAG_H_
+#define PACKAGER_APP_VALIDATE_FLAG_H_
 
 #include <string>
 
@@ -54,4 +54,4 @@ bool ValidateFlag(const char* flag_name,
 
 }  // namespace shaka
 
-#endif  // APP_VALIDATE_FLAG_H_
+#endif  // PACKAGER_APP_VALIDATE_FLAG_H_
diff --git a/packager/app/vlog_flags.cc b/packager/app/vlog_flags.cc
index fb56cf9394..6e9eceac58 100644
--- a/packager/app/vlog_flags.cc
+++ b/packager/app/vlog_flags.cc
@@ -6,8 +6,10 @@
 //
 // Defines verbose logging flags.
 
-#include <absl/strings/numbers.h>
 #include <packager/app/vlog_flags.h>
+
+#include <absl/strings/numbers.h>
+
 #include <packager/kv_pairs/kv_pairs.h>
 
 ABSL_FLAG(int32_t,
diff --git a/packager/app/widevine_encryption_flags.cc b/packager/app/widevine_encryption_flags.cc
index 8c397beb55..48b5bb3453 100644
--- a/packager/app/widevine_encryption_flags.cc
+++ b/packager/app/widevine_encryption_flags.cc
@@ -8,12 +8,14 @@
 
 #include <packager/app/widevine_encryption_flags.h>
 
+#include <string_view>
+
 #include <absl/flags/flag.h>
 #include <absl/strings/ascii.h>
 #include <absl/strings/match.h>
 #include <glog/logging.h>
+
 #include <packager/app/validate_flag.h>
-#include <string_view>
 
 ABSL_FLAG(bool,
           enable_widevine_encryption,
diff --git a/packager/file/callback_file.cc b/packager/file/callback_file.cc
index 1607af60d1..288fef447b 100644
--- a/packager/file/callback_file.cc
+++ b/packager/file/callback_file.cc
@@ -7,6 +7,7 @@
 #include <packager/file/callback_file.h>
 
 #include <glog/logging.h>
+
 #include <packager/macros.h>
 
 namespace shaka {
diff --git a/packager/file/callback_file_unittest.cc b/packager/file/callback_file_unittest.cc
index 141149dd50..f666b04c15 100644
--- a/packager/file/callback_file_unittest.cc
+++ b/packager/file/callback_file_unittest.cc
@@ -6,11 +6,11 @@
 
 #include <packager/file/callback_file.h>
 
+#include <memory>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <memory>
-
 #include <packager/file/file.h>
 #include <packager/file/file_closer.h>
 
diff --git a/packager/file/file.cc b/packager/file/file.cc
index e3032a8003..b1174621ee 100644
--- a/packager/file/file.cc
+++ b/packager/file/file.cc
@@ -6,9 +6,8 @@
 
 #include <packager/file/file.h>
 
-#include <inttypes.h>
-
 #include <algorithm>
+#include <cinttypes>
 #include <filesystem>
 #include <memory>
 
diff --git a/packager/file/file.h b/packager/file/file.h
index 492fdb3caf..67e491b85c 100644
--- a/packager/file/file.h
+++ b/packager/file/file.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_FILE_FILE_H_
 #define PACKAGER_FILE_FILE_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 
 #include <packager/file/public/buffer_callback_params.h>
diff --git a/packager/file/file_closer.h b/packager/file/file_closer.h
index e9aaa29560..7c3b7eb164 100644
--- a/packager/file/file_closer.h
+++ b/packager/file/file_closer.h
@@ -8,6 +8,7 @@
 #define MEDIA_FILE_FILE_CLOSER_H_
 
 #include <glog/logging.h>
+
 #include <packager/file/file.h>
 
 namespace shaka {
diff --git a/packager/file/file_test_util.h b/packager/file/file_test_util.h
index f99cd79905..77914db079 100644
--- a/packager/file/file_test_util.h
+++ b/packager/file/file_test_util.h
@@ -7,12 +7,12 @@
 #ifndef MEDIA_FILE_FILE_TEST_UTIL_H_
 #define MEDIA_FILE_FILE_TEST_UTIL_H_
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <iterator>
 #include <string>
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <packager/file/file.h>
 
 namespace shaka {
diff --git a/packager/file/file_unittest.cc b/packager/file/file_unittest.cc
index e852f161ce..ceff9ad150 100644
--- a/packager/file/file_unittest.cc
+++ b/packager/file/file_unittest.cc
@@ -4,14 +4,15 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
-#include <cstdio>
+#include <packager/file/file.h>
 
+#include <cstdio>
 #include <filesystem>
 #include <locale>
 
 #include <absl/flags/declare.h>
-#include <packager/file/file.h>
+#include <gtest/gtest.h>
+
 #include <packager/file/file_test_util.h>
 #include <packager/flag_saver.h>
 
diff --git a/packager/file/file_util_unittest.cc b/packager/file/file_util_unittest.cc
index 8478c461c3..2497777085 100644
--- a/packager/file/file_util_unittest.cc
+++ b/packager/file/file_util_unittest.cc
@@ -6,9 +6,8 @@
 
 #include <packager/file/file_util.h>
 
-#include <gtest/gtest.h>
-
 #include <glog/logging.h>
+#include <gtest/gtest.h>
 
 namespace shaka {
 
diff --git a/packager/file/http_file.cc b/packager/file/http_file.cc
index dbd5f15534..ecc0593123 100644
--- a/packager/file/http_file.cc
+++ b/packager/file/http_file.cc
@@ -6,12 +6,11 @@
 
 #include <packager/file/http_file.h>
 
-#include <curl/curl.h>
-
 #include <absl/flags/declare.h>
 #include <absl/flags/flag.h>
 #include <absl/strings/escaping.h>
 #include <absl/strings/str_format.h>
+#include <curl/curl.h>
 #include <glog/logging.h>
 
 #include <packager/file/thread_pool.h>
diff --git a/packager/file/http_file_unittest.cc b/packager/file/http_file_unittest.cc
index 62ed2e6baa..a1393b75b0 100644
--- a/packager/file/http_file_unittest.cc
+++ b/packager/file/http_file_unittest.cc
@@ -6,16 +6,16 @@
 
 #include <packager/file/http_file.h>
 
-#include <gtest/gtest.h>
-
 #include <memory>
 #include <vector>
 
 #include <absl/strings/str_split.h>
+#include <gtest/gtest.h>
+#include <nlohmann/json.hpp>
+
 #include <packager/file/file.h>
 #include <packager/file/file_closer.h>
 #include <packager/media/test/test_web_server.h>
-#include <nlohmann/json.hpp>
 
 #define ASSERT_JSON_STRING(json, key, value) \
   ASSERT_EQ(GetJsonString((json), (key)), (value)) << "JSON is " << (json)
diff --git a/packager/file/io_cache.cc b/packager/file/io_cache.cc
index f402c51ba3..908a33d34e 100644
--- a/packager/file/io_cache.cc
+++ b/packager/file/io_cache.cc
@@ -6,9 +6,8 @@
 
 #include <packager/file/io_cache.h>
 
-#include <string.h>
-
 #include <algorithm>
+#include <cstring>
 
 #include <glog/logging.h>
 
diff --git a/packager/file/io_cache.h b/packager/file/io_cache.h
index b3a1d4ca36..6f973eff81 100644
--- a/packager/file/io_cache.h
+++ b/packager/file/io_cache.h
@@ -7,11 +7,11 @@
 #ifndef PACKAGER_FILE_IO_CACHE_H_
 #define PACKAGER_FILE_IO_CACHE_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <absl/synchronization/mutex.h>
+
 #include <packager/macros.h>
 
 namespace shaka {
diff --git a/packager/file/io_cache_unittest.cc b/packager/file/io_cache_unittest.cc
index b27c5c9b20..c4fec3fdd4 100644
--- a/packager/file/io_cache_unittest.cc
+++ b/packager/file/io_cache_unittest.cc
@@ -6,13 +6,13 @@
 
 #include <packager/file/io_cache.h>
 
-#include <gtest/gtest.h>
-#include <string.h>
-
 #include <algorithm>
 #include <chrono>
+#include <cstring>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 namespace {
 const uint64_t kBlockSize = 256;
 const uint64_t kCacheSize = 16 * kBlockSize;
diff --git a/packager/file/local_file.cc b/packager/file/local_file.cc
index 21d88ec800..a3e7d24fde 100644
--- a/packager/file/local_file.cc
+++ b/packager/file/local_file.cc
@@ -6,14 +6,13 @@
 
 #include <packager/file/local_file.h>
 
-#include <cstdio>
-
 #if defined(OS_WIN)
 #include <windows.h>
 #else
 #include <sys/stat.h>
 #endif  // defined(OS_WIN)
 
+#include <cstdio>
 #include <filesystem>
 
 #include <glog/logging.h>
diff --git a/packager/file/local_file.h b/packager/file/local_file.h
index 5221ce9458..438d97a194 100644
--- a/packager/file/local_file.h
+++ b/packager/file/local_file.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_FILE_LOCAL_FILE_H_
 #define PACKAGER_FILE_LOCAL_FILE_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 
 #include <packager/file/file.h>
diff --git a/packager/file/memory_file.cc b/packager/file/memory_file.cc
index 8467c8f859..f0d69f5bcc 100644
--- a/packager/file/memory_file.cc
+++ b/packager/file/memory_file.cc
@@ -6,9 +6,8 @@
 
 #include <packager/file/memory_file.h>
 
-#include <string.h>  // for memcpy
-
 #include <algorithm>
+#include <cstring>  // for memcpy
 #include <map>
 #include <memory>
 #include <set>
diff --git a/packager/file/memory_file.h b/packager/file/memory_file.h
index 2ca0ca8a2a..5930ee7873 100644
--- a/packager/file/memory_file.h
+++ b/packager/file/memory_file.h
@@ -7,8 +7,7 @@
 #ifndef MEDIA_FILE_MEDIA_FILE_H_
 #define MEDIA_FILE_MEDIA_FILE_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/packager/file/memory_file_unittest.cc b/packager/file/memory_file_unittest.cc
index a1ad94f027..518421e45c 100644
--- a/packager/file/memory_file_unittest.cc
+++ b/packager/file/memory_file_unittest.cc
@@ -4,9 +4,10 @@
 
 #include <packager/file/memory_file.h>
 
-#include <gtest/gtest.h>
 #include <memory>
 
+#include <gtest/gtest.h>
+
 #include <packager/file/file.h>
 #include <packager/file/file_closer.h>
 
diff --git a/packager/file/thread_pool.h b/packager/file/thread_pool.h
index c57c59ec2a..8ecac03064 100644
--- a/packager/file/thread_pool.h
+++ b/packager/file/thread_pool.h
@@ -12,6 +12,7 @@
 
 #include <absl/base/thread_annotations.h>
 #include <absl/synchronization/mutex.h>
+
 #include <packager/macros.h>
 
 namespace shaka {
diff --git a/packager/file/threaded_io_file.h b/packager/file/threaded_io_file.h
index ca989c8e34..f91d2fe126 100644
--- a/packager/file/threaded_io_file.h
+++ b/packager/file/threaded_io_file.h
@@ -11,6 +11,7 @@
 #include <memory>
 
 #include <absl/synchronization/mutex.h>
+
 #include <packager/file/file.h>
 #include <packager/file/file_closer.h>
 #include <packager/file/io_cache.h>
diff --git a/packager/file/udp_file.cc b/packager/file/udp_file.cc
index a85221615f..1bfee39c7e 100644
--- a/packager/file/udp_file.cc
+++ b/packager/file/udp_file.cc
@@ -29,6 +29,7 @@
 #include <limits>
 
 #include <glog/logging.h>
+
 #include <packager/file/udp_options.h>
 
 namespace shaka {
diff --git a/packager/file/udp_file.h b/packager/file/udp_file.h
index 4e2746fd02..ea9d40f6ef 100644
--- a/packager/file/udp_file.h
+++ b/packager/file/udp_file.h
@@ -7,12 +7,9 @@
 #ifndef MEDIA_FILE_UDP_FILE_H_
 #define MEDIA_FILE_UDP_FILE_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 
-#include <packager/file/file.h>
-
 #if defined(OS_WIN)
 #include <windows.h>
 #include <winsock2.h>
@@ -20,6 +17,8 @@
 typedef int SOCKET;
 #endif  // defined(OS_WIN)
 
+#include <packager/file/file.h>
+
 namespace shaka {
 
 /// Implements UdpFile, which receives UDP unicast and multicast streams.
diff --git a/packager/file/udp_options.cc b/packager/file/udp_options.cc
index c1f78b4ec2..e3dfe23681 100644
--- a/packager/file/udp_options.cc
+++ b/packager/file/udp_options.cc
@@ -12,6 +12,7 @@
 #include <absl/strings/numbers.h>
 #include <absl/strings/str_split.h>
 #include <glog/logging.h>
+
 #include <packager/kv_pairs/kv_pairs.h>
 #include <packager/macros.h>
 
diff --git a/packager/file/udp_options_unittest.cc b/packager/file/udp_options_unittest.cc
index aa749b7351..bb79567626 100644
--- a/packager/file/udp_options_unittest.cc
+++ b/packager/file/udp_options_unittest.cc
@@ -6,10 +6,10 @@
 
 #include <packager/file/udp_options.h>
 
-#include <gtest/gtest.h>
-
 #include <absl/flags/declare.h>
 #include <absl/flags/flag.h>
+#include <gtest/gtest.h>
+
 #include <packager/flag_saver.h>
 
 ABSL_DECLARE_FLAG(std::string, udp_interface_address);
diff --git a/packager/hls/base/master_playlist.cc b/packager/hls/base/master_playlist.cc
index cccd7590da..d7e70eebee 100644
--- a/packager/hls/base/master_playlist.cc
+++ b/packager/hls/base/master_playlist.cc
@@ -7,18 +7,18 @@
 #include <packager/hls/base/master_playlist.h>
 
 #include <algorithm>  // std::max
-
-#include <inttypes.h>
+#include <cstdint>
+#include <filesystem>
 
 #include <absl/strings/numbers.h>
 #include <absl/strings/str_format.h>
 #include <absl/strings/str_join.h>
 #include <glog/logging.h>
+
 #include <packager/file/file.h>
 #include <packager/hls/base/media_playlist.h>
 #include <packager/hls/base/tag.h>
 #include <packager/version/version.h>
-#include <filesystem>
 
 namespace shaka {
 namespace hls {
diff --git a/packager/hls/base/master_playlist_unittest.cc b/packager/hls/base/master_playlist_unittest.cc
index 5c0a563088..41eaa761bd 100644
--- a/packager/hls/base/master_playlist_unittest.cc
+++ b/packager/hls/base/master_playlist_unittest.cc
@@ -4,11 +4,14 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/hls/base/master_playlist.h>
+
+#include <filesystem>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <packager/file/file.h>
-#include <packager/hls/base/master_playlist.h>
 #include <packager/hls/base/media_playlist.h>
 #include <packager/hls/base/mock_media_playlist.h>
 #include <packager/version/version.h>
diff --git a/packager/hls/base/media_playlist.cc b/packager/hls/base/media_playlist.cc
index 2dbf0da624..6a11383ea9 100644
--- a/packager/hls/base/media_playlist.cc
+++ b/packager/hls/base/media_playlist.cc
@@ -6,15 +6,15 @@
 
 #include <packager/hls/base/media_playlist.h>
 
-#include <inttypes.h>
-
 #include <algorithm>
+#include <cinttypes>
 #include <cmath>
 #include <memory>
 
 #include <absl/strings/numbers.h>
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
+
 #include <packager/file/file.h>
 #include <packager/hls/base/tag.h>
 #include <packager/media/base/language_utils.h>
diff --git a/packager/hls/base/media_playlist_unittest.cc b/packager/hls/base/media_playlist_unittest.cc
index e59343b0c1..978f9928b9 100644
--- a/packager/hls/base/media_playlist_unittest.cc
+++ b/packager/hls/base/media_playlist_unittest.cc
@@ -4,14 +4,15 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/hls/base/media_playlist.h>
+
+#include <absl/strings/str_format.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <absl/strings/str_format.h>
 #include <packager/file/file.h>
 #include <packager/file/file_closer.h>
 #include <packager/file/file_test_util.h>
-#include <packager/hls/base/media_playlist.h>
 #include <packager/version/version.h>
 
 namespace shaka {
diff --git a/packager/hls/base/simple_hls_notifier.cc b/packager/hls/base/simple_hls_notifier.cc
index aba591b724..0303f67010 100644
--- a/packager/hls/base/simple_hls_notifier.cc
+++ b/packager/hls/base/simple_hls_notifier.cc
@@ -6,19 +6,20 @@
 
 #include <packager/hls/base/simple_hls_notifier.h>
 
-#include <absl/flags/flag.h>
 #include <cmath>
+#include <filesystem>
+#include <optional>
 
+#include <absl/flags/flag.h>
 #include <absl/strings/escaping.h>
 #include <absl/strings/numbers.h>
 #include <glog/logging.h>
+
 #include <packager/file/file_util.h>
 #include <packager/media/base/protection_system_ids.h>
 #include <packager/media/base/protection_system_specific_info.h>
 #include <packager/media/base/proto_json_util.h>
 #include <packager/media/base/widevine_pssh_data.pb.h>
-#include <filesystem>
-#include <optional>
 
 ABSL_FLAG(bool,
           enable_legacy_widevine_hls_signaling,
diff --git a/packager/hls/base/simple_hls_notifier_unittest.cc b/packager/hls/base/simple_hls_notifier_unittest.cc
index 318b896f83..8126ebc44e 100644
--- a/packager/hls/base/simple_hls_notifier_unittest.cc
+++ b/packager/hls/base/simple_hls_notifier_unittest.cc
@@ -4,21 +4,22 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <packager/hls/base/simple_hls_notifier.h>
+
+#include <filesystem>
+#include <memory>
 
 #include <absl/flags/declare.h>
 #include <absl/flags/flag.h>
-#include <memory>
-
 #include <absl/strings/escaping.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <packager/flag_saver.h>
 #include <packager/hls/base/mock_media_playlist.h>
-#include <packager/hls/base/simple_hls_notifier.h>
 #include <packager/media/base/protection_system_ids.h>
 #include <packager/media/base/protection_system_specific_info.h>
 #include <packager/media/base/widevine_pssh_data.pb.h>
-#include <filesystem>
 
 ABSL_DECLARE_FLAG(bool, enable_legacy_widevine_hls_signaling);
 
diff --git a/packager/hls/base/tag.cc b/packager/hls/base/tag.cc
index 04f904285b..e26b321ab8 100644
--- a/packager/hls/base/tag.cc
+++ b/packager/hls/base/tag.cc
@@ -6,8 +6,9 @@
 
 #include <packager/hls/base/tag.h>
 
+#include <cinttypes>
+
 #include <absl/strings/str_format.h>
-#include <inttypes.h>
 
 namespace shaka {
 namespace hls {
diff --git a/packager/kv_pairs/kv_pairs_unittest.cc b/packager/kv_pairs/kv_pairs_unittest.cc
index afa6bc6105..7693b4b124 100644
--- a/packager/kv_pairs/kv_pairs_unittest.cc
+++ b/packager/kv_pairs/kv_pairs_unittest.cc
@@ -4,11 +4,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/kv_pairs/kv_pairs.h>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <packager/kv_pairs/kv_pairs.h>
-
 namespace shaka {
 
 using ::std::make_pair;
diff --git a/packager/media/base/aes_cryptor.h b/packager/media/base/aes_cryptor.h
index f3b7130717..ebfe18fc75 100644
--- a/packager/media/base/aes_cryptor.h
+++ b/packager/media/base/aes_cryptor.h
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include <mbedtls/cipher.h>
+
 #include <packager/macros.h>
 #include <packager/media/base/fourccs.h>
 
diff --git a/packager/media/base/aes_cryptor_unittest.cc b/packager/media/base/aes_cryptor_unittest.cc
index d358fbcec3..234243fd0a 100644
--- a/packager/media/base/aes_cryptor_unittest.cc
+++ b/packager/media/base/aes_cryptor_unittest.cc
@@ -4,15 +4,16 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
+#include <packager/media/base/aes_decryptor.h>
+#include <packager/media/base/aes_encryptor.h>
 
 #include <iterator>
 #include <memory>
 
 #include <absl/strings/escaping.h>
 #include <glog/logging.h>
-#include <packager/media/base/aes_decryptor.h>
-#include <packager/media/base/aes_encryptor.h>
+#include <gtest/gtest.h>
+
 #include <packager/utils/bytes_to_string_view.h>
 
 namespace {
diff --git a/packager/media/base/aes_pattern_cryptor.h b/packager/media/base/aes_pattern_cryptor.h
index fa0790cb61..73e6a4f7f3 100644
--- a/packager/media/base/aes_pattern_cryptor.h
+++ b/packager/media/base/aes_pattern_cryptor.h
@@ -4,11 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <packager/media/base/aes_cryptor.h>
-
 #include <memory>
 
 #include <packager/macros.h>
+#include <packager/media/base/aes_cryptor.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/aes_pattern_cryptor_unittest.cc b/packager/media/base/aes_pattern_cryptor_unittest.cc
index df2bb0813f..1090394b6e 100644
--- a/packager/media/base/aes_pattern_cryptor_unittest.cc
+++ b/packager/media/base/aes_pattern_cryptor_unittest.cc
@@ -4,11 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/base/aes_pattern_cryptor.h>
+
+#include <absl/strings/escaping.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <absl/strings/escaping.h>
-#include <packager/media/base/aes_pattern_cryptor.h>
 #include <packager/media/base/mock_aes_cryptor.h>
 
 using ::testing::_;
diff --git a/packager/media/base/audio_stream_info.cc b/packager/media/base/audio_stream_info.cc
index 828f271f28..6b72f731f9 100644
--- a/packager/media/base/audio_stream_info.cc
+++ b/packager/media/base/audio_stream_info.cc
@@ -6,10 +6,11 @@
 
 #include <packager/media/base/audio_stream_info.h>
 
-#include <inttypes.h>
+#include <cinttypes>
 
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
+
 #include <packager/macros.h>
 #include <packager/media/base/limits.h>
 
diff --git a/packager/media/base/audio_timestamp_helper.cc b/packager/media/base/audio_timestamp_helper.cc
index d5ec1480e4..8816073342 100644
--- a/packager/media/base/audio_timestamp_helper.cc
+++ b/packager/media/base/audio_timestamp_helper.cc
@@ -5,6 +5,7 @@
 #include <packager/media/base/audio_timestamp_helper.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/timestamp.h>
 
 namespace shaka {
diff --git a/packager/media/base/audio_timestamp_helper.h b/packager/media/base/audio_timestamp_helper.h
index 63445a400a..7ee642acbf 100644
--- a/packager/media/base/audio_timestamp_helper.h
+++ b/packager/media/base/audio_timestamp_helper.h
@@ -5,7 +5,7 @@
 #ifndef PACKAGER_MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_
 #define PACKAGER_MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <packager/macros.h>
 
diff --git a/packager/media/base/audio_timestamp_helper_unittest.cc b/packager/media/base/audio_timestamp_helper_unittest.cc
index 405650da76..8524afc934 100644
--- a/packager/media/base/audio_timestamp_helper_unittest.cc
+++ b/packager/media/base/audio_timestamp_helper_unittest.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gtest/gtest.h>
+#include <packager/media/base/audio_timestamp_helper.h>
 
 #include <iterator>
 
-#include <packager/media/base/audio_timestamp_helper.h>
+#include <gtest/gtest.h>
+
 #include <packager/media/base/timestamp.h>
 
 namespace shaka {
diff --git a/packager/media/base/bit_reader.h b/packager/media/base/bit_reader.h
index 43c90b47c9..6672750079 100644
--- a/packager/media/base/bit_reader.h
+++ b/packager/media/base/bit_reader.h
@@ -5,10 +5,11 @@
 #ifndef PACKAGER_MEDIA_BASE_BIT_READER_H_
 #define PACKAGER_MEDIA_BASE_BIT_READER_H_
 
-#include <stdint.h>
-#include <sys/types.h>
+#include <cstddef>
+#include <cstdint>
 
 #include <glog/logging.h>
+
 #include <packager/macros.h>
 
 namespace shaka {
diff --git a/packager/media/base/bit_reader_unittest.cc b/packager/media/base/bit_reader_unittest.cc
index 27dfc9c4b2..dd8f143002 100644
--- a/packager/media/base/bit_reader_unittest.cc
+++ b/packager/media/base/bit_reader_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gtest/gtest.h>
-
 #include <packager/media/base/bit_reader.h>
 
+#include <gtest/gtest.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/base/bit_writer.h b/packager/media/base/bit_writer.h
index 9a64ac2d7e..1f8409d6db 100644
--- a/packager/media/base/bit_writer.h
+++ b/packager/media/base/bit_writer.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_BASE_BIT_WRITER_H_
 #define PACKAGER_MEDIA_BASE_BIT_WRITER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <glog/logging.h>
diff --git a/packager/media/base/buffer_reader.h b/packager/media/base/buffer_reader.h
index 296f9a096b..a850e0e202 100644
--- a/packager/media/base/buffer_reader.h
+++ b/packager/media/base/buffer_reader.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_BASE_BUFFER_READER_H_
 #define PACKAGER_MEDIA_BASE_BUFFER_READER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/packager/media/base/buffer_writer.cc b/packager/media/base/buffer_writer.cc
index 114ab5555f..61bf962d53 100644
--- a/packager/media/base/buffer_writer.cc
+++ b/packager/media/base/buffer_writer.cc
@@ -8,6 +8,7 @@
 
 #include <absl/base/internal/endian.h>
 #include <glog/logging.h>
+
 #include <packager/file/file.h>
 
 namespace shaka {
diff --git a/packager/media/base/buffer_writer_unittest.cc b/packager/media/base/buffer_writer_unittest.cc
index 99ad266172..92c22b9eab 100644
--- a/packager/media/base/buffer_writer_unittest.cc
+++ b/packager/media/base/buffer_writer_unittest.cc
@@ -11,6 +11,7 @@
 #include <memory>
 
 #include <glog/logging.h>
+
 #include <packager/file/file.h>
 #include <packager/file/file_test_util.h>
 #include <packager/media/base/buffer_reader.h>
diff --git a/packager/media/base/byte_queue.h b/packager/media/base/byte_queue.h
index 39eb885443..98a01d8277 100644
--- a/packager/media/base/byte_queue.h
+++ b/packager/media/base/byte_queue.h
@@ -5,8 +5,7 @@
 #ifndef PACKAGER_MEDIA_BASE_BYTE_QUEUE_H_
 #define PACKAGER_MEDIA_BASE_BYTE_QUEUE_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <memory>
 
 #include <packager/macros.h>
diff --git a/packager/media/base/container_names.cc b/packager/media/base/container_names.cc
index a614c8aba9..d9b0043aa4 100644
--- a/packager/media/base/container_names.cc
+++ b/packager/media/base/container_names.cc
@@ -4,16 +4,16 @@
 
 #include <packager/media/base/container_names.h>
 
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <stdint.h>
-
 #include <algorithm>
 #include <cctype>
+#include <cstdint>
 #include <iterator>
 #include <limits>
 
 #include <glog/logging.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/mpd/base/xml/scoped_xml_ptr.h>
 
diff --git a/packager/media/base/container_names.h b/packager/media/base/container_names.h
index 897136c33d..2c587411fe 100644
--- a/packager/media/base/container_names.h
+++ b/packager/media/base/container_names.h
@@ -5,8 +5,7 @@
 #ifndef PACKAGER_MEDIA_BASE_CONTAINER_NAMES_H_
 #define PACKAGER_MEDIA_BASE_CONTAINER_NAMES_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 
 namespace shaka {
diff --git a/packager/media/base/container_names_unittest.cc b/packager/media/base/container_names_unittest.cc
index ed34e9351d..e0ef6b811b 100644
--- a/packager/media/base/container_names_unittest.cc
+++ b/packager/media/base/container_names_unittest.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gtest/gtest.h>
+#include <packager/media/base/container_names.h>
 
 #include <iterator>
 
-#include <packager/media/base/container_names.h>
+#include <gtest/gtest.h>
+
 #include <packager/media/test/test_data_util.h>
 
 namespace shaka {
diff --git a/packager/media/base/decrypt_config.h b/packager/media/base/decrypt_config.h
index 572aba3dd6..123eacacd2 100644
--- a/packager/media/base/decrypt_config.h
+++ b/packager/media/base/decrypt_config.h
@@ -5,8 +5,7 @@
 #ifndef PACKAGER_MEDIA_BASE_DECRYPT_CONFIG_H_
 #define PACKAGER_MEDIA_BASE_DECRYPT_CONFIG_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/packager/media/base/decryptor_source.cc b/packager/media/base/decryptor_source.cc
index b4fb2eede1..1b2e7f1a3c 100644
--- a/packager/media/base/decryptor_source.cc
+++ b/packager/media/base/decryptor_source.cc
@@ -7,6 +7,7 @@
 #include <packager/media/base/decryptor_source.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/aes_decryptor.h>
 #include <packager/media/base/aes_pattern_cryptor.h>
 
diff --git a/packager/media/base/decryptor_source_unittest.cc b/packager/media/base/decryptor_source_unittest.cc
index 4a69697005..4ccead81b8 100644
--- a/packager/media/base/decryptor_source_unittest.cc
+++ b/packager/media/base/decryptor_source_unittest.cc
@@ -6,11 +6,11 @@
 
 #include <packager/media/base/decryptor_source.h>
 
+#include <iterator>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <iterator>
-
 #include <packager/macros.h>
 #include <packager/media/base/raw_key_source.h>
 
diff --git a/packager/media/base/http_key_fetcher_unittest.cc b/packager/media/base/http_key_fetcher_unittest.cc
index 8aad63e93c..af4d91b97c 100644
--- a/packager/media/base/http_key_fetcher_unittest.cc
+++ b/packager/media/base/http_key_fetcher_unittest.cc
@@ -9,6 +9,7 @@
 #include <algorithm>
 
 #include <glog/logging.h>
+
 #include <packager/media/test/test_web_server.h>
 #include <packager/status/status_test_util.h>
 
diff --git a/packager/media/base/id3_tag.cc b/packager/media/base/id3_tag.cc
index 164fcc542b..e5797b0938 100644
--- a/packager/media/base/id3_tag.cc
+++ b/packager/media/base/id3_tag.cc
@@ -7,6 +7,7 @@
 #include <packager/media/base/id3_tag.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/fourccs.h>
 
diff --git a/packager/media/base/language_utils.cc b/packager/media/base/language_utils.cc
index fc7941af98..f71f5385da 100644
--- a/packager/media/base/language_utils.cc
+++ b/packager/media/base/language_utils.cc
@@ -9,6 +9,7 @@
 #include <iterator>
 
 #include <glog/logging.h>
+
 #include <packager/macros.h>
 
 namespace {
diff --git a/packager/media/base/media_handler_test_base.h b/packager/media/base/media_handler_test_base.h
index df450bf58e..980948a5e4 100644
--- a/packager/media/base/media_handler_test_base.h
+++ b/packager/media/base/media_handler_test_base.h
@@ -7,11 +7,11 @@
 #ifndef PACKAGER_MEDIA_BASE_MEDIA_HANDLER_TEST_BASE_H_
 #define PACKAGER_MEDIA_BASE_MEDIA_HANDLER_TEST_BASE_H_
 
+#include <absl/strings/escaping.h>
+#include <absl/strings/numbers.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <absl/strings/escaping.h>
-#include <absl/strings/numbers.h>
 #include <packager/media/base/media_handler.h>
 #include <packager/media/base/video_stream_info.h>
 #include <packager/utils/bytes_to_string_view.h>
diff --git a/packager/media/base/media_sample.cc b/packager/media/base/media_sample.cc
index 5f9cde37c9..63bd550b91 100644
--- a/packager/media/base/media_sample.cc
+++ b/packager/media/base/media_sample.cc
@@ -6,7 +6,7 @@
 
 #include <packager/media/base/media_sample.h>
 
-#include <inttypes.h>
+#include <cinttypes>
 
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
diff --git a/packager/media/base/media_sample.h b/packager/media/base/media_sample.h
index 1e63b8289e..8e06e025e6 100644
--- a/packager/media/base/media_sample.h
+++ b/packager/media/base/media_sample.h
@@ -13,6 +13,7 @@
 #include <vector>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/decrypt_config.h>
 
 namespace shaka {
diff --git a/packager/media/base/muxer_options.h b/packager/media/base/muxer_options.h
index b8aaa60f68..348ddaf262 100644
--- a/packager/media/base/muxer_options.h
+++ b/packager/media/base/muxer_options.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_BASE_MUXER_OPTIONS_H_
 #define PACKAGER_MEDIA_BASE_MUXER_OPTIONS_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 
 #include <packager/media/public/mp4_output_params.h>
diff --git a/packager/media/base/muxer_util.cc b/packager/media/base/muxer_util.cc
index ac8abdf9f1..09e711e758 100644
--- a/packager/media/base/muxer_util.cc
+++ b/packager/media/base/muxer_util.cc
@@ -6,8 +6,7 @@
 
 #include <packager/media/base/muxer_util.h>
 
-#include <inttypes.h>
-
+#include <cinttypes>
 #include <string>
 #include <vector>
 
@@ -15,6 +14,7 @@
 #include <absl/strings/str_format.h>
 #include <absl/strings/str_split.h>
 #include <glog/logging.h>
+
 #include <packager/media/base/video_stream_info.h>
 
 namespace shaka {
diff --git a/packager/media/base/muxer_util.h b/packager/media/base/muxer_util.h
index 800ec9900a..72d68312bb 100644
--- a/packager/media/base/muxer_util.h
+++ b/packager/media/base/muxer_util.h
@@ -9,7 +9,7 @@
 #ifndef PACKAGER_MEDIA_BASE_MUXER_UTIL_H_
 #define PACKAGER_MEDIA_BASE_MUXER_UTIL_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <packager/status/status.h>
 
diff --git a/packager/media/base/muxer_util_unittest.cc b/packager/media/base/muxer_util_unittest.cc
index 66e0262f42..0f410ff885 100644
--- a/packager/media/base/muxer_util_unittest.cc
+++ b/packager/media/base/muxer_util_unittest.cc
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
-
 #include <packager/media/base/muxer_util.h>
 
+#include <gtest/gtest.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/base/offset_byte_queue.cc b/packager/media/base/offset_byte_queue.cc
index c0b2a91238..fb10406731 100644
--- a/packager/media/base/offset_byte_queue.cc
+++ b/packager/media/base/offset_byte_queue.cc
@@ -4,7 +4,7 @@
 
 #include <packager/media/base/offset_byte_queue.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <glog/logging.h>
 
diff --git a/packager/media/base/offset_byte_queue.h b/packager/media/base/offset_byte_queue.h
index 73a7b67d0e..5c95f21220 100644
--- a/packager/media/base/offset_byte_queue.h
+++ b/packager/media/base/offset_byte_queue.h
@@ -5,7 +5,7 @@
 #ifndef PACKAGER_MEDIA_BASE_OFFSET_BYTE_QUEUE_H_
 #define PACKAGER_MEDIA_BASE_OFFSET_BYTE_QUEUE_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <packager/media/base/byte_queue.h>
 
diff --git a/packager/media/base/offset_byte_queue_unittest.cc b/packager/media/base/offset_byte_queue_unittest.cc
index e3e8367317..c874a89175 100644
--- a/packager/media/base/offset_byte_queue_unittest.cc
+++ b/packager/media/base/offset_byte_queue_unittest.cc
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gtest/gtest.h>
 #include <packager/media/base/offset_byte_queue.h>
-#include <stdint.h>
-#include <string.h>
+
+#include <cstdint>
+#include <cstring>
 #include <memory>
 
+#include <gtest/gtest.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/base/playready_key_source.cc b/packager/media/base/playready_key_source.cc
index 1016885e1e..4e34612360 100644
--- a/packager/media/base/playready_key_source.cc
+++ b/packager/media/base/playready_key_source.cc
@@ -11,6 +11,7 @@
 
 #include <absl/strings/escaping.h>
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/http_key_fetcher.h>
 #include <packager/media/base/key_source.h>
diff --git a/packager/media/base/playready_pssh_generator.cc b/packager/media/base/playready_pssh_generator.cc
index a1e72a6814..0b451e76de 100644
--- a/packager/media/base/playready_pssh_generator.cc
+++ b/packager/media/base/playready_pssh_generator.cc
@@ -14,6 +14,7 @@
 #include <absl/strings/escaping.h>
 #include <glog/logging.h>
 #include <mbedtls/cipher.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/protection_system_ids.h>
 
diff --git a/packager/media/base/producer_consumer_queue.h b/packager/media/base/producer_consumer_queue.h
index c4a9acd96e..a7570a13f9 100644
--- a/packager/media/base/producer_consumer_queue.h
+++ b/packager/media/base/producer_consumer_queue.h
@@ -13,6 +13,8 @@
 #include <absl/strings/str_format.h>
 #include <absl/synchronization/mutex.h>
 #include <absl/time/time.h>
+#include <glog/logging.h>
+
 #include <packager/macros.h>
 #include <packager/status/status.h>
 
diff --git a/packager/media/base/producer_consumer_queue_unittest.cc b/packager/media/base/producer_consumer_queue_unittest.cc
index 88f4e10935..71188fe4bb 100644
--- a/packager/media/base/producer_consumer_queue_unittest.cc
+++ b/packager/media/base/producer_consumer_queue_unittest.cc
@@ -4,13 +4,14 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
+#include <packager/media/base/producer_consumer_queue.h>
 
 #include <thread>
 
 #include <absl/synchronization/notification.h>
 #include <glog/logging.h>
-#include <packager/media/base/producer_consumer_queue.h>
+#include <gtest/gtest.h>
+
 #include <packager/status/status_test_util.h>
 
 namespace shaka {
diff --git a/packager/media/base/protection_system_specific_info.h b/packager/media/base/protection_system_specific_info.h
index 4a9de8bef3..6874f062a2 100644
--- a/packager/media/base/protection_system_specific_info.h
+++ b/packager/media/base/protection_system_specific_info.h
@@ -7,11 +7,12 @@
 #ifndef PACKAGER_MEDIA_BASE_PROTECTION_SYSTEM_SPECIFIC_INFO_H_
 #define PACKAGER_MEDIA_BASE_PROTECTION_SYSTEM_SPECIFIC_INFO_H_
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <vector>
 
 #include <glog/logging.h>
+
 #include <packager/media/public/crypto_params.h>
 
 namespace shaka {
diff --git a/packager/media/base/protection_system_specific_info_unittest.cc b/packager/media/base/protection_system_specific_info_unittest.cc
index 3692289d56..d035377534 100644
--- a/packager/media/base/protection_system_specific_info_unittest.cc
+++ b/packager/media/base/protection_system_specific_info_unittest.cc
@@ -4,12 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
+#include <packager/media/base/protection_system_specific_info.h>
 
 #include <iterator>
 
+#include <gtest/gtest.h>
+
 #include <packager/macros.h>
-#include <packager/media/base/protection_system_specific_info.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/proto_json_util.cc b/packager/media/base/proto_json_util.cc
index 67e5d84bdf..621de4f5c3 100644
--- a/packager/media/base/proto_json_util.cc
+++ b/packager/media/base/proto_json_util.cc
@@ -7,7 +7,6 @@
 #include <packager/media/base/proto_json_util.h>
 
 #include <google/protobuf/util/json_util.h>
-
 #include <glog/logging.h>
 
 namespace shaka {
diff --git a/packager/media/base/pssh_generator_unittest.cc b/packager/media/base/pssh_generator_unittest.cc
index 770a6253ee..b1ca375a52 100644
--- a/packager/media/base/pssh_generator_unittest.cc
+++ b/packager/media/base/pssh_generator_unittest.cc
@@ -4,12 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <packager/media/base/common_pssh_generator.h>
 #include <packager/media/base/playready_pssh_generator.h>
 #include <packager/media/base/widevine_pssh_generator.h>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <packager/status/status_test_util.h>
 
 using ::testing::ElementsAreArray;
diff --git a/packager/media/base/range.h b/packager/media/base/range.h
index 506e34ad71..9024a0e1c7 100644
--- a/packager/media/base/range.h
+++ b/packager/media/base/range.h
@@ -9,7 +9,7 @@
 #ifndef PACKAGER_MEDIA_BASE_RANGE_H_
 #define PACKAGER_MEDIA_BASE_RANGE_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/raw_key_source.cc b/packager/media/base/raw_key_source.cc
index a9fbaa5910..594bfc3831 100644
--- a/packager/media/base/raw_key_source.cc
+++ b/packager/media/base/raw_key_source.cc
@@ -10,6 +10,7 @@
 
 #include <absl/strings/escaping.h>
 #include <glog/logging.h>
+
 #include <packager/media/base/key_source.h>
 #include <packager/status/status_macros.h>
 #include <packager/utils/bytes_to_string_view.h>
diff --git a/packager/media/base/raw_key_source_unittest.cc b/packager/media/base/raw_key_source_unittest.cc
index 4a379e76e4..78fe0a020f 100644
--- a/packager/media/base/raw_key_source_unittest.cc
+++ b/packager/media/base/raw_key_source_unittest.cc
@@ -4,11 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/base/raw_key_source.h>
+
+#include <absl/strings/escaping.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <absl/strings/escaping.h>
-#include <packager/media/base/raw_key_source.h>
 #include <packager/status/status_test_util.h>
 
 #define EXPECT_HEX_EQ(expected_hex, actual)                          \
diff --git a/packager/media/base/request_signer.cc b/packager/media/base/request_signer.cc
index 769298c719..0603df045f 100644
--- a/packager/media/base/request_signer.cc
+++ b/packager/media/base/request_signer.cc
@@ -8,6 +8,7 @@
 
 #include <glog/logging.h>
 #include <mbedtls/md.h>
+
 #include <packager/media/base/aes_encryptor.h>
 #include <packager/media/base/rsa_key.h>
 
diff --git a/packager/media/base/rsa_key.h b/packager/media/base/rsa_key.h
index 50da9ebeda..b58c1b8d2d 100644
--- a/packager/media/base/rsa_key.h
+++ b/packager/media/base/rsa_key.h
@@ -15,6 +15,7 @@
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/pk.h>
+
 #include <packager/macros.h>
 
 namespace shaka {
diff --git a/packager/media/base/rsa_key_unittest.cc b/packager/media/base/rsa_key_unittest.cc
index 89e1584ed0..873388a648 100644
--- a/packager/media/base/rsa_key_unittest.cc
+++ b/packager/media/base/rsa_key_unittest.cc
@@ -6,12 +6,14 @@
 //
 // Unit test for rsa_key RSA encryption and signing.
 
-#include <gtest/gtest.h>
+#include <packager/media/base/rsa_key.h>
+
 #include <filesystem>
 #include <memory>
 
 #include <glog/logging.h>
-#include <packager/media/base/rsa_key.h>
+#include <gtest/gtest.h>
+
 #include <packager/media/base/test/rsa_test_data.h>
 #include <packager/media/test/test_data_util.h>
 
diff --git a/packager/media/base/stream_info.cc b/packager/media/base/stream_info.cc
index 510f4b6303..9ef4bd478a 100644
--- a/packager/media/base/stream_info.cc
+++ b/packager/media/base/stream_info.cc
@@ -6,10 +6,11 @@
 
 #include <packager/media/base/stream_info.h>
 
-#include <inttypes.h>
+#include <cinttypes>
 
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
+
 #include <packager/macros.h>
 #include <packager/media/base/timestamp.h>
 
diff --git a/packager/media/base/test/rsa_test_data.cc b/packager/media/base/test/rsa_test_data.cc
index 638c49cb49..002da9d18b 100644
--- a/packager/media/base/test/rsa_test_data.cc
+++ b/packager/media/base/test/rsa_test_data.cc
@@ -6,7 +6,7 @@
 
 #include <packager/media/base/test/rsa_test_data.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace {
 const uint8_t kTestRsaPrivateKey_3072[] = {
diff --git a/packager/media/base/text_sample.h b/packager/media/base/text_sample.h
index 14901344a1..81f78eac67 100644
--- a/packager/media/base/text_sample.h
+++ b/packager/media/base/text_sample.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_BASE_TEXT_SAMPLE_H_
 #define PACKAGER_MEDIA_BASE_TEXT_SAMPLE_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <optional>
 #include <string>
 #include <vector>
diff --git a/packager/media/base/text_stream_info.h b/packager/media/base/text_stream_info.h
index 884bffed91..ed608a028e 100644
--- a/packager/media/base/text_stream_info.h
+++ b/packager/media/base/text_stream_info.h
@@ -7,12 +7,12 @@
 #ifndef PACKAGER_MEDIA_BASE_TEXT_STREAM_INFO_H_
 #define PACKAGER_MEDIA_BASE_TEXT_STREAM_INFO_H_
 
-#include <packager/media/base/stream_info.h>
-#include <packager/media/base/text_sample.h>
-
 #include <map>
 #include <string>
 
+#include <packager/media/base/stream_info.h>
+#include <packager/media/base/text_sample.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/base/timestamp.h b/packager/media/base/timestamp.h
index 013a3ab184..cb90a6959d 100644
--- a/packager/media/base/timestamp.h
+++ b/packager/media/base/timestamp.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_BASE_TIMESTAMP_H_
 #define PACKAGER_MEDIA_BASE_TIMESTAMP_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <limits>
 
 namespace shaka {
diff --git a/packager/media/base/video_stream_info.cc b/packager/media/base/video_stream_info.cc
index 4062cbad2b..1582ac3565 100644
--- a/packager/media/base/video_stream_info.cc
+++ b/packager/media/base/video_stream_info.cc
@@ -8,6 +8,7 @@
 
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
+
 #include <packager/macros.h>
 #include <packager/media/base/limits.h>
 
diff --git a/packager/media/base/video_util.h b/packager/media/base/video_util.h
index 7ff81692c3..290c3aca1d 100644
--- a/packager/media/base/video_util.h
+++ b/packager/media/base/video_util.h
@@ -7,7 +7,7 @@
 #ifndef PACKAGER_MEDIA_BASE_VIDEO_UTIL_H_
 #define PACKAGER_MEDIA_BASE_VIDEO_UTIL_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/widevine_key_source.cc b/packager/media/base/widevine_key_source.cc
index fe48880f57..910bcb390b 100644
--- a/packager/media/base/widevine_key_source.cc
+++ b/packager/media/base/widevine_key_source.cc
@@ -12,6 +12,7 @@
 #include <absl/base/internal/endian.h>
 #include <absl/flags/flag.h>
 #include <absl/strings/escaping.h>
+
 #include <packager/media/base/http_key_fetcher.h>
 #include <packager/media/base/producer_consumer_queue.h>
 #include <packager/media/base/protection_system_ids.h>
diff --git a/packager/media/base/widevine_key_source.h b/packager/media/base/widevine_key_source.h
index 9f1b21a45d..7f839bd68d 100644
--- a/packager/media/base/widevine_key_source.h
+++ b/packager/media/base/widevine_key_source.h
@@ -13,6 +13,7 @@
 
 #include <absl/synchronization/mutex.h>
 #include <absl/synchronization/notification.h>
+
 #include <packager/media/base/fourccs.h>
 #include <packager/media/base/key_source.h>
 
diff --git a/packager/media/base/widevine_key_source_unittest.cc b/packager/media/base/widevine_key_source_unittest.cc
index 3a22a72806..30bdc79230 100644
--- a/packager/media/base/widevine_key_source_unittest.cc
+++ b/packager/media/base/widevine_key_source_unittest.cc
@@ -4,19 +4,20 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <inttypes.h>
+#include <packager/media/base/widevine_key_source.h>
 
 #include <algorithm>
+#include <cinttypes>
 #include <iterator>
 
 #include <absl/strings/escaping.h>
 #include <absl/strings/str_format.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <packager/media/base/key_fetcher.h>
 #include <packager/media/base/protection_system_ids.h>
 #include <packager/media/base/request_signer.h>
-#include <packager/media/base/widevine_key_source.h>
 #include <packager/media/base/widevine_pssh_generator.h>
 #include <packager/status/status_test_util.h>
 
diff --git a/packager/media/chunking/chunking_handler.cc b/packager/media/chunking/chunking_handler.cc
index 7cee54d69d..4cbad42880 100644
--- a/packager/media/chunking/chunking_handler.cc
+++ b/packager/media/chunking/chunking_handler.cc
@@ -9,6 +9,7 @@
 #include <algorithm>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/media_sample.h>
 #include <packager/status/status_macros.h>
 
diff --git a/packager/media/chunking/chunking_handler.h b/packager/media/chunking/chunking_handler.h
index dd52b62f17..443869f135 100644
--- a/packager/media/chunking/chunking_handler.h
+++ b/packager/media/chunking/chunking_handler.h
@@ -12,6 +12,7 @@
 #include <queue>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/media_handler.h>
 #include <packager/media/public/chunking_params.h>
 
diff --git a/packager/media/chunking/sync_point_queue.cc b/packager/media/chunking/sync_point_queue.cc
index 468f7a5a30..82af70360e 100644
--- a/packager/media/chunking/sync_point_queue.cc
+++ b/packager/media/chunking/sync_point_queue.cc
@@ -4,12 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <packager/media/base/media_handler.h>
 #include <packager/media/chunking/sync_point_queue.h>
 
 #include <algorithm>
 #include <limits>
 
+#include <packager/media/base/media_handler.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/chunking/sync_point_queue.h b/packager/media/chunking/sync_point_queue.h
index bcfcf11ac1..0d69f5ead1 100644
--- a/packager/media/chunking/sync_point_queue.h
+++ b/packager/media/chunking/sync_point_queue.h
@@ -8,6 +8,7 @@
 #include <memory>
 
 #include <absl/synchronization/mutex.h>
+
 #include <packager/media/public/ad_cue_generator_params.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/aac_audio_specific_config.cc b/packager/media/codecs/aac_audio_specific_config.cc
index beb22ae793..cf4c4d7f53 100644
--- a/packager/media/codecs/aac_audio_specific_config.cc
+++ b/packager/media/codecs/aac_audio_specific_config.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/rcheck.h>
 
diff --git a/packager/media/codecs/aac_audio_specific_config.h b/packager/media/codecs/aac_audio_specific_config.h
index ca1c93a4e6..a56f0958a4 100644
--- a/packager/media/codecs/aac_audio_specific_config.h
+++ b/packager/media/codecs/aac_audio_specific_config.h
@@ -5,9 +5,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_AAC_AUDIO_SPECIFIC_CONFIG_H_
 #define PACKAGER_MEDIA_CODECS_AAC_AUDIO_SPECIFIC_CONFIG_H_
 
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
 namespace shaka {
diff --git a/packager/media/codecs/aac_audio_specific_config_unittest.cc b/packager/media/codecs/aac_audio_specific_config_unittest.cc
index 7350759e17..c017e53348 100644
--- a/packager/media/codecs/aac_audio_specific_config_unittest.cc
+++ b/packager/media/codecs/aac_audio_specific_config_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gtest/gtest.h>
-
 #include <packager/media/codecs/aac_audio_specific_config.h>
 
+#include <gtest/gtest.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/codecs/ac3_audio_util.cc b/packager/media/codecs/ac3_audio_util.cc
index 0eadff95c1..76c67c0f16 100644
--- a/packager/media/codecs/ac3_audio_util.cc
+++ b/packager/media/codecs/ac3_audio_util.cc
@@ -7,6 +7,7 @@
 #include <packager/media/codecs/ac3_audio_util.h>
 
 #include <absl/strings/escaping.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/rcheck.h>
 #include <packager/utils/bytes_to_string_view.h>
diff --git a/packager/media/codecs/ac3_audio_util.h b/packager/media/codecs/ac3_audio_util.h
index 9909f4bfed..d92bce1f60 100644
--- a/packager/media/codecs/ac3_audio_util.h
+++ b/packager/media/codecs/ac3_audio_util.h
@@ -9,8 +9,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_AC3_AUDIO_UTIL_H_
 #define PACKAGER_MEDIA_CODECS_AC3_AUDIO_UTIL_H_
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
 namespace shaka {
diff --git a/packager/media/codecs/ac3_audio_util_unittest.cc b/packager/media/codecs/ac3_audio_util_unittest.cc
index 43c09089c3..7d829254d8 100644
--- a/packager/media/codecs/ac3_audio_util_unittest.cc
+++ b/packager/media/codecs/ac3_audio_util_unittest.cc
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
-
 #include <packager/media/codecs/ac3_audio_util.h>
 
+#include <gtest/gtest.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/codecs/ac4_audio_util.cc b/packager/media/codecs/ac4_audio_util.cc
index 989ee5921b..b587e7a565 100644
--- a/packager/media/codecs/ac4_audio_util.cc
+++ b/packager/media/codecs/ac4_audio_util.cc
@@ -8,6 +8,7 @@
 
 #include <absl/strings/escaping.h>
 #include <absl/strings/str_format.h>
+
 #include <packager/macros.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/rcheck.h>
diff --git a/packager/media/codecs/ac4_audio_util.h b/packager/media/codecs/ac4_audio_util.h
index d084409ef6..ee1ff971b6 100644
--- a/packager/media/codecs/ac4_audio_util.h
+++ b/packager/media/codecs/ac4_audio_util.h
@@ -9,8 +9,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_AC4_AUDIO_UTIL_H_
 #define PACKAGER_MEDIA_CODECS_AC4_AUDIO_UTIL_H_
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
 namespace shaka {
diff --git a/packager/media/codecs/ac4_audio_util_unittest.cc b/packager/media/codecs/ac4_audio_util_unittest.cc
index fbec62a74a..24b66e2ca4 100644
--- a/packager/media/codecs/ac4_audio_util_unittest.cc
+++ b/packager/media/codecs/ac4_audio_util_unittest.cc
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
-
 #include <packager/media/codecs/ac4_audio_util.h>
 
+#include <gtest/gtest.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/codecs/av1_codec_configuration_record.cc b/packager/media/codecs/av1_codec_configuration_record.cc
index 46d7188d9c..f231e7239b 100644
--- a/packager/media/codecs/av1_codec_configuration_record.cc
+++ b/packager/media/codecs/av1_codec_configuration_record.cc
@@ -7,6 +7,7 @@
 #include <packager/media/codecs/av1_codec_configuration_record.h>
 
 #include <absl/strings/str_format.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/rcheck.h>
 
diff --git a/packager/media/codecs/av1_codec_configuration_record.h b/packager/media/codecs/av1_codec_configuration_record.h
index 0517ab9e81..d3973a0d53 100644
--- a/packager/media/codecs/av1_codec_configuration_record.h
+++ b/packager/media/codecs/av1_codec_configuration_record.h
@@ -7,7 +7,7 @@
 #ifndef PACKAGER_MEDIA_CODECS_AV1_CODEC_CONFIGURATION_RECORD_H_
 #define PACKAGER_MEDIA_CODECS_AV1_CODEC_CONFIGURATION_RECORD_H_
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/packager/media/codecs/av1_parser.cc b/packager/media/codecs/av1_parser.cc
index 35ab9f65b4..bd20da437a 100644
--- a/packager/media/codecs/av1_parser.cc
+++ b/packager/media/codecs/av1_parser.cc
@@ -9,6 +9,7 @@
 #include <algorithm>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/rcheck.h>
 
diff --git a/packager/media/codecs/av1_parser.h b/packager/media/codecs/av1_parser.h
index 6d69cab5de..19895c1d85 100644
--- a/packager/media/codecs/av1_parser.h
+++ b/packager/media/codecs/av1_parser.h
@@ -7,9 +7,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_AV1_PARSER_H_
 #define PACKAGER_MEDIA_CODECS_AV1_PARSER_H_
 
-#include <stdint.h>
-#include <stdlib.h>
-
+#include <cstdint>
+#include <cstdlib>
 #include <vector>
 
 namespace shaka {
diff --git a/packager/media/codecs/avc_decoder_configuration_record.cc b/packager/media/codecs/avc_decoder_configuration_record.cc
index aa5497782e..a37ef15bee 100644
--- a/packager/media/codecs/avc_decoder_configuration_record.cc
+++ b/packager/media/codecs/avc_decoder_configuration_record.cc
@@ -8,6 +8,7 @@
 
 #include <absl/strings/ascii.h>
 #include <absl/strings/escaping.h>
+
 #include <packager/macros.h>
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/base/rcheck.h>
diff --git a/packager/media/codecs/avc_decoder_configuration_record.h b/packager/media/codecs/avc_decoder_configuration_record.h
index 5fd862f49d..18507cacf1 100644
--- a/packager/media/codecs/avc_decoder_configuration_record.h
+++ b/packager/media/codecs/avc_decoder_configuration_record.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_CODECS_AVC_DECODER_CONFIGURATION_RECORD_H_
 #define PACKAGER_MEDIA_CODECS_AVC_DECODER_CONFIGURATION_RECORD_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/packager/media/codecs/decoder_configuration_record.h b/packager/media/codecs/decoder_configuration_record.h
index e5654f8d4b..0c5db919b8 100644
--- a/packager/media/codecs/decoder_configuration_record.h
+++ b/packager/media/codecs/decoder_configuration_record.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include <glog/logging.h>
+
 #include <packager/macros.h>
 #include <packager/media/codecs/nalu_reader.h>
 
diff --git a/packager/media/codecs/dovi_decoder_configuration_record.cc b/packager/media/codecs/dovi_decoder_configuration_record.cc
index 4846ac2483..4814c70a91 100644
--- a/packager/media/codecs/dovi_decoder_configuration_record.cc
+++ b/packager/media/codecs/dovi_decoder_configuration_record.cc
@@ -7,6 +7,7 @@
 #include <packager/media/codecs/dovi_decoder_configuration_record.h>
 
 #include <absl/strings/str_format.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/rcheck.h>
 
diff --git a/packager/media/codecs/dovi_decoder_configuration_record.h b/packager/media/codecs/dovi_decoder_configuration_record.h
index 748e01effd..64e9445f28 100644
--- a/packager/media/codecs/dovi_decoder_configuration_record.h
+++ b/packager/media/codecs/dovi_decoder_configuration_record.h
@@ -7,7 +7,7 @@
 #ifndef PACKAGER_MEDIA_CODECS_DOVI_DECODER_CONFIGURATION_RECORD_H_
 #define PACKAGER_MEDIA_CODECS_DOVI_DECODER_CONFIGURATION_RECORD_H_
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/packager/media/codecs/ec3_audio_util.cc b/packager/media/codecs/ec3_audio_util.cc
index d1f9005600..c80a8972ff 100644
--- a/packager/media/codecs/ec3_audio_util.cc
+++ b/packager/media/codecs/ec3_audio_util.cc
@@ -7,6 +7,7 @@
 #include <packager/media/codecs/ec3_audio_util.h>
 
 #include <absl/strings/escaping.h>
+
 #include <packager/macros.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/rcheck.h>
diff --git a/packager/media/codecs/ec3_audio_util.h b/packager/media/codecs/ec3_audio_util.h
index b792206ffe..8eb76377f8 100644
--- a/packager/media/codecs/ec3_audio_util.h
+++ b/packager/media/codecs/ec3_audio_util.h
@@ -9,8 +9,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_EC3_AUDIO_UTIL_H_
 #define PACKAGER_MEDIA_CODECS_EC3_AUDIO_UTIL_H_
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
 namespace shaka {
diff --git a/packager/media/codecs/ec3_audio_util_unittest.cc b/packager/media/codecs/ec3_audio_util_unittest.cc
index 33bf1a8655..d854a1d53b 100644
--- a/packager/media/codecs/ec3_audio_util_unittest.cc
+++ b/packager/media/codecs/ec3_audio_util_unittest.cc
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
-
 #include <packager/media/codecs/ec3_audio_util.h>
 
+#include <gtest/gtest.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/codecs/es_descriptor.h b/packager/media/codecs/es_descriptor.h
index 674a6620c0..46f3339140 100644
--- a/packager/media/codecs/es_descriptor.h
+++ b/packager/media/codecs/es_descriptor.h
@@ -5,9 +5,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_ES_DESCRIPTOR_H_
 #define PACKAGER_MEDIA_CODECS_ES_DESCRIPTOR_H_
 
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
 namespace shaka {
diff --git a/packager/media/codecs/h264_byte_to_unit_stream_converter.cc b/packager/media/codecs/h264_byte_to_unit_stream_converter.cc
index f431567f34..4c17f33b9b 100644
--- a/packager/media/codecs/h264_byte_to_unit_stream_converter.cc
+++ b/packager/media/codecs/h264_byte_to_unit_stream_converter.cc
@@ -9,6 +9,7 @@
 #include <limits>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/codecs/h264_parser.h>
 
diff --git a/packager/media/codecs/h264_byte_to_unit_stream_converter.h b/packager/media/codecs/h264_byte_to_unit_stream_converter.h
index 4668feb6aa..516650a4d3 100644
--- a/packager/media/codecs/h264_byte_to_unit_stream_converter.h
+++ b/packager/media/codecs/h264_byte_to_unit_stream_converter.h
@@ -7,9 +7,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_
 #define PACKAGER_MEDIA_CODECS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_
 
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
 #include <packager/media/codecs/h26x_byte_to_unit_stream_converter.h>
diff --git a/packager/media/codecs/h264_byte_to_unit_stream_converter_unittest.cc b/packager/media/codecs/h264_byte_to_unit_stream_converter_unittest.cc
index 1288528a78..e86ed0a57e 100644
--- a/packager/media/codecs/h264_byte_to_unit_stream_converter_unittest.cc
+++ b/packager/media/codecs/h264_byte_to_unit_stream_converter_unittest.cc
@@ -6,9 +6,9 @@
 
 #include <packager/media/codecs/h264_byte_to_unit_stream_converter.h>
 
+#include <absl/strings/escaping.h>
 #include <gtest/gtest.h>
 
-#include <absl/strings/escaping.h>
 #include <packager/media/test/test_data_util.h>
 
 namespace {
diff --git a/packager/media/codecs/h264_parser.cc b/packager/media/codecs/h264_parser.cc
index cd4b7c0902..9f211ad614 100644
--- a/packager/media/codecs/h264_parser.cc
+++ b/packager/media/codecs/h264_parser.cc
@@ -7,6 +7,7 @@
 #include <memory>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_reader.h>
 
 #define LOG_ERROR_ONCE(msg)             \
diff --git a/packager/media/codecs/h264_parser.h b/packager/media/codecs/h264_parser.h
index 99925a728d..b9816b65db 100644
--- a/packager/media/codecs/h264_parser.h
+++ b/packager/media/codecs/h264_parser.h
@@ -7,9 +7,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_H264_PARSER_H_
 #define PACKAGER_MEDIA_CODECS_H264_PARSER_H_
 
-#include <stdint.h>
-#include <stdlib.h>
-
+#include <cstdint>
+#include <cstdlib>
 #include <map>
 #include <memory>
 
diff --git a/packager/media/codecs/h264_parser_unittest.cc b/packager/media/codecs/h264_parser_unittest.cc
index e85191ab5b..98aabb39d7 100644
--- a/packager/media/codecs/h264_parser_unittest.cc
+++ b/packager/media/codecs/h264_parser_unittest.cc
@@ -1,12 +1,13 @@
 // Copyright 2014 The Chromium Authors. All rights reserved.
+//
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <packager/media/codecs/h264_parser.h>
 
+#include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include <glog/logging.h>
 #include <packager/media/test/test_data_util.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/h265_byte_to_unit_stream_converter.cc b/packager/media/codecs/h265_byte_to_unit_stream_converter.cc
index 5e4559153c..b4490bdad2 100644
--- a/packager/media/codecs/h265_byte_to_unit_stream_converter.cc
+++ b/packager/media/codecs/h265_byte_to_unit_stream_converter.cc
@@ -9,6 +9,7 @@
 #include <limits>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/rcheck.h>
 #include <packager/media/codecs/h265_parser.h>
diff --git a/packager/media/codecs/h265_byte_to_unit_stream_converter.h b/packager/media/codecs/h265_byte_to_unit_stream_converter.h
index f092acee83..47f5bc6e65 100644
--- a/packager/media/codecs/h265_byte_to_unit_stream_converter.h
+++ b/packager/media/codecs/h265_byte_to_unit_stream_converter.h
@@ -7,9 +7,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_
 #define PACKAGER_MEDIA_CODECS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_
 
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
 #include <packager/media/codecs/h26x_byte_to_unit_stream_converter.h>
diff --git a/packager/media/codecs/h265_byte_to_unit_stream_converter_unittest.cc b/packager/media/codecs/h265_byte_to_unit_stream_converter_unittest.cc
index e741d8bba6..9b6dcd7284 100644
--- a/packager/media/codecs/h265_byte_to_unit_stream_converter_unittest.cc
+++ b/packager/media/codecs/h265_byte_to_unit_stream_converter_unittest.cc
@@ -6,9 +6,9 @@
 
 #include <packager/media/codecs/h265_byte_to_unit_stream_converter.h>
 
+#include <absl/strings/escaping.h>
 #include <gtest/gtest.h>
 
-#include <absl/strings/escaping.h>
 #include <packager/media/codecs/hevc_decoder_configuration_record.h>
 #include <packager/media/test/test_data_util.h>
 
diff --git a/packager/media/codecs/h265_parser.cc b/packager/media/codecs/h265_parser.cc
index 3a5ec1fd56..c2f2f78a0d 100644
--- a/packager/media/codecs/h265_parser.cc
+++ b/packager/media/codecs/h265_parser.cc
@@ -6,11 +6,11 @@
 
 #include <packager/media/codecs/h265_parser.h>
 
-#include <math.h>
-
 #include <algorithm>
+#include <cmath>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/macros.h>
 #include <packager/media/codecs/nalu_reader.h>
 
diff --git a/packager/media/codecs/h265_parser_unittest.cc b/packager/media/codecs/h265_parser_unittest.cc
index 8ea9e98e64..64bd07a4a9 100644
--- a/packager/media/codecs/h265_parser_unittest.cc
+++ b/packager/media/codecs/h265_parser_unittest.cc
@@ -4,9 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/codecs/h265_parser.h>
+
 #include <gtest/gtest.h>
 
-#include <packager/media/codecs/h265_parser.h>
 #include <packager/media/codecs/nalu_reader.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/h26x_bit_reader.h b/packager/media/codecs/h26x_bit_reader.h
index d348276e15..347511f6e5 100644
--- a/packager/media/codecs/h26x_bit_reader.h
+++ b/packager/media/codecs/h26x_bit_reader.h
@@ -7,9 +7,10 @@
 #ifndef PACKAGER_MEDIA_CODECS_H264_BIT_READER_H_
 #define PACKAGER_MEDIA_CODECS_H264_BIT_READER_H_
 
-#include <stdint.h>
 #include <sys/types.h>
 
+#include <cstdint>
+
 #include <packager/macros.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/h26x_bit_reader_unittest.cc b/packager/media/codecs/h26x_bit_reader_unittest.cc
index 5b5268f329..a3f3c6b263 100644
--- a/packager/media/codecs/h26x_bit_reader_unittest.cc
+++ b/packager/media/codecs/h26x_bit_reader_unittest.cc
@@ -1,11 +1,12 @@
 // Copyright 2014 The Chromium Authors. All rights reserved.
+//
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gtest/gtest.h>
-
 #include <packager/media/codecs/h26x_bit_reader.h>
 
+#include <gtest/gtest.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/codecs/h26x_byte_to_unit_stream_converter.cc b/packager/media/codecs/h26x_byte_to_unit_stream_converter.cc
index 2286bd4a34..63be7e4f64 100644
--- a/packager/media/codecs/h26x_byte_to_unit_stream_converter.cc
+++ b/packager/media/codecs/h26x_byte_to_unit_stream_converter.cc
@@ -11,6 +11,7 @@
 #include <absl/flags/flag.h>
 #include <absl/strings/escaping.h>
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/utils/bytes_to_string_view.h>
 
diff --git a/packager/media/codecs/h26x_byte_to_unit_stream_converter.h b/packager/media/codecs/h26x_byte_to_unit_stream_converter.h
index b700090419..b96e2e61c3 100644
--- a/packager/media/codecs/h26x_byte_to_unit_stream_converter.h
+++ b/packager/media/codecs/h26x_byte_to_unit_stream_converter.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_CODECS_H26X_BYTE_TO_UNIT_STREAM_CONVERTER_H_
 #define PACKAGER_MEDIA_CODECS_H26X_BYTE_TO_UNIT_STREAM_CONVERTER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <packager/media/base/video_stream_info.h>
diff --git a/packager/media/codecs/hevc_decoder_configuration_record.cc b/packager/media/codecs/hevc_decoder_configuration_record.cc
index e124e822b6..b7b0e80f86 100644
--- a/packager/media/codecs/hevc_decoder_configuration_record.cc
+++ b/packager/media/codecs/hevc_decoder_configuration_record.cc
@@ -9,6 +9,7 @@
 #include <absl/strings/escaping.h>
 #include <absl/strings/str_format.h>
 #include <absl/strings/str_join.h>
+
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/base/rcheck.h>
 #include <packager/media/codecs/h265_parser.h>
diff --git a/packager/media/codecs/hevc_decoder_configuration_record.h b/packager/media/codecs/hevc_decoder_configuration_record.h
index 3d469ba353..9001134429 100644
--- a/packager/media/codecs/hevc_decoder_configuration_record.h
+++ b/packager/media/codecs/hevc_decoder_configuration_record.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_CODECS_HEVC_DECODER_CONFIGURATION_RECORD_H_
 #define PACKAGER_MEDIA_CODECS_HEVC_DECODER_CONFIGURATION_RECORD_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/packager/media/codecs/nal_unit_to_byte_stream_converter.cc b/packager/media/codecs/nal_unit_to_byte_stream_converter.cc
index 8db6655631..9d77db8d31 100644
--- a/packager/media/codecs/nal_unit_to_byte_stream_converter.cc
+++ b/packager/media/codecs/nal_unit_to_byte_stream_converter.cc
@@ -9,6 +9,7 @@
 #include <list>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/base/buffer_writer.h>
diff --git a/packager/media/codecs/nal_unit_to_byte_stream_converter.h b/packager/media/codecs/nal_unit_to_byte_stream_converter.h
index e9d0505c6f..d6608ca0af 100644
--- a/packager/media/codecs/nal_unit_to_byte_stream_converter.h
+++ b/packager/media/codecs/nal_unit_to_byte_stream_converter.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_CODECS_NAL_UNIT_TO_BYTE_STREAM_CONVERTER_H_
 #define PACKAGER_MEDIA_CODECS_NAL_UNIT_TO_BYTE_STREAM_CONVERTER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <packager/macros.h>
diff --git a/packager/media/codecs/nal_unit_to_byte_stream_converter_unittest.cc b/packager/media/codecs/nal_unit_to_byte_stream_converter_unittest.cc
index 76bbe7ff50..80bbffc265 100644
--- a/packager/media/codecs/nal_unit_to_byte_stream_converter_unittest.cc
+++ b/packager/media/codecs/nal_unit_to_byte_stream_converter_unittest.cc
@@ -4,11 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/codecs/nal_unit_to_byte_stream_converter.h>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <packager/media/base/media_sample.h>
-#include <packager/media/codecs/nal_unit_to_byte_stream_converter.h>
 #include <packager/media/formats/mp4/box_definitions_comparison.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/nalu_reader.cc b/packager/media/codecs/nalu_reader.cc
index 2551be731c..e5849f562b 100644
--- a/packager/media/codecs/nalu_reader.cc
+++ b/packager/media/codecs/nalu_reader.cc
@@ -9,6 +9,7 @@
 #include <iostream>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/codecs/h264_parser.h>
 
diff --git a/packager/media/codecs/nalu_reader.h b/packager/media/codecs/nalu_reader.h
index 1a34b504f5..9fb69b6ef6 100644
--- a/packager/media/codecs/nalu_reader.h
+++ b/packager/media/codecs/nalu_reader.h
@@ -7,8 +7,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_NALU_READER_H_
 #define PACKAGER_MEDIA_CODECS_NALU_READER_H_
 
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 
 #include <packager/macros.h>
 #include <packager/media/base/decrypt_config.h>
diff --git a/packager/media/codecs/vp8_parser.cc b/packager/media/codecs/vp8_parser.cc
index 56eb9429bf..3024f8eeee 100644
--- a/packager/media/codecs/vp8_parser.cc
+++ b/packager/media/codecs/vp8_parser.cc
@@ -7,6 +7,7 @@
 #include <packager/media/codecs/vp8_parser.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/rcheck.h>
 
diff --git a/packager/media/codecs/vp8_parser.h b/packager/media/codecs/vp8_parser.h
index d7a8344b6e..1151223171 100644
--- a/packager/media/codecs/vp8_parser.h
+++ b/packager/media/codecs/vp8_parser.h
@@ -7,8 +7,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_VP8_PARSER_H_
 #define PACKAGER_MEDIA_CODECS_VP8_PARSER_H_
 
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 
 #include <packager/macros.h>
 #include <packager/media/codecs/vpx_parser.h>
diff --git a/packager/media/codecs/vp9_parser.cc b/packager/media/codecs/vp9_parser.cc
index 49f361edd8..aefd81d1ae 100644
--- a/packager/media/codecs/vp9_parser.cc
+++ b/packager/media/codecs/vp9_parser.cc
@@ -7,6 +7,7 @@
 #include <packager/media/codecs/vp9_parser.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/rcheck.h>
 
diff --git a/packager/media/codecs/vp9_parser.h b/packager/media/codecs/vp9_parser.h
index c59eb1b28f..ffc3b50f1f 100644
--- a/packager/media/codecs/vp9_parser.h
+++ b/packager/media/codecs/vp9_parser.h
@@ -7,8 +7,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_VP9_PARSER_H_
 #define PACKAGER_MEDIA_CODECS_VP9_PARSER_H_
 
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 
 #include <packager/macros.h>
 #include <packager/media/codecs/vpx_parser.h>
diff --git a/packager/media/codecs/vp_codec_configuration_record.cc b/packager/media/codecs/vp_codec_configuration_record.cc
index 7e7c21d465..23ff73ca50 100644
--- a/packager/media/codecs/vp_codec_configuration_record.cc
+++ b/packager/media/codecs/vp_codec_configuration_record.cc
@@ -8,6 +8,7 @@
 
 #include <absl/strings/str_format.h>
 #include <absl/strings/str_replace.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/base/buffer_writer.h>
diff --git a/packager/media/codecs/vp_codec_configuration_record.h b/packager/media/codecs/vp_codec_configuration_record.h
index c857b2c234..2aac8d76a4 100644
--- a/packager/media/codecs/vp_codec_configuration_record.h
+++ b/packager/media/codecs/vp_codec_configuration_record.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_CODECS_VP_CODEC_CONFIGURATION_RECORD_H_
 #define PACKAGER_MEDIA_CODECS_VP_CODEC_CONFIGURATION_RECORD_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <optional>
 #include <string>
 #include <vector>
diff --git a/packager/media/codecs/vpx_parser.h b/packager/media/codecs/vpx_parser.h
index c3c7383375..ca6812eead 100644
--- a/packager/media/codecs/vpx_parser.h
+++ b/packager/media/codecs/vpx_parser.h
@@ -7,8 +7,8 @@
 #ifndef PACKAGER_MEDIA_CODECS_VPX_PARSER_H_
 #define PACKAGER_MEDIA_CODECS_VPX_PARSER_H_
 
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 
 #include <packager/macros.h>
 #include <packager/media/codecs/vp_codec_configuration_record.h>
diff --git a/packager/media/crypto/encryption_handler.cc b/packager/media/crypto/encryption_handler.cc
index 5f9dc969e5..402d8bde6d 100644
--- a/packager/media/crypto/encryption_handler.cc
+++ b/packager/media/crypto/encryption_handler.cc
@@ -6,10 +6,9 @@
 
 #include <packager/media/crypto/encryption_handler.h>
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include <algorithm>
+#include <cstddef>
+#include <cstdint>
 
 #include <packager/media/base/aes_encryptor.h>
 #include <packager/media/base/audio_stream_info.h>
diff --git a/packager/media/crypto/encryption_handler_unittest.cc b/packager/media/crypto/encryption_handler_unittest.cc
index 8f1de69f72..84928c2275 100644
--- a/packager/media/crypto/encryption_handler_unittest.cc
+++ b/packager/media/crypto/encryption_handler_unittest.cc
@@ -6,10 +6,10 @@
 
 #include <packager/media/crypto/encryption_handler.h>
 
+#include <glog/logging.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <glog/logging.h>
 #include <packager/media/base/aes_cryptor.h>
 #include <packager/media/base/media_handler_test_base.h>
 #include <packager/media/base/mock_aes_cryptor.h>
diff --git a/packager/media/crypto/sample_aes_ec3_cryptor.cc b/packager/media/crypto/sample_aes_ec3_cryptor.cc
index b47cd11f44..f926a092b5 100644
--- a/packager/media/crypto/sample_aes_ec3_cryptor.cc
+++ b/packager/media/crypto/sample_aes_ec3_cryptor.cc
@@ -6,9 +6,10 @@
 
 #include <packager/media/crypto/sample_aes_ec3_cryptor.h>
 
-#include <glog/logging.h>
 #include <algorithm>
 
+#include <glog/logging.h>
+
 #include <packager/media/base/buffer_reader.h>
 
 namespace shaka {
diff --git a/packager/media/crypto/sample_aes_ec3_cryptor.h b/packager/media/crypto/sample_aes_ec3_cryptor.h
index e575dff232..1d8501bc5d 100644
--- a/packager/media/crypto/sample_aes_ec3_cryptor.h
+++ b/packager/media/crypto/sample_aes_ec3_cryptor.h
@@ -4,11 +4,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <packager/media/base/aes_cryptor.h>
-
 #ifndef PACKAGER_MEDIA_CRYPTO_SAMPLE_AES_EC3_CRYPTOR_H_
 #define PACKAGER_MEDIA_CRYPTO_SAMPLE_AES_EC3_CRYPTOR_H_
 
+#include <packager/media/base/aes_cryptor.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/demuxer/demuxer.cc b/packager/media/demuxer/demuxer.cc
index 4fe0cb7797..25802ddd26 100644
--- a/packager/media/demuxer/demuxer.cc
+++ b/packager/media/demuxer/demuxer.cc
@@ -7,11 +7,13 @@
 #include <packager/media/demuxer/demuxer.h>
 
 #include <algorithm>
+#include <functional>
 
 #include <absl/strings/escaping.h>
 #include <absl/strings/numbers.h>
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
+
 #include <packager/file/file.h>
 #include <packager/media/base/decryptor_source.h>
 #include <packager/media/base/key_source.h>
@@ -23,7 +25,6 @@
 #include <packager/media/formats/webm/webm_media_parser.h>
 #include <packager/media/formats/webvtt/webvtt_parser.h>
 #include <packager/media/formats/wvm/wvm_media_parser.h>
-#include <functional>
 
 namespace {
 // 65KB, sufficient to determine the container and likely all init data.
diff --git a/packager/media/event/hls_notify_muxer_listener.cc b/packager/media/event/hls_notify_muxer_listener.cc
index 6c78272500..1895d52184 100644
--- a/packager/media/event/hls_notify_muxer_listener.cc
+++ b/packager/media/event/hls_notify_muxer_listener.cc
@@ -9,6 +9,7 @@
 #include <memory>
 
 #include <glog/logging.h>
+
 #include <packager/hls/base/hls_notifier.h>
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/base/protection_system_specific_info.h>
diff --git a/packager/media/event/hls_notify_muxer_listener_unittest.cc b/packager/media/event/hls_notify_muxer_listener_unittest.cc
index bfbb44ccbe..863095434f 100644
--- a/packager/media/event/hls_notify_muxer_listener_unittest.cc
+++ b/packager/media/event/hls_notify_muxer_listener_unittest.cc
@@ -4,13 +4,14 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/event/hls_notify_muxer_listener.h>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <packager/hls/base/hls_notifier.h>
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/base/protection_system_specific_info.h>
-#include <packager/media/event/hls_notify_muxer_listener.h>
 #include <packager/media/event/muxer_listener_test_helper.h>
 
 namespace shaka {
diff --git a/packager/media/event/mpd_notify_muxer_listener.cc b/packager/media/event/mpd_notify_muxer_listener.cc
index fee400885a..0af9233227 100644
--- a/packager/media/event/mpd_notify_muxer_listener.cc
+++ b/packager/media/event/mpd_notify_muxer_listener.cc
@@ -9,6 +9,7 @@
 #include <cmath>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/protection_system_specific_info.h>
 #include <packager/media/base/video_stream_info.h>
diff --git a/packager/media/event/mpd_notify_muxer_listener_unittest.cc b/packager/media/event/mpd_notify_muxer_listener_unittest.cc
index 8d4793b294..2b7ecabf4b 100644
--- a/packager/media/event/mpd_notify_muxer_listener_unittest.cc
+++ b/packager/media/event/mpd_notify_muxer_listener_unittest.cc
@@ -6,12 +6,13 @@
 
 #include <packager/media/event/mpd_notify_muxer_listener.h>
 
+#include <algorithm>
+#include <vector>
+
 #include <gmock/gmock.h>
 #include <google/protobuf/text_format.h>
 #include <google/protobuf/util/message_differencer.h>
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <vector>
 
 #include <packager/media/base/video_stream_info.h>
 #include <packager/media/event/muxer_listener_test_helper.h>
diff --git a/packager/media/event/multi_codec_muxer_listener.cc b/packager/media/event/multi_codec_muxer_listener.cc
index bbc7ddb67e..060888d1b7 100644
--- a/packager/media/event/multi_codec_muxer_listener.cc
+++ b/packager/media/event/multi_codec_muxer_listener.cc
@@ -8,6 +8,7 @@
 
 #include <absl/strings/str_split.h>
 #include <glog/logging.h>
+
 #include <packager/media/base/stream_info.h>
 
 namespace shaka {
diff --git a/packager/media/event/muxer_listener.h b/packager/media/event/muxer_listener.h
index b24abd4cf2..b196eef2d1 100644
--- a/packager/media/event/muxer_listener.h
+++ b/packager/media/event/muxer_listener.h
@@ -9,8 +9,7 @@
 #ifndef PACKAGER_MEDIA_EVENT_MUXER_LISTENER_H_
 #define PACKAGER_MEDIA_EVENT_MUXER_LISTENER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <optional>
 #include <string>
 #include <vector>
diff --git a/packager/media/event/muxer_listener_factory.cc b/packager/media/event/muxer_listener_factory.cc
index 040c80987c..4197eaa203 100644
--- a/packager/media/event/muxer_listener_factory.cc
+++ b/packager/media/event/muxer_listener_factory.cc
@@ -10,6 +10,7 @@
 
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
+
 #include <packager/hls/base/hls_notifier.h>
 #include <packager/media/event/combined_muxer_listener.h>
 #include <packager/media/event/hls_notify_muxer_listener.h>
diff --git a/packager/media/event/muxer_listener_internal.cc b/packager/media/event/muxer_listener_internal.cc
index 72f91ed211..93fcec211f 100644
--- a/packager/media/event/muxer_listener_internal.cc
+++ b/packager/media/event/muxer_listener_internal.cc
@@ -6,11 +6,12 @@
 
 #include <packager/media/event/muxer_listener_internal.h>
 
-#include <google/protobuf/util/message_differencer.h>
-#include <math.h>
+#include <cmath>
 
 #include <absl/strings/escaping.h>
 #include <glog/logging.h>
+#include <google/protobuf/util/message_differencer.h>
+
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/base/protection_system_specific_info.h>
diff --git a/packager/media/event/muxer_listener_internal.h b/packager/media/event/muxer_listener_internal.h
index f5fd54aa08..0b9c8d2b18 100644
--- a/packager/media/event/muxer_listener_internal.h
+++ b/packager/media/event/muxer_listener_internal.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
 #define PACKAGER_MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/packager/media/event/muxer_listener_test_helper.cc b/packager/media/event/muxer_listener_test_helper.cc
index 678989cdac..2736998de8 100644
--- a/packager/media/event/muxer_listener_test_helper.cc
+++ b/packager/media/event/muxer_listener_test_helper.cc
@@ -4,11 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <packager/media/event/muxer_listener.h>
 #include <packager/media/event/muxer_listener_test_helper.h>
 
 #include <gtest/gtest.h>
 
+#include <packager/media/event/muxer_listener.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/event/muxer_listener_test_helper.h b/packager/media/event/muxer_listener_test_helper.h
index a3f1bda30f..de20a8cfef 100644
--- a/packager/media/event/muxer_listener_test_helper.h
+++ b/packager/media/event/muxer_listener_test_helper.h
@@ -7,7 +7,7 @@
 #ifndef PACKAGER_MEDIA_EVENT_MUXER_LISTENER_TEST_HELPER_H_
 #define PACKAGER_MEDIA_EVENT_MUXER_LISTENER_TEST_HELPER_H_
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 #include <packager/media/base/key_source.h>
diff --git a/packager/media/event/progress_listener.h b/packager/media/event/progress_listener.h
index 2a61069d4b..07fb9a12dd 100644
--- a/packager/media/event/progress_listener.h
+++ b/packager/media/event/progress_listener.h
@@ -9,7 +9,7 @@
 #ifndef PACKAGER_MEDIA_EVENT_PROGRESS_LISTENER_H_
 #define PACKAGER_MEDIA_EVENT_PROGRESS_LISTENER_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <packager/macros.h>
 
diff --git a/packager/media/event/vod_media_info_dump_muxer_listener.cc b/packager/media/event/vod_media_info_dump_muxer_listener.cc
index 7772cd14a2..333a1f205e 100644
--- a/packager/media/event/vod_media_info_dump_muxer_listener.cc
+++ b/packager/media/event/vod_media_info_dump_muxer_listener.cc
@@ -6,11 +6,11 @@
 
 #include <packager/media/event/vod_media_info_dump_muxer_listener.h>
 
-#include <google/protobuf/text_format.h>
-
 #include <cmath>
 
 #include <glog/logging.h>
+#include <google/protobuf/text_format.h>
+
 #include <packager/file/file.h>
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/base/protection_system_specific_info.h>
diff --git a/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc b/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc
index d4984ed28c..4d8c7fcd66 100644
--- a/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc
+++ b/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc
@@ -6,13 +6,13 @@
 
 #include <packager/media/event/vod_media_info_dump_muxer_listener.h>
 
+#include <vector>
+
 #include <gmock/gmock.h>
 #include <google/protobuf/text_format.h>
 #include <google/protobuf/util/message_differencer.h>
 #include <gtest/gtest.h>
 
-#include <vector>
-
 #include <packager/file/file.h>
 #include <packager/file/file_test_util.h>
 #include <packager/media/base/fourccs.h>
diff --git a/packager/media/formats/dvb/dvb_sub_parser.cc b/packager/media/formats/dvb/dvb_sub_parser.cc
index 9619515381..a11adeefc4 100644
--- a/packager/media/formats/dvb/dvb_sub_parser.cc
+++ b/packager/media/formats/dvb/dvb_sub_parser.cc
@@ -9,6 +9,7 @@
 #include <algorithm>
 
 #include <glog/logging.h>
+
 #include <packager/media/formats/mp2t/mp2t_common.h>
 
 namespace shaka {
diff --git a/packager/media/formats/dvb/dvb_sub_parser_unittest.cc b/packager/media/formats/dvb/dvb_sub_parser_unittest.cc
index 9cc8e8e1b8..e3545c19cf 100644
--- a/packager/media/formats/dvb/dvb_sub_parser_unittest.cc
+++ b/packager/media/formats/dvb/dvb_sub_parser_unittest.cc
@@ -6,13 +6,13 @@
 
 #include <packager/media/formats/dvb/dvb_sub_parser.h>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <string>
 #include <utility>
 #include <vector>
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/formats/dvb/subtitle_composer.cc b/packager/media/formats/dvb/subtitle_composer.cc
index c064be2993..8d34c27acb 100644
--- a/packager/media/formats/dvb/subtitle_composer.cc
+++ b/packager/media/formats/dvb/subtitle_composer.cc
@@ -6,10 +6,10 @@
 
 #include <packager/media/formats/dvb/subtitle_composer.h>
 
-#include <png.h>
-#include <string.h>
+#include <cstring>
 
 #include <glog/logging.h>
+#include <png.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ac3_header.h b/packager/media/formats/mp2t/ac3_header.h
index f135d51ffc..24722300fe 100644
--- a/packager/media/formats/mp2t/ac3_header.h
+++ b/packager/media/formats/mp2t/ac3_header.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_AC3_HEADER_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_AC3_HEADER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <packager/media/formats/mp2t/audio_header.h>
diff --git a/packager/media/formats/mp2t/ac3_header_unittest.cc b/packager/media/formats/mp2t/ac3_header_unittest.cc
index a422fae32e..3564f0d54d 100644
--- a/packager/media/formats/mp2t/ac3_header_unittest.cc
+++ b/packager/media/formats/mp2t/ac3_header_unittest.cc
@@ -4,15 +4,15 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/formats/mp2t/ac3_header.h>
+
+#include <absl/strings/numbers.h>
+#include <glog/logging.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <packager/utils/hex_parser.h>
 
-#include <absl/strings/numbers.h>
-#include <glog/logging.h>
-#include <packager/media/formats/mp2t/ac3_header.h>
-
 using ::testing::ElementsAreArray;
 
 namespace {
diff --git a/packager/media/formats/mp2t/adts_header.h b/packager/media/formats/mp2t/adts_header.h
index 7517e6b758..9227fa7f66 100644
--- a/packager/media/formats/mp2t/adts_header.h
+++ b/packager/media/formats/mp2t/adts_header.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_ADTS_HEADER_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_ADTS_HEADER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <packager/media/formats/mp2t/audio_header.h>
diff --git a/packager/media/formats/mp2t/adts_header_unittest.cc b/packager/media/formats/mp2t/adts_header_unittest.cc
index 08d43c9a89..054787bef8 100644
--- a/packager/media/formats/mp2t/adts_header_unittest.cc
+++ b/packager/media/formats/mp2t/adts_header_unittest.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gtest/gtest.h>
+#include <packager/media/formats/mp2t/adts_header.h>
 
 #include <absl/strings/numbers.h>
 #include <glog/logging.h>
-#include <packager/media/formats/mp2t/adts_header.h>
+#include <gtest/gtest.h>
+
 #include <packager/utils/hex_parser.h>
 
 namespace {
diff --git a/packager/media/formats/mp2t/audio_header.h b/packager/media/formats/mp2t/audio_header.h
index 293fc2cba1..92c71e63b3 100644
--- a/packager/media/formats/mp2t/audio_header.h
+++ b/packager/media/formats/mp2t/audio_header.h
@@ -7,9 +7,8 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_AUDIO_HEADER_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_AUDIO_HEADER_H_
 
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
 namespace shaka {
diff --git a/packager/media/formats/mp2t/es_parser.h b/packager/media/formats/mp2t/es_parser.h
index 7d3d2b37db..2cb6f472ea 100644
--- a/packager/media/formats/mp2t/es_parser.h
+++ b/packager/media/formats/mp2t/es_parser.h
@@ -5,7 +5,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H_
 
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
 
 namespace shaka {
diff --git a/packager/media/formats/mp2t/es_parser_audio.cc b/packager/media/formats/mp2t/es_parser_audio.cc
index 78b3a3016a..e2e7867652 100644
--- a/packager/media/formats/mp2t/es_parser_audio.cc
+++ b/packager/media/formats/mp2t/es_parser_audio.cc
@@ -4,14 +4,14 @@
 
 #include <packager/media/formats/mp2t/es_parser_audio.h>
 
-#include <stdint.h>
-
 #include <algorithm>
+#include <cstdint>
 #include <list>
 
 #include <absl/strings/escaping.h>
 #include <absl/strings/numbers.h>
 #include <glog/logging.h>
+
 #include <packager/media/base/audio_timestamp_helper.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/media_sample.h>
diff --git a/packager/media/formats/mp2t/es_parser_audio.h b/packager/media/formats/mp2t/es_parser_audio.h
index 98072dd09b..1579211395 100644
--- a/packager/media/formats/mp2t/es_parser_audio.h
+++ b/packager/media/formats/mp2t/es_parser_audio.h
@@ -5,6 +5,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_AUDIO_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_AUDIO_H_
 
+#include <functional>
 #include <list>
 #include <memory>
 #include <utility>
diff --git a/packager/media/formats/mp2t/es_parser_dvb.h b/packager/media/formats/mp2t/es_parser_dvb.h
index ffc9cf01bb..6a7d6f99d1 100644
--- a/packager/media/formats/mp2t/es_parser_dvb.h
+++ b/packager/media/formats/mp2t/es_parser_dvb.h
@@ -7,6 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_DVB_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_DVB_H_
 
+#include <functional>
 #include <unordered_map>
 
 #include <packager/media/base/byte_queue.h>
diff --git a/packager/media/formats/mp2t/es_parser_h264.cc b/packager/media/formats/mp2t/es_parser_h264.cc
index 3c34fc44f1..34bfc5db85 100644
--- a/packager/media/formats/mp2t/es_parser_h264.cc
+++ b/packager/media/formats/mp2t/es_parser_h264.cc
@@ -4,9 +4,10 @@
 
 #include <packager/media/formats/mp2t/es_parser_h264.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/timestamp.h>
 #include <packager/media/base/video_stream_info.h>
diff --git a/packager/media/formats/mp2t/es_parser_h264.h b/packager/media/formats/mp2t/es_parser_h264.h
index 759f21f3ef..7a926c8ba3 100644
--- a/packager/media/formats/mp2t/es_parser_h264.h
+++ b/packager/media/formats/mp2t/es_parser_h264.h
@@ -5,11 +5,12 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
 
-#include <packager/media/formats/mp2t/es_parser_h26x.h>
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
 #include <memory>
 
+#include <packager/media/formats/mp2t/es_parser_h26x.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/formats/mp2t/es_parser_h264_unittest.cc b/packager/media/formats/mp2t/es_parser_h264_unittest.cc
index 6b37edcb53..ce10cb9eee 100644
--- a/packager/media/formats/mp2t/es_parser_h264_unittest.cc
+++ b/packager/media/formats/mp2t/es_parser_h264_unittest.cc
@@ -2,19 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gtest/gtest.h>
+#include <packager/media/formats/mp2t/es_parser_h264.h>
 
 #include <algorithm>
+#include <functional>
 #include <vector>
 
 #include <glog/logging.h>
+#include <gtest/gtest.h>
+
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/timestamp.h>
 #include <packager/media/base/video_stream_info.h>
 #include <packager/media/codecs/h264_parser.h>
-#include <packager/media/formats/mp2t/es_parser_h264.h>
 #include <packager/media/test/test_data_util.h>
-#include <functional>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/es_parser_h265.cc b/packager/media/formats/mp2t/es_parser_h265.cc
index 36a71f54d3..4a6ca532a7 100644
--- a/packager/media/formats/mp2t/es_parser_h265.cc
+++ b/packager/media/formats/mp2t/es_parser_h265.cc
@@ -6,9 +6,10 @@
 
 #include <packager/media/formats/mp2t/es_parser_h265.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/offset_byte_queue.h>
 #include <packager/media/base/timestamp.h>
diff --git a/packager/media/formats/mp2t/es_parser_h265.h b/packager/media/formats/mp2t/es_parser_h265.h
index d7320fade3..0d3109af61 100644
--- a/packager/media/formats/mp2t/es_parser_h265.h
+++ b/packager/media/formats/mp2t/es_parser_h265.h
@@ -7,8 +7,8 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H265_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H265_H_
 
-#include <stdint.h>
-
+#include <cstdint>
+#include <functional>
 #include <list>
 #include <memory>
 #include <utility>
diff --git a/packager/media/formats/mp2t/es_parser_h26x.cc b/packager/media/formats/mp2t/es_parser_h26x.cc
index 50910692d4..5a5501bcb0 100644
--- a/packager/media/formats/mp2t/es_parser_h26x.cc
+++ b/packager/media/formats/mp2t/es_parser_h26x.cc
@@ -4,9 +4,10 @@
 
 #include <packager/media/formats/mp2t/es_parser_h26x.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/offset_byte_queue.h>
 #include <packager/media/base/timestamp.h>
diff --git a/packager/media/formats/mp2t/es_parser_h26x.h b/packager/media/formats/mp2t/es_parser_h26x.h
index f7df70dc59..9ce62d9cfa 100644
--- a/packager/media/formats/mp2t/es_parser_h26x.h
+++ b/packager/media/formats/mp2t/es_parser_h26x.h
@@ -5,9 +5,9 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H26x_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H26x_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <deque>
+#include <functional>
 #include <list>
 #include <memory>
 
diff --git a/packager/media/formats/mp2t/es_parser_h26x_unittest.cc b/packager/media/formats/mp2t/es_parser_h26x_unittest.cc
index 96b56c8be5..9a0a5bc5a3 100644
--- a/packager/media/formats/mp2t/es_parser_h26x_unittest.cc
+++ b/packager/media/formats/mp2t/es_parser_h26x_unittest.cc
@@ -4,17 +4,18 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
+#include <packager/media/formats/mp2t/es_parser_h26x.h>
 
+#include <functional>
 #include <vector>
 
 #include <glog/logging.h>
+#include <gtest/gtest.h>
+
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/stream_info.h>
 #include <packager/media/base/timestamp.h>
 #include <packager/media/codecs/h26x_byte_to_unit_stream_converter.h>
-#include <packager/media/formats/mp2t/es_parser_h26x.h>
-#include <functional>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/mp2t_media_parser.cc b/packager/media/formats/mp2t/mp2t_media_parser.cc
index 2d612c35d1..78c2a8f326 100644
--- a/packager/media/formats/mp2t/mp2t_media_parser.cc
+++ b/packager/media/formats/mp2t/mp2t_media_parser.cc
@@ -4,6 +4,7 @@
 
 #include <packager/media/formats/mp2t/mp2t_media_parser.h>
 
+#include <functional>
 #include <memory>
 
 #include <packager/media/base/media_sample.h>
diff --git a/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc b/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc
index 8084cb6d10..a1b2c18d6d 100644
--- a/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc
+++ b/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc
@@ -2,20 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gtest/gtest.h>
+#include <packager/media/formats/mp2t/mp2t_media_parser.h>
 
 #include <algorithm>
+#include <functional>
 #include <string>
 
 #include <glog/logging.h>
+#include <gtest/gtest.h>
+
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/stream_info.h>
 #include <packager/media/base/timestamp.h>
 #include <packager/media/base/video_stream_info.h>
 #include <packager/media/formats/mp2t/mp2t_common.h>
-#include <packager/media/formats/mp2t/mp2t_media_parser.h>
 #include <packager/media/test/test_data_util.h>
-#include <functional>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/mpeg1_header.cc b/packager/media/formats/mp2t/mpeg1_header.cc
index eed4f70e29..d8c577d866 100644
--- a/packager/media/formats/mp2t/mpeg1_header.cc
+++ b/packager/media/formats/mp2t/mpeg1_header.cc
@@ -1,3 +1,9 @@
+// Copyright 2023 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 #include <packager/media/formats/mp2t/mpeg1_header.h>
 
 #include <packager/media/base/bit_reader.h>
diff --git a/packager/media/formats/mp2t/mpeg1_header.h b/packager/media/formats/mp2t/mpeg1_header.h
index 5ec9105598..a8e4d1b5e2 100644
--- a/packager/media/formats/mp2t/mpeg1_header.h
+++ b/packager/media/formats/mp2t/mpeg1_header.h
@@ -1,8 +1,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_MPEG1_HEADER_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_MPEG1_HEADER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <packager/media/formats/mp2t/audio_header.h>
diff --git a/packager/media/formats/mp2t/mpeg1_header_unittest.cc b/packager/media/formats/mp2t/mpeg1_header_unittest.cc
index fb3509210c..86c370a448 100644
--- a/packager/media/formats/mp2t/mpeg1_header_unittest.cc
+++ b/packager/media/formats/mp2t/mpeg1_header_unittest.cc
@@ -1,9 +1,16 @@
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+// Copyright 2023 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#include <packager/media/formats/mp2t/mpeg1_header.h>
 
 #include <absl/strings/numbers.h>
 #include <glog/logging.h>
-#include <packager/media/formats/mp2t/mpeg1_header.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <packager/utils/hex_parser.h>
 
 using ::testing::ElementsAreArray;
diff --git a/packager/media/formats/mp2t/pes_packet.h b/packager/media/formats/mp2t/pes_packet.h
index 80dc50b7f9..0b85076551 100644
--- a/packager/media/formats/mp2t/pes_packet.h
+++ b/packager/media/formats/mp2t/pes_packet.h
@@ -7,7 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_PES_PACKET_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_PES_PACKET_H_
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 #include <packager/macros.h>
diff --git a/packager/media/formats/mp2t/pes_packet_generator_unittest.cc b/packager/media/formats/mp2t/pes_packet_generator_unittest.cc
index 77469707e9..c47e8aa53f 100644
--- a/packager/media/formats/mp2t/pes_packet_generator_unittest.cc
+++ b/packager/media/formats/mp2t/pes_packet_generator_unittest.cc
@@ -4,6 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/formats/mp2t/pes_packet_generator.h>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -14,7 +16,6 @@
 #include <packager/media/codecs/aac_audio_specific_config.h>
 #include <packager/media/codecs/nal_unit_to_byte_stream_converter.h>
 #include <packager/media/formats/mp2t/pes_packet.h>
-#include <packager/media/formats/mp2t/pes_packet_generator.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/program_map_table_writer.cc b/packager/media/formats/mp2t/program_map_table_writer.cc
index b88c3cef4e..2de15c639b 100644
--- a/packager/media/formats/mp2t/program_map_table_writer.cc
+++ b/packager/media/formats/mp2t/program_map_table_writer.cc
@@ -10,6 +10,7 @@
 #include <limits>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/fourccs.h>
 #include <packager/media/codecs/hls_audio_util.h>
diff --git a/packager/media/formats/mp2t/program_map_table_writer.h b/packager/media/formats/mp2t/program_map_table_writer.h
index 2d57f06169..cc30e1f0ff 100644
--- a/packager/media/formats/mp2t/program_map_table_writer.h
+++ b/packager/media/formats/mp2t/program_map_table_writer.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_PROGRAM_MAP_TABLE_WRITER_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_PROGRAM_MAP_TABLE_WRITER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <packager/media/base/buffer_writer.h>
diff --git a/packager/media/formats/mp2t/program_map_table_writer_unittest.cc b/packager/media/formats/mp2t/program_map_table_writer_unittest.cc
index e9b02f83f5..eea1ea8fed 100644
--- a/packager/media/formats/mp2t/program_map_table_writer_unittest.cc
+++ b/packager/media/formats/mp2t/program_map_table_writer_unittest.cc
@@ -4,13 +4,14 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
+#include <packager/media/formats/mp2t/program_map_table_writer.h>
 
 #include <vector>
 
+#include <gtest/gtest.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/formats/mp2t/continuity_counter.h>
-#include <packager/media/formats/mp2t/program_map_table_writer.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ts_packet.cc b/packager/media/formats/mp2t/ts_packet.cc
index 351321da85..a6f605fe36 100644
--- a/packager/media/formats/mp2t/ts_packet.cc
+++ b/packager/media/formats/mp2t/ts_packet.cc
@@ -4,10 +4,11 @@
 
 #include <packager/media/formats/mp2t/ts_packet.h>
 
+#include <memory>
+
 #include <packager/macros.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/formats/mp2t/mp2t_common.h>
-#include <memory>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ts_packet.h b/packager/media/formats/mp2t/ts_packet.h
index 827e38f4d8..fef4cf3a38 100644
--- a/packager/media/formats/mp2t/ts_packet.h
+++ b/packager/media/formats/mp2t/ts_packet.h
@@ -5,7 +5,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_PACKET_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_TS_PACKET_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <packager/macros.h>
 
diff --git a/packager/media/formats/mp2t/ts_packet_writer_util.cc b/packager/media/formats/mp2t/ts_packet_writer_util.cc
index aea623c923..b5d5f59695 100644
--- a/packager/media/formats/mp2t/ts_packet_writer_util.cc
+++ b/packager/media/formats/mp2t/ts_packet_writer_util.cc
@@ -7,6 +7,7 @@
 #include <packager/media/formats/mp2t/ts_packet_writer_util.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/formats/mp2t/continuity_counter.h>
 
diff --git a/packager/media/formats/mp2t/ts_packet_writer_util.h b/packager/media/formats/mp2t/ts_packet_writer_util.h
index e76d00f784..ebff0b5d08 100644
--- a/packager/media/formats/mp2t/ts_packet_writer_util.h
+++ b/packager/media/formats/mp2t/ts_packet_writer_util.h
@@ -9,8 +9,8 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_WRITER_UTIL_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_TS_WRITER_UTIL_H_
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ts_section_pat.cc b/packager/media/formats/mp2t/ts_section_pat.cc
index e97d3d2870..0a47373c8b 100644
--- a/packager/media/formats/mp2t/ts_section_pat.cc
+++ b/packager/media/formats/mp2t/ts_section_pat.cc
@@ -7,6 +7,7 @@
 #include <vector>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/formats/mp2t/mp2t_common.h>
 
diff --git a/packager/media/formats/mp2t/ts_section_pat.h b/packager/media/formats/mp2t/ts_section_pat.h
index 644af0104b..421550cf3f 100644
--- a/packager/media/formats/mp2t/ts_section_pat.h
+++ b/packager/media/formats/mp2t/ts_section_pat.h
@@ -5,9 +5,10 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_
 
+#include <functional>
+
 #include <packager/macros.h>
 #include <packager/media/formats/mp2t/ts_section_psi.h>
-#include <functional>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ts_section_pes.cc b/packager/media/formats/mp2t/ts_section_pes.cc
index ad561a3f7f..9f8444bc54 100644
--- a/packager/media/formats/mp2t/ts_section_pes.cc
+++ b/packager/media/formats/mp2t/ts_section_pes.cc
@@ -5,6 +5,7 @@
 #include <packager/media/formats/mp2t/ts_section_pes.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/timestamp.h>
 #include <packager/media/formats/mp2t/es_parser.h>
diff --git a/packager/media/formats/mp2t/ts_section_pes.h b/packager/media/formats/mp2t/ts_section_pes.h
index e98f681961..93dde6293e 100644
--- a/packager/media/formats/mp2t/ts_section_pes.h
+++ b/packager/media/formats/mp2t/ts_section_pes.h
@@ -5,11 +5,12 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_
 
+#include <cstdint>
+#include <memory>
+
 #include <packager/macros.h>
 #include <packager/media/base/byte_queue.h>
 #include <packager/media/formats/mp2t/ts_section.h>
-#include <stdint.h>
-#include <memory>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ts_section_pmt.cc b/packager/media/formats/mp2t/ts_section_pmt.cc
index de0671d9c3..8ac25fdafa 100644
--- a/packager/media/formats/mp2t/ts_section_pmt.cc
+++ b/packager/media/formats/mp2t/ts_section_pmt.cc
@@ -7,6 +7,7 @@
 #include <vector>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/formats/mp2t/mp2t_common.h>
 #include <packager/media/formats/mp2t/ts_stream_type.h>
diff --git a/packager/media/formats/mp2t/ts_section_pmt.h b/packager/media/formats/mp2t/ts_section_pmt.h
index bb132b72ba..0913d02d51 100644
--- a/packager/media/formats/mp2t/ts_section_pmt.h
+++ b/packager/media/formats/mp2t/ts_section_pmt.h
@@ -5,10 +5,11 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
 
+#include <functional>
+
 #include <packager/macros.h>
 #include <packager/media/formats/mp2t/ts_section_psi.h>
 #include <packager/media/formats/mp2t/ts_stream_type.h>
-#include <functional>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ts_section_psi.cc b/packager/media/formats/mp2t/ts_section_psi.cc
index f0e0868417..f76550ab1d 100644
--- a/packager/media/formats/mp2t/ts_section_psi.cc
+++ b/packager/media/formats/mp2t/ts_section_psi.cc
@@ -4,11 +4,11 @@
 
 #include <packager/media/formats/mp2t/ts_section_psi.h>
 
-#include <stdint.h>
-
 #include <algorithm>
+#include <cstdint>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/formats/mp2t/mp2t_common.h>
 
diff --git a/packager/media/formats/mp2t/ts_segmenter.h b/packager/media/formats/mp2t/ts_segmenter.h
index 6918706daf..1d146bde2a 100644
--- a/packager/media/formats/mp2t/ts_segmenter.h
+++ b/packager/media/formats/mp2t/ts_segmenter.h
@@ -7,12 +7,13 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_SEGMENTER_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_TS_SEGMENTER_H_
 
+#include <memory>
+
 #include <packager/file/file.h>
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/formats/mp2t/pes_packet_generator.h>
 #include <packager/media/formats/mp2t/ts_writer.h>
 #include <packager/status/status.h>
-#include <memory>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ts_segmenter_unittest.cc b/packager/media/formats/mp2t/ts_segmenter_unittest.cc
index c794d589c1..3dcc3b4326 100644
--- a/packager/media/formats/mp2t/ts_segmenter_unittest.cc
+++ b/packager/media/formats/mp2t/ts_segmenter_unittest.cc
@@ -4,6 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/formats/mp2t/ts_segmenter.h>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -13,7 +15,6 @@
 #include <packager/media/event/mock_muxer_listener.h>
 #include <packager/media/formats/mp2t/pes_packet.h>
 #include <packager/media/formats/mp2t/program_map_table_writer.h>
-#include <packager/media/formats/mp2t/ts_segmenter.h>
 #include <packager/status/status_test_util.h>
 
 namespace shaka {
diff --git a/packager/media/formats/mp2t/ts_stream_type.h b/packager/media/formats/mp2t/ts_stream_type.h
index 7d6501dd52..459311da0d 100644
--- a/packager/media/formats/mp2t/ts_stream_type.h
+++ b/packager/media/formats/mp2t/ts_stream_type.h
@@ -7,7 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_STREAM_TYPE_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_TS_STREAM_TYPE_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ts_writer.cc b/packager/media/formats/mp2t/ts_writer.cc
index aa79aa5a8a..8f9a40d569 100644
--- a/packager/media/formats/mp2t/ts_writer.cc
+++ b/packager/media/formats/mp2t/ts_writer.cc
@@ -9,6 +9,7 @@
 #include <algorithm>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/formats/mp2t/pes_packet.h>
diff --git a/packager/media/formats/mp2t/ts_writer.h b/packager/media/formats/mp2t/ts_writer.h
index 0ebb129fb2..c815bf4b0b 100644
--- a/packager/media/formats/mp2t/ts_writer.h
+++ b/packager/media/formats/mp2t/ts_writer.h
@@ -10,6 +10,7 @@
 #include <list>
 #include <map>
 #include <memory>
+#include <optional>
 #include <vector>
 
 #include <packager/file/file.h>
diff --git a/packager/media/formats/mp2t/ts_writer_unittest.cc b/packager/media/formats/mp2t/ts_writer_unittest.cc
index 1a3e7ad2ef..3fdb70f98e 100644
--- a/packager/media/formats/mp2t/ts_writer_unittest.cc
+++ b/packager/media/formats/mp2t/ts_writer_unittest.cc
@@ -4,6 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/formats/mp2t/ts_writer.h>
+
+#include <filesystem>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -12,7 +16,6 @@
 #include <packager/media/base/video_stream_info.h>
 #include <packager/media/formats/mp2t/pes_packet.h>
 #include <packager/media/formats/mp2t/program_map_table_writer.h>
-#include <packager/media/formats/mp2t/ts_writer.h>
 #include <filesystem>
 
 using ::testing::InSequence;
diff --git a/packager/media/formats/mp4/box.cc b/packager/media/formats/mp4/box.cc
index 435551a9ca..26f07b62df 100644
--- a/packager/media/formats/mp4/box.cc
+++ b/packager/media/formats/mp4/box.cc
@@ -7,6 +7,7 @@
 #include <packager/media/formats/mp4/box.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/formats/mp4/box_buffer.h>
 
 namespace shaka {
diff --git a/packager/media/formats/mp4/box.h b/packager/media/formats/mp4/box.h
index 0272392f3e..a03d271be1 100644
--- a/packager/media/formats/mp4/box.h
+++ b/packager/media/formats/mp4/box.h
@@ -7,7 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP4_BOX_H_
 #define PACKAGER_MEDIA_FORMATS_MP4_BOX_H_
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <packager/media/base/fourccs.h>
 
diff --git a/packager/media/formats/mp4/box_definitions.cc b/packager/media/formats/mp4/box_definitions.cc
index f72e21eed4..ba93bae4d7 100644
--- a/packager/media/formats/mp4/box_definitions.cc
+++ b/packager/media/formats/mp4/box_definitions.cc
@@ -4,11 +4,12 @@
 
 #include <packager/media/formats/mp4/box_definitions.h>
 
-#include <absl/flags/flag.h>
 #include <algorithm>
 #include <limits>
 
+#include <absl/flags/flag.h>
 #include <glog/logging.h>
+
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/macros.h>
 #include <packager/media/base/rcheck.h>
diff --git a/packager/media/formats/mp4/box_definitions_unittest.cc b/packager/media/formats/mp4/box_definitions_unittest.cc
index 0709e60292..f7d68f14f6 100644
--- a/packager/media/formats/mp4/box_definitions_unittest.cc
+++ b/packager/media/formats/mp4/box_definitions_unittest.cc
@@ -4,14 +4,15 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
+#include <packager/media/formats/mp4/box_definitions.h>
 
 #include <limits>
 #include <memory>
 
+#include <gtest/gtest.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/protection_system_specific_info.h>
-#include <packager/media/formats/mp4/box_definitions.h>
 #include <packager/media/formats/mp4/box_definitions_comparison.h>
 #include <packager/media/formats/mp4/box_reader.h>
 
diff --git a/packager/media/formats/mp4/box_reader.cc b/packager/media/formats/mp4/box_reader.cc
index cccb6ff552..9de0714e7d 100644
--- a/packager/media/formats/mp4/box_reader.cc
+++ b/packager/media/formats/mp4/box_reader.cc
@@ -4,13 +4,13 @@
 
 #include <packager/media/formats/mp4/box_reader.h>
 
-#include <inttypes.h>
-
+#include <cinttypes>
 #include <limits>
 #include <memory>
 
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
+
 #include <packager/media/formats/mp4/box.h>
 
 namespace shaka {
diff --git a/packager/media/formats/mp4/box_reader.h b/packager/media/formats/mp4/box_reader.h
index 9caaf9d6a1..25efb5c9d4 100644
--- a/packager/media/formats/mp4/box_reader.h
+++ b/packager/media/formats/mp4/box_reader.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include <glog/logging.h>
+
 #include <packager/macros.h>
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/base/fourccs.h>
diff --git a/packager/media/formats/mp4/box_reader_unittest.cc b/packager/media/formats/mp4/box_reader_unittest.cc
index 6085332157..30ad1f1399 100644
--- a/packager/media/formats/mp4/box_reader_unittest.cc
+++ b/packager/media/formats/mp4/box_reader_unittest.cc
@@ -2,15 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gtest/gtest.h>
-#include <stdint.h>
-#include <string.h>
+#include <packager/media/formats/mp4/box_buffer.h>
 
+#include <cstdint>
+#include <cstring>
 #include <memory>
 
 #include <glog/logging.h>
+#include <gtest/gtest.h>
+
 #include <packager/media/base/rcheck.h>
-#include <packager/media/formats/mp4/box_buffer.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp4/chunk_info_iterator.h b/packager/media/formats/mp4/chunk_info_iterator.h
index 54276a4dc6..54b1f61973 100644
--- a/packager/media/formats/mp4/chunk_info_iterator.h
+++ b/packager/media/formats/mp4/chunk_info_iterator.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
 #define PACKAGER_MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <packager/macros.h>
diff --git a/packager/media/formats/mp4/chunk_info_iterator_unittest.cc b/packager/media/formats/mp4/chunk_info_iterator_unittest.cc
index 133e4201fd..0f50732eb5 100644
--- a/packager/media/formats/mp4/chunk_info_iterator_unittest.cc
+++ b/packager/media/formats/mp4/chunk_info_iterator_unittest.cc
@@ -4,10 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/formats/mp4/chunk_info_iterator.h>
+
+#include <memory>
+
 #include <glog/logging.h>
 #include <gtest/gtest.h>
-#include <packager/media/formats/mp4/chunk_info_iterator.h>
-#include <memory>
 
 namespace {
 struct ChunkProperty {
diff --git a/packager/media/formats/mp4/composition_offset_iterator.h b/packager/media/formats/mp4/composition_offset_iterator.h
index c99fbb7214..1c2d2cbed8 100644
--- a/packager/media/formats/mp4/composition_offset_iterator.h
+++ b/packager/media/formats/mp4/composition_offset_iterator.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
 #define PACKAGER_MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <packager/macros.h>
diff --git a/packager/media/formats/mp4/composition_offset_iterator_unittest.cc b/packager/media/formats/mp4/composition_offset_iterator_unittest.cc
index b7d4484226..d9530b71b8 100644
--- a/packager/media/formats/mp4/composition_offset_iterator_unittest.cc
+++ b/packager/media/formats/mp4/composition_offset_iterator_unittest.cc
@@ -4,10 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
 #include <packager/media/formats/mp4/composition_offset_iterator.h>
+
 #include <memory>
 
+#include <gtest/gtest.h>
+
 namespace shaka {
 namespace media {
 namespace mp4 {
diff --git a/packager/media/formats/mp4/decoding_time_iterator.h b/packager/media/formats/mp4/decoding_time_iterator.h
index bda1847b62..5441146490 100644
--- a/packager/media/formats/mp4/decoding_time_iterator.h
+++ b/packager/media/formats/mp4/decoding_time_iterator.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
 #define PACKAGER_MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <packager/macros.h>
diff --git a/packager/media/formats/mp4/decoding_time_iterator_unittest.cc b/packager/media/formats/mp4/decoding_time_iterator_unittest.cc
index e193bc041e..e416f3723c 100644
--- a/packager/media/formats/mp4/decoding_time_iterator_unittest.cc
+++ b/packager/media/formats/mp4/decoding_time_iterator_unittest.cc
@@ -4,10 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
 #include <packager/media/formats/mp4/decoding_time_iterator.h>
+
 #include <memory>
 
+#include <gtest/gtest.h>
+
 namespace shaka {
 namespace media {
 namespace mp4 {
diff --git a/packager/media/formats/mp4/fragmenter.h b/packager/media/formats/mp4/fragmenter.h
index 94937f32bd..74edbd518c 100644
--- a/packager/media/formats/mp4/fragmenter.h
+++ b/packager/media/formats/mp4/fragmenter.h
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include <glog/logging.h>
+
 #include <packager/macros.h>
 #include <packager/status/status.h>
 
diff --git a/packager/media/formats/mp4/low_latency_segment_segmenter.h b/packager/media/formats/mp4/low_latency_segment_segmenter.h
index cd638e4f03..e874dc6b37 100644
--- a/packager/media/formats/mp4/low_latency_segment_segmenter.h
+++ b/packager/media/formats/mp4/low_latency_segment_segmenter.h
@@ -7,10 +7,9 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP4_LOW_LATENCY_SEGMENT_SEGMENTER_H_
 #define PACKAGER_MEDIA_FORMATS_MP4_LOW_LATENCY_SEGMENT_SEGMENTER_H_
 
-#include <packager/media/formats/mp4/segmenter.h>
-
 #include <packager/file/file.h>
 #include <packager/file/file_closer.h>
+#include <packager/media/formats/mp4/segmenter.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp4/mp4_media_parser.cc b/packager/media/formats/mp4/mp4_media_parser.cc
index 919c0895da..b768993fae 100644
--- a/packager/media/formats/mp4/mp4_media_parser.cc
+++ b/packager/media/formats/mp4/mp4_media_parser.cc
@@ -5,10 +5,12 @@
 #include <packager/media/formats/mp4/mp4_media_parser.h>
 
 #include <algorithm>
+#include <functional>
 #include <limits>
 
 #include <absl/strings/numbers.h>
 #include <glog/logging.h>
+
 #include <packager/file/file.h>
 #include <packager/file/file_closer.h>
 #include <packager/media/base/audio_stream_info.h>
@@ -32,7 +34,6 @@
 #include <packager/media/formats/mp4/box_definitions.h>
 #include <packager/media/formats/mp4/box_reader.h>
 #include <packager/media/formats/mp4/track_run_iterator.h>
-#include <functional>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp4/mp4_media_parser.h b/packager/media/formats/mp4/mp4_media_parser.h
index 18c53a43b7..614308afbe 100644
--- a/packager/media/formats/mp4/mp4_media_parser.h
+++ b/packager/media/formats/mp4/mp4_media_parser.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
 #define PACKAGER_MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <vector>
diff --git a/packager/media/formats/mp4/mp4_media_parser_unittest.cc b/packager/media/formats/mp4/mp4_media_parser_unittest.cc
index f0b205bba3..48b9fc5feb 100644
--- a/packager/media/formats/mp4/mp4_media_parser_unittest.cc
+++ b/packager/media/formats/mp4/mp4_media_parser_unittest.cc
@@ -4,17 +4,19 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/formats/mp4/mp4_media_parser.h>
+
+#include <functional>
+
+#include <glog/logging.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <glog/logging.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/raw_key_source.h>
 #include <packager/media/base/stream_info.h>
 #include <packager/media/base/video_stream_info.h>
-#include <packager/media/formats/mp4/mp4_media_parser.h>
 #include <packager/media/test/test_data_util.h>
-#include <functional>
 
 using ::testing::_;
 using ::testing::DoAll;
diff --git a/packager/media/formats/mp4/mp4_muxer.cc b/packager/media/formats/mp4/mp4_muxer.cc
index 26eae06eb8..3315509eb8 100644
--- a/packager/media/formats/mp4/mp4_muxer.cc
+++ b/packager/media/formats/mp4/mp4_muxer.cc
@@ -7,9 +7,11 @@
 #include <packager/media/formats/mp4/mp4_muxer.h>
 
 #include <algorithm>
+#include <chrono>
 
 #include <absl/strings/escaping.h>
 #include <absl/strings/numbers.h>
+
 #include <packager/file/file.h>
 #include <packager/media/base/aes_encryptor.h>
 #include <packager/media/base/audio_stream_info.h>
@@ -26,7 +28,6 @@
 #include <packager/media/formats/mp4/single_segment_segmenter.h>
 #include <packager/media/formats/ttml/ttml_generator.h>
 #include <packager/status/status_macros.h>
-#include <chrono>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp4/mp4_muxer.h b/packager/media/formats/mp4/mp4_muxer.h
index e19a453dbf..6ab918de8d 100644
--- a/packager/media/formats/mp4/mp4_muxer.h
+++ b/packager/media/formats/mp4/mp4_muxer.h
@@ -7,6 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP4_MP4_MUXER_H_
 #define PACKAGER_MEDIA_FORMATS_MP4_MP4_MUXER_H_
 
+#include <optional>
 #include <vector>
 
 #include <packager/media/base/muxer.h>
diff --git a/packager/media/formats/mp4/multi_segment_segmenter.cc b/packager/media/formats/mp4/multi_segment_segmenter.cc
index 2cf0da648f..e0c57ee94f 100644
--- a/packager/media/formats/mp4/multi_segment_segmenter.cc
+++ b/packager/media/formats/mp4/multi_segment_segmenter.cc
@@ -10,6 +10,7 @@
 
 #include <absl/strings/numbers.h>
 #include <absl/strings/str_format.h>
+
 #include <packager/file/file.h>
 #include <packager/file/file_closer.h>
 #include <packager/media/base/buffer_writer.h>
diff --git a/packager/media/formats/mp4/segmenter.cc b/packager/media/formats/mp4/segmenter.cc
index b596b7f42e..2d49b03bdf 100644
--- a/packager/media/formats/mp4/segmenter.cc
+++ b/packager/media/formats/mp4/segmenter.cc
@@ -9,6 +9,7 @@
 #include <algorithm>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/id3_tag.h>
 #include <packager/media/base/media_sample.h>
diff --git a/packager/media/formats/mp4/segmenter.h b/packager/media/formats/mp4/segmenter.h
index 3e30790395..c9ab7800e0 100644
--- a/packager/media/formats/mp4/segmenter.h
+++ b/packager/media/formats/mp4/segmenter.h
@@ -9,6 +9,7 @@
 
 #include <map>
 #include <memory>
+#include <optional>
 #include <vector>
 
 #include <packager/media/base/fourccs.h>
diff --git a/packager/media/formats/mp4/sync_sample_iterator.h b/packager/media/formats/mp4/sync_sample_iterator.h
index e8e07faa12..b544dec733 100644
--- a/packager/media/formats/mp4/sync_sample_iterator.h
+++ b/packager/media/formats/mp4/sync_sample_iterator.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
 #define PACKAGER_MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <packager/macros.h>
diff --git a/packager/media/formats/mp4/sync_sample_iterator_unittest.cc b/packager/media/formats/mp4/sync_sample_iterator_unittest.cc
index ba9e78d4fa..0103a8fe6d 100644
--- a/packager/media/formats/mp4/sync_sample_iterator_unittest.cc
+++ b/packager/media/formats/mp4/sync_sample_iterator_unittest.cc
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
-
 #include <packager/media/formats/mp4/sync_sample_iterator.h>
 
+#include <gtest/gtest.h>
+
 namespace {
 const uint32_t kNumSamples = 100;
 const uint32_t kSyncSamples[] = {3, 10, 30, 35, 89, 97};
diff --git a/packager/media/formats/mp4/track_run_iterator.cc b/packager/media/formats/mp4/track_run_iterator.cc
index 18ee6cfbf0..73188931ab 100644
--- a/packager/media/formats/mp4/track_run_iterator.cc
+++ b/packager/media/formats/mp4/track_run_iterator.cc
@@ -4,17 +4,11 @@
 
 #include <packager/media/formats/mp4/track_run_iterator.h>
 
-#include <absl/flags/flag.h>
-
-ABSL_FLAG(bool,
-          mp4_reset_initial_composition_offset_to_zero,
-          true,
-          "MP4 only. If it is true, reset the initial composition offset to "
-          "zero, i.e. by assuming that there is a missing EditList.");
-
 #include <algorithm>
 #include <limits>
 
+#include <absl/flags/flag.h>
+
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/base/fourccs.h>
 #include <packager/media/base/rcheck.h>
@@ -23,6 +17,12 @@ ABSL_FLAG(bool,
 #include <packager/media/formats/mp4/decoding_time_iterator.h>
 #include <packager/media/formats/mp4/sync_sample_iterator.h>
 
+ABSL_FLAG(bool,
+          mp4_reset_initial_composition_offset_to_zero,
+          true,
+          "MP4 only. If it is true, reset the initial composition offset to "
+          "zero, i.e. by assuming that there is a missing EditList.");
+
 namespace {
 const int64_t kInvalidOffset = std::numeric_limits<int64_t>::max();
 
diff --git a/packager/media/formats/mp4/track_run_iterator_unittest.cc b/packager/media/formats/mp4/track_run_iterator_unittest.cc
index 7611ee0cbc..1223f44194 100644
--- a/packager/media/formats/mp4/track_run_iterator_unittest.cc
+++ b/packager/media/formats/mp4/track_run_iterator_unittest.cc
@@ -4,14 +4,16 @@
 
 #include <packager/media/formats/mp4/track_run_iterator.h>
 
+#include <cstdint>
+#include <memory>
+
 #include <absl/flags/declare.h>
 #include <absl/flags/flag.h>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
+
 #include <packager/flag_saver.h>
 #include <packager/media/formats/mp4/box_definitions.h>
-#include <stdint.h>
-#include <memory>
 
 ABSL_DECLARE_FLAG(bool, mp4_reset_initial_composition_offset_to_zero);
 
diff --git a/packager/media/formats/ttml/ttml_generator.cc b/packager/media/formats/ttml/ttml_generator.cc
index 12735fb43e..e7fc596fc3 100644
--- a/packager/media/formats/ttml/ttml_generator.cc
+++ b/packager/media/formats/ttml/ttml_generator.cc
@@ -8,6 +8,7 @@
 
 #include <absl/strings/escaping.h>
 #include <absl/strings/str_format.h>
+
 #include <packager/media/base/rcheck.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webm/cluster_builder.cc b/packager/media/formats/webm/cluster_builder.cc
index 9ef02fa8cc..21fc6cdc1a 100644
--- a/packager/media/formats/webm/cluster_builder.cc
+++ b/packager/media/formats/webm/cluster_builder.cc
@@ -5,6 +5,7 @@
 #include <packager/media/formats/webm/cluster_builder.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/formats/webm/webm_constants.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webm/cluster_builder.h b/packager/media/formats/webm/cluster_builder.h
index 6d9198faaa..748110398a 100644
--- a/packager/media/formats/webm/cluster_builder.h
+++ b/packager/media/formats/webm/cluster_builder.h
@@ -5,8 +5,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_
 #define PACKAGER_MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <memory>
 
 #include <packager/macros.h>
diff --git a/packager/media/formats/webm/encrypted_segmenter_unittest.cc b/packager/media/formats/webm/encrypted_segmenter_unittest.cc
index 3a1ded0028..51ee4be820 100644
--- a/packager/media/formats/webm/encrypted_segmenter_unittest.cc
+++ b/packager/media/formats/webm/encrypted_segmenter_unittest.cc
@@ -4,10 +4,12 @@
 
 #include <packager/media/formats/webm/two_pass_single_segment_segmenter.h>
 
-#include <gtest/gtest.h>
-#include <packager/media/formats/webm/segmenter_test_base.h>
 #include <memory>
 
+#include <gtest/gtest.h>
+
+#include <packager/media/formats/webm/segmenter_test_base.h>
+
 namespace shaka {
 namespace media {
 namespace {
diff --git a/packager/media/formats/webm/encryptor.h b/packager/media/formats/webm/encryptor.h
index 08e56059d9..40bc43c298 100644
--- a/packager/media/formats/webm/encryptor.h
+++ b/packager/media/formats/webm/encryptor.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include <mkvmuxer/mkvmuxer.h>
+
 #include <packager/status/status.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webm/encryptor_unittest.cc b/packager/media/formats/webm/encryptor_unittest.cc
index d825662f5a..b0b29c11cf 100644
--- a/packager/media/formats/webm/encryptor_unittest.cc
+++ b/packager/media/formats/webm/encryptor_unittest.cc
@@ -6,10 +6,10 @@
 
 #include <packager/media/formats/webm/encryptor.h>
 
-#include <gtest/gtest.h>
-
 #include <memory>
 
+#include <gtest/gtest.h>
+
 #include <packager/media/base/media_sample.h>
 #include <packager/media/formats/webm/webm_constants.h>
 #include <packager/status/status_test_util.h>
diff --git a/packager/media/formats/webm/mkv_writer.h b/packager/media/formats/webm/mkv_writer.h
index 024d38a793..0bb5bf5433 100644
--- a/packager/media/formats/webm/mkv_writer.h
+++ b/packager/media/formats/webm/mkv_writer.h
@@ -11,6 +11,7 @@
 #include <string>
 
 #include <mkvmuxer/mkvmuxer.h>
+
 #include <packager/file/file_closer.h>
 #include <packager/status/status.h>
 
diff --git a/packager/media/formats/webm/multi_segment_segmenter.cc b/packager/media/formats/webm/multi_segment_segmenter.cc
index 2331dcfcfc..e12531b70f 100644
--- a/packager/media/formats/webm/multi_segment_segmenter.cc
+++ b/packager/media/formats/webm/multi_segment_segmenter.cc
@@ -7,6 +7,7 @@
 #include <packager/media/formats/webm/multi_segment_segmenter.h>
 
 #include <mkvmuxer/mkvmuxer.h>
+
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/base/muxer_util.h>
 #include <packager/media/base/stream_info.h>
diff --git a/packager/media/formats/webm/multi_segment_segmenter_unittest.cc b/packager/media/formats/webm/multi_segment_segmenter_unittest.cc
index 81222ce41c..5eb35ffda2 100644
--- a/packager/media/formats/webm/multi_segment_segmenter_unittest.cc
+++ b/packager/media/formats/webm/multi_segment_segmenter_unittest.cc
@@ -4,10 +4,12 @@
 
 #include <packager/media/formats/webm/multi_segment_segmenter.h>
 
+#include <memory>
+
 #include <gtest/gtest.h>
+
 #include <packager/media/base/muxer_util.h>
 #include <packager/media/formats/webm/segmenter_test_base.h>
-#include <memory>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/seek_head.h b/packager/media/formats/webm/seek_head.h
index 6d57d73669..1b92c9e0a4 100644
--- a/packager/media/formats/webm/seek_head.h
+++ b/packager/media/formats/webm/seek_head.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_WEBM_SEEK_HEAD_H_
 #define PACKAGER_MEDIA_FORMATS_WEBM_SEEK_HEAD_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 #include <mkvmuxer/mkvmuxer.h>
diff --git a/packager/media/formats/webm/segmenter.cc b/packager/media/formats/webm/segmenter.cc
index 604ca1d3e8..3e0d44d9d4 100644
--- a/packager/media/formats/webm/segmenter.cc
+++ b/packager/media/formats/webm/segmenter.cc
@@ -7,6 +7,7 @@
 #include <packager/media/formats/webm/segmenter.h>
 
 #include <mkvmuxer/mkvmuxerutil.h>
+
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/media_handler.h>
 #include <packager/media/base/muxer_options.h>
diff --git a/packager/media/formats/webm/segmenter.h b/packager/media/formats/webm/segmenter.h
index 10e6b1d7f4..cfa4831cc4 100644
--- a/packager/media/formats/webm/segmenter.h
+++ b/packager/media/formats/webm/segmenter.h
@@ -10,6 +10,7 @@
 #include <memory>
 
 #include <mkvmuxer/mkvmuxer.h>
+
 #include <packager/media/base/range.h>
 #include <packager/media/formats/webm/mkv_writer.h>
 #include <packager/media/formats/webm/seek_head.h>
diff --git a/packager/media/formats/webm/single_segment_segmenter.cc b/packager/media/formats/webm/single_segment_segmenter.cc
index 0f9ab0f24c..1cd8aed730 100644
--- a/packager/media/formats/webm/single_segment_segmenter.cc
+++ b/packager/media/formats/webm/single_segment_segmenter.cc
@@ -7,6 +7,7 @@
 #include <packager/media/formats/webm/single_segment_segmenter.h>
 
 #include <mkvmuxer/mkvmuxer.h>
+
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/event/muxer_listener.h>
 
diff --git a/packager/media/formats/webm/single_segment_segmenter_unittest.cc b/packager/media/formats/webm/single_segment_segmenter_unittest.cc
index 8c0ad513b6..b3a30373ea 100644
--- a/packager/media/formats/webm/single_segment_segmenter_unittest.cc
+++ b/packager/media/formats/webm/single_segment_segmenter_unittest.cc
@@ -4,10 +4,12 @@
 
 #include <packager/media/formats/webm/two_pass_single_segment_segmenter.h>
 
-#include <gtest/gtest.h>
-#include <packager/media/formats/webm/segmenter_test_base.h>
 #include <memory>
 
+#include <gtest/gtest.h>
+
+#include <packager/media/formats/webm/segmenter_test_base.h>
+
 namespace shaka {
 namespace media {
 namespace {
diff --git a/packager/media/formats/webm/tracks_builder.cc b/packager/media/formats/webm/tracks_builder.cc
index 1e5bb35ba9..13134b819c 100644
--- a/packager/media/formats/webm/tracks_builder.cc
+++ b/packager/media/formats/webm/tracks_builder.cc
@@ -5,6 +5,7 @@
 #include <packager/media/formats/webm/tracks_builder.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/formats/webm/webm_constants.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webm/tracks_builder.h b/packager/media/formats/webm/tracks_builder.h
index 0272f10481..c2832fb5a2 100644
--- a/packager/media/formats/webm/tracks_builder.h
+++ b/packager/media/formats/webm/tracks_builder.h
@@ -5,8 +5,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
 #define PACKAGER_MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <list>
 #include <string>
 #include <vector>
diff --git a/packager/media/formats/webm/two_pass_single_segment_segmenter.cc b/packager/media/formats/webm/two_pass_single_segment_segmenter.cc
index 43391c7ab3..fe32cb192f 100644
--- a/packager/media/formats/webm/two_pass_single_segment_segmenter.cc
+++ b/packager/media/formats/webm/two_pass_single_segment_segmenter.cc
@@ -10,6 +10,7 @@
 
 #include <mkvmuxer/mkvmuxer.h>
 #include <mkvmuxer/mkvmuxerutil.h>
+
 #include <packager/file/file_util.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/muxer_options.h>
diff --git a/packager/media/formats/webm/webm_audio_client.cc b/packager/media/formats/webm/webm_audio_client.cc
index 2f213136bc..043f8c1c37 100644
--- a/packager/media/formats/webm/webm_audio_client.cc
+++ b/packager/media/formats/webm/webm_audio_client.cc
@@ -5,6 +5,7 @@
 #include <packager/media/formats/webm/webm_audio_client.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/formats/webm/webm_constants.h>
 
 namespace {
diff --git a/packager/media/formats/webm/webm_cluster_parser.cc b/packager/media/formats/webm/webm_cluster_parser.cc
index 05888a43d6..1f98f7c75c 100644
--- a/packager/media/formats/webm/webm_cluster_parser.cc
+++ b/packager/media/formats/webm/webm_cluster_parser.cc
@@ -9,6 +9,7 @@
 
 #include <absl/base/internal/endian.h>
 #include <glog/logging.h>
+
 #include <packager/media/base/timestamp.h>
 #include <packager/media/codecs/vp8_parser.h>
 #include <packager/media/codecs/vp9_parser.h>
diff --git a/packager/media/formats/webm/webm_cluster_parser_unittest.cc b/packager/media/formats/webm/webm_cluster_parser_unittest.cc
index 6e4eb4328a..ccba02251a 100644
--- a/packager/media/formats/webm/webm_cluster_parser_unittest.cc
+++ b/packager/media/formats/webm/webm_cluster_parser_unittest.cc
@@ -4,9 +4,6 @@
 
 #include <packager/media/formats/webm/webm_cluster_parser.h>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <algorithm>
 #include <cstdlib>
 #include <functional>
@@ -15,6 +12,9 @@
 
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <packager/media/base/decrypt_config.h>
 #include <packager/media/base/raw_key_source.h>
 #include <packager/media/base/timestamp.h>
diff --git a/packager/media/formats/webm/webm_constants.h b/packager/media/formats/webm/webm_constants.h
index d36f662172..15b41d0239 100644
--- a/packager/media/formats/webm/webm_constants.h
+++ b/packager/media/formats/webm/webm_constants.h
@@ -5,8 +5,8 @@
 #ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
 #define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
 
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/webm_content_encodings.h b/packager/media/formats/webm/webm_content_encodings.h
index 0c7d86d09e..0f008a08d3 100644
--- a/packager/media/formats/webm/webm_content_encodings.h
+++ b/packager/media/formats/webm/webm_content_encodings.h
@@ -5,7 +5,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
 #define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
 
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <string>
 
diff --git a/packager/media/formats/webm/webm_content_encodings_client.cc b/packager/media/formats/webm/webm_content_encodings_client.cc
index a844b50d38..e3fb5a7e47 100644
--- a/packager/media/formats/webm/webm_content_encodings_client.cc
+++ b/packager/media/formats/webm/webm_content_encodings_client.cc
@@ -5,6 +5,7 @@
 #include <packager/media/formats/webm/webm_content_encodings_client.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/formats/webm/webm_constants.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webm/webm_content_encodings_client_unittest.cc b/packager/media/formats/webm/webm_content_encodings_client_unittest.cc
index 4622826ea3..6744ef57b6 100644
--- a/packager/media/formats/webm/webm_content_encodings_client_unittest.cc
+++ b/packager/media/formats/webm/webm_content_encodings_client_unittest.cc
@@ -4,11 +4,11 @@
 
 #include <packager/media/formats/webm/webm_content_encodings_client.h>
 
-#include <gtest/gtest.h>
-
 #include <string>
 
 #include <absl/strings/numbers.h>
+#include <gtest/gtest.h>
+
 #include <packager/media/formats/webm/webm_constants.h>
 #include <packager/media/formats/webm/webm_parser.h>
 
diff --git a/packager/media/formats/webm/webm_crypto_helpers.cc b/packager/media/formats/webm/webm_crypto_helpers.cc
index 0ee2912af0..044ce2c84e 100644
--- a/packager/media/formats/webm/webm_crypto_helpers.cc
+++ b/packager/media/formats/webm/webm_crypto_helpers.cc
@@ -6,6 +6,7 @@
 
 #include <absl/base/internal/endian.h>
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/formats/webm/webm_constants.h>
 
diff --git a/packager/media/formats/webm/webm_crypto_helpers.h b/packager/media/formats/webm/webm_crypto_helpers.h
index 524a6a6431..4122ae6ac8 100644
--- a/packager/media/formats/webm/webm_crypto_helpers.h
+++ b/packager/media/formats/webm/webm_crypto_helpers.h
@@ -5,10 +5,11 @@
 #ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_
 #define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_
 
-#include <packager/media/base/decrypt_config.h>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 
+#include <packager/media/base/decrypt_config.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/formats/webm/webm_info_parser.cc b/packager/media/formats/webm/webm_info_parser.cc
index f8a6689acc..c509cb91a2 100644
--- a/packager/media/formats/webm/webm_info_parser.cc
+++ b/packager/media/formats/webm/webm_info_parser.cc
@@ -7,6 +7,7 @@
 #include <ctime>
 
 #include <glog/logging.h>
+
 #include <packager/media/formats/webm/webm_constants.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webm/webm_media_parser.cc b/packager/media/formats/webm/webm_media_parser.cc
index 1290cda786..4f82eba2a2 100644
--- a/packager/media/formats/webm/webm_media_parser.cc
+++ b/packager/media/formats/webm/webm_media_parser.cc
@@ -7,6 +7,7 @@
 #include <string>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/timestamp.h>
 #include <packager/media/formats/webm/webm_cluster_parser.h>
diff --git a/packager/media/formats/webm/webm_parser.cc b/packager/media/formats/webm/webm_parser.cc
index 45c6a8d632..f45fbbbd89 100644
--- a/packager/media/formats/webm/webm_parser.cc
+++ b/packager/media/formats/webm/webm_parser.cc
@@ -2,18 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <packager/media/formats/webm/webm_parser.h>
-
 // This file contains code to parse WebM file elements. It was created
 // from information in the Matroska spec.
 // http://www.matroska.org/technical/specs/index.html
+//
 // This file contains code for encrypted WebM. Current WebM
 // encrypted request for comments specification is here
 // http://wiki.webmproject.org/encryption/webm-encryption-rfc
 
+#include <packager/media/formats/webm/webm_parser.h>
+
 #include <limits>
 
 #include <glog/logging.h>
+
 #include <packager/media/formats/webm/webm_constants.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webm/webm_parser.h b/packager/media/formats/webm/webm_parser.h
index 7bccc33385..13996345d4 100644
--- a/packager/media/formats/webm/webm_parser.h
+++ b/packager/media/formats/webm/webm_parser.h
@@ -5,8 +5,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
 #define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/packager/media/formats/webm/webm_tracks_parser.cc b/packager/media/formats/webm/webm_tracks_parser.cc
index 3984100e38..e311e7a92b 100644
--- a/packager/media/formats/webm/webm_tracks_parser.cc
+++ b/packager/media/formats/webm/webm_tracks_parser.cc
@@ -6,6 +6,7 @@
 
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
+
 #include <packager/media/base/timestamp.h>
 #include <packager/media/formats/webm/webm_constants.h>
 #include <packager/media/formats/webm/webm_content_encodings.h>
diff --git a/packager/media/formats/webm/webm_tracks_parser_unittest.cc b/packager/media/formats/webm/webm_tracks_parser_unittest.cc
index 365d16546e..68524b7697 100644
--- a/packager/media/formats/webm/webm_tracks_parser_unittest.cc
+++ b/packager/media/formats/webm/webm_tracks_parser_unittest.cc
@@ -4,10 +4,10 @@
 
 #include <packager/media/formats/webm/webm_tracks_parser.h>
 
+#include <glog/logging.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <glog/logging.h>
 #include <packager/media/base/timestamp.h>
 #include <packager/media/formats/webm/tracks_builder.h>
 #include <packager/media/formats/webm/webm_constants.h>
diff --git a/packager/media/formats/webm/webm_video_client.cc b/packager/media/formats/webm/webm_video_client.cc
index 334f94909e..dc081beaab 100644
--- a/packager/media/formats/webm/webm_video_client.cc
+++ b/packager/media/formats/webm/webm_video_client.cc
@@ -5,6 +5,7 @@
 #include <packager/media/formats/webm/webm_video_client.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/video_util.h>
 #include <packager/media/codecs/av1_codec_configuration_record.h>
 #include <packager/media/codecs/vp_codec_configuration_record.h>
diff --git a/packager/media/formats/webm/webm_webvtt_parser.h b/packager/media/formats/webm/webm_webvtt_parser.h
index 8269a2ad8b..97675aec46 100644
--- a/packager/media/formats/webm/webm_webvtt_parser.h
+++ b/packager/media/formats/webm/webm_webvtt_parser.h
@@ -5,8 +5,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_WEBVTT_PARSER_H_
 #define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_WEBVTT_PARSER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 
 #include <packager/macros.h>
diff --git a/packager/media/formats/webvtt/text_readers_unittest.cc b/packager/media/formats/webvtt/text_readers_unittest.cc
index 92fe6bdf60..8fc1813484 100644
--- a/packager/media/formats/webvtt/text_readers_unittest.cc
+++ b/packager/media/formats/webvtt/text_readers_unittest.cc
@@ -4,11 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/formats/webvtt/text_readers.h>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <packager/file/file.h>
-#include <packager/media/formats/webvtt/text_readers.h>
 #include <packager/status/status_test_util.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webvtt/webvtt_file_buffer.cc b/packager/media/formats/webvtt/webvtt_file_buffer.cc
index 905ac4c809..4ca2c61842 100644
--- a/packager/media/formats/webvtt/webvtt_file_buffer.cc
+++ b/packager/media/formats/webvtt/webvtt_file_buffer.cc
@@ -7,6 +7,7 @@
 #include <packager/media/formats/webvtt/webvtt_file_buffer.h>
 
 #include <absl/strings/str_format.h>
+
 #include <packager/media/base/text_sample.h>
 #include <packager/media/formats/webvtt/webvtt_utils.h>
 
diff --git a/packager/media/formats/webvtt/webvtt_muxer_unittest.cc b/packager/media/formats/webvtt/webvtt_muxer_unittest.cc
index 75c346bbe3..a769ae3a57 100644
--- a/packager/media/formats/webvtt/webvtt_muxer_unittest.cc
+++ b/packager/media/formats/webvtt/webvtt_muxer_unittest.cc
@@ -4,6 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/formats/webvtt/webvtt_muxer.h>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -12,7 +14,6 @@
 #include <packager/media/base/text_stream_info.h>
 #include <packager/media/event/combined_muxer_listener.h>
 #include <packager/media/event/mock_muxer_listener.h>
-#include <packager/media/formats/webvtt/webvtt_muxer.h>
 #include <packager/status/status_test_util.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webvtt/webvtt_parser.cc b/packager/media/formats/webvtt/webvtt_parser.cc
index e8f09866b0..27ce212136 100644
--- a/packager/media/formats/webvtt/webvtt_parser.cc
+++ b/packager/media/formats/webvtt/webvtt_parser.cc
@@ -10,6 +10,7 @@
 #include <absl/strings/str_format.h>
 #include <absl/strings/str_split.h>
 #include <glog/logging.h>
+
 #include <packager/kv_pairs/kv_pairs.h>
 #include <packager/media/base/text_stream_info.h>
 #include <packager/media/formats/webvtt/webvtt_utils.h>
diff --git a/packager/media/formats/webvtt/webvtt_parser_unittest.cc b/packager/media/formats/webvtt/webvtt_parser_unittest.cc
index a040c1e013..9f0287e611 100644
--- a/packager/media/formats/webvtt/webvtt_parser_unittest.cc
+++ b/packager/media/formats/webvtt/webvtt_parser_unittest.cc
@@ -6,11 +6,12 @@
 
 #include <packager/media/formats/webvtt/webvtt_parser.h>
 
+#include <functional>
+
 #include <gtest/gtest.h>
 
 #include <packager/media/base/stream_info.h>
 #include <packager/media/base/text_sample.h>
-#include <functional>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webvtt/webvtt_to_mp4_handler.h b/packager/media/formats/webvtt/webvtt_to_mp4_handler.h
index 3d1470e27b..177734df14 100644
--- a/packager/media/formats/webvtt/webvtt_to_mp4_handler.h
+++ b/packager/media/formats/webvtt/webvtt_to_mp4_handler.h
@@ -7,8 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_WEBVTT_WEBVTT_MP4_CUE_HANDLER_H_
 #define PACKAGER_MEDIA_FORMATS_WEBVTT_WEBVTT_MP4_CUE_HANDLER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <list>
 #include <queue>
 
diff --git a/packager/media/formats/webvtt/webvtt_to_mp4_handler_unittest.cc b/packager/media/formats/webvtt/webvtt_to_mp4_handler_unittest.cc
index 69f6ddf68d..7d1758ce11 100644
--- a/packager/media/formats/webvtt/webvtt_to_mp4_handler_unittest.cc
+++ b/packager/media/formats/webvtt/webvtt_to_mp4_handler_unittest.cc
@@ -4,11 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/media/formats/webvtt/webvtt_to_mp4_handler.h>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <packager/media/base/media_handler_test_base.h>
-#include <packager/media/formats/webvtt/webvtt_to_mp4_handler.h>
 #include <packager/status/status_test_util.h>
 
 using testing::_;
diff --git a/packager/media/formats/webvtt/webvtt_utils.cc b/packager/media/formats/webvtt/webvtt_utils.cc
index 80716505ef..b57881fdc7 100644
--- a/packager/media/formats/webvtt/webvtt_utils.cc
+++ b/packager/media/formats/webvtt/webvtt_utils.cc
@@ -6,10 +6,9 @@
 
 #include <packager/media/formats/webvtt/webvtt_utils.h>
 
-#include <ctype.h>
-#include <inttypes.h>
-
 #include <algorithm>
+#include <cctype>
+#include <cinttypes>
 #include <unordered_set>
 
 #include <absl/strings/numbers.h>
diff --git a/packager/media/formats/webvtt/webvtt_utils.h b/packager/media/formats/webvtt/webvtt_utils.h
index 1a0f908bea..c5749faadd 100644
--- a/packager/media/formats/webvtt/webvtt_utils.h
+++ b/packager/media/formats/webvtt/webvtt_utils.h
@@ -7,15 +7,14 @@
 #ifndef PACKAGER_MEDIA_FORMATS_WEBVTT_UTILS_H_
 #define PACKAGER_MEDIA_FORMATS_WEBVTT_UTILS_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <list>
 #include <memory>
 #include <string>
+#include <string_view>
 
 #include <packager/media/base/text_sample.h>
 #include <packager/media/base/text_stream_info.h>
-#include <string_view>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webvtt/webvtt_utils_unittest.cc b/packager/media/formats/webvtt/webvtt_utils_unittest.cc
index 2adf47ab25..f20f7c062f 100644
--- a/packager/media/formats/webvtt/webvtt_utils_unittest.cc
+++ b/packager/media/formats/webvtt/webvtt_utils_unittest.cc
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest.h>
-
 #include <packager/media/formats/webvtt/webvtt_utils.h>
 
+#include <gtest/gtest.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/formats/wvm/wvm_media_parser.cc b/packager/media/formats/wvm/wvm_media_parser.cc
index a35f45ae7c..547a4176b6 100644
--- a/packager/media/formats/wvm/wvm_media_parser.cc
+++ b/packager/media/formats/wvm/wvm_media_parser.cc
@@ -10,6 +10,7 @@
 
 #include <absl/base/internal/endian.h>
 #include <absl/strings/str_format.h>
+
 #include <packager/media/base/aes_decryptor.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/key_source.h>
diff --git a/packager/media/formats/wvm/wvm_media_parser.h b/packager/media/formats/wvm/wvm_media_parser.h
index deafd576c3..6ba9ab9f34 100644
--- a/packager/media/formats/wvm/wvm_media_parser.h
+++ b/packager/media/formats/wvm/wvm_media_parser.h
@@ -13,6 +13,7 @@
 #include <vector>
 
 #include <absl/base/internal/endian.h>
+
 #include <packager/macros.h>
 #include <packager/media/base/media_parser.h>
 #include <packager/media/codecs/h264_byte_to_unit_stream_converter.h>
diff --git a/packager/media/formats/wvm/wvm_media_parser_unittest.cc b/packager/media/formats/wvm/wvm_media_parser_unittest.cc
index 242ee7afd2..61fc7feb66 100644
--- a/packager/media/formats/wvm/wvm_media_parser_unittest.cc
+++ b/packager/media/formats/wvm/wvm_media_parser_unittest.cc
@@ -2,13 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <packager/media/formats/wvm/wvm_media_parser.h>
 
 #include <algorithm>
+#include <functional>
 #include <string>
 
 #include <glog/logging.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/raw_key_source.h>
@@ -16,9 +19,7 @@
 #include <packager/media/base/stream_info.h>
 #include <packager/media/base/timestamp.h>
 #include <packager/media/base/video_stream_info.h>
-#include <packager/media/formats/wvm/wvm_media_parser.h>
 #include <packager/media/test/test_data_util.h>
-#include <functional>
 
 namespace {
 const char kWvmFile[] = "bear-640x360.wvm";
diff --git a/packager/media/replicator/replicator.cc b/packager/media/replicator/replicator.cc
index ba15d86736..e5a8f46ee5 100644
--- a/packager/media/replicator/replicator.cc
+++ b/packager/media/replicator/replicator.cc
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <glog/logging.h>
-
 #include <packager/media/replicator/replicator.h>
 
+#include <glog/logging.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/test/test_data_util.h b/packager/media/test/test_data_util.h
index be270f0766..5c4c82a6b3 100644
--- a/packager/media/test/test_data_util.h
+++ b/packager/media/test/test_data_util.h
@@ -5,8 +5,7 @@
 #ifndef PACKAGER_MEDIA_TEST_TEST_DATA_UTIL_H_
 #define PACKAGER_MEDIA_TEST_TEST_DATA_UTIL_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <filesystem>
 #include <string>
 #include <vector>
diff --git a/packager/media/trick_play/trick_play_handler.cc b/packager/media/trick_play/trick_play_handler.cc
index b68a64996b..a7f8713e4b 100644
--- a/packager/media/trick_play/trick_play_handler.cc
+++ b/packager/media/trick_play/trick_play_handler.cc
@@ -7,6 +7,7 @@
 #include <packager/media/trick_play/trick_play_handler.h>
 
 #include <glog/logging.h>
+
 #include <packager/media/base/video_stream_info.h>
 #include <packager/status/status.h>
 
diff --git a/packager/mpd/base/adaptation_set.cc b/packager/mpd/base/adaptation_set.cc
index 760c1502cf..f001568cdc 100644
--- a/packager/mpd/base/adaptation_set.cc
+++ b/packager/mpd/base/adaptation_set.cc
@@ -6,11 +6,12 @@
 
 #include <packager/mpd/base/adaptation_set.h>
 
-#include <absl/strings/numbers.h>
-#include <glog/logging.h>
 #include <cmath>
 
+#include <absl/strings/numbers.h>
 #include <absl/strings/str_format.h>
+#include <glog/logging.h>
+
 #include <packager/mpd/base/media_info.pb.h>
 #include <packager/mpd/base/mpd_options.h>
 #include <packager/mpd/base/mpd_utils.h>
diff --git a/packager/mpd/base/adaptation_set.h b/packager/mpd/base/adaptation_set.h
index ee17183cf3..fc463c1a7e 100644
--- a/packager/mpd/base/adaptation_set.h
+++ b/packager/mpd/base/adaptation_set.h
@@ -9,8 +9,7 @@
 #ifndef PACKAGER_MPD_BASE_ADAPTATION_SET_H_
 #define PACKAGER_MPD_BASE_ADAPTATION_SET_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <list>
 #include <map>
 #include <memory>
diff --git a/packager/mpd/base/bandwidth_estimator.h b/packager/mpd/base/bandwidth_estimator.h
index 40563998c0..69a4038df7 100644
--- a/packager/mpd/base/bandwidth_estimator.h
+++ b/packager/mpd/base/bandwidth_estimator.h
@@ -7,8 +7,7 @@
 #ifndef MPD_BASE_BANDWIDTH_ESTIMATOR_H_
 #define MPD_BASE_BANDWIDTH_ESTIMATOR_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <vector>
 
 namespace shaka {
diff --git a/packager/mpd/base/mock_mpd_builder.cc b/packager/mpd/base/mock_mpd_builder.cc
index c38189a2f1..a766a11b48 100644
--- a/packager/mpd/base/mock_mpd_builder.cc
+++ b/packager/mpd/base/mock_mpd_builder.cc
@@ -1,3 +1,9 @@
+// Copyright 2023 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 #include <packager/mpd/base/mock_mpd_builder.h>
 
 #include <packager/mpd/base/media_info.pb.h>
diff --git a/packager/mpd/base/mock_mpd_builder.h b/packager/mpd/base/mock_mpd_builder.h
index 7db6c7d408..916972bebd 100644
--- a/packager/mpd/base/mock_mpd_builder.h
+++ b/packager/mpd/base/mock_mpd_builder.h
@@ -7,9 +7,9 @@
 #ifndef MPD_BASE_MOCK_MPD_BUILDER_H_
 #define MPD_BASE_MOCK_MPD_BUILDER_H_
 
+#include <absl/synchronization/mutex.h>
 #include <gmock/gmock.h>
 
-#include <absl/synchronization/mutex.h>
 #include <packager/macros.h>
 #include <packager/mpd/base/adaptation_set.h>
 #include <packager/mpd/base/content_protection_element.h>
diff --git a/packager/mpd/base/mock_mpd_notifier.cc b/packager/mpd/base/mock_mpd_notifier.cc
index 22f579075c..cd8893954b 100644
--- a/packager/mpd/base/mock_mpd_notifier.cc
+++ b/packager/mpd/base/mock_mpd_notifier.cc
@@ -1,3 +1,9 @@
+// Copyright 2023 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 #include <packager/mpd/base/mock_mpd_notifier.h>
 
 namespace shaka {
diff --git a/packager/mpd/base/mock_mpd_notifier.h b/packager/mpd/base/mock_mpd_notifier.h
index 1bef1a0a73..6d19413273 100644
--- a/packager/mpd/base/mock_mpd_notifier.h
+++ b/packager/mpd/base/mock_mpd_notifier.h
@@ -7,12 +7,11 @@
 #ifndef MPD_BASE_MOCK_MPD_NOTIFIER_H_
 #define MPD_BASE_MOCK_MPD_NOTIFIER_H_
 
-#include <packager/mpd/base/mpd_notifier.h>
-
 #include <gmock/gmock.h>
 
 #include <packager/mpd/base/content_protection_element.h>
 #include <packager/mpd/base/media_info.pb.h>
+#include <packager/mpd/base/mpd_notifier.h>
 
 namespace shaka {
 
diff --git a/packager/mpd/base/mpd_builder.cc b/packager/mpd/base/mpd_builder.cc
index f56a0cb57e..038c5aa514 100644
--- a/packager/mpd/base/mpd_builder.cc
+++ b/packager/mpd/base/mpd_builder.cc
@@ -6,15 +6,16 @@
 
 #include <packager/mpd/base/mpd_builder.h>
 
-#include <absl/strings/numbers.h>
-#include <absl/strings/str_format.h>
-#include <absl/synchronization/mutex.h>
-#include <glog/logging.h>
 #include <algorithm>
 #include <chrono>
 #include <filesystem>
 #include <optional>
 
+#include <absl/strings/numbers.h>
+#include <absl/strings/str_format.h>
+#include <absl/synchronization/mutex.h>
+#include <glog/logging.h>
+
 #include <packager/file/file_util.h>
 #include <packager/media/base/rcheck.h>
 #include <packager/mpd/base/adaptation_set.h>
diff --git a/packager/mpd/base/mpd_builder.h b/packager/mpd/base/mpd_builder.h
index 25a2b7fc34..6c02b018cd 100644
--- a/packager/mpd/base/mpd_builder.h
+++ b/packager/mpd/base/mpd_builder.h
@@ -11,14 +11,14 @@
 #ifndef MPD_BASE_MPD_BUILDER_H_
 #define MPD_BASE_MPD_BUILDER_H_
 
-#include <libxml/tree.h>
-
 #include <chrono>
 #include <list>
 #include <memory>
 #include <optional>
 #include <string>
 
+#include <libxml/tree.h>
+
 #include <packager/macros.h>
 #include <packager/mpd/base/mpd_options.h>
 #include <packager/mpd/base/xml/xml_node.h>
diff --git a/packager/mpd/base/mpd_builder_unittest.cc b/packager/mpd/base/mpd_builder_unittest.cc
index 5540bcf27e..d413f5d64e 100644
--- a/packager/mpd/base/mpd_builder_unittest.cc
+++ b/packager/mpd/base/mpd_builder_unittest.cc
@@ -4,13 +4,14 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <packager/mpd/base/mpd_builder.h>
 
 #include <memory>
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <packager/mpd/base/adaptation_set.h>
-#include <packager/mpd/base/mpd_builder.h>
 #include <packager/mpd/base/period.h>
 #include <packager/mpd/base/representation.h>
 #include <packager/mpd/test/mpd_builder_test_helper.h>
diff --git a/packager/mpd/base/mpd_notifier.h b/packager/mpd/base/mpd_notifier.h
index acbda7cf56..fc25255c3f 100644
--- a/packager/mpd/base/mpd_notifier.h
+++ b/packager/mpd/base/mpd_notifier.h
@@ -10,8 +10,7 @@
 #ifndef MPD_BASE_MPD_NOTIFIER_H_
 #define MPD_BASE_MPD_NOTIFIER_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/packager/mpd/base/mpd_notifier_util.cc b/packager/mpd/base/mpd_notifier_util.cc
index 5229df0a4e..56ab89f341 100644
--- a/packager/mpd/base/mpd_notifier_util.cc
+++ b/packager/mpd/base/mpd_notifier_util.cc
@@ -7,6 +7,7 @@
 #include <packager/mpd/base/mpd_notifier_util.h>
 
 #include <glog/logging.h>
+
 #include <packager/file/file.h>
 #include <packager/mpd/base/mpd_utils.h>
 
diff --git a/packager/mpd/base/mpd_notifier_util.h b/packager/mpd/base/mpd_notifier_util.h
index 58187045a7..70f9331f21 100644
--- a/packager/mpd/base/mpd_notifier_util.h
+++ b/packager/mpd/base/mpd_notifier_util.h
@@ -14,6 +14,7 @@
 #include <vector>
 
 #include <absl/strings/escaping.h>
+
 #include <packager/mpd/base/media_info.pb.h>
 #include <packager/mpd/base/mpd_builder.h>
 
diff --git a/packager/mpd/base/mpd_utils.cc b/packager/mpd/base/mpd_utils.cc
index 3f2abbffb9..8c742becbe 100644
--- a/packager/mpd/base/mpd_utils.cc
+++ b/packager/mpd/base/mpd_utils.cc
@@ -9,10 +9,10 @@
 #include <absl/flags/flag.h>
 #include <absl/strings/escaping.h>
 #include <absl/strings/numbers.h>
+#include <absl/strings/str_format.h>
 #include <glog/logging.h>
 #include <libxml/tree.h>
 
-#include <absl/strings/str_format.h>
 #include <packager/media/base/language_utils.h>
 #include <packager/media/base/protection_system_specific_info.h>
 #include <packager/mpd/base/adaptation_set.h>
diff --git a/packager/mpd/base/mpd_utils.h b/packager/mpd/base/mpd_utils.h
index 84b5f73575..846988228e 100644
--- a/packager/mpd/base/mpd_utils.h
+++ b/packager/mpd/base/mpd_utils.h
@@ -9,12 +9,12 @@
 #ifndef MPD_BASE_MPD_UTILS_H_
 #define MPD_BASE_MPD_UTILS_H_
 
-#include <libxml/tree.h>
-
 #include <cstdint>
 #include <list>
 #include <string>
 
+#include <libxml/tree.h>
+
 namespace shaka {
 
 class AdaptationSet;
diff --git a/packager/mpd/base/mpd_utils_unittest.cc b/packager/mpd/base/mpd_utils_unittest.cc
index 69031bf802..3974e5f5d5 100644
--- a/packager/mpd/base/mpd_utils_unittest.cc
+++ b/packager/mpd/base/mpd_utils_unittest.cc
@@ -4,14 +4,16 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <absl/strings/escaping.h>
-#include <gtest/gtest.h>
+#include <packager/mpd/base/mpd_utils.h>
+
 #include <memory>
 
+#include <absl/strings/escaping.h>
 #include <absl/types/span.h>
+#include <gtest/gtest.h>
+
 #include <packager/mpd/base/adaptation_set.h>
 #include <packager/mpd/base/mpd_options.h>
-#include <packager/mpd/base/mpd_utils.h>
 #include <packager/mpd/test/mpd_builder_test_helper.h>
 #include <packager/mpd/test/xml_compare.h>
 
diff --git a/packager/mpd/base/period.cc b/packager/mpd/base/period.cc
index 29b58ecf27..9d35cb16da 100644
--- a/packager/mpd/base/period.cc
+++ b/packager/mpd/base/period.cc
@@ -4,9 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <glog/logging.h>
 #include <packager/mpd/base/period.h>
 
+#include <glog/logging.h>
+
 #include <packager/mpd/base/adaptation_set.h>
 #include <packager/mpd/base/mpd_options.h>
 #include <packager/mpd/base/mpd_utils.h>
diff --git a/packager/mpd/base/period.h b/packager/mpd/base/period.h
index 6994f9425c..fb505766e6 100644
--- a/packager/mpd/base/period.h
+++ b/packager/mpd/base/period.h
@@ -11,11 +11,11 @@
 
 #include <list>
 #include <map>
+#include <optional>
 
 #include <packager/mpd/base/adaptation_set.h>
 #include <packager/mpd/base/media_info.pb.h>
 #include <packager/mpd/base/xml/xml_node.h>
-#include <optional>
 
 namespace shaka {
 
diff --git a/packager/mpd/base/representation.cc b/packager/mpd/base/representation.cc
index 96d642a2df..7ff51afaa5 100644
--- a/packager/mpd/base/representation.cc
+++ b/packager/mpd/base/representation.cc
@@ -6,10 +6,11 @@
 
 #include <packager/mpd/base/representation.h>
 
+#include <algorithm>
+
 #include <absl/flags/declare.h>
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
-#include <algorithm>
 
 #include <packager/file/file.h>
 #include <packager/media/base/muxer_util.h>
diff --git a/packager/mpd/base/representation.h b/packager/mpd/base/representation.h
index 83f0828dcf..e6b958bb43 100644
--- a/packager/mpd/base/representation.h
+++ b/packager/mpd/base/representation.h
@@ -9,8 +9,7 @@
 #ifndef PACKAGER_MPD_BASE_REPRESENTATION_H_
 #define PACKAGER_MPD_BASE_REPRESENTATION_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <list>
 #include <memory>
 #include <optional>
diff --git a/packager/mpd/base/representation_unittest.cc b/packager/mpd/base/representation_unittest.cc
index 2869eb7e01..9e3f95a829 100644
--- a/packager/mpd/base/representation_unittest.cc
+++ b/packager/mpd/base/representation_unittest.cc
@@ -6,12 +6,13 @@
 
 #include <packager/mpd/base/representation.h>
 
+#include <cinttypes>
+
 #include <absl/flags/declare.h>
 #include <absl/flags/flag.h>
 #include <absl/strings/str_format.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <inttypes.h>
 
 #include <packager/file/file.h>
 #include <packager/file/file_closer.h>
diff --git a/packager/mpd/base/segment_info.h b/packager/mpd/base/segment_info.h
index 77369bc327..dc6415e279 100644
--- a/packager/mpd/base/segment_info.h
+++ b/packager/mpd/base/segment_info.h
@@ -7,7 +7,10 @@
 #ifndef MPD_BASE_SEGMENT_INFO_H_
 #define MPD_BASE_SEGMENT_INFO_H_
 
+#include <cstdint>
+
 namespace shaka {
+
 /// Container for keeping track of information about a segment.
 /// Used for keeping track of all the segments used for generating MPD with
 /// dynamic  profile.
@@ -21,6 +24,7 @@ struct SegmentInfo {
   // in the DASH MPD spec.
   int repeat;
 };
+
 }  // namespace shaka
 
 #endif  // MPD_BASE_SEGMENT_INFO_H_
diff --git a/packager/mpd/base/simple_mpd_notifier.cc b/packager/mpd/base/simple_mpd_notifier.cc
index 4cfd065c19..15d8b939df 100644
--- a/packager/mpd/base/simple_mpd_notifier.cc
+++ b/packager/mpd/base/simple_mpd_notifier.cc
@@ -7,6 +7,7 @@
 #include <packager/mpd/base/simple_mpd_notifier.h>
 
 #include <glog/logging.h>
+
 #include <packager/mpd/base/adaptation_set.h>
 #include <packager/mpd/base/mpd_builder.h>
 #include <packager/mpd/base/mpd_notifier_util.h>
diff --git a/packager/mpd/base/simple_mpd_notifier.h b/packager/mpd/base/simple_mpd_notifier.h
index 9e1f9a40ed..ad985aeb0f 100644
--- a/packager/mpd/base/simple_mpd_notifier.h
+++ b/packager/mpd/base/simple_mpd_notifier.h
@@ -13,6 +13,7 @@
 #include <vector>
 
 #include <absl/synchronization/mutex.h>
+
 #include <packager/mpd/base/mpd_notifier.h>
 #include <packager/mpd/base/mpd_notifier_util.h>
 
diff --git a/packager/mpd/base/simple_mpd_notifier_unittest.cc b/packager/mpd/base/simple_mpd_notifier_unittest.cc
index 747b147836..426525da30 100644
--- a/packager/mpd/base/simple_mpd_notifier_unittest.cc
+++ b/packager/mpd/base/simple_mpd_notifier_unittest.cc
@@ -4,16 +4,18 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/mpd/base/simple_mpd_notifier.h>
+
+#include <filesystem>
+
 #include <gmock/gmock.h>
 #include <google/protobuf/util/message_differencer.h>
 #include <gtest/gtest.h>
-#include <filesystem>
 
 #include <packager/file/file_test_util.h>
 #include <packager/mpd/base/mock_mpd_builder.h>
 #include <packager/mpd/base/mpd_builder.h>
 #include <packager/mpd/base/mpd_options.h>
-#include <packager/mpd/base/simple_mpd_notifier.h>
 #include <packager/mpd/test/mpd_builder_test_helper.h>
 
 namespace shaka {
diff --git a/packager/mpd/base/xml/scoped_xml_ptr.h b/packager/mpd/base/xml/scoped_xml_ptr.h
index e7936c8014..616012f15a 100644
--- a/packager/mpd/base/xml/scoped_xml_ptr.h
+++ b/packager/mpd/base/xml/scoped_xml_ptr.h
@@ -10,11 +10,11 @@
 #ifndef MPD_BASE_XML_SCOPED_XML_PTR_H_
 #define MPD_BASE_XML_SCOPED_XML_PTR_H_
 
+#include <memory>
+
 #include <libxml/tree.h>
 #include <libxml/xmlschemas.h>
 
-#include <memory>
-
 namespace shaka {
 namespace xml {
 
diff --git a/packager/mpd/base/xml/xml_node.cc b/packager/mpd/base/xml/xml_node.cc
index 5811bf0f2e..0462f0394e 100644
--- a/packager/mpd/base/xml/xml_node.cc
+++ b/packager/mpd/base/xml/xml_node.cc
@@ -6,18 +6,18 @@
 
 #include <packager/mpd/base/xml/xml_node.h>
 
-#include <absl/base/internal/endian.h>
-#include <absl/flags/flag.h>
-#include <absl/strings/numbers.h>
-#include <glog/logging.h>
-#include <libxml/tree.h>
-
 #include <cmath>
 #include <limits>
 #include <set>
 
+#include <absl/base/internal/endian.h>
+#include <absl/flags/flag.h>
 #include <absl/strings/escaping.h>
+#include <absl/strings/numbers.h>
 #include <absl/strings/str_format.h>
+#include <glog/logging.h>
+#include <libxml/tree.h>
+
 #include <packager/macros.h>
 #include <packager/media/base/rcheck.h>
 #include <packager/mpd/base/media_info.pb.h>
diff --git a/packager/mpd/base/xml/xml_node.h b/packager/mpd/base/xml/xml_node.h
index cff8b969d3..2df3ce5758 100644
--- a/packager/mpd/base/xml/xml_node.h
+++ b/packager/mpd/base/xml/xml_node.h
@@ -10,8 +10,7 @@
 #ifndef MPD_BASE_XML_XML_NODE_H_
 #define MPD_BASE_XML_XML_NODE_H_
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <list>
 #include <set>
 #include <string>
diff --git a/packager/mpd/base/xml/xml_node_unittest.cc b/packager/mpd/base/xml/xml_node_unittest.cc
index f2d9ba0763..43ad2d1986 100644
--- a/packager/mpd/base/xml/xml_node_unittest.cc
+++ b/packager/mpd/base/xml/xml_node_unittest.cc
@@ -4,18 +4,19 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/mpd/base/xml/xml_node.h>
+
+#include <list>
+
 #include <absl/flags/declare.h>
 #include <absl/flags/flag.h>
+#include <glog/logging.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <libxml/tree.h>
 
-#include <list>
-
-#include <glog/logging.h>
 #include <packager/flag_saver.h>
 #include <packager/mpd/base/segment_info.h>
-#include <packager/mpd/base/xml/xml_node.h>
 #include <packager/mpd/test/mpd_builder_test_helper.h>
 #include <packager/mpd/test/xml_compare.h>
 
diff --git a/packager/mpd/test/mpd_builder_test_helper.cc b/packager/mpd/test/mpd_builder_test_helper.cc
index 423380f0ec..805425f596 100644
--- a/packager/mpd/test/mpd_builder_test_helper.cc
+++ b/packager/mpd/test/mpd_builder_test_helper.cc
@@ -6,10 +6,11 @@
 
 #include <packager/mpd/test/mpd_builder_test_helper.h>
 
+#include <filesystem>
+
 #include <glog/logging.h>
 #include <google/protobuf/text_format.h>
 #include <gtest/gtest.h>
-#include <filesystem>
 
 #include <packager/media/test/test_data_util.h>
 #include <packager/mpd/base/media_info.pb.h>
diff --git a/packager/mpd/test/xml_compare.cc b/packager/mpd/test/xml_compare.cc
index e5c47970a7..5cec362289 100644
--- a/packager/mpd/test/xml_compare.cc
+++ b/packager/mpd/test/xml_compare.cc
@@ -1,13 +1,20 @@
+// Copyright 2023 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 #include <packager/mpd/test/xml_compare.h>
 
+#include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+
 #include <absl/strings/strip.h>
 #include <glog/logging.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#include <algorithm>
-#include <map>
-#include <string>
-#include <utility>
 
 namespace shaka {
 
diff --git a/packager/mpd/test/xml_compare.h b/packager/mpd/test/xml_compare.h
index bd38c18965..81fe2d207c 100644
--- a/packager/mpd/test/xml_compare.h
+++ b/packager/mpd/test/xml_compare.h
@@ -1,14 +1,20 @@
+// Copyright 2023 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 #ifndef MPD_TEST_XML_COMPARE_H_
 #define MPD_TEST_XML_COMPARE_H_
 
+#include <optional>
+#include <string>
+
 #include <gmock/gmock.h>
 #include <libxml/tree.h>
 
-#include <string>
-
 #include <packager/mpd/base/xml/scoped_xml_ptr.h>
 #include <packager/mpd/base/xml/xml_node.h>
-#include <optional>
 
 namespace shaka {
 
diff --git a/packager/mpd/util/mpd_writer.cc b/packager/mpd/util/mpd_writer.cc
index 558c286061..43d7298b6e 100644
--- a/packager/mpd/util/mpd_writer.cc
+++ b/packager/mpd/util/mpd_writer.cc
@@ -6,10 +6,11 @@
 
 #include <packager/mpd/util/mpd_writer.h>
 
+#include <cstdint>
+
 #include <absl/flags/flag.h>
 #include <glog/logging.h>
 #include <google/protobuf/text_format.h>
-#include <stdint.h>
 
 #include <packager/file/file.h>
 #include <packager/mpd/base/mpd_builder.h>
diff --git a/packager/mpd/util/mpd_writer_unittest.cc b/packager/mpd/util/mpd_writer_unittest.cc
index 3e0f9f11c7..dd18b74f03 100644
--- a/packager/mpd/util/mpd_writer_unittest.cc
+++ b/packager/mpd/util/mpd_writer_unittest.cc
@@ -4,15 +4,17 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <packager/mpd/util/mpd_writer.h>
+
+#include <filesystem>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <filesystem>
 
 #include <packager/file/file_test_util.h>
 #include <packager/mpd/base/mock_mpd_notifier.h>
 #include <packager/mpd/base/mpd_options.h>
 #include <packager/mpd/test/mpd_builder_test_helper.h>
-#include <packager/mpd/util/mpd_writer.h>
 
 namespace shaka {
 
diff --git a/packager/packager.cc b/packager/packager.cc
index 004dfa0735..c4c5184d19 100644
--- a/packager/packager.cc
+++ b/packager/packager.cc
@@ -7,10 +7,13 @@
 #include <packager/packager.h>
 
 #include <algorithm>
+#include <chrono>
+#include <optional>
 
 #include <absl/strings/match.h>
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
+
 #include <packager/app/job_manager.h>
 #include <packager/app/muxer_factory.h>
 #include <packager/app/packager_util.h>
@@ -38,8 +41,6 @@
 #include <packager/mpd/base/simple_mpd_notifier.h>
 #include <packager/status/status_macros.h>
 #include <packager/version/version.h>
-#include <chrono>
-#include <optional>
 
 namespace shaka {
 
diff --git a/packager/status/status.cc b/packager/status/status.cc
index 6c56a0e177..bec0969ad2 100644
--- a/packager/status/status.cc
+++ b/packager/status/status.cc
@@ -8,6 +8,7 @@
 
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
+
 #include <packager/macros.h>
 
 namespace shaka {
diff --git a/packager/status/status_test_util_unittest.cc b/packager/status/status_test_util_unittest.cc
index c5160b94c7..143f0e4449 100644
--- a/packager/status/status_test_util_unittest.cc
+++ b/packager/status/status_test_util_unittest.cc
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gtest/gtest-spi.h>
-
 #include <packager/status/status_test_util.h>
 
+#include <gtest/gtest-spi.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/status/status_unittest.cc b/packager/status/status_unittest.cc
index 66c5aee40b..b2d3c78ea7 100644
--- a/packager/status/status_unittest.cc
+++ b/packager/status/status_unittest.cc
@@ -4,11 +4,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include <packager/status/status.h>
 
 #include <absl/strings/str_format.h>
-#include <packager/status/status.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 namespace shaka {
 
diff --git a/packager/utils/absl_flag_hexbytes.cc b/packager/utils/absl_flag_hexbytes.cc
index f8966e5c47..8b4708f8a2 100644
--- a/packager/utils/absl_flag_hexbytes.cc
+++ b/packager/utils/absl_flag_hexbytes.cc
@@ -5,7 +5,9 @@
 // https://developers.google.com/open-source/licenses/bsd
 
 #include <packager/utils/absl_flag_hexbytes.h>
-#include <packager/utils/hex_parser.h>
+
+#include <iostream>
+#include <vector>
 
 #include <absl/flags/flag.h>
 #include <absl/flags/parse.h>
@@ -15,8 +17,8 @@
 #include <absl/strings/str_format.h>
 #include <absl/strings/str_join.h>
 #include <absl/strings/str_split.h>
-#include <iostream>
-#include <vector>
+
+#include <packager/utils/hex_parser.h>
 
 namespace shaka {
 
@@ -53,4 +55,4 @@ std::string AbslUnparseFlag(const HexBytes& flag) {
   return result;
 }
 
-}  // namespace shaka
\ No newline at end of file
+}  // namespace shaka
diff --git a/packager/utils/absl_flag_hexbytes.h b/packager/utils/absl_flag_hexbytes.h
index b48ef20ef0..e793c33b81 100644
--- a/packager/utils/absl_flag_hexbytes.h
+++ b/packager/utils/absl_flag_hexbytes.h
@@ -7,12 +7,12 @@
 #ifndef SHAKA_PACKAGER_ABSL_FLAG_HEXBYTES_H
 #define SHAKA_PACKAGER_ABSL_FLAG_HEXBYTES_H
 
-#include <packager/utils/hex_parser.h>
-
 #include <absl/flags/flag.h>
 #include <absl/strings/ascii.h>
 #include <absl/strings/escaping.h>
 
+#include <packager/utils/hex_parser.h>
+
 // Custom flag type for hexadecimal byte array
 namespace shaka {
 
diff --git a/packager/utils/clock.cc b/packager/utils/clock.cc
index d2f090ec07..38b1485451 100644
--- a/packager/utils/clock.cc
+++ b/packager/utils/clock.cc
@@ -1,3 +1,9 @@
+// Copyright 2023 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
 #include <packager/utils/clock.h>
 
 namespace shaka {
diff --git a/packager/utils/test_clock.cc b/packager/utils/test_clock.cc
index 9ef48bb60b..8c9756451c 100644
--- a/packager/utils/test_clock.cc
+++ b/packager/utils/test_clock.cc
@@ -1,17 +1,18 @@
-//  Copyright 2023 Google LLC. All rights reserved.
+// Copyright 2023 Google LLC. All rights reserved.
 //
-//  Use of this source code is governed by a BSD-style
-//  license that can be found in the LICENSE file or at
-//  https://developers.google.com/open-source/licenses/bsd
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
 
 #include <packager/utils/test_clock.h>
 
-#include <absl/strings/str_split.h>
-#include <absl/strings/string_view.h>
 #include <ctime>
 #include <iostream>
 #include <string>
 
+#include <absl/strings/str_split.h>
+#include <absl/strings/string_view.h>
+
 std::tm parseISO8601(const std::string& date_string) {
   std::tm tm = {};
   std::vector<absl::string_view> date_time_parts =
diff --git a/packager/utils/test_clock.h b/packager/utils/test_clock.h
index 278b357d5f..d4e5f8ee6e 100644
--- a/packager/utils/test_clock.h
+++ b/packager/utils/test_clock.h
@@ -7,10 +7,11 @@
 #ifndef SHAKA_PACKAGER_TEST_CLOCK_H
 #define SHAKA_PACKAGER_TEST_CLOCK_H
 
-#include <packager/utils/clock.h>
 #include <chrono>
 #include <string>
 
+#include <packager/utils/clock.h>
+
 namespace shaka {
 
 class TestClock : public Clock {
@@ -24,4 +25,4 @@ class TestClock : public Clock {
 
 }  // namespace shaka
 
-#endif
\ No newline at end of file
+#endif
diff --git a/packager/version/version.h b/packager/version/version.h
index 920b8d1b57..8b72ced0f1 100644
--- a/packager/version/version.h
+++ b/packager/version/version.h
@@ -4,6 +4,9 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#ifndef PACKAGER_VERSION_VERSION_H_
+#define PACKAGER_VERSION_VERSION_H_
+
 #include <string>
 
 namespace shaka {
@@ -19,3 +22,5 @@ std::string GetPackagerVersion();
 void SetPackagerVersionForTesting(const std::string& version);
 
 }  // namespace shaka
+
+#endif  // PACKAGER_VERSION_VERSION_H_