style: Sort headers to comply with the style guide (#1273)

Reorder headers to follow the Google C++ Style Guide:

> In dir/foo.cc or dir/foo_test.cc:
>
> 1. dir2/foo2.h.
> 2. A blank line
> 3. C system headers (more precisely: headers in angle brackets with
the .h extension), e.g., <unistd.h>, <stdlib.h>.
> 4. A blank line
> 5. C++ standard library headers (without file extension), e.g.,
<algorithm>, <cstddef>.
> 6. A blank line
> 7. Other libraries' .h files.
> 8. A blank line
> 9. Your project's .h files.


https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes

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",

packager/app/job_manager.h

@@ -14,6 +14,7 @@
 #include <vector>
 
 #include <absl/synchronization/mutex.h>
+
 #include <packager/status/status.h>
 
 namespace shaka {

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,

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.");

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>

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,

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 {

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>

packager/app/validate_flag.h

@@ -6,8 +6,8 @@
 //
 // Flag validation help functions.
 
-#ifndef APP_VALIDATE_FLAG_H_
+#ifndef PACKAGER_APP_VALIDATE_FLAG_H_
-#define 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_

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,

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,

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 {

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>
 

packager/file/file.cc

@@ -6,9 +6,8 @@
 
 #include <packager/file/file.h>
 
-#include <inttypes.h>
-
 #include <algorithm>
+#include <cinttypes>
 #include <filesystem>
 #include <memory>
 

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>

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 {

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 {

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 <packager/file/file.h>
-#include <cstdio>
 
+#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>
 

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 {
 

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>

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)

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>
 

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 {

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;

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>

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>

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>

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>
 

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>
 

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 {

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>

packager/file/udp_file.cc

@@ -29,6 +29,7 @@
 #include <limits>
 
 #include <glog/logging.h>
+
 #include <packager/file/udp_options.h>
 
 namespace shaka {

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.

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>
 

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);

packager/hls/base/master_playlist.cc

@@ -7,18 +7,18 @@
 #include <packager/hls/base/master_playlist.h>
 
 #include <algorithm>  // std::max
-
+#include <cstdint>
-#include <inttypes.h>
+#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 {

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>

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>

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 {

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,

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 <packager/hls/base/simple_hls_notifier.h>
-#include <gtest/gtest.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);
 

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 {

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;

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>
 

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 <gtest/gtest.h>
-#include <packager/media/base/aes_encryptor.h>
+
 #include <packager/utils/bytes_to_string_view.h>
 
 namespace {

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 {

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::_;

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>
 

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 {

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>
 

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 {

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 <cstddef>
-#include <sys/types.h>
+#include <cstdint>
 
 #include <glog/logging.h>
+
 #include <packager/macros.h>
 
 namespace shaka {

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 {
 

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>

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>
 

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 {

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>

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>

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>
 

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 {

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 {

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>
 

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>
 

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>
 

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>
 

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>
 

packager/media/base/language_utils.cc

@@ -9,6 +9,7 @@
 #include <iterator>
 
 #include <glog/logging.h>
+
 #include <packager/macros.h>
 
 namespace {

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>

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>

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 {

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>

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 {

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>
 

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 {
 

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>
 

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>
 

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 {
 

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>

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>
 

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>
 

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 {

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 {

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 {

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 {

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;

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 {

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>

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)                          \

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>
 

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 {

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>
 

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>
 

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[] = {

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>

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 {
 

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 {

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>
 

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 {

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>

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>