diff --git a/packager/app/crypto_flags.cc b/packager/app/crypto_flags.cc
index 25930ab7d6..d07d367dbd 100644
--- a/packager/app/crypto_flags.cc
+++ b/packager/app/crypto_flags.cc
@@ -7,7 +7,7 @@
 #include "packager/app/crypto_flags.h"
 #include <absl/flags/flag.h>
 
-#include <stdio.h>
+#include <cstdio>
 
 ABSL_FLAG(std::string,
           protection_scheme,
diff --git a/packager/app/job_manager.h b/packager/app/job_manager.h
index 1bd83b20d5..83969e32e1 100644
--- a/packager/app/job_manager.h
+++ b/packager/app/job_manager.h
@@ -13,7 +13,7 @@
 #include <thread>
 #include <vector>
 
-#include "absl/synchronization/mutex.h"
+#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 b619435b85..5df3be141f 100644
--- a/packager/app/mpd_generator.cc
+++ b/packager/app/mpd_generator.cc
@@ -6,12 +6,12 @@
 
 #include <iostream>
 
+#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 "absl/flags/parse.h"
-#include "absl/flags/usage.h"
-#include "absl/flags/usage_config.h"
 #include "packager/app/mpd_generator_flags.h"
 #include "packager/mpd/util/mpd_writer.h"
 #include "packager/tools/license_notice.h"
diff --git a/packager/app/muxer_factory.cc b/packager/app/muxer_factory.cc
index c34592cd8c..61451ba9c9 100644
--- a/packager/app/muxer_factory.cc
+++ b/packager/app/muxer_factory.cc
@@ -6,9 +6,7 @@
 
 #include "packager/app/muxer_factory.h"
 
-#include <chrono>
 #include "packager/media/base/muxer.h"
-#include "packager/media/base/muxer_options.h"
 #include "packager/media/formats/mp2t/ts_muxer.h"
 #include "packager/media/formats/mp4/mp4_muxer.h"
 #include "packager/media/formats/packed_audio/packed_audio_writer.h"
diff --git a/packager/app/packager_main.cc b/packager/app/packager_main.cc
index 0030e820f8..3aa466ca28 100644
--- a/packager/app/packager_main.cc
+++ b/packager/app/packager_main.cc
@@ -7,14 +7,14 @@
 #include <absl/flags/flag.h>
 #include <iostream>
 
+#include <absl/flags/parse.h>
+#include <absl/flags/usage.h>
+#include <absl/flags/usage_config.h>
 #include <absl/strings/numbers.h>
 #include <absl/strings/str_format.h>
 #include <absl/strings/str_split.h>
 #include <glog/logging.h>
 #include <optional>
-#include "absl/flags/parse.h"
-#include "absl/flags/usage.h"
-#include "absl/flags/usage_config.h"
 #include "packager/app/ad_cue_generator_flags.h"
 #include "packager/app/crypto_flags.h"
 #include "packager/app/hls_flags.h"
diff --git a/packager/app/packager_util.cc b/packager/app/packager_util.cc
index a855cd149b..fdb1856f67 100644
--- a/packager/app/packager_util.cc
+++ b/packager/app/packager_util.cc
@@ -6,8 +6,6 @@
 
 #include "packager/app/packager_util.h"
 
-#include <absl/strings/numbers.h>
-#include <absl/strings/str_split.h>
 #include <glog/logging.h>
 #include "packager/file/file.h"
 #include "packager/media/base/media_handler.h"
@@ -17,7 +15,6 @@
 #include "packager/media/base/request_signer.h"
 #include "packager/media/base/widevine_key_source.h"
 #include "packager/mpd/base/mpd_options.h"
-#include "packager/status/status.h"
 
 namespace shaka {
 namespace media {
diff --git a/packager/app/retired_flags.cc b/packager/app/retired_flags.cc
index 56a685ca4a..dbfdf9dba2 100644
--- a/packager/app/retired_flags.cc
+++ b/packager/app/retired_flags.cc
@@ -9,7 +9,7 @@
 
 #include "packager/app/retired_flags.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 ABSL_FLAG(std::string, profile, "", "This flag is deprecated. Do not use.");
 ABSL_FLAG(bool, single_segment, true, "This flag is deprecated. Do not use.");
diff --git a/packager/app/validate_flag.cc b/packager/app/validate_flag.cc
index 5abb2dc8b5..c2fe9c6f59 100644
--- a/packager/app/validate_flag.cc
+++ b/packager/app/validate_flag.cc
@@ -8,7 +8,7 @@
 
 #include "packager/app/validate_flag.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 namespace shaka {
 
diff --git a/packager/app/vlog_flags.cc b/packager/app/vlog_flags.cc
index 496f2a9fd6..d9bdaea2c9 100644
--- a/packager/app/vlog_flags.cc
+++ b/packager/app/vlog_flags.cc
@@ -7,7 +7,7 @@
 // Defines verbose logging flags.
 
 #include "packager/app/vlog_flags.h"
-#include "absl/strings/numbers.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 8af76039a3..3f2cf68994 100644
--- a/packager/app/widevine_encryption_flags.cc
+++ b/packager/app/widevine_encryption_flags.cc
@@ -11,11 +11,9 @@
 #include <absl/flags/flag.h>
 #include <absl/strings/ascii.h>
 #include <absl/strings/match.h>
-#include <absl/strings/str_format.h>
 #include <glog/logging.h>
 #include <string_view>
 #include "packager/app/validate_flag.h"
-#include "packager/utils/absl_flag_hexbytes.h"
 
 ABSL_FLAG(bool,
           enable_widevine_encryption,
diff --git a/packager/file/callback_file.cc b/packager/file/callback_file.cc
index 7e4bbd5bf9..bc87a6c01e 100644
--- a/packager/file/callback_file.cc
+++ b/packager/file/callback_file.cc
@@ -6,7 +6,7 @@
 
 #include "packager/file/callback_file.h"
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/macros.h"
 
 namespace shaka {
diff --git a/packager/file/file.cc b/packager/file/file.cc
index 49d8f0f64e..8156ceb6a9 100644
--- a/packager/file/file.cc
+++ b/packager/file/file.cc
@@ -12,10 +12,10 @@
 #include <filesystem>
 #include <memory>
 
-#include "absl/flags/flag.h"
-#include "absl/strings/numbers.h"
-#include "absl/strings/str_format.h"
-#include "glog/logging.h"
+#include <absl/flags/flag.h>
+#include <absl/strings/numbers.h>
+#include <absl/strings/str_format.h>
+#include <glog/logging.h>
 
 #include "packager/file/callback_file.h"
 #include "packager/file/file_util.h"
diff --git a/packager/file/file_closer.h b/packager/file/file_closer.h
index 7febb75806..a3c9687afe 100644
--- a/packager/file/file_closer.h
+++ b/packager/file/file_closer.h
@@ -7,7 +7,7 @@
 #ifndef MEDIA_FILE_FILE_CLOSER_H_
 #define MEDIA_FILE_FILE_CLOSER_H_
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/file/file.h"
 
 namespace shaka {
diff --git a/packager/file/file_test_util.cc b/packager/file/file_test_util.cc
index 3cfeafa1c3..48b097dccf 100644
--- a/packager/file/file_test_util.cc
+++ b/packager/file/file_test_util.cc
@@ -6,8 +6,6 @@
 
 #include "packager/file/file_test_util.h"
 
-#include <stdlib.h>
-
 #include <filesystem>
 
 namespace shaka {
diff --git a/packager/file/file_unittest.cc b/packager/file/file_unittest.cc
index c5af12dc76..3ed649797d 100644
--- a/packager/file/file_unittest.cc
+++ b/packager/file/file_unittest.cc
@@ -5,14 +5,12 @@
 // https://developers.google.com/open-source/licenses/bsd
 
 #include <gtest/gtest.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
+#include <cstdio>
 
 #include <filesystem>
 #include <locale>
 
-#include "absl/flags/declare.h"
+#include <absl/flags/declare.h>
 #include "packager/file/file.h"
 #include "packager/file/file_test_util.h"
 #include "packager/flag_saver.h"
diff --git a/packager/file/file_util.cc b/packager/file/file_util.cc
index 55f59c477a..52e8834e2e 100644
--- a/packager/file/file_util.cc
+++ b/packager/file/file_util.cc
@@ -6,8 +6,6 @@
 
 #include "packager/file/file_util.h"
 
-#include <inttypes.h>
-
 #if defined(OS_WIN)
 #include <windows.h>
 #else
@@ -17,7 +15,7 @@
 #include <filesystem>
 #include <thread>
 
-#include "absl/strings/str_format.h"
+#include <absl/strings/str_format.h>
 
 namespace shaka {
 namespace {
diff --git a/packager/file/file_util_unittest.cc b/packager/file/file_util_unittest.cc
index c0cfa8d1ed..7877b4b84e 100644
--- a/packager/file/file_util_unittest.cc
+++ b/packager/file/file_util_unittest.cc
@@ -8,7 +8,7 @@
 
 #include <gtest/gtest.h>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 
diff --git a/packager/file/http_file.cc b/packager/file/http_file.cc
index f68b62ba75..5afaf7fc05 100644
--- a/packager/file/http_file.cc
+++ b/packager/file/http_file.cc
@@ -8,11 +8,11 @@
 
 #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 "glog/logging.h"
+#include <absl/flags/declare.h>
+#include <absl/flags/flag.h>
+#include <absl/strings/escaping.h>
+#include <absl/strings/str_format.h>
+#include <glog/logging.h>
 
 #include "packager/file/thread_pool.h"
 #include "packager/macros.h"
diff --git a/packager/file/http_file.h b/packager/file/http_file.h
index cd685996e0..91dfa30de4 100644
--- a/packager/file/http_file.h
+++ b/packager/file/http_file.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <string>
 
-#include "absl/synchronization/notification.h"
+#include <absl/synchronization/notification.h>
 
 #include "packager/file/file.h"
 #include "packager/file/io_cache.h"
diff --git a/packager/file/http_file_unittest.cc b/packager/file/http_file_unittest.cc
index 9c0030abc2..00ca3fd109 100644
--- a/packager/file/http_file_unittest.cc
+++ b/packager/file/http_file_unittest.cc
@@ -11,8 +11,8 @@
 #include <memory>
 #include <vector>
 
-#include "absl/strings/str_split.h"
-#include "nlohmann/json.hpp"
+#include <absl/strings/str_split.h>
+#include <nlohmann/json.hpp>
 #include "packager/file/file.h"
 #include "packager/file/file_closer.h"
 #include "packager/media/test/test_web_server.h"
diff --git a/packager/file/io_cache.cc b/packager/file/io_cache.cc
index 85bb34e7cf..9303c63a44 100644
--- a/packager/file/io_cache.cc
+++ b/packager/file/io_cache.cc
@@ -10,7 +10,7 @@
 
 #include <algorithm>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 
diff --git a/packager/file/io_cache.h b/packager/file/io_cache.h
index 8847ab3880..98d35323c8 100644
--- a/packager/file/io_cache.h
+++ b/packager/file/io_cache.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include "absl/synchronization/mutex.h"
+#include <absl/synchronization/mutex.h>
 #include "packager/macros.h"
 
 namespace shaka {
diff --git a/packager/file/local_file.cc b/packager/file/local_file.cc
index 23a6765086..1e2f627ea3 100644
--- a/packager/file/local_file.cc
+++ b/packager/file/local_file.cc
@@ -6,7 +6,7 @@
 
 #include "packager/file/local_file.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ -16,7 +16,7 @@
 
 #include <filesystem>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 
diff --git a/packager/file/memory_file.cc b/packager/file/memory_file.cc
index a389a6d7b6..598dd33ae4 100644
--- a/packager/file/memory_file.cc
+++ b/packager/file/memory_file.cc
@@ -13,8 +13,8 @@
 #include <memory>
 #include <set>
 
-#include "absl/synchronization/mutex.h"
-#include "glog/logging.h"
+#include <absl/synchronization/mutex.h>
+#include <glog/logging.h>
 
 namespace shaka {
 namespace {
diff --git a/packager/file/thread_pool.cc b/packager/file/thread_pool.cc
index 5cb1237775..6b8505896e 100644
--- a/packager/file/thread_pool.cc
+++ b/packager/file/thread_pool.cc
@@ -8,8 +8,8 @@
 
 #include <thread>
 
-#include "absl/time/time.h"
-#include "glog/logging.h"
+#include <absl/time/time.h>
+#include <glog/logging.h>
 
 namespace shaka {
 
diff --git a/packager/file/thread_pool.h b/packager/file/thread_pool.h
index d559940a91..2ff1a19118 100644
--- a/packager/file/thread_pool.h
+++ b/packager/file/thread_pool.h
@@ -10,8 +10,8 @@
 #include <functional>
 #include <queue>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/synchronization/mutex.h"
+#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 892091b4b1..4f885329b7 100644
--- a/packager/file/threaded_io_file.h
+++ b/packager/file/threaded_io_file.h
@@ -10,7 +10,7 @@
 #include <atomic>
 #include <memory>
 
-#include "absl/synchronization/mutex.h"
+#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 bbb83c4fa8..562e3f3d24 100644
--- a/packager/file/udp_file.cc
+++ b/packager/file/udp_file.cc
@@ -28,7 +28,7 @@
 
 #include <limits>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/file/udp_options.h"
 
 namespace shaka {
diff --git a/packager/file/udp_options.cc b/packager/file/udp_options.cc
index e9f183fd73..c2069a7a41 100644
--- a/packager/file/udp_options.cc
+++ b/packager/file/udp_options.cc
@@ -8,10 +8,10 @@
 
 #include <iterator>
 
-#include "absl/flags/flag.h"
-#include "absl/strings/numbers.h"
-#include "absl/strings/str_split.h"
-#include "glog/logging.h"
+#include <absl/flags/flag.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/macros.h"
 
diff --git a/packager/file/udp_options_unittest.cc b/packager/file/udp_options_unittest.cc
index cf28efbe75..e18512c2d8 100644
--- a/packager/file/udp_options_unittest.cc
+++ b/packager/file/udp_options_unittest.cc
@@ -8,8 +8,8 @@
 
 #include <gtest/gtest.h>
 
-#include "absl/flags/declare.h"
-#include "absl/flags/flag.h"
+#include <absl/flags/declare.h>
+#include <absl/flags/flag.h>
 #include "packager/flag_saver.h"
 
 ABSL_DECLARE_FLAG(std::string, udp_interface_address);
diff --git a/packager/flag_saver.h b/packager/flag_saver.h
index b30d39f76f..9dfcc3a2b0 100644
--- a/packager/flag_saver.h
+++ b/packager/flag_saver.h
@@ -7,7 +7,7 @@
 #ifndef PACKAGER_FLAG_SAVER_H_
 #define PACKAGER_FLAG_SAVER_H_
 
-#include "absl/flags/flag.h"
+#include <absl/flags/flag.h>
 
 namespace shaka {
 
diff --git a/packager/kv_pairs/kv_pairs.cc b/packager/kv_pairs/kv_pairs.cc
index 12852a3943..86b69fbd8c 100644
--- a/packager/kv_pairs/kv_pairs.cc
+++ b/packager/kv_pairs/kv_pairs.cc
@@ -6,7 +6,7 @@
 
 #include "packager/kv_pairs/kv_pairs.h"
 
-#include "absl/strings/str_split.h"
+#include <absl/strings/str_split.h>
 
 namespace shaka {
 
diff --git a/packager/media/base/aes_cryptor.cc b/packager/media/base/aes_cryptor.cc
index fbe398f21c..8f3889caae 100644
--- a/packager/media/base/aes_cryptor.cc
+++ b/packager/media/base/aes_cryptor.cc
@@ -9,8 +9,8 @@
 #include <string>
 #include <vector>
 
-#include "glog/logging.h"
-#include "mbedtls/entropy.h"
+#include <glog/logging.h>
+#include <mbedtls/entropy.h>
 
 namespace {
 
diff --git a/packager/media/base/aes_cryptor.h b/packager/media/base/aes_cryptor.h
index afcaa37340..af5d089210 100644
--- a/packager/media/base/aes_cryptor.h
+++ b/packager/media/base/aes_cryptor.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "mbedtls/cipher.h"
+#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 e45b929576..184f0c7430 100644
--- a/packager/media/base/aes_cryptor_unittest.cc
+++ b/packager/media/base/aes_cryptor_unittest.cc
@@ -9,8 +9,8 @@
 #include <iterator>
 #include <memory>
 
-#include "absl/strings/escaping.h"
-#include "glog/logging.h"
+#include <absl/strings/escaping.h>
+#include <glog/logging.h>
 #include "packager/media/base/aes_decryptor.h"
 #include "packager/media/base/aes_encryptor.h"
 #include "packager/utils/bytes_to_string_view.h"
diff --git a/packager/media/base/aes_decryptor.cc b/packager/media/base/aes_decryptor.cc
index a02a03f3fe..94a8abd448 100644
--- a/packager/media/base/aes_decryptor.cc
+++ b/packager/media/base/aes_decryptor.cc
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/aes_encryptor.cc b/packager/media/base/aes_encryptor.cc
index 460aba3bd0..7fe8a90ef8 100644
--- a/packager/media/base/aes_encryptor.cc
+++ b/packager/media/base/aes_encryptor.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/base/aes_encryptor.h"
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace {
 
diff --git a/packager/media/base/aes_pattern_cryptor.cc b/packager/media/base/aes_pattern_cryptor.cc
index 30ebc7b65d..392d4e10c7 100644
--- a/packager/media/base/aes_pattern_cryptor.cc
+++ b/packager/media/base/aes_pattern_cryptor.cc
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "glog/logging.h"
+#include <glog/logging.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 917879dc23..1462df9516 100644
--- a/packager/media/base/aes_pattern_cryptor_unittest.cc
+++ b/packager/media/base/aes_pattern_cryptor_unittest.cc
@@ -7,7 +7,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "absl/strings/escaping.h"
+#include <absl/strings/escaping.h>
 #include "packager/media/base/aes_pattern_cryptor.h"
 #include "packager/media/base/mock_aes_cryptor.h"
 
diff --git a/packager/media/base/audio_stream_info.cc b/packager/media/base/audio_stream_info.cc
index 179101210a..58f128d2b9 100644
--- a/packager/media/base/audio_stream_info.cc
+++ b/packager/media/base/audio_stream_info.cc
@@ -8,8 +8,8 @@
 
 #include <inttypes.h>
 
-#include "absl/strings/str_format.h"
-#include "glog/logging.h"
+#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 a156e0a23c..e6044dba0a 100644
--- a/packager/media/base/audio_timestamp_helper.cc
+++ b/packager/media/base/audio_timestamp_helper.cc
@@ -4,7 +4,7 @@
 
 #include "packager/media/base/audio_timestamp_helper.h"
 
-#include "glog/logging.h"
+#include <glog/logging.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 6733327800..bf0720b90e 100644
--- a/packager/media/base/bit_reader.h
+++ b/packager/media/base/bit_reader.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/macros.h"
 
 namespace shaka {
diff --git a/packager/media/base/bit_writer.h b/packager/media/base/bit_writer.h
index 8860783943..9a64ac2d7e 100644
--- a/packager/media/base/bit_writer.h
+++ b/packager/media/base/bit_writer.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/buffer_reader.cc b/packager/media/base/buffer_reader.cc
index 0062721f22..0f1059cebe 100644
--- a/packager/media/base/buffer_reader.cc
+++ b/packager/media/base/buffer_reader.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/base/buffer_reader.h"
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/buffer_writer.cc b/packager/media/base/buffer_writer.cc
index 8ae3a43c9e..802c0bf28c 100644
--- a/packager/media/base/buffer_writer.cc
+++ b/packager/media/base/buffer_writer.cc
@@ -6,8 +6,8 @@
 
 #include "packager/media/base/buffer_writer.h"
 
-#include "absl/base/internal/endian.h"
-#include "glog/logging.h"
+#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 85b4bbc59f..1355e305d4 100644
--- a/packager/media/base/buffer_writer_unittest.cc
+++ b/packager/media/base/buffer_writer_unittest.cc
@@ -10,7 +10,7 @@
 #include <limits>
 #include <memory>
 
-#include "glog/logging.h"
+#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.cc b/packager/media/base/byte_queue.cc
index 953d3d0fb3..c91e400c2b 100644
--- a/packager/media/base/byte_queue.cc
+++ b/packager/media/base/byte_queue.cc
@@ -4,7 +4,7 @@
 
 #include "packager/media/base/byte_queue.h"
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/container_names.cc b/packager/media/base/container_names.cc
index cdf9c66f8b..c524a16973 100644
--- a/packager/media/base/container_names.cc
+++ b/packager/media/base/container_names.cc
@@ -13,7 +13,7 @@
 #include <iterator>
 #include <limits>
 
-#include "glog/logging.h"
+#include <glog/logging.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_unittest.cc b/packager/media/base/container_names_unittest.cc
index 0e88e9e9f4..836c8e2bc8 100644
--- a/packager/media/base/container_names_unittest.cc
+++ b/packager/media/base/container_names_unittest.cc
@@ -4,10 +4,8 @@
 
 #include <gtest/gtest.h>
 
-#include <filesystem>
 #include <iterator>
 
-#include "packager/macros.h"
 #include "packager/media/base/container_names.h"
 #include "packager/media/test/test_data_util.h"
 
diff --git a/packager/media/base/decrypt_config.cc b/packager/media/base/decrypt_config.cc
index ec5521879b..3e49881285 100644
--- a/packager/media/base/decrypt_config.cc
+++ b/packager/media/base/decrypt_config.cc
@@ -4,7 +4,7 @@
 
 #include "packager/media/base/decrypt_config.h"
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/decryptor_source.cc b/packager/media/base/decryptor_source.cc
index 09999db9f7..80e1d3e122 100644
--- a/packager/media/base/decryptor_source.cc
+++ b/packager/media/base/decryptor_source.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/base/decryptor_source.h"
 
-#include "glog/logging.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/http_key_fetcher_unittest.cc b/packager/media/base/http_key_fetcher_unittest.cc
index 977bd4345d..dc34ca0893 100644
--- a/packager/media/base/http_key_fetcher_unittest.cc
+++ b/packager/media/base/http_key_fetcher_unittest.cc
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "glog/logging.h"
+#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 c841216d61..f6984f9809 100644
--- a/packager/media/base/id3_tag.cc
+++ b/packager/media/base/id3_tag.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/base/id3_tag.h"
 
-#include "glog/logging.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 b671783bdc..2813a27fae 100644
--- a/packager/media/base/language_utils.cc
+++ b/packager/media/base/language_utils.cc
@@ -8,7 +8,7 @@
 
 #include <iterator>
 
-#include "glog/logging.h"
+#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 f4c9b87e6f..ae489b0767 100644
--- a/packager/media/base/media_handler_test_base.h
+++ b/packager/media/base/media_handler_test_base.h
@@ -10,8 +10,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "absl/strings/escaping.h"
-#include "absl/strings/numbers.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 208b5efe37..a515db03e4 100644
--- a/packager/media/base/media_sample.cc
+++ b/packager/media/base/media_sample.cc
@@ -8,8 +8,8 @@
 
 #include <inttypes.h>
 
-#include "absl/strings/str_format.h"
-#include "glog/logging.h"
+#include <absl/strings/str_format.h>
+#include <glog/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/media_sample.h b/packager/media/base/media_sample.h
index eefa89bebf..b54607f77e 100644
--- a/packager/media/base/media_sample.h
+++ b/packager/media/base/media_sample.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/media/base/decrypt_config.h"
 
 namespace shaka {
diff --git a/packager/media/base/muxer_util.cc b/packager/media/base/muxer_util.cc
index 202fb1176a..1774cd117d 100644
--- a/packager/media/base/muxer_util.cc
+++ b/packager/media/base/muxer_util.cc
@@ -11,10 +11,10 @@
 #include <string>
 #include <vector>
 
-#include "absl/strings/numbers.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_split.h"
-#include "glog/logging.h"
+#include <absl/strings/numbers.h>
+#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/offset_byte_queue.cc b/packager/media/base/offset_byte_queue.cc
index 4839095df1..655e835cbc 100644
--- a/packager/media/base/offset_byte_queue.cc
+++ b/packager/media/base/offset_byte_queue.cc
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/playready_key_source.cc b/packager/media/base/playready_key_source.cc
index f1a3a7bf89..2f0c835ffd 100644
--- a/packager/media/base/playready_key_source.cc
+++ b/packager/media/base/playready_key_source.cc
@@ -9,8 +9,8 @@
 #include <algorithm>
 #include <iterator>
 
-#include "absl/strings/escaping.h"
-#include "glog/logging.h"
+#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 4380ec50b4..13fb6605d7 100644
--- a/packager/media/base/playready_pssh_generator.cc
+++ b/packager/media/base/playready_pssh_generator.cc
@@ -11,9 +11,9 @@
 #include <set>
 #include <vector>
 
-#include "absl/strings/escaping.h"
-#include "glog/logging.h"
-#include "mbedtls/cipher.h"
+#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 5db7f8efcb..31280d939c 100644
--- a/packager/media/base/producer_consumer_queue.h
+++ b/packager/media/base/producer_consumer_queue.h
@@ -10,9 +10,9 @@
 #include <chrono>
 #include <deque>
 
-#include "absl/strings/str_format.h"
-#include "absl/synchronization/mutex.h"
-#include "absl/time/time.h"
+#include <absl/strings/str_format.h>
+#include <absl/synchronization/mutex.h>
+#include <absl/time/time.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 547b54fa14..71a725bc18 100644
--- a/packager/media/base/producer_consumer_queue_unittest.cc
+++ b/packager/media/base/producer_consumer_queue_unittest.cc
@@ -8,8 +8,8 @@
 
 #include <thread>
 
-#include "absl/synchronization/notification.h"
-#include "glog/logging.h"
+#include <absl/synchronization/notification.h>
+#include <glog/logging.h>
 #include "packager/media/base/producer_consumer_queue.h"
 #include "packager/status/status_test_util.h"
 
diff --git a/packager/media/base/protection_system_specific_info.h b/packager/media/base/protection_system_specific_info.h
index a3d650b60a..cdd6a50f24 100644
--- a/packager/media/base/protection_system_specific_info.h
+++ b/packager/media/base/protection_system_specific_info.h
@@ -11,7 +11,7 @@
 #include <memory>
 #include <vector>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/media/public/crypto_params.h"
 
 namespace shaka {
diff --git a/packager/media/base/proto_json_util.cc b/packager/media/base/proto_json_util.cc
index 5668e6c836..356316e63e 100644
--- a/packager/media/base/proto_json_util.cc
+++ b/packager/media/base/proto_json_util.cc
@@ -8,7 +8,7 @@
 
 #include <google/protobuf/util/json_util.h>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/raw_key_source.cc b/packager/media/base/raw_key_source.cc
index 486dcc7ee9..980908de82 100644
--- a/packager/media/base/raw_key_source.cc
+++ b/packager/media/base/raw_key_source.cc
@@ -8,8 +8,8 @@
 
 #include <algorithm>
 
-#include "absl/strings/escaping.h"
-#include "glog/logging.h"
+#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 3b1ec5e965..97fe85aedd 100644
--- a/packager/media/base/raw_key_source_unittest.cc
+++ b/packager/media/base/raw_key_source_unittest.cc
@@ -7,7 +7,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "absl/strings/escaping.h"
+#include <absl/strings/escaping.h>
 #include "packager/media/base/raw_key_source.h"
 #include "packager/status/status_test_util.h"
 
diff --git a/packager/media/base/rcheck.h b/packager/media/base/rcheck.h
index c52d0024d0..c05ffb562f 100644
--- a/packager/media/base/rcheck.h
+++ b/packager/media/base/rcheck.h
@@ -5,7 +5,7 @@
 #ifndef PACKAGER_MEDIA_BASE_RCHECK_H_
 #define PACKAGER_MEDIA_BASE_RCHECK_H_
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 #define RCHECK(x)                                       \
   do {                                                  \
diff --git a/packager/media/base/request_signer.cc b/packager/media/base/request_signer.cc
index ff679073d7..aceb4566ec 100644
--- a/packager/media/base/request_signer.cc
+++ b/packager/media/base/request_signer.cc
@@ -6,8 +6,8 @@
 
 #include "packager/media/base/request_signer.h"
 
-#include "glog/logging.h"
-#include "mbedtls/md.h"
+#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.cc b/packager/media/base/rsa_key.cc
index 59598561af..0589bdc219 100644
--- a/packager/media/base/rsa_key.cc
+++ b/packager/media/base/rsa_key.cc
@@ -21,9 +21,9 @@
 #include <memory>
 #include <vector>
 
-#include "glog/logging.h"
-#include "mbedtls/error.h"
-#include "mbedtls/md.h"
+#include <glog/logging.h>
+#include <mbedtls/error.h>
+#include <mbedtls/md.h>
 
 namespace {
 
diff --git a/packager/media/base/rsa_key.h b/packager/media/base/rsa_key.h
index 2312980144..7e96c7e647 100644
--- a/packager/media/base/rsa_key.h
+++ b/packager/media/base/rsa_key.h
@@ -12,9 +12,9 @@
 
 #include <string>
 
-#include "mbedtls/ctr_drbg.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/pk.h"
+#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 4897c8ec57..d0e40fef51 100644
--- a/packager/media/base/rsa_key_unittest.cc
+++ b/packager/media/base/rsa_key_unittest.cc
@@ -10,7 +10,7 @@
 #include <filesystem>
 #include <memory>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/media/base/rsa_key.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 efd87a36bb..b86d812a99 100644
--- a/packager/media/base/stream_info.cc
+++ b/packager/media/base/stream_info.cc
@@ -8,8 +8,8 @@
 
 #include <inttypes.h>
 
-#include "absl/strings/str_format.h"
-#include "glog/logging.h"
+#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/text_sample.cc b/packager/media/base/text_sample.cc
index 6101685189..bfd2d42cd5 100644
--- a/packager/media/base/text_sample.cc
+++ b/packager/media/base/text_sample.cc
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <functional>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/text_stream_info.cc b/packager/media/base/text_stream_info.cc
index eb5d7910bf..97101c0263 100644
--- a/packager/media/base/text_stream_info.cc
+++ b/packager/media/base/text_stream_info.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/base/text_stream_info.h"
 
-#include "absl/strings/str_format.h"
+#include <absl/strings/str_format.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/video_stream_info.cc b/packager/media/base/video_stream_info.cc
index 974b2bb068..0ae53de2ab 100644
--- a/packager/media/base/video_stream_info.cc
+++ b/packager/media/base/video_stream_info.cc
@@ -6,8 +6,8 @@
 
 #include "packager/media/base/video_stream_info.h"
 
-#include "absl/strings/str_format.h"
-#include "glog/logging.h"
+#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/widevine_key_source.cc b/packager/media/base/widevine_key_source.cc
index 12dbda2438..28dfb5608f 100644
--- a/packager/media/base/widevine_key_source.cc
+++ b/packager/media/base/widevine_key_source.cc
@@ -9,9 +9,9 @@
 #include <functional>
 #include <iterator>
 
-#include "absl/base/internal/endian.h"
-#include "absl/flags/flag.h"
-#include "absl/strings/escaping.h"
+#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 e7b175e10f..613ff8422f 100644
--- a/packager/media/base/widevine_key_source.h
+++ b/packager/media/base/widevine_key_source.h
@@ -11,8 +11,8 @@
 #include <memory>
 #include <thread>
 
-#include "absl/synchronization/mutex.h"
-#include "absl/synchronization/notification.h"
+#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 c4b06aa10c..d050f0df45 100644
--- a/packager/media/base/widevine_key_source_unittest.cc
+++ b/packager/media/base/widevine_key_source_unittest.cc
@@ -11,8 +11,8 @@
 #include <algorithm>
 #include <iterator>
 
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_format.h"
+#include <absl/strings/escaping.h>
+#include <absl/strings/str_format.h>
 #include "packager/media/base/key_fetcher.h"
 #include "packager/media/base/protection_system_ids.h"
 #include "packager/media/base/request_signer.h"
diff --git a/packager/media/chunking/chunking_handler.cc b/packager/media/chunking/chunking_handler.cc
index aeef2dfaaa..e13724e293 100644
--- a/packager/media/chunking/chunking_handler.cc
+++ b/packager/media/chunking/chunking_handler.cc
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "glog/logging.h"
+#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 43c953648c..5980398d56 100644
--- a/packager/media/chunking/chunking_handler.h
+++ b/packager/media/chunking/chunking_handler.h
@@ -11,7 +11,7 @@
 #include <optional>
 #include <queue>
 
-#include "glog/logging.h"
+#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.h b/packager/media/chunking/sync_point_queue.h
index b233944919..0dd629d014 100644
--- a/packager/media/chunking/sync_point_queue.h
+++ b/packager/media/chunking/sync_point_queue.h
@@ -7,7 +7,7 @@
 #include <map>
 #include <memory>
 
-#include "absl/synchronization/mutex.h"
+#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 761e34d0eb..c6435d7ce3 100644
--- a/packager/media/codecs/aac_audio_specific_config.cc
+++ b/packager/media/codecs/aac_audio_specific_config.cc
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/media/base/bit_reader.h"
 #include "packager/media/base/rcheck.h"
 
diff --git a/packager/media/codecs/ac3_audio_util.cc b/packager/media/codecs/ac3_audio_util.cc
index c3938d121a..1c60a6ff45 100644
--- a/packager/media/codecs/ac3_audio_util.cc
+++ b/packager/media/codecs/ac3_audio_util.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/codecs/ac3_audio_util.h"
 
-#include "absl/strings/escaping.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/ac4_audio_util.cc b/packager/media/codecs/ac4_audio_util.cc
index 9f50696a7b..5b590480fd 100644
--- a/packager/media/codecs/ac4_audio_util.cc
+++ b/packager/media/codecs/ac4_audio_util.cc
@@ -6,8 +6,8 @@
 
 #include "packager/media/codecs/ac4_audio_util.h"
 
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_format.h"
+#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/av1_codec_configuration_record.cc b/packager/media/codecs/av1_codec_configuration_record.cc
index aa50f14018..bb8b8c8f2b 100644
--- a/packager/media/codecs/av1_codec_configuration_record.cc
+++ b/packager/media/codecs/av1_codec_configuration_record.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/codecs/av1_codec_configuration_record.h"
 
-#include "absl/strings/str_format.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_parser.cc b/packager/media/codecs/av1_parser.cc
index 0befe90f32..732583a22e 100644
--- a/packager/media/codecs/av1_parser.cc
+++ b/packager/media/codecs/av1_parser.cc
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/media/base/bit_reader.h"
 #include "packager/media/base/rcheck.h"
 
diff --git a/packager/media/codecs/avc_decoder_configuration_record.cc b/packager/media/codecs/avc_decoder_configuration_record.cc
index 9e837caf1d..5f242b528f 100644
--- a/packager/media/codecs/avc_decoder_configuration_record.cc
+++ b/packager/media/codecs/avc_decoder_configuration_record.cc
@@ -6,8 +6,8 @@
 
 #include "packager/media/codecs/avc_decoder_configuration_record.h"
 
-#include "absl/strings/ascii.h"
-#include "absl/strings/escaping.h"
+#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/decoder_configuration_record.h b/packager/media/codecs/decoder_configuration_record.h
index b712a0dc13..feef7723bf 100644
--- a/packager/media/codecs/decoder_configuration_record.h
+++ b/packager/media/codecs/decoder_configuration_record.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "glog/logging.h"
+#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 e49e2593bd..76debd1b9d 100644
--- a/packager/media/codecs/dovi_decoder_configuration_record.cc
+++ b/packager/media/codecs/dovi_decoder_configuration_record.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/codecs/dovi_decoder_configuration_record.h"
 
-#include "absl/strings/str_format.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/ec3_audio_util.cc b/packager/media/codecs/ec3_audio_util.cc
index ea1f81c229..bd3ca26b82 100644
--- a/packager/media/codecs/ec3_audio_util.cc
+++ b/packager/media/codecs/ec3_audio_util.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/codecs/ec3_audio_util.h"
 
-#include "absl/strings/escaping.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/h264_byte_to_unit_stream_converter.cc b/packager/media/codecs/h264_byte_to_unit_stream_converter.cc
index 189627e7fa..385169daba 100644
--- a/packager/media/codecs/h264_byte_to_unit_stream_converter.cc
+++ b/packager/media/codecs/h264_byte_to_unit_stream_converter.cc
@@ -8,7 +8,7 @@
 
 #include <limits>
 
-#include "glog/logging.h"
+#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_unittest.cc b/packager/media/codecs/h264_byte_to_unit_stream_converter_unittest.cc
index 696fb3671b..c2c8db540a 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
@@ -7,9 +7,8 @@
 #include "packager/media/codecs/h264_byte_to_unit_stream_converter.h"
 
 #include <gtest/gtest.h>
-#include <stdio.h>
 
-#include "absl/strings/escaping.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 ea8db4abdf..b34ba9c5e0 100644
--- a/packager/media/codecs/h264_parser.cc
+++ b/packager/media/codecs/h264_parser.cc
@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/media/base/buffer_reader.h"
 
 #define LOG_ERROR_ONCE(msg)             \
diff --git a/packager/media/codecs/h264_parser_unittest.cc b/packager/media/codecs/h264_parser_unittest.cc
index cb8aecdd11..718e3896cc 100644
--- a/packager/media/codecs/h264_parser_unittest.cc
+++ b/packager/media/codecs/h264_parser_unittest.cc
@@ -6,7 +6,7 @@
 
 #include <gtest/gtest.h>
 
-#include "glog/logging.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 fa92f86569..fff4caacb1 100644
--- a/packager/media/codecs/h265_byte_to_unit_stream_converter.cc
+++ b/packager/media/codecs/h265_byte_to_unit_stream_converter.cc
@@ -8,7 +8,7 @@
 
 #include <limits>
 
-#include "glog/logging.h"
+#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_unittest.cc b/packager/media/codecs/h265_byte_to_unit_stream_converter_unittest.cc
index c1ab91414f..e8683cad26 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
@@ -7,9 +7,8 @@
 #include "packager/media/codecs/h265_byte_to_unit_stream_converter.h"
 
 #include <gtest/gtest.h>
-#include <stdio.h>
 
-#include "absl/strings/escaping.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 3eb2651747..ca5e46e16c 100644
--- a/packager/media/codecs/h265_parser.cc
+++ b/packager/media/codecs/h265_parser.cc
@@ -10,7 +10,7 @@
 
 #include <algorithm>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/media/base/macros.h"
 #include "packager/media/codecs/nalu_reader.h"
 
diff --git a/packager/media/codecs/h26x_bit_reader.cc b/packager/media/codecs/h26x_bit_reader.cc
index 87ea5879e8..c9e1679072 100644
--- a/packager/media/codecs/h26x_bit_reader.cc
+++ b/packager/media/codecs/h26x_bit_reader.cc
@@ -4,7 +4,7 @@
 
 #include "packager/media/codecs/h26x_bit_reader.h"
 
-#include "glog/logging.h"
+#include <glog/logging.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 d7709c706b..1f379c1b88 100644
--- a/packager/media/codecs/h26x_byte_to_unit_stream_converter.cc
+++ b/packager/media/codecs/h26x_byte_to_unit_stream_converter.cc
@@ -8,9 +8,9 @@
 
 #include <limits>
 
-#include "absl/flags/flag.h"
-#include "absl/strings/escaping.h"
-#include "glog/logging.h"
+#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/hevc_decoder_configuration_record.cc b/packager/media/codecs/hevc_decoder_configuration_record.cc
index b0c803dc06..90a84a56cd 100644
--- a/packager/media/codecs/hevc_decoder_configuration_record.cc
+++ b/packager/media/codecs/hevc_decoder_configuration_record.cc
@@ -6,9 +6,9 @@
 
 #include "packager/media/codecs/hevc_decoder_configuration_record.h"
 
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_join.h"
+#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/nal_unit_to_byte_stream_converter.cc b/packager/media/codecs/nal_unit_to_byte_stream_converter.cc
index 9cf836b319..0e9aafa21d 100644
--- a/packager/media/codecs/nal_unit_to_byte_stream_converter.cc
+++ b/packager/media/codecs/nal_unit_to_byte_stream_converter.cc
@@ -8,7 +8,7 @@
 
 #include <list>
 
-#include "glog/logging.h"
+#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/nalu_reader.cc b/packager/media/codecs/nalu_reader.cc
index b1f3f0d0c7..86da14708b 100644
--- a/packager/media/codecs/nalu_reader.cc
+++ b/packager/media/codecs/nalu_reader.cc
@@ -8,7 +8,7 @@
 
 #include <iostream>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/media/base/buffer_reader.h"
 #include "packager/media/codecs/h264_parser.h"
 
diff --git a/packager/media/codecs/vp8_parser.cc b/packager/media/codecs/vp8_parser.cc
index 1ba7b95964..b328414e06 100644
--- a/packager/media/codecs/vp8_parser.cc
+++ b/packager/media/codecs/vp8_parser.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/codecs/vp8_parser.h"
 
-#include "glog/logging.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.cc b/packager/media/codecs/vp9_parser.cc
index 16d8f8e305..00090fa15e 100644
--- a/packager/media/codecs/vp9_parser.cc
+++ b/packager/media/codecs/vp9_parser.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/codecs/vp9_parser.h"
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/media/base/bit_reader.h"
 #include "packager/media/base/rcheck.h"
 
diff --git a/packager/media/codecs/vp_codec_configuration_record.cc b/packager/media/codecs/vp_codec_configuration_record.cc
index cfcebc5fa8..55ee7ac2a1 100644
--- a/packager/media/codecs/vp_codec_configuration_record.cc
+++ b/packager/media/codecs/vp_codec_configuration_record.cc
@@ -6,8 +6,8 @@
 
 #include "packager/media/codecs/vp_codec_configuration_record.h"
 
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_replace.h"
+#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/crypto/encryption_handler_unittest.cc b/packager/media/crypto/encryption_handler_unittest.cc
index f8d12ebf32..210b9e2f19 100644
--- a/packager/media/crypto/encryption_handler_unittest.cc
+++ b/packager/media/crypto/encryption_handler_unittest.cc
@@ -9,7 +9,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "glog/logging.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/event/hls_notify_muxer_listener.cc b/packager/media/event/hls_notify_muxer_listener.cc
index dde0299e87..8635e64268 100644
--- a/packager/media/event/hls_notify_muxer_listener.cc
+++ b/packager/media/event/hls_notify_muxer_listener.cc
@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include "glog/logging.h"
+#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/mpd_notify_muxer_listener.cc b/packager/media/event/mpd_notify_muxer_listener.cc
index 5d2ff22fb5..f85b212b49 100644
--- a/packager/media/event/mpd_notify_muxer_listener.cc
+++ b/packager/media/event/mpd_notify_muxer_listener.cc
@@ -8,7 +8,7 @@
 
 #include <cmath>
 
-#include "glog/logging.h"
+#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/multi_codec_muxer_listener.cc b/packager/media/event/multi_codec_muxer_listener.cc
index e2191e63ce..a515f4f71b 100644
--- a/packager/media/event/multi_codec_muxer_listener.cc
+++ b/packager/media/event/multi_codec_muxer_listener.cc
@@ -6,8 +6,8 @@
 
 #include "packager/media/event/multi_codec_muxer_listener.h"
 
-#include "absl/strings/str_split.h"
-#include "glog/logging.h"
+#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_factory.cc b/packager/media/event/muxer_listener_factory.cc
index 2e23c7735f..222ad9c4c3 100644
--- a/packager/media/event/muxer_listener_factory.cc
+++ b/packager/media/event/muxer_listener_factory.cc
@@ -8,8 +8,8 @@
 
 #include <list>
 
-#include "absl/strings/str_format.h"
-#include "glog/logging.h"
+#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 6a1f391cd2..56bb3916f8 100644
--- a/packager/media/event/muxer_listener_internal.cc
+++ b/packager/media/event/muxer_listener_internal.cc
@@ -9,8 +9,8 @@
 #include <google/protobuf/util/message_differencer.h>
 #include <math.h>
 
-#include "absl/strings/escaping.h"
-#include "glog/logging.h"
+#include <absl/strings/escaping.h>
+#include <glog/logging.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/vod_media_info_dump_muxer_listener.cc b/packager/media/event/vod_media_info_dump_muxer_listener.cc
index cefb8acbdc..e7d2da856c 100644
--- a/packager/media/event/vod_media_info_dump_muxer_listener.cc
+++ b/packager/media/event/vod_media_info_dump_muxer_listener.cc
@@ -10,7 +10,7 @@
 
 #include <cmath>
 
-#include "glog/logging.h"
+#include <glog/logging.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/formats/mp4/single_segment_segmenter.cc b/packager/media/formats/mp4/single_segment_segmenter.cc
index 015bd7c736..84641ffcfe 100644
--- a/packager/media/formats/mp4/single_segment_segmenter.cc
+++ b/packager/media/formats/mp4/single_segment_segmenter.cc
@@ -8,12 +8,10 @@
 
 #include <algorithm>
 
-#include "packager/file/file.h"
 #include "packager/file/file_util.h"
 #include "packager/media/base/buffer_writer.h"
 #include "packager/media/base/muxer_options.h"
 #include "packager/media/event/progress_listener.h"
-#include "packager/media/formats/mp4/box_definitions.h"
 #include "packager/media/formats/mp4/key_frame_info.h"
 
 namespace shaka {
diff --git a/packager/media/formats/webm/cluster_builder.cc b/packager/media/formats/webm/cluster_builder.cc
index 372e80592f..fe6bd151a7 100644
--- a/packager/media/formats/webm/cluster_builder.cc
+++ b/packager/media/formats/webm/cluster_builder.cc
@@ -4,7 +4,7 @@
 
 #include "packager/media/formats/webm/cluster_builder.h"
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/media/formats/webm/webm_constants.h"
 
 namespace shaka {
diff --git a/packager/media/formats/webm/encryptor.h b/packager/media/formats/webm/encryptor.h
index cb6ceecb00..ac6b08748d 100644
--- a/packager/media/formats/webm/encryptor.h
+++ b/packager/media/formats/webm/encryptor.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "mkvmuxer/mkvmuxer.h"
+#include <mkvmuxer/mkvmuxer.h>
 #include "packager/status/status.h"
 
 namespace shaka {
diff --git a/packager/media/formats/webm/mkv_writer.h b/packager/media/formats/webm/mkv_writer.h
index 70a97e15f9..1044e53488 100644
--- a/packager/media/formats/webm/mkv_writer.h
+++ b/packager/media/formats/webm/mkv_writer.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <string>
 
-#include "mkvmuxer/mkvmuxer.h"
+#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 66de2c3928..9a7fc61080 100644
--- a/packager/media/formats/webm/multi_segment_segmenter.cc
+++ b/packager/media/formats/webm/multi_segment_segmenter.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/formats/webm/multi_segment_segmenter.h"
 
-#include "mkvmuxer/mkvmuxer.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/seek_head.cc b/packager/media/formats/webm/seek_head.cc
index 1e745950ef..f7a19a0b02 100644
--- a/packager/media/formats/webm/seek_head.cc
+++ b/packager/media/formats/webm/seek_head.cc
@@ -9,9 +9,9 @@
 #include <algorithm>
 #include <limits>
 
-#include "common/webmids.h"
-#include "glog/logging.h"
-#include "mkvmuxer/mkvmuxerutil.h"
+#include <common/webmids.h>
+#include <glog/logging.h>
+#include <mkvmuxer/mkvmuxerutil.h>
 
 using namespace mkvmuxer;
 
diff --git a/packager/media/formats/webm/seek_head.h b/packager/media/formats/webm/seek_head.h
index 9b58c2ec63..6d57d73669 100644
--- a/packager/media/formats/webm/seek_head.h
+++ b/packager/media/formats/webm/seek_head.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include "mkvmuxer/mkvmuxer.h"
+#include <mkvmuxer/mkvmuxer.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/segmenter.cc b/packager/media/formats/webm/segmenter.cc
index 3b47bd1f31..d64ffda4ef 100644
--- a/packager/media/formats/webm/segmenter.cc
+++ b/packager/media/formats/webm/segmenter.cc
@@ -6,14 +6,10 @@
 
 #include "packager/media/formats/webm/segmenter.h"
 
-#include "common/webmids.h"
-#include "mkvmuxer/mkvmuxerutil.h"
+#include <mkvmuxer/mkvmuxerutil.h>
 #include "packager/media/base/audio_stream_info.h"
 #include "packager/media/base/media_handler.h"
-#include "packager/media/base/media_sample.h"
 #include "packager/media/base/muxer_options.h"
-#include "packager/media/base/muxer_util.h"
-#include "packager/media/base/stream_info.h"
 #include "packager/media/base/video_stream_info.h"
 #include "packager/media/codecs/vp_codec_configuration_record.h"
 #include "packager/media/event/muxer_listener.h"
diff --git a/packager/media/formats/webm/segmenter.h b/packager/media/formats/webm/segmenter.h
index 7fa0b920aa..58083dafb5 100644
--- a/packager/media/formats/webm/segmenter.h
+++ b/packager/media/formats/webm/segmenter.h
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "mkvmuxer/mkvmuxer.h"
+#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 e79a136749..fa0d910721 100644
--- a/packager/media/formats/webm/single_segment_segmenter.cc
+++ b/packager/media/formats/webm/single_segment_segmenter.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/formats/webm/single_segment_segmenter.h"
 
-#include "mkvmuxer/mkvmuxer.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/tracks_builder.cc b/packager/media/formats/webm/tracks_builder.cc
index f3dbeec7a1..790c9a4ed7 100644
--- a/packager/media/formats/webm/tracks_builder.cc
+++ b/packager/media/formats/webm/tracks_builder.cc
@@ -4,7 +4,7 @@
 
 #include "packager/media/formats/webm/tracks_builder.h"
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/media/formats/webm/webm_constants.h"
 
 namespace shaka {
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 af08e923d1..0e09b81f93 100644
--- a/packager/media/formats/webm/two_pass_single_segment_segmenter.cc
+++ b/packager/media/formats/webm/two_pass_single_segment_segmenter.cc
@@ -8,9 +8,8 @@
 
 #include <algorithm>
 
-#include "common/webmids.h"
-#include "mkvmuxer/mkvmuxer.h"
-#include "mkvmuxer/mkvmuxerutil.h"
+#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 aea0aa011e..ce56214751 100644
--- a/packager/media/formats/webm/webm_audio_client.cc
+++ b/packager/media/formats/webm/webm_audio_client.cc
@@ -4,7 +4,7 @@
 
 #include "packager/media/formats/webm/webm_audio_client.h"
 
-#include "glog/logging.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 15646fb72b..3e9ef281b4 100644
--- a/packager/media/formats/webm/webm_cluster_parser.cc
+++ b/packager/media/formats/webm/webm_cluster_parser.cc
@@ -7,9 +7,8 @@
 #include <algorithm>
 #include <vector>
 
-#include "absl/base/internal/endian.h"
-#include "glog/logging.h"
-#include "packager/media/base/decrypt_config.h"
+#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 fbe647700a..0d16c67648 100644
--- a/packager/media/formats/webm/webm_cluster_parser_unittest.cc
+++ b/packager/media/formats/webm/webm_cluster_parser_unittest.cc
@@ -13,8 +13,8 @@
 #include <string>
 #include <vector>
 
-#include "absl/strings/str_format.h"
-#include "glog/logging.h"
+#include <absl/strings/str_format.h>
+#include <glog/logging.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_content_encodings.cc b/packager/media/formats/webm/webm_content_encodings.cc
index 4b6f6248ec..29790dc1e1 100644
--- a/packager/media/formats/webm/webm_content_encodings.cc
+++ b/packager/media/formats/webm/webm_content_encodings.cc
@@ -4,7 +4,7 @@
 
 #include "packager/media/formats/webm/webm_content_encodings.h"
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/webm_content_encodings_client.cc b/packager/media/formats/webm/webm_content_encodings_client.cc
index edc209ce8b..fd25e5aa9d 100644
--- a/packager/media/formats/webm/webm_content_encodings_client.cc
+++ b/packager/media/formats/webm/webm_content_encodings_client.cc
@@ -4,7 +4,7 @@
 
 #include "packager/media/formats/webm/webm_content_encodings_client.h"
 
-#include "glog/logging.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 09e714c587..7dba34a64f 100644
--- a/packager/media/formats/webm/webm_content_encodings_client_unittest.cc
+++ b/packager/media/formats/webm/webm_content_encodings_client_unittest.cc
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "absl/strings/numbers.h"
+#include <absl/strings/numbers.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 9a39e8f23d..6a7459ff91 100644
--- a/packager/media/formats/webm/webm_crypto_helpers.cc
+++ b/packager/media/formats/webm/webm_crypto_helpers.cc
@@ -4,8 +4,8 @@
 
 #include "packager/media/formats/webm/webm_crypto_helpers.h"
 
-#include "absl/base/internal/endian.h"
-#include "glog/logging.h"
+#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_info_parser.cc b/packager/media/formats/webm/webm_info_parser.cc
index baca66f37e..0aadc157ed 100644
--- a/packager/media/formats/webm/webm_info_parser.cc
+++ b/packager/media/formats/webm/webm_info_parser.cc
@@ -6,7 +6,7 @@
 
 #include <ctime>
 
-#include "glog/logging.h"
+#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 8ca1df28d2..0cb6c33f6d 100644
--- a/packager/media/formats/webm/webm_media_parser.cc
+++ b/packager/media/formats/webm/webm_media_parser.cc
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "glog/logging.h"
+#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 4c0c26d6b9..d00adcf19e 100644
--- a/packager/media/formats/webm/webm_parser.cc
+++ b/packager/media/formats/webm/webm_parser.cc
@@ -13,7 +13,7 @@
 
 #include <limits>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/media/formats/webm/webm_constants.h"
 
 namespace shaka {
diff --git a/packager/media/formats/webm/webm_tracks_parser.cc b/packager/media/formats/webm/webm_tracks_parser.cc
index b95fec0a3b..8de4c673b1 100644
--- a/packager/media/formats/webm/webm_tracks_parser.cc
+++ b/packager/media/formats/webm/webm_tracks_parser.cc
@@ -4,8 +4,8 @@
 
 #include "packager/media/formats/webm/webm_tracks_parser.h"
 
-#include "absl/strings/str_format.h"
-#include "glog/logging.h"
+#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 ec50a663bb..01d77c720a 100644
--- a/packager/media/formats/webm/webm_tracks_parser_unittest.cc
+++ b/packager/media/formats/webm/webm_tracks_parser_unittest.cc
@@ -7,7 +7,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "glog/logging.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 0f53035786..d3f508cddc 100644
--- a/packager/media/formats/webm/webm_video_client.cc
+++ b/packager/media/formats/webm/webm_video_client.cc
@@ -4,7 +4,7 @@
 
 #include "packager/media/formats/webm/webm_video_client.h"
 
-#include "glog/logging.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/wvm/wvm_media_parser.cc b/packager/media/formats/wvm/wvm_media_parser.cc
index c527d3e816..cb983ede4d 100644
--- a/packager/media/formats/wvm/wvm_media_parser.cc
+++ b/packager/media/formats/wvm/wvm_media_parser.cc
@@ -8,8 +8,8 @@
 #include <sstream>
 #include <vector>
 
+#include <absl/base/internal/endian.h>
 #include <absl/strings/str_format.h>
-#include "absl/base/internal/endian.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 d90126cb78..b37b608cab 100644
--- a/packager/media/formats/wvm/wvm_media_parser.h
+++ b/packager/media/formats/wvm/wvm_media_parser.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include "absl/base/internal/endian.h"
+#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/test/test_data_util.cc b/packager/media/test/test_data_util.cc
index a784dffa7e..3400fa4837 100644
--- a/packager/media/test/test_data_util.cc
+++ b/packager/media/test/test_data_util.cc
@@ -4,7 +4,7 @@
 
 #include "packager/media/test/test_data_util.h"
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/test/test_web_server.cc b/packager/media/test/test_web_server.cc
index ed81c55d42..3186a5be21 100644
--- a/packager/media/test/test_web_server.cc
+++ b/packager/media/test/test_web_server.cc
@@ -10,10 +10,10 @@
 #include <random>
 #include <string_view>
 
-#include "absl/strings/numbers.h"
-#include "absl/strings/str_format.h"
-#include "mongoose.h"
-#include "nlohmann/json.hpp"
+#include <absl/strings/numbers.h>
+#include <absl/strings/str_format.h>
+#include <mongoose.h>
+#include <nlohmann/json.hpp>
 
 // A full replacement for our former use of httpbin.org in tests.  This
 // embedded web server can:
diff --git a/packager/media/test/test_web_server.h b/packager/media/test/test_web_server.h
index 208ab0f447..489b3d75fb 100644
--- a/packager/media/test/test_web_server.h
+++ b/packager/media/test/test_web_server.h
@@ -11,8 +11,8 @@
 #include <memory>
 #include <thread>
 
-#include "absl/synchronization/mutex.h"
-#include "absl/time/time.h"
+#include <absl/synchronization/mutex.h>
+#include <absl/time/time.h>
 
 // Forward declare mongoose struct types, used as pointers below.
 struct mg_connection;
diff --git a/packager/media/trick_play/trick_play_handler.cc b/packager/media/trick_play/trick_play_handler.cc
index 0e77c9875a..533f5f5415 100644
--- a/packager/media/trick_play/trick_play_handler.cc
+++ b/packager/media/trick_play/trick_play_handler.cc
@@ -6,7 +6,7 @@
 
 #include "packager/media/trick_play/trick_play_handler.h"
 
-#include "glog/logging.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 cbc4bc23c8..6f55a6f46a 100644
--- a/packager/mpd/base/adaptation_set.cc
+++ b/packager/mpd/base/adaptation_set.cc
@@ -10,7 +10,7 @@
 #include <glog/logging.h>
 #include <cmath>
 
-#include "absl/strings/str_format.h"
+#include <absl/strings/str_format.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/bandwidth_estimator.cc b/packager/mpd/base/bandwidth_estimator.cc
index 7ec886cbb4..e7e3afa91b 100644
--- a/packager/mpd/base/bandwidth_estimator.cc
+++ b/packager/mpd/base/bandwidth_estimator.cc
@@ -10,7 +10,7 @@
 #include <cmath>
 #include <numeric>
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 
 namespace shaka {
 
diff --git a/packager/mpd/base/mock_mpd_builder.h b/packager/mpd/base/mock_mpd_builder.h
index 90294aa83c..bc05171063 100644
--- a/packager/mpd/base/mock_mpd_builder.h
+++ b/packager/mpd/base/mock_mpd_builder.h
@@ -9,7 +9,7 @@
 
 #include <gmock/gmock.h>
 
-#include "absl/synchronization/mutex.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/mpd_notifier_util.cc b/packager/mpd/base/mpd_notifier_util.cc
index 13c3a4eb70..063d69353d 100644
--- a/packager/mpd/base/mpd_notifier_util.cc
+++ b/packager/mpd/base/mpd_notifier_util.cc
@@ -6,7 +6,7 @@
 
 #include "packager/mpd/base/mpd_notifier_util.h"
 
-#include "glog/logging.h"
+#include <glog/logging.h>
 #include "packager/file/file.h"
 #include "packager/mpd/base/mpd_utils.h"
 
diff --git a/packager/mpd/base/mpd_utils.cc b/packager/mpd/base/mpd_utils.cc
index 18eae549d8..ab38b50ab1 100644
--- a/packager/mpd/base/mpd_utils.cc
+++ b/packager/mpd/base/mpd_utils.cc
@@ -12,7 +12,7 @@
 #include <glog/logging.h>
 #include <libxml/tree.h>
 
-#include "absl/strings/str_format.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_unittest.cc b/packager/mpd/base/mpd_utils_unittest.cc
index 0c3e0f0afb..0db2437538 100644
--- a/packager/mpd/base/mpd_utils_unittest.cc
+++ b/packager/mpd/base/mpd_utils_unittest.cc
@@ -8,7 +8,7 @@
 #include <gtest/gtest.h>
 #include <memory>
 
-#include "absl/types/span.h"
+#include <absl/types/span.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/simple_mpd_notifier.h b/packager/mpd/base/simple_mpd_notifier.h
index ebb67ebb51..8438fc9cc6 100644
--- a/packager/mpd/base/simple_mpd_notifier.h
+++ b/packager/mpd/base/simple_mpd_notifier.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include "absl/synchronization/mutex.h"
+#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/xml/xml_node.cc b/packager/mpd/base/xml/xml_node.cc
index 42c823e357..02a00e23e1 100644
--- a/packager/mpd/base/xml/xml_node.cc
+++ b/packager/mpd/base/xml/xml_node.cc
@@ -16,8 +16,8 @@
 #include <limits>
 #include <set>
 
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_format.h"
+#include <absl/strings/escaping.h>
+#include <absl/strings/str_format.h>
 #include "packager/macros.h"
 #include "packager/media/base/rcheck.h"
 #include "packager/mpd/base/media_info.pb.h"
diff --git a/packager/packager.cc b/packager/packager.cc
index 2ce17f5cf0..9e655c3f26 100644
--- a/packager/packager.cc
+++ b/packager/packager.cc
@@ -8,27 +8,21 @@
 
 #include <algorithm>
 
+#include <absl/strings/match.h>
 #include <absl/strings/str_format.h>
 #include <glog/logging.h>
 #include <chrono>
-#include <filesystem>
 #include <optional>
-#include "absl/strings/match.h"
 #include "packager/app/job_manager.h"
 #include "packager/app/muxer_factory.h"
 #include "packager/app/packager_util.h"
 #include "packager/app/single_thread_job_manager.h"
-#include "packager/app/stream_descriptor.h"
 #include "packager/file/file.h"
 #include "packager/hls/base/hls_notifier.h"
 #include "packager/hls/base/simple_hls_notifier.h"
 #include "packager/media/base/cc_stream_filter.h"
-#include "packager/media/base/container_names.h"
-#include "packager/media/base/fourccs.h"
-#include "packager/media/base/key_source.h"
 #include "packager/media/base/language_utils.h"
 #include "packager/media/base/muxer.h"
-#include "packager/media/base/muxer_options.h"
 #include "packager/media/base/muxer_util.h"
 #include "packager/media/chunking/chunking_handler.h"
 #include "packager/media/chunking/cue_alignment_handler.h"
@@ -43,7 +37,6 @@
 #include "packager/media/replicator/replicator.h"
 #include "packager/media/trick_play/trick_play_handler.h"
 #include "packager/mpd/base/media_info.pb.h"
-#include "packager/mpd/base/mpd_builder.h"
 #include "packager/mpd/base/simple_mpd_notifier.h"
 #include "packager/status/status_macros.h"
 #include "packager/version/version.h"
diff --git a/packager/status/status.cc b/packager/status/status.cc
index 63e809470c..5e15601741 100644
--- a/packager/status/status.cc
+++ b/packager/status/status.cc
@@ -6,8 +6,8 @@
 
 #include "packager/status/status.h"
 
-#include "absl/strings/str_format.h"
-#include "glog/logging.h"
+#include <absl/strings/str_format.h>
+#include <glog/logging.h>
 #include "packager/macros.h"
 
 namespace shaka {
diff --git a/packager/status/status_unittest.cc b/packager/status/status_unittest.cc
index 80ea63df4d..2c82fe448e 100644
--- a/packager/status/status_unittest.cc
+++ b/packager/status/status_unittest.cc
@@ -7,7 +7,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "absl/strings/str_format.h"
+#include <absl/strings/str_format.h>
 #include "packager/status/status.h"
 
 namespace shaka {
diff --git a/packager/utils/absl_flag_hexbytes.cc b/packager/utils/absl_flag_hexbytes.cc
index db22b0789f..19f510edf4 100644
--- a/packager/utils/absl_flag_hexbytes.cc
+++ b/packager/utils/absl_flag_hexbytes.cc
@@ -7,16 +7,16 @@
 #include "packager/utils/absl_flag_hexbytes.h"
 #include "packager/utils/hex_parser.h"
 
+#include <absl/flags/flag.h>
+#include <absl/flags/parse.h>
+#include <absl/flags/usage.h>
+#include <absl/strings/ascii.h>
+#include <absl/strings/escaping.h>
+#include <absl/strings/str_format.h>
+#include <absl/strings/str_join.h>
+#include <absl/strings/str_split.h>
 #include <iostream>
 #include <vector>
-#include "absl/flags/flag.h"
-#include "absl/flags/parse.h"
-#include "absl/flags/usage.h"
-#include "absl/strings/ascii.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_join.h"
-#include "absl/strings/str_split.h"
 
 namespace shaka {
 
diff --git a/packager/utils/absl_flag_hexbytes.h b/packager/utils/absl_flag_hexbytes.h
index 93d8bfbf8b..bc164baaee 100644
--- a/packager/utils/absl_flag_hexbytes.h
+++ b/packager/utils/absl_flag_hexbytes.h
@@ -9,9 +9,9 @@
 
 #include "packager/utils/hex_parser.h"
 
-#include "absl/flags/flag.h"
-#include "absl/strings/ascii.h"
-#include "absl/strings/escaping.h"
+#include <absl/flags/flag.h>
+#include <absl/strings/ascii.h>
+#include <absl/strings/escaping.h>
 
 // Custom flag type for hexadecimal byte array
 namespace shaka {
diff --git a/packager/utils/hex_parser.cc b/packager/utils/hex_parser.cc
index 4d27204860..d3cb94173b 100644
--- a/packager/utils/hex_parser.cc
+++ b/packager/utils/hex_parser.cc
@@ -6,8 +6,8 @@
 
 #include "packager/utils/hex_parser.h"
 
-#include "absl/strings/escaping.h"
-#include "absl/types/span.h"
+#include <absl/strings/escaping.h>
+#include <absl/types/span.h>
 
 namespace shaka {
 
diff --git a/packager/version/version.cc b/packager/version/version.cc
index 4778541dc0..2ce3b83fe1 100644
--- a/packager/version/version.cc
+++ b/packager/version/version.cc
@@ -6,7 +6,7 @@
 
 #include "packager/version/version.h"
 
-#include "absl/synchronization/mutex.h"
+#include <absl/synchronization/mutex.h>
 
 namespace shaka {
 namespace {