diff --git a/CMakeLists.txt b/CMakeLists.txt
index 447c607207..6d8401db1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,10 +19,6 @@ project(shaka-packager VERSION "")
 # libpackager library.  By default, don't.
 option(LIBPACKAGER_SHARED "Build libpackager as a shared library" OFF)
 
-# Global include paths.
-# Project root, to reference packager/foo/bar/...
-include_directories(.)
-
 # Enable CMake's test infrastructure.
 enable_testing()
 
diff --git a/include/README.md b/include/README.md
new file mode 100644
index 0000000000..dc822e13bd
--- /dev/null
+++ b/include/README.md
@@ -0,0 +1,6 @@
+# Public headers for libpackager
+
+These are the public headers for libpackager.  They can only reference other
+public headers or standard system headers.  They cannot reference internal
+headers (in `packager/...`) or third-party dependency headers (in
+`packager/third_party/...`).
diff --git a/packager/media/public/ad_cue_generator_params.h b/include/packager/ad_cue_generator_params.h
similarity index 77%
rename from packager/media/public/ad_cue_generator_params.h
rename to include/packager/ad_cue_generator_params.h
index cff3a6f2c9..272b84c737 100644
--- a/packager/media/public/ad_cue_generator_params.h
+++ b/include/packager/ad_cue_generator_params.h
@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_MEDIA_PUBLIC_AD_CUE_GENERATOR_PARAMS_H_
-#define PACKAGER_MEDIA_PUBLIC_AD_CUE_GENERATOR_PARAMS_H_
+#ifndef PACKAGER_PUBLIC_AD_CUE_GENERATOR_PARAMS_H_
+#define PACKAGER_PUBLIC_AD_CUE_GENERATOR_PARAMS_H_
 
 #include <vector>
 
@@ -27,4 +27,4 @@ struct AdCueGeneratorParams {
 
 }  // namespace shaka
 
-#endif  // PACKAGER_MEDIA_PUBLIC_AD_CUE_GENERATOR_PARAMS_H_
+#endif  // PACKAGER_PUBLIC_AD_CUE_GENERATOR_PARAMS_H_
diff --git a/packager/file/public/buffer_callback_params.h b/include/packager/buffer_callback_params.h
similarity index 87%
rename from packager/file/public/buffer_callback_params.h
rename to include/packager/buffer_callback_params.h
index ebf126fc3c..caa4c5e25d 100644
--- a/packager/file/public/buffer_callback_params.h
+++ b/include/packager/buffer_callback_params.h
@@ -4,9 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_FILE_PUBLIC_BUFFER_CALLBACK_PARAMS_H_
-#define PACKAGER_FILE_PUBLIC_BUFFER_CALLBACK_PARAMS_H_
+#ifndef PACKAGER_PUBLIC_BUFFER_CALLBACK_PARAMS_H_
+#define PACKAGER_PUBLIC_BUFFER_CALLBACK_PARAMS_H_
 
+#include <cstdint>
 #include <functional>
 
 namespace shaka {
@@ -32,4 +33,4 @@ struct BufferCallbackParams {
 
 }  // namespace shaka
 
-#endif  // PACKAGER_FILE_PUBLIC_BUFFER_CALLBACK_PARAMS_H_
+#endif  // PACKAGER_PUBLIC_BUFFER_CALLBACK_PARAMS_H_
diff --git a/packager/media/public/chunking_params.h b/include/packager/chunking_params.h
similarity index 90%
rename from packager/media/public/chunking_params.h
rename to include/packager/chunking_params.h
index 78cb816a00..e12baf0b9e 100644
--- a/packager/media/public/chunking_params.h
+++ b/include/packager/chunking_params.h
@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_MEDIA_PUBLIC_CHUNKING_PARAMS_H_
-#define PACKAGER_MEDIA_PUBLIC_CHUNKING_PARAMS_H_
+#ifndef PACKAGER_PUBLIC_CHUNKING_PARAMS_H_
+#define PACKAGER_PUBLIC_CHUNKING_PARAMS_H_
 
 namespace shaka {
 
@@ -35,4 +35,4 @@ struct ChunkingParams {
 
 }  // namespace shaka
 
-#endif  // PACKAGER_MEDIA_PUBLIC_CHUNKING_PARAMS_H_
+#endif  // PACKAGER_PUBLIC_CHUNKING_PARAMS_H_
diff --git a/packager/media/public/crypto_params.h b/include/packager/crypto_params.h
similarity index 97%
rename from packager/media/public/crypto_params.h
rename to include/packager/crypto_params.h
index e6c818413e..845d91cf42 100644
--- a/packager/media/public/crypto_params.h
+++ b/include/packager/crypto_params.h
@@ -4,16 +4,15 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_MEDIA_PUBLIC_CRYPTO_PARAMS_H_
-#define PACKAGER_MEDIA_PUBLIC_CRYPTO_PARAMS_H_
+#ifndef PACKAGER_PUBLIC_CRYPTO_PARAMS_H_
+#define PACKAGER_PUBLIC_CRYPTO_PARAMS_H_
 
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <string>
 #include <vector>
 
-#include <packager/status/status.h>
-
 namespace shaka {
 
 /// Encryption key providers.  These provide keys to decrypt the content if the
@@ -237,4 +236,4 @@ struct DecryptionParams {
 
 }  // namespace shaka
 
-#endif  // PACKAGER_MEDIA_PUBLIC_CRYPTO_PARAMS_H_
+#endif  // PACKAGER_PUBLIC_CRYPTO_PARAMS_H_
diff --git a/include/packager/export.h b/include/packager/export.h
new file mode 100644
index 0000000000..8814943be1
--- /dev/null
+++ b/include/packager/export.h
@@ -0,0 +1,33 @@
+// Copyright 2023 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef PACKAGER_PUBLIC_EXPORT_H_
+#define PACKAGER_PUBLIC_EXPORT_H_
+
+#if defined(SHARED_LIBRARY_BUILD)
+#if defined(_WIN32)
+
+#if defined(SHAKA_IMPLEMENTATION)
+#define SHAKA_EXPORT __declspec(dllexport)
+#else
+#define SHAKA_EXPORT __declspec(dllimport)
+#endif  // defined(SHAKA_IMPLEMENTATION)
+
+#else  // defined(_WIN32)
+
+#if defined(SHAKA_IMPLEMENTATION)
+#define SHAKA_EXPORT __attribute__((visibility("default")))
+#else
+#define SHAKA_EXPORT
+#endif
+
+#endif  // defined(_WIN32)
+
+#else  // defined(SHARED_LIBRARY_BUILD)
+#define SHAKA_EXPORT
+#endif  // defined(SHARED_LIBRARY_BUILD)
+
+#endif  // PACKAGER_PUBLIC_EXPORT_H_
diff --git a/packager/file/file.h b/include/packager/file.h
similarity index 97%
rename from packager/file/file.h
rename to include/packager/file.h
index 67e491b85c..b9475837e3 100644
--- a/packager/file/file.h
+++ b/include/packager/file.h
@@ -4,15 +4,16 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_FILE_FILE_H_
-#define PACKAGER_FILE_FILE_H_
+#ifndef PACKAGER_PUBLIC_FILE_H_
+#define PACKAGER_PUBLIC_FILE_H_
 
 #include <cstdint>
 #include <string>
 
-#include <packager/file/public/buffer_callback_params.h>
-#include <packager/macros.h>
-#include <packager/status/status.h>
+#include <packager/buffer_callback_params.h>
+#include <packager/export.h>
+#include <packager/macros/classes.h>
+#include <packager/status.h>
 
 namespace shaka {
 
@@ -200,4 +201,4 @@ class SHAKA_EXPORT File {
 
 }  // namespace shaka
 
-#endif  // PACKAGER_FILE_FILE_H_
+#endif  // PACKAGER_PUBLIC_FILE_H_
diff --git a/packager/hls/public/hls_params.h b/include/packager/hls_params.h
similarity index 95%
rename from packager/hls/public/hls_params.h
rename to include/packager/hls_params.h
index c05e33ed76..a476beb412 100644
--- a/packager/hls/public/hls_params.h
+++ b/include/packager/hls_params.h
@@ -4,9 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_HLS_PUBLIC_HLS_PARAMS_H_
-#define PACKAGER_HLS_PUBLIC_HLS_PARAMS_H_
+#ifndef PACKAGER_PUBLIC_HLS_PARAMS_H_
+#define PACKAGER_PUBLIC_HLS_PARAMS_H_
 
+#include <cstdint>
 #include <string>
 
 namespace shaka {
@@ -66,4 +67,4 @@ struct HlsParams {
 
 }  // namespace shaka
 
-#endif  // PACKAGER_HLS_PUBLIC_HLS_PARAMS_H_
+#endif  // PACKAGER_PUBLIC_HLS_PARAMS_H_
diff --git a/packager/media/public/mp4_output_params.h b/include/packager/mp4_output_params.h
similarity index 88%
rename from packager/media/public/mp4_output_params.h
rename to include/packager/mp4_output_params.h
index dbc43d3e75..971007fdb8 100644
--- a/packager/media/public/mp4_output_params.h
+++ b/include/packager/mp4_output_params.h
@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_MEDIA_PUBLIC_MP4_OUTPUT_PARAMS_H_
-#define PACKAGER_MEDIA_PUBLIC_MP4_OUTPUT_PARAMS_H_
+#ifndef PACKAGER_PUBLIC_MP4_OUTPUT_PARAMS_H_
+#define PACKAGER_PUBLIC_MP4_OUTPUT_PARAMS_H_
 
 namespace shaka {
 
@@ -30,4 +30,4 @@ struct Mp4OutputParams {
 
 }  // namespace shaka
 
-#endif  // PACKAGER_MEDIA_PUBLIC_MP4_OUTPUT_PARAMS_H_
+#endif  // PACKAGER_PUBLIC_MP4_OUTPUT_PARAMS_H_
diff --git a/packager/mpd/public/mpd_params.h b/include/packager/mpd_params.h
similarity index 97%
rename from packager/mpd/public/mpd_params.h
rename to include/packager/mpd_params.h
index 3ca098bbf1..1609063433 100644
--- a/packager/mpd/public/mpd_params.h
+++ b/include/packager/mpd_params.h
@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_MPD_PUBLIC_MPD_PARAMS_H_
-#define PACKAGER_MPD_PUBLIC_MPD_PARAMS_H_
+#ifndef PACKAGER_PUBLIC_MPD_PARAMS_H_
+#define PACKAGER_PUBLIC_MPD_PARAMS_H_
 
 #include <string>
 #include <vector>
@@ -106,4 +106,4 @@ struct MpdParams {
 
 }  // namespace shaka
 
-#endif  // PACKAGER_MPD_PUBLIC_MPD_PARAMS_H_
+#endif  // PACKAGER_PUBLIC_MPD_PARAMS_H_
diff --git a/packager/packager.h b/include/packager/packager.h
similarity index 92%
rename from packager/packager.h
rename to include/packager/packager.h
index 668fa34260..6c7ad7a260 100644
--- a/packager/packager.h
+++ b/include/packager/packager.h
@@ -4,22 +4,23 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_PACKAGER_H_
-#define PACKAGER_PACKAGER_H_
+#ifndef PACKAGER_PUBLIC_PACKAGER_H_
+#define PACKAGER_PUBLIC_PACKAGER_H_
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <packager/file/public/buffer_callback_params.h>
-#include <packager/hls/public/hls_params.h>
-#include <packager/macros.h>
-#include <packager/media/public/ad_cue_generator_params.h>
-#include <packager/media/public/chunking_params.h>
-#include <packager/media/public/crypto_params.h>
-#include <packager/media/public/mp4_output_params.h>
-#include <packager/mpd/public/mpd_params.h>
-#include <packager/status/status.h>
+#include <packager/ad_cue_generator_params.h>
+#include <packager/buffer_callback_params.h>
+#include <packager/chunking_params.h>
+#include <packager/crypto_params.h>
+#include <packager/export.h>
+#include <packager/hls_params.h>
+#include <packager/mp4_output_params.h>
+#include <packager/mpd_params.h>
+#include <packager/status.h>
 
 namespace shaka {
 
@@ -152,9 +153,8 @@ class SHAKA_EXPORT Packager {
   /// @param packaging_params contains the packaging parameters.
   /// @param stream_descriptors a list of stream descriptors.
   /// @return OK on success, an appropriate error code on failure.
-  Status Initialize(
-      const PackagingParams& packaging_params,
-      const std::vector<StreamDescriptor>& stream_descriptors);
+  Status Initialize(const PackagingParams& packaging_params,
+                    const std::vector<StreamDescriptor>& stream_descriptors);
 
   /// Run the pipeline to completion (or failed / been cancelled). Note
   /// that it blocks until completion.
@@ -202,4 +202,4 @@ class SHAKA_EXPORT Packager {
 
 }  // namespace shaka
 
-#endif  // PACKAGER_PACKAGER_H_
+#endif  // PACKAGER_PUBLIC_PACKAGER_H_
diff --git a/packager/status/status.h b/include/packager/status.h
similarity index 96%
rename from packager/status/status.h
rename to include/packager/status.h
index ba7bd821a1..d364fe90aa 100644
--- a/packager/status/status.h
+++ b/include/packager/status.h
@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_STATUS_H_
-#define PACKAGER_STATUS_H_
+#ifndef PACKAGER_PUBLIC_STATUS_H_
+#define PACKAGER_PUBLIC_STATUS_H_
 
 #include <iostream>
 #include <string>
 
-#include <packager/macros.h>
+#include <packager/export.h>
 
 namespace shaka {
 
@@ -136,4 +136,4 @@ std::ostream& operator<<(std::ostream& os, const Status& x);
 
 }  // namespace shaka
 
-#endif  // PACKAGER_STATUS_H_
+#endif  // PACKAGER_PUBLIC_STATUS_H_
diff --git a/packager/CMakeLists.txt b/packager/CMakeLists.txt
index c97ff457d2..29e9661f23 100644
--- a/packager/CMakeLists.txt
+++ b/packager/CMakeLists.txt
@@ -48,6 +48,12 @@ else()
   add_compile_options(-Wno-unknown-warning-option)
 endif()
 
+# Global include paths.
+# Project root, to reference internal headers as packager/foo/bar/...
+include_directories(..)
+# Public include folder, to reference public headers as packager/foo.h
+include_directories(../include)
+
 # Include our module for gtest-based testing.
 include("gtest.cmake")
 
@@ -76,7 +82,7 @@ set(libpackager_sources
   app/single_thread_job_manager.cc
   app/single_thread_job_manager.h
   packager.cc
-  packager.h
+  ../include/packager/packager.h
   )
 
 if(LIBPACKAGER_SHARED)
diff --git a/packager/app/job_manager.h b/packager/app/job_manager.h
index 9637a0e296..3d7268f627 100644
--- a/packager/app/job_manager.h
+++ b/packager/app/job_manager.h
@@ -15,7 +15,7 @@
 
 #include <absl/synchronization/mutex.h>
 
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/app/muxer_factory.h b/packager/app/muxer_factory.h
index 79a5c13335..3b5b613100 100644
--- a/packager/app/muxer_factory.h
+++ b/packager/app/muxer_factory.h
@@ -11,7 +11,7 @@
 #include <string>
 
 #include <packager/media/base/container_names.h>
-#include <packager/media/public/mp4_output_params.h>
+#include <packager/mp4_output_params.h>
 #include <packager/mpd/base/mpd_builder.h>
 
 namespace shaka {
diff --git a/packager/app/packager_main.cc b/packager/app/packager_main.cc
index a99ec70ddd..7651a0cd01 100644
--- a/packager/app/packager_main.cc
+++ b/packager/app/packager_main.cc
@@ -36,7 +36,7 @@
 #include <packager/app/stream_descriptor.h>
 #include <packager/app/vlog_flags.h>
 #include <packager/app/widevine_encryption_flags.h>
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/kv_pairs/kv_pairs.h>
 #include <packager/tools/license_notice.h>
 #include <packager/utils/string_trim_split.h>
diff --git a/packager/app/packager_util.cc b/packager/app/packager_util.cc
index c3efbff209..17ad193391 100644
--- a/packager/app/packager_util.cc
+++ b/packager/app/packager_util.cc
@@ -8,7 +8,7 @@
 
 #include <absl/log/log.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/media/base/media_handler.h>
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/base/playready_key_source.h>
diff --git a/packager/app/stream_descriptor.h b/packager/app/stream_descriptor.h
index 5a9a877f0d..4a1fa81a3b 100644
--- a/packager/app/stream_descriptor.h
+++ b/packager/app/stream_descriptor.h
@@ -11,7 +11,6 @@
 #include <string>
 
 #include <packager/packager.h>
-#include <optional>
 
 namespace shaka {
 
diff --git a/packager/app/vlog_flags.cc b/packager/app/vlog_flags.cc
index 558ec8fd52..fe1b82b966 100644
--- a/packager/app/vlog_flags.cc
+++ b/packager/app/vlog_flags.cc
@@ -13,6 +13,7 @@
 #include <absl/strings/numbers.h>
 
 #include <packager/kv_pairs/kv_pairs.h>
+#include <packager/macros/logging.h>
 
 ABSL_FLAG(int,
           v,
diff --git a/packager/file/callback_file.cc b/packager/file/callback_file.cc
index c5099e3f18..4912bd5679 100644
--- a/packager/file/callback_file.cc
+++ b/packager/file/callback_file.cc
@@ -8,7 +8,8 @@
 
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
 
 namespace shaka {
 
diff --git a/packager/file/callback_file.h b/packager/file/callback_file.h
index db9fb28e4c..965572c70a 100644
--- a/packager/file/callback_file.h
+++ b/packager/file/callback_file.h
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 
 namespace shaka {
 
diff --git a/packager/file/callback_file_unittest.cc b/packager/file/callback_file_unittest.cc
index f666b04c15..2805029a96 100644
--- a/packager/file/callback_file_unittest.cc
+++ b/packager/file/callback_file_unittest.cc
@@ -11,8 +11,9 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_closer.h>
+#include <packager/macros/compiler.h>
 
 using testing::_;
 using testing::Eq;
diff --git a/packager/file/file.cc b/packager/file/file.cc
index 18dfab1169..9e97f96c86 100644
--- a/packager/file/file.cc
+++ b/packager/file/file.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 
 #include <algorithm>
 #include <cinttypes>
@@ -24,7 +24,8 @@
 #include <packager/file/memory_file.h>
 #include <packager/file/threaded_io_file.h>
 #include <packager/file/udp_file.h>
-#include <packager/macros.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
 
 ABSL_FLAG(uint64_t,
           io_cache_size,
diff --git a/packager/file/file_closer.h b/packager/file/file_closer.h
index 257b58e0cd..4cec4c81dc 100644
--- a/packager/file/file_closer.h
+++ b/packager/file/file_closer.h
@@ -9,7 +9,7 @@
 
 #include <absl/log/log.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 
 namespace shaka {
 
diff --git a/packager/file/file_test_util.h b/packager/file/file_test_util.h
index 77914db079..cccf3fa47a 100644
--- a/packager/file/file_test_util.h
+++ b/packager/file/file_test_util.h
@@ -13,7 +13,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 
 namespace shaka {
 
diff --git a/packager/file/file_unittest.cc b/packager/file/file_unittest.cc
index ceff9ad150..ce419e2fa1 100644
--- a/packager/file/file_unittest.cc
+++ b/packager/file/file_unittest.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 
 #include <cstdio>
 #include <filesystem>
diff --git a/packager/file/http_file.cc b/packager/file/http_file.cc
index ec2092532a..e2a27e2d0d 100644
--- a/packager/file/http_file.cc
+++ b/packager/file/http_file.cc
@@ -15,7 +15,8 @@
 #include <curl/curl.h>
 
 #include <packager/file/thread_pool.h>
-#include <packager/macros.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
 #include <packager/version/version.h>
 
 ABSL_FLAG(std::string,
diff --git a/packager/file/http_file.h b/packager/file/http_file.h
index 82bfd1652b..f0207e2cac 100644
--- a/packager/file/http_file.h
+++ b/packager/file/http_file.h
@@ -12,7 +12,7 @@
 
 #include <absl/synchronization/notification.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/io_cache.h>
 
 typedef void CURL;
diff --git a/packager/file/http_file_unittest.cc b/packager/file/http_file_unittest.cc
index ba52d24323..a4633acccf 100644
--- a/packager/file/http_file_unittest.cc
+++ b/packager/file/http_file_unittest.cc
@@ -13,9 +13,9 @@
 #include <gtest/gtest.h>
 #include <nlohmann/json.hpp>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_closer.h>
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/test/test_web_server.h>
 
 #define ASSERT_JSON_STRING(json, key, value) \
diff --git a/packager/file/io_cache.cc b/packager/file/io_cache.cc
index dc93d94150..964b13ec98 100644
--- a/packager/file/io_cache.cc
+++ b/packager/file/io_cache.cc
@@ -12,7 +12,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 
 namespace shaka {
 
diff --git a/packager/file/io_cache.h b/packager/file/io_cache.h
index 6f973eff81..959be259b8 100644
--- a/packager/file/io_cache.h
+++ b/packager/file/io_cache.h
@@ -12,7 +12,7 @@
 
 #include <absl/synchronization/mutex.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 
diff --git a/packager/file/local_file.cc b/packager/file/local_file.cc
index 06357bd9c8..5ddc304e12 100644
--- a/packager/file/local_file.cc
+++ b/packager/file/local_file.cc
@@ -18,7 +18,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 
 namespace shaka {
 
diff --git a/packager/file/local_file.h b/packager/file/local_file.h
index 438d97a194..f7cd4b6fc9 100644
--- a/packager/file/local_file.h
+++ b/packager/file/local_file.h
@@ -10,7 +10,8 @@
 #include <cstdint>
 #include <string>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 
diff --git a/packager/file/memory_file.cc b/packager/file/memory_file.cc
index b3d52b773a..4276a4e7df 100644
--- a/packager/file/memory_file.cc
+++ b/packager/file/memory_file.cc
@@ -16,6 +16,8 @@
 #include <absl/log/log.h>
 #include <absl/synchronization/mutex.h>
 
+#include <packager/macros/logging.h>
+
 namespace shaka {
 namespace {
 
diff --git a/packager/file/memory_file.h b/packager/file/memory_file.h
index 5930ee7873..aee9ead53a 100644
--- a/packager/file/memory_file.h
+++ b/packager/file/memory_file.h
@@ -11,7 +11,8 @@
 #include <string>
 #include <vector>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 
diff --git a/packager/file/memory_file_unittest.cc b/packager/file/memory_file_unittest.cc
index 518421e45c..a0f42932aa 100644
--- a/packager/file/memory_file_unittest.cc
+++ b/packager/file/memory_file_unittest.cc
@@ -8,7 +8,7 @@
 
 #include <gtest/gtest.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_closer.h>
 
 namespace shaka {
diff --git a/packager/file/thread_pool.h b/packager/file/thread_pool.h
index 8ecac03064..25736f22ca 100644
--- a/packager/file/thread_pool.h
+++ b/packager/file/thread_pool.h
@@ -13,7 +13,7 @@
 #include <absl/base/thread_annotations.h>
 #include <absl/synchronization/mutex.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 
diff --git a/packager/file/threaded_io_file.h b/packager/file/threaded_io_file.h
index f91d2fe126..c46460b910 100644
--- a/packager/file/threaded_io_file.h
+++ b/packager/file/threaded_io_file.h
@@ -12,9 +12,10 @@
 
 #include <absl/synchronization/mutex.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_closer.h>
 #include <packager/file/io_cache.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 
diff --git a/packager/file/udp_file.cc b/packager/file/udp_file.cc
index e0e470bdee..ccbe2fd061 100644
--- a/packager/file/udp_file.cc
+++ b/packager/file/udp_file.cc
@@ -32,6 +32,9 @@
 #include <absl/log/log.h>
 
 #include <packager/file/udp_options.h>
+#include <packager/macros/classes.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
 
 namespace shaka {
 
diff --git a/packager/file/udp_file.h b/packager/file/udp_file.h
index ea9d40f6ef..493f9d7592 100644
--- a/packager/file/udp_file.h
+++ b/packager/file/udp_file.h
@@ -17,7 +17,8 @@
 typedef int SOCKET;
 #endif  // defined(OS_WIN)
 
-#include <packager/file/file.h>
+#include <packager/file.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 
diff --git a/packager/file/udp_options.cc b/packager/file/udp_options.cc
index 644bd4e93b..36cdf9185a 100644
--- a/packager/file/udp_options.cc
+++ b/packager/file/udp_options.cc
@@ -15,7 +15,6 @@
 #include <absl/strings/str_split.h>
 
 #include <packager/kv_pairs/kv_pairs.h>
-#include <packager/macros.h>
 
 ABSL_FLAG(std::string,
           udp_interface_address,
diff --git a/packager/hls/CMakeLists.txt b/packager/hls/CMakeLists.txt
index 83671d51db..e5cf25e94d 100644
--- a/packager/hls/CMakeLists.txt
+++ b/packager/hls/CMakeLists.txt
@@ -16,7 +16,6 @@ add_library(hls_builder
   base/simple_hls_notifier.h
   base/tag.cc
   base/tag.h
-  public/hls_params.h
   )
 
 target_link_libraries(hls_builder
diff --git a/packager/hls/base/hls_notifier.h b/packager/hls/base/hls_notifier.h
index 9c34485c3b..256b3e163b 100644
--- a/packager/hls/base/hls_notifier.h
+++ b/packager/hls/base/hls_notifier.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/hls/public/hls_params.h>
+#include <packager/hls_params.h>
 #include <packager/mpd/base/media_info.pb.h>
 
 namespace shaka {
diff --git a/packager/hls/base/master_playlist.cc b/packager/hls/base/master_playlist.cc
index f090b7c572..752207baaa 100644
--- a/packager/hls/base/master_playlist.cc
+++ b/packager/hls/base/master_playlist.cc
@@ -16,9 +16,10 @@
 #include <absl/strings/str_format.h>
 #include <absl/strings/str_join.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/hls/base/media_playlist.h>
 #include <packager/hls/base/tag.h>
+#include <packager/macros/logging.h>
 #include <packager/version/version.h>
 
 namespace shaka {
diff --git a/packager/hls/base/master_playlist_unittest.cc b/packager/hls/base/master_playlist_unittest.cc
index 41eaa761bd..887e5e4fe7 100644
--- a/packager/hls/base/master_playlist_unittest.cc
+++ b/packager/hls/base/master_playlist_unittest.cc
@@ -11,7 +11,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/hls/base/media_playlist.h>
 #include <packager/hls/base/mock_media_playlist.h>
 #include <packager/version/version.h>
diff --git a/packager/hls/base/media_playlist.cc b/packager/hls/base/media_playlist.cc
index 1df0bed06e..1b129c2555 100644
--- a/packager/hls/base/media_playlist.cc
+++ b/packager/hls/base/media_playlist.cc
@@ -16,9 +16,9 @@
 #include <absl/strings/numbers.h>
 #include <absl/strings/str_format.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/hls/base/tag.h>
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/language_utils.h>
 #include <packager/media/base/muxer_util.h>
 #include <packager/version/version.h>
diff --git a/packager/hls/base/media_playlist.h b/packager/hls/base/media_playlist.h
index 0e30b2c755..a97f251e86 100644
--- a/packager/hls/base/media_playlist.h
+++ b/packager/hls/base/media_playlist.h
@@ -13,8 +13,8 @@
 #include <string>
 #include <vector>
 
-#include <packager/hls/public/hls_params.h>
-#include <packager/macros.h>
+#include <packager/hls_params.h>
+#include <packager/macros/classes.h>
 #include <packager/mpd/base/bandwidth_estimator.h>
 #include <packager/mpd/base/media_info.pb.h>
 
diff --git a/packager/hls/base/media_playlist_unittest.cc b/packager/hls/base/media_playlist_unittest.cc
index 978f9928b9..580dee4b83 100644
--- a/packager/hls/base/media_playlist_unittest.cc
+++ b/packager/hls/base/media_playlist_unittest.cc
@@ -10,7 +10,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_closer.h>
 #include <packager/file/file_test_util.h>
 #include <packager/version/version.h>
diff --git a/packager/hls/base/mock_media_playlist.cc b/packager/hls/base/mock_media_playlist.cc
index e0800f1543..92c0351325 100644
--- a/packager/hls/base/mock_media_playlist.cc
+++ b/packager/hls/base/mock_media_playlist.cc
@@ -6,7 +6,7 @@
 
 #include <packager/hls/base/mock_media_playlist.h>
 
-#include <packager/hls/public/hls_params.h>
+#include <packager/hls_params.h>
 
 namespace shaka {
 namespace hls {
diff --git a/packager/hls/base/simple_hls_notifier.h b/packager/hls/base/simple_hls_notifier.h
index 75c31144b6..6cec2be7b1 100644
--- a/packager/hls/base/simple_hls_notifier.h
+++ b/packager/hls/base/simple_hls_notifier.h
@@ -18,8 +18,8 @@
 #include <packager/hls/base/hls_notifier.h>
 #include <packager/hls/base/master_playlist.h>
 #include <packager/hls/base/media_playlist.h>
-#include <packager/hls/public/hls_params.h>
-#include <packager/macros.h>
+#include <packager/hls_params.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace hls {
diff --git a/packager/macros.h b/packager/macros.h
deleted file mode 100644
index 16eccd2f7f..0000000000
--- a/packager/macros.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2022 Google LLC. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-#ifndef PACKAGER_MACROS_H_
-#define PACKAGER_MACROS_H_
-
-#include <type_traits>
-
-#include <absl/log/globals.h>
-#include <absl/log/log.h>
-
-/// A macro to disable copying and assignment. Usage:
-/// class Foo {
-///  private:
-///   DISALLOW_COPY_AND_ASSIGN(Foo);
-/// }
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&) = delete;      \
-  void operator=(const TypeName&) = delete;
-
-/// A macro to disable all implicit constructors (copy, assignment, and default
-/// constructor). Usage:
-/// class Foo {
-///  private:
-///   DISALLOW_IMPLICIT_CONSTRUCTORS(Foo);
-/// }
-#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-  TypeName() = delete;                           \
-  DISALLOW_COPY_AND_ASSIGN(TypeName);
-
-/// A macro to declare that you intentionally did not use a parameter.  Useful
-/// when implementing abstract interfaces.
-#define UNUSED(x) (void)(x)
-
-/// A macro to declare that you intentionally did not implement a method.
-/// You can use the insertion operator to add specific logs to this.
-#define NOTIMPLEMENTED() LOG(ERROR) << "NOTIMPLEMENTED: "
-
-/// AES block size in bytes, regardless of key size.
-#define AES_BLOCK_SIZE 16
-
-#define VLOG(verboselevel) \
-  LOG(LEVEL(static_cast<absl::LogSeverity>(-verboselevel)))
-
-#define VLOG_IS_ON(verboselevel) \
-  (static_cast<int>(absl::MinLogLevel()) <= -verboselevel)
-
-#ifndef NDEBUG
-#define DVLOG(verboselevel) VLOG(verboselevel)
-#else
-// We need this expression to work with << after it, so this is a simple way to
-// turn DVLOG into a no-op in release builds.
-#define DVLOG(verboselevel) \
-  if (false)                \
-  VLOG(verboselevel)
-#endif
-
-#if defined(SHARED_LIBRARY_BUILD)
-#if defined(_WIN32)
-
-#if defined(SHAKA_IMPLEMENTATION)
-#define SHAKA_EXPORT __declspec(dllexport)
-#else
-#define SHAKA_EXPORT __declspec(dllimport)
-#endif  // defined(SHAKA_IMPLEMENTATION)
-
-#else  // defined(_WIN32)
-
-#if defined(SHAKA_IMPLEMENTATION)
-#define SHAKA_EXPORT __attribute__((visibility("default")))
-#else
-#define SHAKA_EXPORT
-#endif
-
-#endif  // defined(_WIN32)
-
-#else  // defined(SHARED_LIBRARY_BUILD)
-#define SHAKA_EXPORT
-#endif  // defined(SHARED_LIBRARY_BUILD)
-
-#endif  // PACKAGER_MACROS_H_
diff --git a/packager/macros/classes.h b/packager/macros/classes.h
new file mode 100644
index 0000000000..e30e862321
--- /dev/null
+++ b/packager/macros/classes.h
@@ -0,0 +1,29 @@
+// Copyright 2023 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef PACKAGER_MACROS_CLASSES_H_
+#define PACKAGER_MACROS_CLASSES_H_
+
+/// A macro to disable copying and assignment. Usage:
+/// class Foo {
+///  private:
+///   DISALLOW_COPY_AND_ASSIGN(Foo);
+/// }
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+  TypeName(const TypeName&) = delete;      \
+  void operator=(const TypeName&) = delete;
+
+/// A macro to disable all implicit constructors (copy, assignment, and default
+/// constructor). Usage:
+/// class Foo {
+///  private:
+///   DISALLOW_IMPLICIT_CONSTRUCTORS(Foo);
+/// }
+#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
+  TypeName() = delete;                           \
+  DISALLOW_COPY_AND_ASSIGN(TypeName);
+
+#endif  // PACKAGER_MACROS_CLASSES_H_
diff --git a/packager/media/base/macros.h b/packager/macros/compiler.h
similarity index 85%
rename from packager/media/base/macros.h
rename to packager/macros/compiler.h
index 7eea32738c..a7cd90b432 100644
--- a/packager/media/base/macros.h
+++ b/packager/macros/compiler.h
@@ -1,11 +1,15 @@
-// Copyright 2016 Google LLC. All rights reserved.
+// Copyright 2023 Google LLC. All rights reserved.
 //
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_MEDIA_BASE_MACROS_H_
-#define PACKAGER_MEDIA_BASE_MACROS_H_
+#ifndef PACKAGER_MACROS_COMPILER_H_
+#define PACKAGER_MACROS_COMPILER_H_
+
+/// A macro to declare that you intentionally did not use a parameter.  Useful
+/// when implementing abstract interfaces.
+#define UNUSED(x) (void)(x)
 
 // The FALLTHROUGH_INTENDED macro can be used to annotate implicit fall-through
 // between switch labels:
@@ -49,4 +53,4 @@
 #define FALLTHROUGH_INTENDED [[fallthrough]]
 #endif
 
-#endif  // PACKAGER_MEDIA_BASE_MACROS_H_
+#endif  // PACKAGER_MACROS_COMPILER_H_
diff --git a/packager/macros/crypto.h b/packager/macros/crypto.h
new file mode 100644
index 0000000000..0614d6806d
--- /dev/null
+++ b/packager/macros/crypto.h
@@ -0,0 +1,13 @@
+// Copyright 2023 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef PACKAGER_MACROS_CRYPTO_H_
+#define PACKAGER_MACROS_CRYPTO_H_
+
+/// AES block size in bytes, regardless of key size.
+#define AES_BLOCK_SIZE 16
+
+#endif  // PACKAGER_MACROS_CRYPTO_H_
diff --git a/packager/macros/logging.h b/packager/macros/logging.h
new file mode 100644
index 0000000000..00be3041b4
--- /dev/null
+++ b/packager/macros/logging.h
@@ -0,0 +1,33 @@
+// Copyright 2023 Google LLC. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+#ifndef PACKAGER_MACROS_LOGGING_H_
+#define PACKAGER_MACROS_LOGGING_H_
+
+#include <absl/log/globals.h>
+#include <absl/log/log.h>
+
+/// A macro to declare that you intentionally did not implement a method.
+/// You can use the insertion operator to add specific logs to this.
+#define NOTIMPLEMENTED() LOG(ERROR) << "NOTIMPLEMENTED: "
+
+#define VLOG(verboselevel) \
+  LOG(LEVEL(static_cast<absl::LogSeverity>(-verboselevel)))
+
+#define VLOG_IS_ON(verboselevel) \
+  (static_cast<int>(absl::MinLogLevel()) <= -verboselevel)
+
+#ifndef NDEBUG
+#define DVLOG(verboselevel) VLOG(verboselevel)
+#else
+// We need this expression to work with << after it, so this is a simple way to
+// turn DVLOG into a no-op in release builds.
+#define DVLOG(verboselevel) \
+  if (false)                \
+  VLOG(verboselevel)
+#endif
+
+#endif  // PACKAGER_MACROS_LOGGING_H_
diff --git a/packager/status/status_macros.h b/packager/macros/status.h
similarity index 86%
rename from packager/status/status_macros.h
rename to packager/macros/status.h
index e42b300db7..d1424ba726 100644
--- a/packager/status/status_macros.h
+++ b/packager/macros/status.h
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_STATUS_MACROS_H_
-#define PACKAGER_STATUS_MACROS_H_
+#ifndef PACKAGER_MACROS_STATUS_H_
+#define PACKAGER_MACROS_STATUS_H_
 
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 // Evaluates an expression that produces a `Status`. If the status is not
 // ok, returns it from the current function.
@@ -21,4 +21,4 @@
 
 // TODO(kqyang): Support build Status and update Status message through "<<".
 
-#endif  // PACKAGER_STATUS_MACROS_H_
+#endif  // PACKAGER_MACROS_STATUS_H_
diff --git a/packager/media/base/aes_cryptor.cc b/packager/media/base/aes_cryptor.cc
index beba4d3675..458999885e 100644
--- a/packager/media/base/aes_cryptor.cc
+++ b/packager/media/base/aes_cryptor.cc
@@ -13,6 +13,9 @@
 #include <absl/log/log.h>
 #include <mbedtls/entropy.h>
 
+#include <packager/macros/compiler.h>
+#include <packager/macros/crypto.h>
+
 namespace {
 
 // According to ISO/IEC 23001-7:2016 CENC spec, IV should be either
diff --git a/packager/media/base/aes_cryptor.h b/packager/media/base/aes_cryptor.h
index ebfe18fc75..1e77377487 100644
--- a/packager/media/base/aes_cryptor.h
+++ b/packager/media/base/aes_cryptor.h
@@ -13,7 +13,7 @@
 
 #include <mbedtls/cipher.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/fourccs.h>
 
 namespace shaka {
diff --git a/packager/media/base/aes_decryptor.cc b/packager/media/base/aes_decryptor.cc
index f3bea9e0ed..68a646d79d 100644
--- a/packager/media/base/aes_decryptor.cc
+++ b/packager/media/base/aes_decryptor.cc
@@ -11,6 +11,8 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
+#include <packager/macros/crypto.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/base/aes_decryptor.h b/packager/media/base/aes_decryptor.h
index b10537f283..c28145acf0 100644
--- a/packager/media/base/aes_decryptor.h
+++ b/packager/media/base/aes_decryptor.h
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/aes_cryptor.h>
 #include <packager/media/base/aes_encryptor.h>
 
diff --git a/packager/media/base/aes_encryptor.cc b/packager/media/base/aes_encryptor.cc
index d66c97e1a8..4912da2c3e 100644
--- a/packager/media/base/aes_encryptor.cc
+++ b/packager/media/base/aes_encryptor.cc
@@ -9,6 +9,8 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
+#include <packager/macros/crypto.h>
+
 namespace {
 
 // Increment an 8-byte counter by 1. Return true if overflowed.
diff --git a/packager/media/base/aes_encryptor.h b/packager/media/base/aes_encryptor.h
index c19580ba47..0fdee5d32e 100644
--- a/packager/media/base/aes_encryptor.h
+++ b/packager/media/base/aes_encryptor.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/aes_cryptor.h>
 
 namespace shaka {
diff --git a/packager/media/base/aes_pattern_cryptor.cc b/packager/media/base/aes_pattern_cryptor.cc
index a9a445962c..e74b792bf9 100644
--- a/packager/media/base/aes_pattern_cryptor.cc
+++ b/packager/media/base/aes_pattern_cryptor.cc
@@ -11,6 +11,8 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
+#include <packager/macros/crypto.h>
+
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/base/aes_pattern_cryptor.h b/packager/media/base/aes_pattern_cryptor.h
index 73e6a4f7f3..49ac43775e 100644
--- a/packager/media/base/aes_pattern_cryptor.h
+++ b/packager/media/base/aes_pattern_cryptor.h
@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/aes_cryptor.h>
 
 namespace shaka {
diff --git a/packager/media/base/audio_stream_info.cc b/packager/media/base/audio_stream_info.cc
index f3620bb412..35a2a5e68b 100644
--- a/packager/media/base/audio_stream_info.cc
+++ b/packager/media/base/audio_stream_info.cc
@@ -11,7 +11,8 @@
 #include <absl/log/log.h>
 #include <absl/strings/str_format.h>
 
-#include <packager/macros.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/limits.h>
 
 namespace shaka {
diff --git a/packager/media/base/audio_timestamp_helper.h b/packager/media/base/audio_timestamp_helper.h
index 7ee642acbf..bc975c8552 100644
--- a/packager/media/base/audio_timestamp_helper.h
+++ b/packager/media/base/audio_timestamp_helper.h
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/audio_timestamp_helper_unittest.cc b/packager/media/base/audio_timestamp_helper_unittest.cc
index 8524afc934..8426eed3d6 100644
--- a/packager/media/base/audio_timestamp_helper_unittest.cc
+++ b/packager/media/base/audio_timestamp_helper_unittest.cc
@@ -8,6 +8,7 @@
 
 #include <gtest/gtest.h>
 
+#include <packager/macros/classes.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 b05bcebcb6..9caf8b896a 100644
--- a/packager/media/base/bit_reader.h
+++ b/packager/media/base/bit_reader.h
@@ -11,7 +11,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/buffer_reader.h b/packager/media/base/buffer_reader.h
index a850e0e202..7ec444bf36 100644
--- a/packager/media/base/buffer_reader.h
+++ b/packager/media/base/buffer_reader.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/buffer_writer.cc b/packager/media/base/buffer_writer.cc
index 53e2292df6..37855b925f 100644
--- a/packager/media/base/buffer_writer.cc
+++ b/packager/media/base/buffer_writer.cc
@@ -10,7 +10,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/buffer_writer.h b/packager/media/base/buffer_writer.h
index 12c3ac1292..314c618f4c 100644
--- a/packager/media/base/buffer_writer.h
+++ b/packager/media/base/buffer_writer.h
@@ -10,8 +10,8 @@
 #include <cstdint>
 #include <vector>
 
-#include <packager/macros.h>
-#include <packager/status/status.h>
+#include <packager/macros/classes.h>
+#include <packager/status.h>
 
 namespace shaka {
 
diff --git a/packager/media/base/buffer_writer_unittest.cc b/packager/media/base/buffer_writer_unittest.cc
index 089a1db443..7e75aab611 100644
--- a/packager/media/base/buffer_writer_unittest.cc
+++ b/packager/media/base/buffer_writer_unittest.cc
@@ -12,8 +12,9 @@
 
 #include <absl/log/log.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_test_util.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/buffer_reader.h>
 #include <packager/status/status_test_util.h>
 
diff --git a/packager/media/base/byte_queue.h b/packager/media/base/byte_queue.h
index 98a01d8277..c8ca8840e0 100644
--- a/packager/media/base/byte_queue.h
+++ b/packager/media/base/byte_queue.h
@@ -8,7 +8,7 @@
 #include <cstdint>
 #include <memory>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/cc_stream_filter.h b/packager/media/base/cc_stream_filter.h
index f3d70f2c7e..98d61fc162 100644
--- a/packager/media/base/cc_stream_filter.h
+++ b/packager/media/base/cc_stream_filter.h
@@ -11,7 +11,7 @@
 
 #include <packager/media/base/media_handler.h>
 #include <packager/media/base/text_sample.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/common_pssh_generator.cc b/packager/media/base/common_pssh_generator.cc
index dfa737466b..9288c98c95 100644
--- a/packager/media/base/common_pssh_generator.cc
+++ b/packager/media/base/common_pssh_generator.cc
@@ -6,7 +6,9 @@
 
 #include <packager/media/base/common_pssh_generator.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/protection_system_ids.h>
 
 namespace shaka {
diff --git a/packager/media/base/decrypt_config.h b/packager/media/base/decrypt_config.h
index 123eacacd2..895a4aeb36 100644
--- a/packager/media/base/decrypt_config.h
+++ b/packager/media/base/decrypt_config.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/fourccs.h>
 
 namespace shaka {
diff --git a/packager/media/base/decryptor_source.h b/packager/media/base/decryptor_source.h
index d76c135e58..8916e6327f 100644
--- a/packager/media/base/decryptor_source.h
+++ b/packager/media/base/decryptor_source.h
@@ -11,6 +11,7 @@
 #include <memory>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/aes_decryptor.h>
 #include <packager/media/base/decrypt_config.h>
 #include <packager/media/base/key_source.h>
diff --git a/packager/media/base/decryptor_source_unittest.cc b/packager/media/base/decryptor_source_unittest.cc
index 4ccead81b8..6b3a6fa355 100644
--- a/packager/media/base/decryptor_source_unittest.cc
+++ b/packager/media/base/decryptor_source_unittest.cc
@@ -11,7 +11,6 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <packager/macros.h>
 #include <packager/media/base/raw_key_source.h>
 
 using ::testing::_;
diff --git a/packager/media/base/http_key_fetcher.h b/packager/media/base/http_key_fetcher.h
index c55e09c012..6bc176d015 100644
--- a/packager/media/base/http_key_fetcher.h
+++ b/packager/media/base/http_key_fetcher.h
@@ -10,9 +10,9 @@
 #include <string>
 
 #include <packager/file/http_file.h>
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/key_fetcher.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/key_fetcher.h b/packager/media/base/key_fetcher.h
index bc39cc4061..ab0ca1c03f 100644
--- a/packager/media/base/key_fetcher.h
+++ b/packager/media/base/key_fetcher.h
@@ -7,8 +7,8 @@
 #ifndef PACKAGER_MEDIA_BASE_KEY_FETCHER_H_
 #define PACKAGER_MEDIA_BASE_KEY_FETCHER_H_
 
-#include <packager/macros.h>
-#include <packager/status/status.h>
+#include <packager/macros/classes.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/key_source.h b/packager/media/base/key_source.h
index 7c93d5ecc0..b074890f48 100644
--- a/packager/media/base/key_source.h
+++ b/packager/media/base/key_source.h
@@ -12,11 +12,11 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/fourccs.h>
 #include <packager/media/base/protection_system_specific_info.h>
 #include <packager/media/base/pssh_generator.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/language_utils.cc b/packager/media/base/language_utils.cc
index f389041447..1c54c4133f 100644
--- a/packager/media/base/language_utils.cc
+++ b/packager/media/base/language_utils.cc
@@ -11,8 +11,6 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
-
 namespace {
 
 // A map from 3-letter language codes (ISO 639-2) to 2-letter language codes
diff --git a/packager/media/base/media_handler.cc b/packager/media/base/media_handler.cc
index cba9b0cdfb..51631106c9 100644
--- a/packager/media/base/media_handler.cc
+++ b/packager/media/base/media_handler.cc
@@ -6,7 +6,7 @@
 
 #include <packager/media/base/media_handler.h>
 
-#include <packager/status/status_macros.h>
+#include <packager/macros/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/media_handler.h b/packager/media/base/media_handler.h
index 1e0fe7d3de..e2975ad52e 100644
--- a/packager/media/base/media_handler.h
+++ b/packager/media/base/media_handler.h
@@ -14,7 +14,7 @@
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/stream_info.h>
 #include <packager/media/base/text_sample.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/media_handler_test_base.cc b/packager/media/base/media_handler_test_base.cc
index 22a43cb73b..0a5b28e91c 100644
--- a/packager/media/base/media_handler_test_base.cc
+++ b/packager/media/base/media_handler_test_base.cc
@@ -8,6 +8,7 @@
 
 #include <absl/log/check.h>
 
+#include <packager/macros/compiler.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/text_stream_info.h>
 #include <packager/media/base/video_stream_info.h>
diff --git a/packager/media/base/media_parser.h b/packager/media/base/media_parser.h
index dbebc19eca..e5b9407659 100644
--- a/packager/media/base/media_parser.h
+++ b/packager/media/base/media_parser.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/container_names.h>
 
 namespace shaka {
diff --git a/packager/media/base/media_sample.h b/packager/media/base/media_sample.h
index dbde2a95e4..f3b63790ab 100644
--- a/packager/media/base/media_sample.h
+++ b/packager/media/base/media_sample.h
@@ -15,6 +15,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/decrypt_config.h>
 
 namespace shaka {
diff --git a/packager/media/base/muxer.cc b/packager/media/base/muxer.cc
index 6d6952d480..3baf81bf95 100644
--- a/packager/media/base/muxer.cc
+++ b/packager/media/base/muxer.cc
@@ -9,10 +9,11 @@
 #include <algorithm>
 #include <chrono>
 
-#include <packager/macros.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
+#include <packager/macros/status.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/muxer_util.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/muxer.h b/packager/media/base/muxer.h
index ea411c57e4..8a073cb2bb 100644
--- a/packager/media/base/muxer.h
+++ b/packager/media/base/muxer.h
@@ -17,7 +17,7 @@
 #include <packager/media/event/muxer_listener.h>
 #include <packager/media/event/progress_listener.h>
 #include <packager/mpd/base/mpd_builder.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/muxer_options.h b/packager/media/base/muxer_options.h
index 348ddaf262..ba207f934d 100644
--- a/packager/media/base/muxer_options.h
+++ b/packager/media/base/muxer_options.h
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <string>
 
-#include <packager/media/public/mp4_output_params.h>
+#include <packager/mp4_output_params.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/muxer_util.h b/packager/media/base/muxer_util.h
index 72d68312bb..02473ecb51 100644
--- a/packager/media/base/muxer_util.h
+++ b/packager/media/base/muxer_util.h
@@ -11,7 +11,7 @@
 
 #include <cstdint>
 
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/offset_byte_queue.cc b/packager/media/base/offset_byte_queue.cc
index 433dcad6d2..219421c2e8 100644
--- a/packager/media/base/offset_byte_queue.cc
+++ b/packager/media/base/offset_byte_queue.cc
@@ -8,7 +8,7 @@
 
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/offset_byte_queue.h b/packager/media/base/offset_byte_queue.h
index 5c95f21220..aaa613057e 100644
--- a/packager/media/base/offset_byte_queue.h
+++ b/packager/media/base/offset_byte_queue.h
@@ -7,6 +7,7 @@
 
 #include <cstdint>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/byte_queue.h>
 
 namespace shaka {
diff --git a/packager/media/base/playready_key_source.cc b/packager/media/base/playready_key_source.cc
index 561793fb0d..73419ca1ed 100644
--- a/packager/media/base/playready_key_source.cc
+++ b/packager/media/base/playready_key_source.cc
@@ -13,12 +13,13 @@
 #include <absl/log/log.h>
 #include <absl/strings/escaping.h>
 
-#include <packager/macros.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
+#include <packager/macros/status.h>
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/http_key_fetcher.h>
 #include <packager/media/base/key_source.h>
 #include <packager/media/base/protection_system_ids.h>
-#include <packager/status/status_macros.h>
 #include <packager/utils/hex_parser.h>
 
 namespace shaka {
diff --git a/packager/media/base/playready_key_source.h b/packager/media/base/playready_key_source.h
index b4aa0ad55d..d1ca05c918 100644
--- a/packager/media/base/playready_key_source.h
+++ b/packager/media/base/playready_key_source.h
@@ -11,6 +11,7 @@
 #include <string>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/key_source.h>
 
 namespace shaka {
diff --git a/packager/media/base/playready_pssh_generator.cc b/packager/media/base/playready_pssh_generator.cc
index 0c36697bd9..862722bd87 100644
--- a/packager/media/base/playready_pssh_generator.cc
+++ b/packager/media/base/playready_pssh_generator.cc
@@ -16,6 +16,9 @@
 #include <absl/strings/escaping.h>
 #include <mbedtls/cipher.h>
 
+#include <packager/macros/compiler.h>
+#include <packager/macros/crypto.h>
+#include <packager/macros/logging.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 80a2cd8ab1..783099cd4b 100644
--- a/packager/media/base/producer_consumer_queue.h
+++ b/packager/media/base/producer_consumer_queue.h
@@ -16,8 +16,8 @@
 #include <absl/synchronization/mutex.h>
 #include <absl/time/time.h>
 
-#include <packager/macros.h>
-#include <packager/status/status.h>
+#include <packager/macros/classes.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/producer_consumer_queue_unittest.cc b/packager/media/base/producer_consumer_queue_unittest.cc
index b1d2fe2882..4ed5c90188 100644
--- a/packager/media/base/producer_consumer_queue_unittest.cc
+++ b/packager/media/base/producer_consumer_queue_unittest.cc
@@ -12,6 +12,8 @@
 #include <absl/synchronization/notification.h>
 #include <gtest/gtest.h>
 
+#include <packager/macros/classes.h>
+#include <packager/macros/logging.h>
 #include <packager/status/status_test_util.h>
 
 namespace shaka {
diff --git a/packager/media/base/protection_system_specific_info.h b/packager/media/base/protection_system_specific_info.h
index f52defd35d..7d41bff673 100644
--- a/packager/media/base/protection_system_specific_info.h
+++ b/packager/media/base/protection_system_specific_info.h
@@ -14,7 +14,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/media/public/crypto_params.h>
+#include <packager/crypto_params.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/protection_system_specific_info_unittest.cc b/packager/media/base/protection_system_specific_info_unittest.cc
index d035377534..8fa0d3d61b 100644
--- a/packager/media/base/protection_system_specific_info_unittest.cc
+++ b/packager/media/base/protection_system_specific_info_unittest.cc
@@ -10,8 +10,6 @@
 
 #include <gtest/gtest.h>
 
-#include <packager/macros.h>
-
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/base/pssh_generator.h b/packager/media/base/pssh_generator.h
index 28b2bbab11..6d96f62a5d 100644
--- a/packager/media/base/pssh_generator.h
+++ b/packager/media/base/pssh_generator.h
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include <packager/media/base/protection_system_specific_info.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 // TODO(hmchen): move pssh related files into a sperate folder.
 namespace shaka {
diff --git a/packager/media/base/raw_key_source.cc b/packager/media/base/raw_key_source.cc
index 0e99db5df9..8dc2250a95 100644
--- a/packager/media/base/raw_key_source.cc
+++ b/packager/media/base/raw_key_source.cc
@@ -12,8 +12,9 @@
 #include <absl/log/log.h>
 #include <absl/strings/escaping.h>
 
+#include <packager/macros/compiler.h>
+#include <packager/macros/status.h>
 #include <packager/media/base/key_source.h>
-#include <packager/status/status_macros.h>
 #include <packager/utils/bytes_to_string_view.h>
 
 namespace {
diff --git a/packager/media/base/raw_key_source.h b/packager/media/base/raw_key_source.h
index 3fdaf95054..e2acfe5451 100644
--- a/packager/media/base/raw_key_source.h
+++ b/packager/media/base/raw_key_source.h
@@ -11,8 +11,8 @@
 #include <string>
 #include <vector>
 
+#include <packager/crypto_params.h>
 #include <packager/media/base/key_source.h>
-#include <packager/media/public/crypto_params.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/request_signer.h b/packager/media/base/request_signer.h
index 31d92d46e6..5aade4f0d6 100644
--- a/packager/media/base/request_signer.h
+++ b/packager/media/base/request_signer.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/rsa_key.h b/packager/media/base/rsa_key.h
index b58c1b8d2d..a213aed7ef 100644
--- a/packager/media/base/rsa_key.h
+++ b/packager/media/base/rsa_key.h
@@ -16,7 +16,7 @@
 #include <mbedtls/entropy.h>
 #include <mbedtls/pk.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/stream_info.cc b/packager/media/base/stream_info.cc
index 72f5d12c02..2d711ad60c 100644
--- a/packager/media/base/stream_info.cc
+++ b/packager/media/base/stream_info.cc
@@ -11,7 +11,7 @@
 #include <absl/log/log.h>
 #include <absl/strings/str_format.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/timestamp.h>
 
 namespace shaka {
diff --git a/packager/media/base/test/rsa_test_data.h b/packager/media/base/test/rsa_test_data.h
index de7b772d0f..946334f949 100644
--- a/packager/media/base/test/rsa_test_data.h
+++ b/packager/media/base/test/rsa_test_data.h
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/text_muxer.cc b/packager/media/base/text_muxer.cc
index 1c22ce79a3..70c967423c 100644
--- a/packager/media/base/text_muxer.cc
+++ b/packager/media/base/text_muxer.cc
@@ -8,8 +8,9 @@
 
 #include <absl/log/check.h>
 
+#include <packager/macros/compiler.h>
+#include <packager/macros/status.h>
 #include <packager/media/base/muxer_util.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/base/video_stream_info.cc b/packager/media/base/video_stream_info.cc
index b96078337d..1512ce83c2 100644
--- a/packager/media/base/video_stream_info.cc
+++ b/packager/media/base/video_stream_info.cc
@@ -9,7 +9,7 @@
 #include <absl/log/log.h>
 #include <absl/strings/str_format.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/limits.h>
 
 namespace shaka {
diff --git a/packager/media/base/widevine_key_source.cc b/packager/media/base/widevine_key_source.cc
index 866940de5f..a7c07960b1 100644
--- a/packager/media/base/widevine_key_source.cc
+++ b/packager/media/base/widevine_key_source.cc
@@ -14,7 +14,7 @@
 #include <absl/log/check.h>
 #include <absl/strings/escaping.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.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 7f839bd68d..b9e0cb79db 100644
--- a/packager/media/base/widevine_key_source.h
+++ b/packager/media/base/widevine_key_source.h
@@ -14,6 +14,7 @@
 #include <absl/synchronization/mutex.h>
 #include <absl/synchronization/notification.h>
 
+#include <packager/macros/classes.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 30bdc79230..490f892cf3 100644
--- a/packager/media/base/widevine_key_source_unittest.cc
+++ b/packager/media/base/widevine_key_source_unittest.cc
@@ -15,6 +15,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <packager/macros/classes.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/base/widevine_pssh_generator.cc b/packager/media/base/widevine_pssh_generator.cc
index c77e40f390..ac24a22072 100644
--- a/packager/media/base/widevine_pssh_generator.cc
+++ b/packager/media/base/widevine_pssh_generator.cc
@@ -6,7 +6,8 @@
 
 #include <packager/media/base/widevine_pssh_generator.h>
 
-#include <packager/macros.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/protection_system_ids.h>
 #include <packager/media/base/widevine_pssh_data.pb.h>
 
diff --git a/packager/media/chunking/chunking_handler.cc b/packager/media/chunking/chunking_handler.cc
index 23131ae08e..bcabf96127 100644
--- a/packager/media/chunking/chunking_handler.cc
+++ b/packager/media/chunking/chunking_handler.cc
@@ -11,9 +11,9 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
+#include <packager/macros/status.h>
 #include <packager/media/base/media_sample.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/chunking/chunking_handler.h b/packager/media/chunking/chunking_handler.h
index 0c1659cc25..717ccec3e1 100644
--- a/packager/media/chunking/chunking_handler.h
+++ b/packager/media/chunking/chunking_handler.h
@@ -13,8 +13,8 @@
 
 #include <absl/log/log.h>
 
+#include <packager/chunking_params.h>
 #include <packager/media/base/media_handler.h>
-#include <packager/media/public/chunking_params.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/chunking/cue_alignment_handler.cc b/packager/media/chunking/cue_alignment_handler.cc
index 6d0347e491..c6ff48684d 100644
--- a/packager/media/chunking/cue_alignment_handler.cc
+++ b/packager/media/chunking/cue_alignment_handler.cc
@@ -10,8 +10,8 @@
 
 #include <absl/log/check.h>
 
-#include <packager/macros.h>
-#include <packager/status/status_macros.h>
+#include <packager/macros/logging.h>
+#include <packager/macros/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/chunking/cue_alignment_handler_unittest.cc b/packager/media/chunking/cue_alignment_handler_unittest.cc
index 71ae9763c4..173f35db50 100644
--- a/packager/media/chunking/cue_alignment_handler_unittest.cc
+++ b/packager/media/chunking/cue_alignment_handler_unittest.cc
@@ -9,10 +9,10 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <packager/ad_cue_generator_params.h>
+#include <packager/macros/status.h>
 #include <packager/media/base/media_handler_test_base.h>
 #include <packager/media/chunking/chunking_handler.h>
-#include <packager/media/public/ad_cue_generator_params.h>
-#include <packager/status/status_macros.h>
 #include <packager/status/status_test_util.h>
 
 using ::testing::_;
diff --git a/packager/media/chunking/sync_point_queue.h b/packager/media/chunking/sync_point_queue.h
index 0d69f5ead1..f13943bc75 100644
--- a/packager/media/chunking/sync_point_queue.h
+++ b/packager/media/chunking/sync_point_queue.h
@@ -9,7 +9,7 @@
 
 #include <absl/synchronization/mutex.h>
 
-#include <packager/media/public/ad_cue_generator_params.h>
+#include <packager/ad_cue_generator_params.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/chunking/text_chunker.cc b/packager/media/chunking/text_chunker.cc
index 1daec99ba6..6e4d5760a3 100644
--- a/packager/media/chunking/text_chunker.cc
+++ b/packager/media/chunking/text_chunker.cc
@@ -8,7 +8,7 @@
 
 #include <absl/log/check.h>
 
-#include <packager/status/status_macros.h>
+#include <packager/macros/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/codecs/ac4_audio_util.cc b/packager/media/codecs/ac4_audio_util.cc
index b587e7a565..05c477e163 100644
--- a/packager/media/codecs/ac4_audio_util.cc
+++ b/packager/media/codecs/ac4_audio_util.cc
@@ -9,7 +9,6 @@
 #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>
 #include <packager/utils/bytes_to_string_view.h>
diff --git a/packager/media/codecs/av1_parser.cc b/packager/media/codecs/av1_parser.cc
index b5739c9525..885496f4a7 100644
--- a/packager/media/codecs/av1_parser.cc
+++ b/packager/media/codecs/av1_parser.cc
@@ -11,7 +11,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/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 a37ef15bee..05dd5f0377 100644
--- a/packager/media/codecs/avc_decoder_configuration_record.cc
+++ b/packager/media/codecs/avc_decoder_configuration_record.cc
@@ -9,7 +9,7 @@
 #include <absl/strings/ascii.h>
 #include <absl/strings/escaping.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/base/rcheck.h>
 #include <packager/media/codecs/h264_parser.h>
diff --git a/packager/media/codecs/avc_decoder_configuration_record.h b/packager/media/codecs/avc_decoder_configuration_record.h
index 18507cacf1..a20a5f06b9 100644
--- a/packager/media/codecs/avc_decoder_configuration_record.h
+++ b/packager/media/codecs/avc_decoder_configuration_record.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/fourccs.h>
 #include <packager/media/codecs/decoder_configuration_record.h>
 
diff --git a/packager/media/codecs/decoder_configuration_record.h b/packager/media/codecs/decoder_configuration_record.h
index 30167e4013..b826484e71 100644
--- a/packager/media/codecs/decoder_configuration_record.h
+++ b/packager/media/codecs/decoder_configuration_record.h
@@ -12,7 +12,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/codecs/nalu_reader.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/dovi_decoder_configuration_record_unittest.cc b/packager/media/codecs/dovi_decoder_configuration_record_unittest.cc
index 2e6e892629..55b8450219 100644
--- a/packager/media/codecs/dovi_decoder_configuration_record_unittest.cc
+++ b/packager/media/codecs/dovi_decoder_configuration_record_unittest.cc
@@ -8,8 +8,6 @@
 
 #include <gtest/gtest.h>
 
-#include <packager/macros.h>
-
 namespace shaka {
 namespace media {
 
diff --git a/packager/media/codecs/ec3_audio_util.cc b/packager/media/codecs/ec3_audio_util.cc
index 8202e9926e..00ea67377e 100644
--- a/packager/media/codecs/ec3_audio_util.cc
+++ b/packager/media/codecs/ec3_audio_util.cc
@@ -9,7 +9,6 @@
 #include <absl/log/check.h>
 #include <absl/strings/escaping.h>
 
-#include <packager/macros.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/h264_byte_to_unit_stream_converter.h b/packager/media/codecs/h264_byte_to_unit_stream_converter.h
index 516650a4d3..5c05b769a3 100644
--- a/packager/media/codecs/h264_byte_to_unit_stream_converter.h
+++ b/packager/media/codecs/h264_byte_to_unit_stream_converter.h
@@ -11,6 +11,7 @@
 #include <cstdint>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/codecs/h26x_byte_to_unit_stream_converter.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/h264_parser.cc b/packager/media/codecs/h264_parser.cc
index 928879755a..8b86133b1d 100644
--- a/packager/media/codecs/h264_parser.cc
+++ b/packager/media/codecs/h264_parser.cc
@@ -9,7 +9,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/buffer_reader.h>
 
 #define LOG_ERROR_ONCE(msg)             \
diff --git a/packager/media/codecs/h264_parser.h b/packager/media/codecs/h264_parser.h
index b9816b65db..423fe5a40d 100644
--- a/packager/media/codecs/h264_parser.h
+++ b/packager/media/codecs/h264_parser.h
@@ -12,6 +12,7 @@
 #include <map>
 #include <memory>
 
+#include <packager/macros/classes.h>
 #include <packager/media/codecs/h26x_bit_reader.h>
 #include <packager/media/codecs/nalu_reader.h>
 
diff --git a/packager/media/codecs/h264_parser_unittest.cc b/packager/media/codecs/h264_parser_unittest.cc
index a6310f2336..2d34ea0d42 100644
--- a/packager/media/codecs/h264_parser_unittest.cc
+++ b/packager/media/codecs/h264_parser_unittest.cc
@@ -8,7 +8,7 @@
 #include <absl/log/log.h>
 #include <gtest/gtest.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/test/test_data_util.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/h265_byte_to_unit_stream_converter.h b/packager/media/codecs/h265_byte_to_unit_stream_converter.h
index 47f5bc6e65..2e4a679021 100644
--- a/packager/media/codecs/h265_byte_to_unit_stream_converter.h
+++ b/packager/media/codecs/h265_byte_to_unit_stream_converter.h
@@ -11,6 +11,7 @@
 #include <cstdint>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/codecs/h26x_byte_to_unit_stream_converter.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/h265_parser.cc b/packager/media/codecs/h265_parser.cc
index e77e2a2a00..bd7f2a411c 100644
--- a/packager/media/codecs/h265_parser.cc
+++ b/packager/media/codecs/h265_parser.cc
@@ -12,8 +12,8 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
-#include <packager/media/base/macros.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
 #include <packager/media/codecs/nalu_reader.h>
 
 #define TRUE_OR_RETURN(a)                            \
diff --git a/packager/media/codecs/h265_parser.h b/packager/media/codecs/h265_parser.h
index 05c464add8..a36f82e8ab 100644
--- a/packager/media/codecs/h265_parser.h
+++ b/packager/media/codecs/h265_parser.h
@@ -11,6 +11,7 @@
 #include <memory>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/codecs/h26x_bit_reader.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/h26x_bit_reader.h b/packager/media/codecs/h26x_bit_reader.h
index 347511f6e5..5710baf2d6 100644
--- a/packager/media/codecs/h26x_bit_reader.h
+++ b/packager/media/codecs/h26x_bit_reader.h
@@ -11,7 +11,7 @@
 
 #include <cstdint>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.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 58f3db4c7c..b9aea732d7 100644
--- a/packager/media/codecs/h26x_byte_to_unit_stream_converter.cc
+++ b/packager/media/codecs/h26x_byte_to_unit_stream_converter.cc
@@ -13,7 +13,7 @@
 #include <absl/log/log.h>
 #include <absl/strings/escaping.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/buffer_writer.h>
 #include <packager/utils/bytes_to_string_view.h>
 
diff --git a/packager/media/codecs/h26x_byte_to_unit_stream_converter.h b/packager/media/codecs/h26x_byte_to_unit_stream_converter.h
index b96e2e61c3..8a07cf4137 100644
--- a/packager/media/codecs/h26x_byte_to_unit_stream_converter.h
+++ b/packager/media/codecs/h26x_byte_to_unit_stream_converter.h
@@ -10,6 +10,7 @@
 #include <cstdint>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/video_stream_info.h>
 #include <packager/media/codecs/nalu_reader.h>
 
diff --git a/packager/media/codecs/hevc_decoder_configuration_record.h b/packager/media/codecs/hevc_decoder_configuration_record.h
index 9001134429..bd6b2e06b3 100644
--- a/packager/media/codecs/hevc_decoder_configuration_record.h
+++ b/packager/media/codecs/hevc_decoder_configuration_record.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/fourccs.h>
 #include <packager/media/base/video_stream_info.h>
 #include <packager/media/codecs/decoder_configuration_record.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 f66af5e37a..a48bb73e74 100644
--- a/packager/media/codecs/nal_unit_to_byte_stream_converter.cc
+++ b/packager/media/codecs/nal_unit_to_byte_stream_converter.cc
@@ -11,10 +11,10 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
+#include <packager/macros/compiler.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/base/buffer_writer.h>
-#include <packager/media/base/macros.h>
 #include <packager/media/codecs/nalu_reader.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/nal_unit_to_byte_stream_converter.h b/packager/media/codecs/nal_unit_to_byte_stream_converter.h
index d6608ca0af..8881899a6a 100644
--- a/packager/media/codecs/nal_unit_to_byte_stream_converter.h
+++ b/packager/media/codecs/nal_unit_to_byte_stream_converter.h
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/decrypt_config.h>
 #include <packager/media/codecs/avc_decoder_configuration_record.h>
 
diff --git a/packager/media/codecs/nalu_reader.cc b/packager/media/codecs/nalu_reader.cc
index 9bbd19e971..91cb5f39ac 100644
--- a/packager/media/codecs/nalu_reader.cc
+++ b/packager/media/codecs/nalu_reader.cc
@@ -11,7 +11,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/codecs/h264_parser.h>
 
diff --git a/packager/media/codecs/nalu_reader.h b/packager/media/codecs/nalu_reader.h
index 9fb69b6ef6..793e56d49b 100644
--- a/packager/media/codecs/nalu_reader.h
+++ b/packager/media/codecs/nalu_reader.h
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <cstdlib>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/decrypt_config.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/video_slice_header_parser.cc b/packager/media/codecs/video_slice_header_parser.cc
index c0a5d6ac6c..342c25bedd 100644
--- a/packager/media/codecs/video_slice_header_parser.cc
+++ b/packager/media/codecs/video_slice_header_parser.cc
@@ -8,7 +8,7 @@
 
 #include <absl/log/check.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/rcheck.h>
 #include <packager/media/codecs/avc_decoder_configuration_record.h>
 #include <packager/media/codecs/hevc_decoder_configuration_record.h>
diff --git a/packager/media/codecs/video_slice_header_parser.h b/packager/media/codecs/video_slice_header_parser.h
index d456a71134..08c95ffbc3 100644
--- a/packager/media/codecs/video_slice_header_parser.h
+++ b/packager/media/codecs/video_slice_header_parser.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include <packager/media/base/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/codecs/h264_parser.h>
 #include <packager/media/codecs/h265_parser.h>
 
diff --git a/packager/media/codecs/vp8_parser.cc b/packager/media/codecs/vp8_parser.cc
index 474e6ebe7d..ad33d9f97f 100644
--- a/packager/media/codecs/vp8_parser.cc
+++ b/packager/media/codecs/vp8_parser.cc
@@ -9,7 +9,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/rcheck.h>
 
diff --git a/packager/media/codecs/vp8_parser.h b/packager/media/codecs/vp8_parser.h
index 1151223171..df183ba0d0 100644
--- a/packager/media/codecs/vp8_parser.h
+++ b/packager/media/codecs/vp8_parser.h
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <cstdlib>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/codecs/vpx_parser.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/vp9_parser.cc b/packager/media/codecs/vp9_parser.cc
index d026d088af..1e2499cc82 100644
--- a/packager/media/codecs/vp9_parser.cc
+++ b/packager/media/codecs/vp9_parser.cc
@@ -9,7 +9,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/rcheck.h>
 
diff --git a/packager/media/codecs/vp9_parser.h b/packager/media/codecs/vp9_parser.h
index ffc3b50f1f..7b974d8343 100644
--- a/packager/media/codecs/vp9_parser.h
+++ b/packager/media/codecs/vp9_parser.h
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <cstdlib>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/codecs/vpx_parser.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/vp_codec_configuration_record.cc b/packager/media/codecs/vp_codec_configuration_record.cc
index 5a51cdfa80..f595809c45 100644
--- a/packager/media/codecs/vp_codec_configuration_record.cc
+++ b/packager/media/codecs/vp_codec_configuration_record.cc
@@ -9,7 +9,7 @@
 #include <absl/strings/str_format.h>
 #include <absl/strings/str_replace.h>
 
-#include <packager/macros.h>
+#include <packager/macros/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/vp_codec_configuration_record.h b/packager/media/codecs/vp_codec_configuration_record.h
index 2aac8d76a4..f946613cb9 100644
--- a/packager/media/codecs/vp_codec_configuration_record.h
+++ b/packager/media/codecs/vp_codec_configuration_record.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/video_stream_info.h>
 
 namespace shaka {
diff --git a/packager/media/codecs/vpx_parser.h b/packager/media/codecs/vpx_parser.h
index ca6812eead..b72d65cf95 100644
--- a/packager/media/codecs/vpx_parser.h
+++ b/packager/media/codecs/vpx_parser.h
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <cstdlib>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/codecs/vp_codec_configuration_record.h>
 
 namespace shaka {
diff --git a/packager/media/crypto/encryption_handler.cc b/packager/media/crypto/encryption_handler.cc
index 8191cf0ec9..bc2703a1e1 100644
--- a/packager/media/crypto/encryption_handler.cc
+++ b/packager/media/crypto/encryption_handler.cc
@@ -12,12 +12,12 @@
 
 #include <absl/log/check.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
+#include <packager/macros/status.h>
 #include <packager/media/base/aes_encryptor.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/common_pssh_generator.h>
 #include <packager/media/base/key_source.h>
-#include <packager/media/base/macros.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/playready_pssh_generator.h>
 #include <packager/media/base/protection_system_ids.h>
@@ -25,7 +25,6 @@
 #include <packager/media/base/widevine_pssh_generator.h>
 #include <packager/media/crypto/aes_encryptor_factory.h>
 #include <packager/media/crypto/subsample_generator.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/crypto/encryption_handler.h b/packager/media/crypto/encryption_handler.h
index bd8b665d33..0884c6c2ad 100644
--- a/packager/media/crypto/encryption_handler.h
+++ b/packager/media/crypto/encryption_handler.h
@@ -7,9 +7,9 @@
 #ifndef PACKAGER_MEDIA_CRYPTO_ENCRYPTION_HANDLER_H_
 #define PACKAGER_MEDIA_CRYPTO_ENCRYPTION_HANDLER_H_
 
+#include <packager/crypto_params.h>
 #include <packager/media/base/key_source.h>
 #include <packager/media/base/media_handler.h>
-#include <packager/media/public/crypto_params.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/crypto/subsample_generator.cc b/packager/media/crypto/subsample_generator.cc
index 2d35629fcd..1730ca262a 100644
--- a/packager/media/crypto/subsample_generator.cc
+++ b/packager/media/crypto/subsample_generator.cc
@@ -11,6 +11,7 @@
 
 #include <absl/log/check.h>
 
+#include <packager/macros/compiler.h>
 #include <packager/media/base/decrypt_config.h>
 #include <packager/media/base/video_stream_info.h>
 #include <packager/media/codecs/av1_parser.h>
diff --git a/packager/media/crypto/subsample_generator.h b/packager/media/crypto/subsample_generator.h
index d38ad2e74b..bced878737 100644
--- a/packager/media/crypto/subsample_generator.h
+++ b/packager/media/crypto/subsample_generator.h
@@ -12,7 +12,7 @@
 
 #include <packager/media/base/fourccs.h>
 #include <packager/media/base/stream_info.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/demuxer/demuxer.cc b/packager/media/demuxer/demuxer.cc
index 2beeac7496..f3dd066b0d 100644
--- a/packager/media/demuxer/demuxer.cc
+++ b/packager/media/demuxer/demuxer.cc
@@ -15,10 +15,11 @@
 #include <absl/strings/numbers.h>
 #include <absl/strings/str_format.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/decryptor_source.h>
 #include <packager/media/base/key_source.h>
-#include <packager/media/base/macros.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/stream_info.h>
 #include <packager/media/formats/mp2t/mp2t_media_parser.h>
diff --git a/packager/media/demuxer/demuxer.h b/packager/media/demuxer/demuxer.h
index b8a6dfde3d..e2a402f930 100644
--- a/packager/media/demuxer/demuxer.h
+++ b/packager/media/demuxer/demuxer.h
@@ -11,10 +11,10 @@
 #include <memory>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/container_names.h>
 #include <packager/media/origin/origin_handler.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 
diff --git a/packager/media/event/hls_notify_muxer_listener.cc b/packager/media/event/hls_notify_muxer_listener.cc
index 7825451b12..316a46293d 100644
--- a/packager/media/event/hls_notify_muxer_listener.cc
+++ b/packager/media/event/hls_notify_muxer_listener.cc
@@ -12,6 +12,7 @@
 #include <absl/log/log.h>
 
 #include <packager/hls/base/hls_notifier.h>
+#include <packager/macros/compiler.h>
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/base/protection_system_specific_info.h>
 #include <packager/media/event/muxer_listener_internal.h>
diff --git a/packager/media/event/mpd_notify_muxer_listener.cc b/packager/media/event/mpd_notify_muxer_listener.cc
index b3f4fbc022..903c2c12d7 100644
--- a/packager/media/event/mpd_notify_muxer_listener.cc
+++ b/packager/media/event/mpd_notify_muxer_listener.cc
@@ -11,6 +11,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
+#include <packager/macros/compiler.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/muxer_listener.h b/packager/media/event/muxer_listener.h
index b196eef2d1..b0a86e0fba 100644
--- a/packager/media/event/muxer_listener.h
+++ b/packager/media/event/muxer_listener.h
@@ -14,7 +14,8 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
+#include <packager/macros/compiler.h>
 #include <packager/media/base/fourccs.h>
 #include <packager/media/base/range.h>
 
diff --git a/packager/media/event/muxer_listener_internal.cc b/packager/media/event/muxer_listener_internal.cc
index 17731fb02b..0f86bd80c3 100644
--- a/packager/media/event/muxer_listener_internal.cc
+++ b/packager/media/event/muxer_listener_internal.cc
@@ -13,6 +13,7 @@
 #include <absl/strings/escaping.h>
 #include <google/protobuf/util/message_differencer.h>
 
+#include <packager/macros/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/progress_listener.h b/packager/media/event/progress_listener.h
index 07fb9a12dd..44d61690d1 100644
--- a/packager/media/event/progress_listener.h
+++ b/packager/media/event/progress_listener.h
@@ -11,7 +11,7 @@
 
 #include <cstdint>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
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 a1246199d2..e0108f6831 100644
--- a/packager/media/event/vod_media_info_dump_muxer_listener.cc
+++ b/packager/media/event/vod_media_info_dump_muxer_listener.cc
@@ -12,7 +12,9 @@
 #include <absl/log/log.h>
 #include <google/protobuf/text_format.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/base/protection_system_specific_info.h>
 #include <packager/media/base/stream_info.h>
diff --git a/packager/media/event/vod_media_info_dump_muxer_listener.h b/packager/media/event/vod_media_info_dump_muxer_listener.h
index 327e663285..4eacb4c671 100644
--- a/packager/media/event/vod_media_info_dump_muxer_listener.h
+++ b/packager/media/event/vod_media_info_dump_muxer_listener.h
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/event/muxer_listener.h>
 
diff --git a/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc b/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc
index e5caa3b7f8..f3926cd3a1 100644
--- a/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc
+++ b/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc
@@ -14,8 +14,9 @@
 #include <google/protobuf/util/message_differencer.h>
 #include <gtest/gtest.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_test_util.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/fourccs.h>
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/base/video_stream_info.h>
diff --git a/packager/media/formats/dvb/subtitle_composer.cc b/packager/media/formats/dvb/subtitle_composer.cc
index 033742c34b..7c8f662294 100644
--- a/packager/media/formats/dvb/subtitle_composer.cc
+++ b/packager/media/formats/dvb/subtitle_composer.cc
@@ -12,7 +12,7 @@
 #include <absl/log/log.h>
 #include <png.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/dvb/subtitle_composer.h b/packager/media/formats/dvb/subtitle_composer.h
index 054e7ff0b0..c42d04a07d 100644
--- a/packager/media/formats/dvb/subtitle_composer.h
+++ b/packager/media/formats/dvb/subtitle_composer.h
@@ -11,7 +11,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/text_sample.h>
 #include <packager/media/formats/dvb/dvb_image.h>
 
diff --git a/packager/media/formats/mp2t/adts_header.cc b/packager/media/formats/mp2t/adts_header.cc
index 8a7bc78198..cfcc820eba 100644
--- a/packager/media/formats/mp2t/adts_header.cc
+++ b/packager/media/formats/mp2t/adts_header.cc
@@ -8,6 +8,7 @@
 
 #include <absl/log/check.h>
 
+#include <packager/macros/logging.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/bit_writer.h>
 #include <packager/media/formats/mp2t/mp2t_common.h>
diff --git a/packager/media/formats/mp2t/continuity_counter.h b/packager/media/formats/mp2t/continuity_counter.h
index 104298971a..c824cb76dc 100644
--- a/packager/media/formats/mp2t/continuity_counter.h
+++ b/packager/media/formats/mp2t/continuity_counter.h
@@ -7,7 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_CONTINUITY_COUNTER_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_CONTINUITY_COUNTER_H_
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/es_parser_audio.cc b/packager/media/formats/mp2t/es_parser_audio.cc
index 10dcef96f5..8a9e0cd4d6 100644
--- a/packager/media/formats/mp2t/es_parser_audio.cc
+++ b/packager/media/formats/mp2t/es_parser_audio.cc
@@ -13,7 +13,7 @@
 #include <absl/strings/escaping.h>
 #include <absl/strings/numbers.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/audio_timestamp_helper.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/media_sample.h>
diff --git a/packager/media/formats/mp2t/es_parser_audio.h b/packager/media/formats/mp2t/es_parser_audio.h
index 1579211395..f71cd2590b 100644
--- a/packager/media/formats/mp2t/es_parser_audio.h
+++ b/packager/media/formats/mp2t/es_parser_audio.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <utility>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/byte_queue.h>
 #include <packager/media/formats/mp2t/es_parser.h>
diff --git a/packager/media/formats/mp2t/es_parser_h264.cc b/packager/media/formats/mp2t/es_parser_h264.cc
index b9336eb915..e450c81202 100644
--- a/packager/media/formats/mp2t/es_parser_h264.cc
+++ b/packager/media/formats/mp2t/es_parser_h264.cc
@@ -8,7 +8,7 @@
 
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/timestamp.h>
 #include <packager/media/base/video_stream_info.h>
diff --git a/packager/media/formats/mp2t/es_parser_h264_unittest.cc b/packager/media/formats/mp2t/es_parser_h264_unittest.cc
index f9a01765a4..849a90e402 100644
--- a/packager/media/formats/mp2t/es_parser_h264_unittest.cc
+++ b/packager/media/formats/mp2t/es_parser_h264_unittest.cc
@@ -12,7 +12,7 @@
 #include <absl/log/log.h>
 #include <gtest/gtest.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/timestamp.h>
 #include <packager/media/base/video_stream_info.h>
diff --git a/packager/media/formats/mp2t/es_parser_h265.cc b/packager/media/formats/mp2t/es_parser_h265.cc
index fdf1e374e6..319ce47bcf 100644
--- a/packager/media/formats/mp2t/es_parser_h265.cc
+++ b/packager/media/formats/mp2t/es_parser_h265.cc
@@ -10,7 +10,7 @@
 
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/offset_byte_queue.h>
 #include <packager/media/base/timestamp.h>
diff --git a/packager/media/formats/mp2t/es_parser_h265.h b/packager/media/formats/mp2t/es_parser_h265.h
index 0d3109af61..097186c384 100644
--- a/packager/media/formats/mp2t/es_parser_h265.h
+++ b/packager/media/formats/mp2t/es_parser_h265.h
@@ -13,7 +13,7 @@
 #include <memory>
 #include <utility>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/formats/mp2t/es_parser_h26x.h>
 #include <functional>
 
diff --git a/packager/media/formats/mp2t/es_parser_h26x.cc b/packager/media/formats/mp2t/es_parser_h26x.cc
index 9bbd01ef56..c9887271fb 100644
--- a/packager/media/formats/mp2t/es_parser_h26x.cc
+++ b/packager/media/formats/mp2t/es_parser_h26x.cc
@@ -9,7 +9,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/offset_byte_queue.h>
 #include <packager/media/base/timestamp.h>
diff --git a/packager/media/formats/mp2t/es_parser_h26x.h b/packager/media/formats/mp2t/es_parser_h26x.h
index 9ce62d9cfa..6116b504c2 100644
--- a/packager/media/formats/mp2t/es_parser_h26x.h
+++ b/packager/media/formats/mp2t/es_parser_h26x.h
@@ -11,7 +11,7 @@
 #include <list>
 #include <memory>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/codecs/nalu_reader.h>
 #include <packager/media/formats/mp2t/es_parser.h>
 #include <functional>
diff --git a/packager/media/formats/mp2t/mp2t_media_parser.cc b/packager/media/formats/mp2t/mp2t_media_parser.cc
index f8acceb70f..a83c95ad27 100644
--- a/packager/media/formats/mp2t/mp2t_media_parser.cc
+++ b/packager/media/formats/mp2t/mp2t_media_parser.cc
@@ -9,7 +9,7 @@
 
 #include <absl/log/check.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/stream_info.h>
 #include <packager/media/base/text_sample.h>
diff --git a/packager/media/formats/mp2t/mp2t_media_parser.h b/packager/media/formats/mp2t/mp2t_media_parser.h
index 0f76f79154..5ddcc74ac5 100644
--- a/packager/media/formats/mp2t/mp2t_media_parser.h
+++ b/packager/media/formats/mp2t/mp2t_media_parser.h
@@ -10,6 +10,7 @@
 #include <map>
 #include <memory>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/byte_queue.h>
 #include <packager/media/base/media_parser.h>
 #include <packager/media/base/stream_info.h>
diff --git a/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc b/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc
index 6f8a7efb6f..aeb44b248b 100644
--- a/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc
+++ b/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc
@@ -11,7 +11,7 @@
 #include <absl/log/log.h>
 #include <gtest/gtest.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/stream_info.h>
 #include <packager/media/base/timestamp.h>
diff --git a/packager/media/formats/mp2t/pes_packet.h b/packager/media/formats/mp2t/pes_packet.h
index 0b85076551..a5d4176631 100644
--- a/packager/media/formats/mp2t/pes_packet.h
+++ b/packager/media/formats/mp2t/pes_packet.h
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/pes_packet_generator.cc b/packager/media/formats/mp2t/pes_packet_generator.cc
index 04f013a01d..cc028ea1b9 100644
--- a/packager/media/formats/mp2t/pes_packet_generator.cc
+++ b/packager/media/formats/mp2t/pes_packet_generator.cc
@@ -12,6 +12,7 @@
 
 #include <absl/log/check.h>
 
+#include <packager/macros/logging.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/media_sample.h>
diff --git a/packager/media/formats/mp2t/pes_packet_generator.h b/packager/media/formats/mp2t/pes_packet_generator.h
index a875091f67..8ab873766f 100644
--- a/packager/media/formats/mp2t/pes_packet_generator.h
+++ b/packager/media/formats/mp2t/pes_packet_generator.h
@@ -10,6 +10,7 @@
 #include <list>
 #include <memory>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/stream_info.h>
 
diff --git a/packager/media/formats/mp2t/ts_muxer.h b/packager/media/formats/mp2t/ts_muxer.h
index 12a04099b7..9f55c2f0e4 100644
--- a/packager/media/formats/mp2t/ts_muxer.h
+++ b/packager/media/formats/mp2t/ts_muxer.h
@@ -7,7 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_MUXER_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_TS_MUXER_H_
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/muxer.h>
 #include <packager/media/formats/mp2t/ts_segmenter.h>
 
diff --git a/packager/media/formats/mp2t/ts_packet.cc b/packager/media/formats/mp2t/ts_packet.cc
index c63b8041d8..1de6afeb5d 100644
--- a/packager/media/formats/mp2t/ts_packet.cc
+++ b/packager/media/formats/mp2t/ts_packet.cc
@@ -8,7 +8,7 @@
 
 #include <absl/log/check.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/formats/mp2t/mp2t_common.h>
 
diff --git a/packager/media/formats/mp2t/ts_packet.h b/packager/media/formats/mp2t/ts_packet.h
index fef4cf3a38..8ef1bb26b4 100644
--- a/packager/media/formats/mp2t/ts_packet.h
+++ b/packager/media/formats/mp2t/ts_packet.h
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ts_section_pat.cc b/packager/media/formats/mp2t/ts_section_pat.cc
index 22de796bef..fdbebeed1b 100644
--- a/packager/media/formats/mp2t/ts_section_pat.cc
+++ b/packager/media/formats/mp2t/ts_section_pat.cc
@@ -8,7 +8,7 @@
 
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/formats/mp2t/mp2t_common.h>
 
diff --git a/packager/media/formats/mp2t/ts_section_pat.h b/packager/media/formats/mp2t/ts_section_pat.h
index 421550cf3f..09be7ab67c 100644
--- a/packager/media/formats/mp2t/ts_section_pat.h
+++ b/packager/media/formats/mp2t/ts_section_pat.h
@@ -7,7 +7,7 @@
 
 #include <functional>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/formats/mp2t/ts_section_psi.h>
 
 namespace shaka {
diff --git a/packager/media/formats/mp2t/ts_section_pes.cc b/packager/media/formats/mp2t/ts_section_pes.cc
index d088f31023..4472d03822 100644
--- a/packager/media/formats/mp2t/ts_section_pes.cc
+++ b/packager/media/formats/mp2t/ts_section_pes.cc
@@ -7,7 +7,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/base/timestamp.h>
 #include <packager/media/formats/mp2t/es_parser.h>
diff --git a/packager/media/formats/mp2t/ts_section_pes.h b/packager/media/formats/mp2t/ts_section_pes.h
index 93dde6293e..cf26fce215 100644
--- a/packager/media/formats/mp2t/ts_section_pes.h
+++ b/packager/media/formats/mp2t/ts_section_pes.h
@@ -8,7 +8,7 @@
 #include <cstdint>
 #include <memory>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/byte_queue.h>
 #include <packager/media/formats/mp2t/ts_section.h>
 
diff --git a/packager/media/formats/mp2t/ts_section_pmt.h b/packager/media/formats/mp2t/ts_section_pmt.h
index 0913d02d51..96075281bb 100644
--- a/packager/media/formats/mp2t/ts_section_pmt.h
+++ b/packager/media/formats/mp2t/ts_section_pmt.h
@@ -7,7 +7,7 @@
 
 #include <functional>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/formats/mp2t/ts_section_psi.h>
 #include <packager/media/formats/mp2t/ts_stream_type.h>
 
diff --git a/packager/media/formats/mp2t/ts_section_psi.cc b/packager/media/formats/mp2t/ts_section_psi.cc
index 1bc5b13677..d369f5e137 100644
--- a/packager/media/formats/mp2t/ts_section_psi.cc
+++ b/packager/media/formats/mp2t/ts_section_psi.cc
@@ -10,7 +10,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/bit_reader.h>
 #include <packager/media/formats/mp2t/mp2t_common.h>
 
diff --git a/packager/media/formats/mp2t/ts_section_psi.h b/packager/media/formats/mp2t/ts_section_psi.h
index ac42f0fb51..147e49e989 100644
--- a/packager/media/formats/mp2t/ts_section_psi.h
+++ b/packager/media/formats/mp2t/ts_section_psi.h
@@ -5,7 +5,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_
 #define PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/byte_queue.h>
 #include <packager/media/formats/mp2t/ts_section.h>
 
diff --git a/packager/media/formats/mp2t/ts_segmenter.cc b/packager/media/formats/mp2t/ts_segmenter.cc
index c8dc2e5316..f2daaeafde 100644
--- a/packager/media/formats/mp2t/ts_segmenter.cc
+++ b/packager/media/formats/mp2t/ts_segmenter.cc
@@ -10,14 +10,14 @@
 
 #include <absl/log/check.h>
 
+#include <packager/macros/status.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/muxer_util.h>
 #include <packager/media/base/video_stream_info.h>
 #include <packager/media/event/muxer_listener.h>
 #include <packager/media/formats/mp2t/pes_packet.h>
 #include <packager/media/formats/mp2t/program_map_table_writer.h>
-#include <packager/status/status.h>
-#include <packager/status/status_macros.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ts_segmenter.h b/packager/media/formats/mp2t/ts_segmenter.h
index 1d146bde2a..7c765a6029 100644
--- a/packager/media/formats/mp2t/ts_segmenter.h
+++ b/packager/media/formats/mp2t/ts_segmenter.h
@@ -9,11 +9,12 @@
 
 #include <memory>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/formats/mp2t/pes_packet_generator.h>
 #include <packager/media/formats/mp2t/ts_writer.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ts_segmenter_unittest.cc b/packager/media/formats/mp2t/ts_segmenter_unittest.cc
index 3dcc3b4326..30fa07abf4 100644
--- a/packager/media/formats/mp2t/ts_segmenter_unittest.cc
+++ b/packager/media/formats/mp2t/ts_segmenter_unittest.cc
@@ -10,7 +10,6 @@
 #include <gtest/gtest.h>
 
 #include <packager/media/base/audio_stream_info.h>
-#include <packager/media/base/macros.h>
 #include <packager/media/base/video_stream_info.h>
 #include <packager/media/event/mock_muxer_listener.h>
 #include <packager/media/formats/mp2t/pes_packet.h>
diff --git a/packager/media/formats/mp2t/ts_writer.h b/packager/media/formats/mp2t/ts_writer.h
index c815bf4b0b..5d5541de02 100644
--- a/packager/media/formats/mp2t/ts_writer.h
+++ b/packager/media/formats/mp2t/ts_writer.h
@@ -13,7 +13,7 @@
 #include <optional>
 #include <vector>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_closer.h>
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/formats/mp2t/continuity_counter.h>
diff --git a/packager/media/formats/mp4/box_buffer.h b/packager/media/formats/mp4/box_buffer.h
index b46a7f2e96..44b747adf3 100644
--- a/packager/media/formats/mp4/box_buffer.h
+++ b/packager/media/formats/mp4/box_buffer.h
@@ -11,7 +11,7 @@
 
 #include <absl/log/check.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/formats/mp4/box.h>
 #include <packager/media/formats/mp4/box_reader.h>
diff --git a/packager/media/formats/mp4/box_definitions.cc b/packager/media/formats/mp4/box_definitions.cc
index 3d85d24144..cff348a803 100644
--- a/packager/media/formats/mp4/box_definitions.cc
+++ b/packager/media/formats/mp4/box_definitions.cc
@@ -11,8 +11,8 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
+#include <packager/macros/logging.h>
 #include <packager/media/base/bit_reader.h>
-#include <packager/media/base/macros.h>
 #include <packager/media/base/rcheck.h>
 #include <packager/media/formats/mp4/box_buffer.h>
 
diff --git a/packager/media/formats/mp4/box_reader.cc b/packager/media/formats/mp4/box_reader.cc
index b1d3e46747..d8943f3211 100644
--- a/packager/media/formats/mp4/box_reader.cc
+++ b/packager/media/formats/mp4/box_reader.cc
@@ -12,7 +12,7 @@
 #include <absl/log/log.h>
 #include <absl/strings/str_format.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/formats/mp4/box.h>
 
 namespace shaka {
diff --git a/packager/media/formats/mp4/box_reader.h b/packager/media/formats/mp4/box_reader.h
index 2bcb4d4a15..54a8fe146d 100644
--- a/packager/media/formats/mp4/box_reader.h
+++ b/packager/media/formats/mp4/box_reader.h
@@ -12,7 +12,8 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/base/fourccs.h>
 #include <packager/media/base/rcheck.h>
diff --git a/packager/media/formats/mp4/box_reader_unittest.cc b/packager/media/formats/mp4/box_reader_unittest.cc
index 6b169aa6cb..50a4cca72c 100644
--- a/packager/media/formats/mp4/box_reader_unittest.cc
+++ b/packager/media/formats/mp4/box_reader_unittest.cc
@@ -12,6 +12,7 @@
 #include <absl/log/log.h>
 #include <gtest/gtest.h>
 
+#include <packager/macros/logging.h>
 #include <packager/media/base/rcheck.h>
 
 namespace shaka {
diff --git a/packager/media/formats/mp4/chunk_info_iterator.h b/packager/media/formats/mp4/chunk_info_iterator.h
index 54b1f61973..9a31e136b0 100644
--- a/packager/media/formats/mp4/chunk_info_iterator.h
+++ b/packager/media/formats/mp4/chunk_info_iterator.h
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/formats/mp4/box_definitions.h>
 
 namespace shaka {
diff --git a/packager/media/formats/mp4/chunk_info_iterator_unittest.cc b/packager/media/formats/mp4/chunk_info_iterator_unittest.cc
index 4661a2a953..ce1694c0b5 100644
--- a/packager/media/formats/mp4/chunk_info_iterator_unittest.cc
+++ b/packager/media/formats/mp4/chunk_info_iterator_unittest.cc
@@ -12,6 +12,8 @@
 #include <absl/log/log.h>
 #include <gtest/gtest.h>
 
+#include <packager/macros/classes.h>
+
 namespace {
 struct ChunkProperty {
   uint32_t samples_per_chunk;
diff --git a/packager/media/formats/mp4/composition_offset_iterator.h b/packager/media/formats/mp4/composition_offset_iterator.h
index 1c2d2cbed8..b2313f0d89 100644
--- a/packager/media/formats/mp4/composition_offset_iterator.h
+++ b/packager/media/formats/mp4/composition_offset_iterator.h
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/formats/mp4/box_definitions.h>
 
 namespace shaka {
diff --git a/packager/media/formats/mp4/composition_offset_iterator_unittest.cc b/packager/media/formats/mp4/composition_offset_iterator_unittest.cc
index d9530b71b8..f8b8146780 100644
--- a/packager/media/formats/mp4/composition_offset_iterator_unittest.cc
+++ b/packager/media/formats/mp4/composition_offset_iterator_unittest.cc
@@ -10,6 +10,8 @@
 
 #include <gtest/gtest.h>
 
+#include <packager/macros/classes.h>
+
 namespace shaka {
 namespace media {
 namespace mp4 {
diff --git a/packager/media/formats/mp4/decoding_time_iterator.h b/packager/media/formats/mp4/decoding_time_iterator.h
index 5441146490..ad18bdcba6 100644
--- a/packager/media/formats/mp4/decoding_time_iterator.h
+++ b/packager/media/formats/mp4/decoding_time_iterator.h
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/formats/mp4/box_definitions.h>
 
 namespace shaka {
diff --git a/packager/media/formats/mp4/decoding_time_iterator_unittest.cc b/packager/media/formats/mp4/decoding_time_iterator_unittest.cc
index e416f3723c..02e55fc152 100644
--- a/packager/media/formats/mp4/decoding_time_iterator_unittest.cc
+++ b/packager/media/formats/mp4/decoding_time_iterator_unittest.cc
@@ -10,6 +10,8 @@
 
 #include <gtest/gtest.h>
 
+#include <packager/macros/classes.h>
+
 namespace shaka {
 namespace media {
 namespace mp4 {
diff --git a/packager/media/formats/mp4/fragmenter.cc b/packager/media/formats/mp4/fragmenter.cc
index e65b9a6126..793a4f5232 100644
--- a/packager/media/formats/mp4/fragmenter.cc
+++ b/packager/media/formats/mp4/fragmenter.cc
@@ -11,12 +11,12 @@
 
 #include <absl/log/check.h>
 
+#include <packager/macros/status.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/formats/mp4/box_definitions.h>
 #include <packager/media/formats/mp4/key_frame_info.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp4/fragmenter.h b/packager/media/formats/mp4/fragmenter.h
index 582e42fcd5..bcb6077543 100644
--- a/packager/media/formats/mp4/fragmenter.h
+++ b/packager/media/formats/mp4/fragmenter.h
@@ -13,8 +13,8 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
-#include <packager/status/status.h>
+#include <packager/macros/classes.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp4/low_latency_segment_segmenter.cc b/packager/media/formats/mp4/low_latency_segment_segmenter.cc
index e9da015ade..cbb1449acc 100644
--- a/packager/media/formats/mp4/low_latency_segment_segmenter.cc
+++ b/packager/media/formats/mp4/low_latency_segment_segmenter.cc
@@ -10,9 +10,10 @@
 
 #include <absl/log/check.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_closer.h>
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
+#include <packager/macros/status.h>
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/media_handler.h>
 #include <packager/media/base/muxer_options.h>
@@ -21,7 +22,6 @@
 #include <packager/media/formats/mp4/box_definitions.h>
 #include <packager/media/formats/mp4/fragmenter.h>
 #include <packager/media/formats/mp4/key_frame_info.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp4/low_latency_segment_segmenter.h b/packager/media/formats/mp4/low_latency_segment_segmenter.h
index e874dc6b37..0db73df8b0 100644
--- a/packager/media/formats/mp4/low_latency_segment_segmenter.h
+++ b/packager/media/formats/mp4/low_latency_segment_segmenter.h
@@ -7,8 +7,9 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP4_LOW_LATENCY_SEGMENT_SEGMENTER_H_
 #define PACKAGER_MEDIA_FORMATS_MP4_LOW_LATENCY_SEGMENT_SEGMENTER_H_
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_closer.h>
+#include <packager/macros/classes.h>
 #include <packager/media/formats/mp4/segmenter.h>
 
 namespace shaka {
diff --git a/packager/media/formats/mp4/mp4_media_parser.cc b/packager/media/formats/mp4/mp4_media_parser.cc
index bd819ebc5c..06e79221c6 100644
--- a/packager/media/formats/mp4/mp4_media_parser.cc
+++ b/packager/media/formats/mp4/mp4_media_parser.cc
@@ -12,14 +12,14 @@
 #include <absl/log/log.h>
 #include <absl/strings/numbers.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_closer.h>
-#include <packager/macros.h>
+#include <packager/macros/compiler.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/base/decrypt_config.h>
 #include <packager/media/base/key_source.h>
-#include <packager/media/base/macros.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/rcheck.h>
 #include <packager/media/base/video_stream_info.h>
diff --git a/packager/media/formats/mp4/mp4_media_parser.h b/packager/media/formats/mp4/mp4_media_parser.h
index 614308afbe..ffa5687a67 100644
--- a/packager/media/formats/mp4/mp4_media_parser.h
+++ b/packager/media/formats/mp4/mp4_media_parser.h
@@ -12,6 +12,7 @@
 #include <memory>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/decryptor_source.h>
 #include <packager/media/base/media_parser.h>
 #include <packager/media/base/offset_byte_queue.h>
diff --git a/packager/media/formats/mp4/mp4_media_parser_unittest.cc b/packager/media/formats/mp4/mp4_media_parser_unittest.cc
index c03697d969..98039b6fdf 100644
--- a/packager/media/formats/mp4/mp4_media_parser_unittest.cc
+++ b/packager/media/formats/mp4/mp4_media_parser_unittest.cc
@@ -12,7 +12,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/raw_key_source.h>
 #include <packager/media/base/stream_info.h>
diff --git a/packager/media/formats/mp4/mp4_muxer.cc b/packager/media/formats/mp4/mp4_muxer.cc
index 3a4b2e9626..947e36f2c3 100644
--- a/packager/media/formats/mp4/mp4_muxer.cc
+++ b/packager/media/formats/mp4/mp4_muxer.cc
@@ -13,8 +13,9 @@
 #include <absl/strings/escaping.h>
 #include <absl/strings/numbers.h>
 
-#include <packager/file/file.h>
-#include <packager/macros.h>
+#include <packager/file.h>
+#include <packager/macros/logging.h>
+#include <packager/macros/status.h>
 #include <packager/media/base/aes_encryptor.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/fourccs.h>
@@ -29,7 +30,6 @@
 #include <packager/media/formats/mp4/multi_segment_segmenter.h>
 #include <packager/media/formats/mp4/single_segment_segmenter.h>
 #include <packager/media/formats/ttml/ttml_generator.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp4/mp4_muxer.h b/packager/media/formats/mp4/mp4_muxer.h
index 6ab918de8d..261f9daa77 100644
--- a/packager/media/formats/mp4/mp4_muxer.h
+++ b/packager/media/formats/mp4/mp4_muxer.h
@@ -10,8 +10,8 @@
 #include <optional>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/muxer.h>
-#include <optional>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp4/multi_segment_segmenter.cc b/packager/media/formats/mp4/multi_segment_segmenter.cc
index 0a5d402fd8..5381a308e7 100644
--- a/packager/media/formats/mp4/multi_segment_segmenter.cc
+++ b/packager/media/formats/mp4/multi_segment_segmenter.cc
@@ -12,16 +12,16 @@
 #include <absl/strings/numbers.h>
 #include <absl/strings/str_format.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_closer.h>
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
+#include <packager/macros/status.h>
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/muxer_options.h>
 #include <packager/media/base/muxer_util.h>
 #include <packager/media/event/muxer_listener.h>
 #include <packager/media/formats/mp4/box_definitions.h>
 #include <packager/media/formats/mp4/key_frame_info.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp4/multi_segment_segmenter.h b/packager/media/formats/mp4/multi_segment_segmenter.h
index edc960b06c..ab19465d7d 100644
--- a/packager/media/formats/mp4/multi_segment_segmenter.h
+++ b/packager/media/formats/mp4/multi_segment_segmenter.h
@@ -7,6 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
 #define PACKAGER_MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
 
+#include <packager/macros/classes.h>
 #include <packager/media/formats/mp4/segmenter.h>
 
 namespace shaka {
diff --git a/packager/media/formats/mp4/segmenter.h b/packager/media/formats/mp4/segmenter.h
index c9ab7800e0..5333ffe35c 100644
--- a/packager/media/formats/mp4/segmenter.h
+++ b/packager/media/formats/mp4/segmenter.h
@@ -12,11 +12,11 @@
 #include <optional>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/fourccs.h>
 #include <packager/media/base/range.h>
 #include <packager/media/formats/mp4/box_definitions.h>
-#include <packager/status/status.h>
-#include <optional>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp4/single_segment_segmenter.h b/packager/media/formats/mp4/single_segment_segmenter.h
index 4491a1a151..edfe618f8e 100644
--- a/packager/media/formats/mp4/single_segment_segmenter.h
+++ b/packager/media/formats/mp4/single_segment_segmenter.h
@@ -8,6 +8,7 @@
 #define PACKAGER_MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_
 
 #include <packager/file/file_closer.h>
+#include <packager/macros/classes.h>
 #include <packager/media/event/muxer_listener.h>
 #include <packager/media/formats/mp4/segmenter.h>
 
diff --git a/packager/media/formats/mp4/sync_sample_iterator.h b/packager/media/formats/mp4/sync_sample_iterator.h
index b544dec733..5e76759f2e 100644
--- a/packager/media/formats/mp4/sync_sample_iterator.h
+++ b/packager/media/formats/mp4/sync_sample_iterator.h
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/formats/mp4/box_definitions.h>
 
 namespace shaka {
diff --git a/packager/media/formats/mp4/track_run_iterator.cc b/packager/media/formats/mp4/track_run_iterator.cc
index e707662d47..276f6314ad 100644
--- a/packager/media/formats/mp4/track_run_iterator.cc
+++ b/packager/media/formats/mp4/track_run_iterator.cc
@@ -10,7 +10,7 @@
 #include <absl/flags/flag.h>
 #include <absl/log/check.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/buffer_reader.h>
 #include <packager/media/base/fourccs.h>
 #include <packager/media/base/rcheck.h>
diff --git a/packager/media/formats/mp4/track_run_iterator.h b/packager/media/formats/mp4/track_run_iterator.h
index b90623fac9..92cb02b989 100644
--- a/packager/media/formats/mp4/track_run_iterator.h
+++ b/packager/media/formats/mp4/track_run_iterator.h
@@ -9,6 +9,7 @@
 #include <memory>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/formats/mp4/box_definitions.h>
 
 namespace shaka {
diff --git a/packager/media/formats/packed_audio/packed_audio_segmenter.cc b/packager/media/formats/packed_audio/packed_audio_segmenter.cc
index 33704a6e1a..765c5e5127 100644
--- a/packager/media/formats/packed_audio/packed_audio_segmenter.cc
+++ b/packager/media/formats/packed_audio/packed_audio_segmenter.cc
@@ -10,11 +10,11 @@
 
 #include <absl/log/check.h>
 
+#include <packager/macros/status.h>
 #include <packager/media/base/id3_tag.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/codecs/aac_audio_specific_config.h>
 #include <packager/media/codecs/hls_audio_util.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/packed_audio/packed_audio_segmenter.h b/packager/media/formats/packed_audio/packed_audio_segmenter.h
index 22b89a26bf..3c9d07a616 100644
--- a/packager/media/formats/packed_audio/packed_audio_segmenter.h
+++ b/packager/media/formats/packed_audio/packed_audio_segmenter.h
@@ -11,7 +11,7 @@
 
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/base/stream_info.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/packed_audio/packed_audio_writer.cc b/packager/media/formats/packed_audio/packed_audio_writer.cc
index bab884fc23..f73e09faa0 100644
--- a/packager/media/formats/packed_audio/packed_audio_writer.cc
+++ b/packager/media/formats/packed_audio/packed_audio_writer.cc
@@ -8,9 +8,9 @@
 
 #include <absl/log/check.h>
 
+#include <packager/macros/status.h>
 #include <packager/media/base/muxer_util.h>
 #include <packager/media/formats/packed_audio/packed_audio_segmenter.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/ttml/ttml_muxer.cc b/packager/media/formats/ttml/ttml_muxer.cc
index 5c364f986c..9349c444f5 100644
--- a/packager/media/formats/ttml/ttml_muxer.cc
+++ b/packager/media/formats/ttml/ttml_muxer.cc
@@ -6,8 +6,8 @@
 
 #include <packager/media/formats/ttml/ttml_muxer.h>
 
-#include <packager/file/file.h>
-#include <packager/status/status_macros.h>
+#include <packager/file.h>
+#include <packager/macros/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/ttml/ttml_to_mp4_handler.cc b/packager/media/formats/ttml/ttml_to_mp4_handler.cc
index 68c83c0c5c..7377dff2b4 100644
--- a/packager/media/formats/ttml/ttml_to_mp4_handler.cc
+++ b/packager/media/formats/ttml/ttml_to_mp4_handler.cc
@@ -8,7 +8,7 @@
 
 #include <absl/log/check.h>
 
-#include <packager/status/status_macros.h>
+#include <packager/macros/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/cluster_builder.h b/packager/media/formats/webm/cluster_builder.h
index 748110398a..cbf0c3a2d7 100644
--- a/packager/media/formats/webm/cluster_builder.h
+++ b/packager/media/formats/webm/cluster_builder.h
@@ -8,7 +8,7 @@
 #include <cstdint>
 #include <memory>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/encryptor.h b/packager/media/formats/webm/encryptor.h
index 40bc43c298..c5cbdd6bdb 100644
--- a/packager/media/formats/webm/encryptor.h
+++ b/packager/media/formats/webm/encryptor.h
@@ -11,7 +11,7 @@
 
 #include <mkvmuxer/mkvmuxer.h>
 
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/mkv_writer.h b/packager/media/formats/webm/mkv_writer.h
index 0bb5bf5433..0618ddb0c1 100644
--- a/packager/media/formats/webm/mkv_writer.h
+++ b/packager/media/formats/webm/mkv_writer.h
@@ -13,7 +13,8 @@
 #include <mkvmuxer/mkvmuxer.h>
 
 #include <packager/file/file_closer.h>
-#include <packager/status/status.h>
+#include <packager/macros/classes.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/multi_segment_segmenter.cc b/packager/media/formats/webm/multi_segment_segmenter.cc
index 0e6efed64f..d88a046f7a 100644
--- a/packager/media/formats/webm/multi_segment_segmenter.cc
+++ b/packager/media/formats/webm/multi_segment_segmenter.cc
@@ -9,12 +9,12 @@
 #include <absl/log/check.h>
 #include <mkvmuxer/mkvmuxer.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
+#include <packager/macros/status.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/event/muxer_listener.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/multi_segment_segmenter.h b/packager/media/formats/webm/multi_segment_segmenter.h
index 1da26d1d90..56a4c0fbfb 100644
--- a/packager/media/formats/webm/multi_segment_segmenter.h
+++ b/packager/media/formats/webm/multi_segment_segmenter.h
@@ -9,9 +9,10 @@
 
 #include <memory>
 
+#include <packager/macros/classes.h>
 #include <packager/media/formats/webm/mkv_writer.h>
 #include <packager/media/formats/webm/segmenter.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/segmenter.cc b/packager/media/formats/webm/segmenter.cc
index cf335d5002..fca31287b3 100644
--- a/packager/media/formats/webm/segmenter.cc
+++ b/packager/media/formats/webm/segmenter.cc
@@ -9,6 +9,7 @@
 #include <absl/log/check.h>
 #include <mkvmuxer/mkvmuxerutil.h>
 
+#include <packager/macros/logging.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/media_handler.h>
 #include <packager/media/base/muxer_options.h>
diff --git a/packager/media/formats/webm/segmenter.h b/packager/media/formats/webm/segmenter.h
index cfa4831cc4..42dacc628e 100644
--- a/packager/media/formats/webm/segmenter.h
+++ b/packager/media/formats/webm/segmenter.h
@@ -11,10 +11,11 @@
 
 #include <mkvmuxer/mkvmuxer.h>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/range.h>
 #include <packager/media/formats/webm/mkv_writer.h>
 #include <packager/media/formats/webm/seek_head.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/segmenter_test_base.h b/packager/media/formats/webm/segmenter_test_base.h
index 41f441f37f..690f49d48e 100644
--- a/packager/media/formats/webm/segmenter_test_base.h
+++ b/packager/media/formats/webm/segmenter_test_base.h
@@ -19,7 +19,7 @@
 #include <packager/media/formats/webm/mkv_writer.h>
 #include <packager/media/formats/webm/segmenter.h>
 #include <packager/media/formats/webm/webm_parser.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 #include <packager/status/status_test_util.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webm/single_segment_segmenter.h b/packager/media/formats/webm/single_segment_segmenter.h
index a16951197c..6f536463ce 100644
--- a/packager/media/formats/webm/single_segment_segmenter.h
+++ b/packager/media/formats/webm/single_segment_segmenter.h
@@ -9,9 +9,10 @@
 
 #include <memory>
 
+#include <packager/macros/classes.h>
 #include <packager/media/formats/webm/mkv_writer.h>
 #include <packager/media/formats/webm/segmenter.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/tracks_builder.h b/packager/media/formats/webm/tracks_builder.h
index c2832fb5a2..851bdcc367 100644
--- a/packager/media/formats/webm/tracks_builder.h
+++ b/packager/media/formats/webm/tracks_builder.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/two_pass_single_segment_segmenter.h b/packager/media/formats/webm/two_pass_single_segment_segmenter.h
index 7ff28c1a29..98281a5a29 100644
--- a/packager/media/formats/webm/two_pass_single_segment_segmenter.h
+++ b/packager/media/formats/webm/two_pass_single_segment_segmenter.h
@@ -10,9 +10,10 @@
 #include <memory>
 #include <string>
 
+#include <packager/macros/classes.h>
 #include <packager/media/formats/webm/mkv_writer.h>
 #include <packager/media/formats/webm/single_segment_segmenter.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/webm_audio_client.h b/packager/media/formats/webm/webm_audio_client.h
index 2d3eef79b4..6ef7e05a8c 100644
--- a/packager/media/formats/webm/webm_audio_client.h
+++ b/packager/media/formats/webm/webm_audio_client.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/formats/webm/webm_parser.h>
 
diff --git a/packager/media/formats/webm/webm_cluster_parser.cc b/packager/media/formats/webm/webm_cluster_parser.cc
index 6a54884e85..61dac07715 100644
--- a/packager/media/formats/webm/webm_cluster_parser.cc
+++ b/packager/media/formats/webm/webm_cluster_parser.cc
@@ -11,7 +11,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/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.h b/packager/media/formats/webm/webm_cluster_parser.h
index e0886aa016..50db57b0f6 100644
--- a/packager/media/formats/webm/webm_cluster_parser.h
+++ b/packager/media/formats/webm/webm_cluster_parser.h
@@ -11,6 +11,7 @@
 #include <set>
 #include <string>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/decryptor_source.h>
 #include <packager/media/base/media_parser.h>
 #include <packager/media/base/media_sample.h>
diff --git a/packager/media/formats/webm/webm_cluster_parser_unittest.cc b/packager/media/formats/webm/webm_cluster_parser_unittest.cc
index b8e3b6e2d6..a287932dfd 100644
--- a/packager/media/formats/webm/webm_cluster_parser_unittest.cc
+++ b/packager/media/formats/webm/webm_cluster_parser_unittest.cc
@@ -16,6 +16,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <packager/macros/classes.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_client.h b/packager/media/formats/webm/webm_content_encodings_client.h
index 499d6495ae..ef2f24be27 100644
--- a/packager/media/formats/webm/webm_content_encodings_client.h
+++ b/packager/media/formats/webm/webm_content_encodings_client.h
@@ -8,6 +8,7 @@
 #include <memory>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/formats/webm/webm_content_encodings.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 d81a99a92e..5b7fde793c 100644
--- a/packager/media/formats/webm/webm_crypto_helpers.cc
+++ b/packager/media/formats/webm/webm_crypto_helpers.cc
@@ -7,7 +7,7 @@
 #include <absl/base/internal/endian.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/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 ec870478b1..a1995d395f 100644
--- a/packager/media/formats/webm/webm_info_parser.cc
+++ b/packager/media/formats/webm/webm_info_parser.cc
@@ -8,7 +8,7 @@
 
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/formats/webm/webm_constants.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webm/webm_info_parser.h b/packager/media/formats/webm/webm_info_parser.h
index e5aba2e593..2fea652c5e 100644
--- a/packager/media/formats/webm/webm_info_parser.h
+++ b/packager/media/formats/webm/webm_info_parser.h
@@ -7,6 +7,7 @@
 
 #include <chrono>
 
+#include <packager/macros/classes.h>
 #include <packager/media/formats/webm/webm_parser.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webm/webm_media_parser.cc b/packager/media/formats/webm/webm_media_parser.cc
index 8f40afe86d..188d10d5bb 100644
--- a/packager/media/formats/webm/webm_media_parser.cc
+++ b/packager/media/formats/webm/webm_media_parser.cc
@@ -9,7 +9,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/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_media_parser.h b/packager/media/formats/webm/webm_media_parser.h
index f7ed93b928..aa51bc8f0c 100644
--- a/packager/media/formats/webm/webm_media_parser.h
+++ b/packager/media/formats/webm/webm_media_parser.h
@@ -5,6 +5,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_MEDIA_PARSER_H_
 #define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_MEDIA_PARSER_H_
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/byte_queue.h>
 #include <packager/media/base/media_parser.h>
 
diff --git a/packager/media/formats/webm/webm_muxer.cc b/packager/media/formats/webm/webm_muxer.cc
index 8c2d683900..7af4dbd80e 100644
--- a/packager/media/formats/webm/webm_muxer.cc
+++ b/packager/media/formats/webm/webm_muxer.cc
@@ -8,6 +8,7 @@
 
 #include <absl/log/check.h>
 
+#include <packager/macros/logging.h>
 #include <packager/media/base/fourccs.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/stream_info.h>
diff --git a/packager/media/formats/webm/webm_muxer.h b/packager/media/formats/webm/webm_muxer.h
index 8762c7a45c..364d0e2d80 100644
--- a/packager/media/formats/webm/webm_muxer.h
+++ b/packager/media/formats/webm/webm_muxer.h
@@ -7,6 +7,7 @@
 #ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_MUXER_H_
 #define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_MUXER_H_
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/muxer.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webm/webm_parser.cc b/packager/media/formats/webm/webm_parser.cc
index 33d4dbd8cb..b877d727bc 100644
--- a/packager/media/formats/webm/webm_parser.cc
+++ b/packager/media/formats/webm/webm_parser.cc
@@ -17,7 +17,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 #include <packager/media/formats/webm/webm_constants.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webm/webm_parser.h b/packager/media/formats/webm/webm_parser.h
index 13996345d4..495eb20b9e 100644
--- a/packager/media/formats/webm/webm_parser.h
+++ b/packager/media/formats/webm/webm_parser.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webm/webm_tracks_parser.h b/packager/media/formats/webm/webm_tracks_parser.h
index 3fc601fe0a..084e912208 100644
--- a/packager/media/formats/webm/webm_tracks_parser.h
+++ b/packager/media/formats/webm/webm_tracks_parser.h
@@ -11,6 +11,7 @@
 #include <string>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/text_track_config.h>
 #include <packager/media/base/video_stream_info.h>
diff --git a/packager/media/formats/webm/webm_video_client.cc b/packager/media/formats/webm/webm_video_client.cc
index 50f3471499..fb8dc13142 100644
--- a/packager/media/formats/webm/webm_video_client.cc
+++ b/packager/media/formats/webm/webm_video_client.cc
@@ -6,6 +6,7 @@
 
 #include <absl/log/log.h>
 
+#include <packager/macros/logging.h>
 #include <packager/media/base/video_util.h>
 #include <packager/media/codecs/av1_codec_configuration_record.h>
 #include <packager/media/codecs/vp_codec_configuration_record.h>
diff --git a/packager/media/formats/webm/webm_video_client.h b/packager/media/formats/webm/webm_video_client.h
index 2be54eeed5..3a5e1d77ef 100644
--- a/packager/media/formats/webm/webm_video_client.h
+++ b/packager/media/formats/webm/webm_video_client.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include <packager/macros/classes.h>
 #include <packager/media/base/video_stream_info.h>
 #include <packager/media/codecs/vp_codec_configuration_record.h>
 #include <packager/media/formats/webm/webm_parser.h>
diff --git a/packager/media/formats/webm/webm_webvtt_parser.h b/packager/media/formats/webm/webm_webvtt_parser.h
index 97675aec46..8bd7ad84db 100644
--- a/packager/media/formats/webm/webm_webvtt_parser.h
+++ b/packager/media/formats/webm/webm_webvtt_parser.h
@@ -8,7 +8,7 @@
 #include <cstdint>
 #include <string>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webvtt/text_padder.cc b/packager/media/formats/webvtt/text_padder.cc
index 9ee887b317..8bb9cf4c6c 100644
--- a/packager/media/formats/webvtt/text_padder.cc
+++ b/packager/media/formats/webvtt/text_padder.cc
@@ -10,7 +10,7 @@
 
 #include <absl/log/check.h>
 
-#include <packager/status/status_macros.h>
+#include <packager/macros/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webvtt/text_readers.h b/packager/media/formats/webvtt/text_readers.h
index 883661e778..3ea99e90d3 100644
--- a/packager/media/formats/webvtt/text_readers.h
+++ b/packager/media/formats/webvtt/text_readers.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include <packager/media/base/byte_queue.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 class File;
diff --git a/packager/media/formats/webvtt/text_readers_unittest.cc b/packager/media/formats/webvtt/text_readers_unittest.cc
index 8fc1813484..c64b23b77d 100644
--- a/packager/media/formats/webvtt/text_readers_unittest.cc
+++ b/packager/media/formats/webvtt/text_readers_unittest.cc
@@ -9,7 +9,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/status/status_test_util.h>
 
 namespace shaka {
diff --git a/packager/media/formats/webvtt/webvtt_file_buffer.h b/packager/media/formats/webvtt/webvtt_file_buffer.h
index 373378a420..bf8cb4c60c 100644
--- a/packager/media/formats/webvtt/webvtt_file_buffer.h
+++ b/packager/media/formats/webvtt/webvtt_file_buffer.h
@@ -9,7 +9,7 @@
 
 #include <string>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webvtt/webvtt_muxer.cc b/packager/media/formats/webvtt/webvtt_muxer.cc
index 011d16d127..d494cedafb 100644
--- a/packager/media/formats/webvtt/webvtt_muxer.cc
+++ b/packager/media/formats/webvtt/webvtt_muxer.cc
@@ -6,10 +6,10 @@
 
 #include <packager/media/formats/webvtt/webvtt_muxer.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_closer.h>
+#include <packager/macros/status.h>
 #include <packager/media/formats/webvtt/webvtt_utils.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webvtt/webvtt_to_mp4_handler.cc b/packager/media/formats/webvtt/webvtt_to_mp4_handler.cc
index 78bb13f375..3eeabaec1b 100644
--- a/packager/media/formats/webvtt/webvtt_to_mp4_handler.cc
+++ b/packager/media/formats/webvtt/webvtt_to_mp4_handler.cc
@@ -11,11 +11,12 @@
 
 #include <absl/log/check.h>
 
+#include <packager/macros/logging.h>
+#include <packager/macros/status.h>
 #include <packager/media/base/buffer_writer.h>
 #include <packager/media/formats/mp4/box_buffer.h>
 #include <packager/media/formats/mp4/box_definitions.h>
 #include <packager/media/formats/webvtt/webvtt_utils.h>
-#include <packager/status/status_macros.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/webvtt/webvtt_utils.cc b/packager/media/formats/webvtt/webvtt_utils.cc
index 2a6be18feb..9e5e036a3b 100644
--- a/packager/media/formats/webvtt/webvtt_utils.cc
+++ b/packager/media/formats/webvtt/webvtt_utils.cc
@@ -16,7 +16,7 @@
 #include <absl/strings/numbers.h>
 #include <absl/strings/str_format.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/wvm/wvm_media_parser.h b/packager/media/formats/wvm/wvm_media_parser.h
index 6ba9ab9f34..49b60796ca 100644
--- a/packager/media/formats/wvm/wvm_media_parser.h
+++ b/packager/media/formats/wvm/wvm_media_parser.h
@@ -14,7 +14,7 @@
 
 #include <absl/base/internal/endian.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/media/base/media_parser.h>
 #include <packager/media/codecs/h264_byte_to_unit_stream_converter.h>
 
diff --git a/packager/media/formats/wvm/wvm_media_parser_unittest.cc b/packager/media/formats/wvm/wvm_media_parser_unittest.cc
index e60c633990..9523835964 100644
--- a/packager/media/formats/wvm/wvm_media_parser_unittest.cc
+++ b/packager/media/formats/wvm/wvm_media_parser_unittest.cc
@@ -12,7 +12,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/audio_stream_info.h>
 #include <packager/media/base/media_sample.h>
 #include <packager/media/base/raw_key_source.h>
diff --git a/packager/media/origin/origin_handler.cc b/packager/media/origin/origin_handler.cc
index cd8590756c..903aa09c9d 100644
--- a/packager/media/origin/origin_handler.cc
+++ b/packager/media/origin/origin_handler.cc
@@ -6,7 +6,7 @@
 
 #include <packager/media/origin/origin_handler.h>
 
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/trick_play/trick_play_handler.cc b/packager/media/trick_play/trick_play_handler.cc
index 1d60c90f1e..ac93d9832f 100644
--- a/packager/media/trick_play/trick_play_handler.cc
+++ b/packager/media/trick_play/trick_play_handler.cc
@@ -10,7 +10,7 @@
 #include <absl/log/log.h>
 
 #include <packager/media/base/video_stream_info.h>
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/mpd/CMakeLists.txt b/packager/mpd/CMakeLists.txt
index 21674d5b3d..48776615d5 100644
--- a/packager/mpd/CMakeLists.txt
+++ b/packager/mpd/CMakeLists.txt
@@ -38,7 +38,6 @@ add_library(mpd_builder STATIC
   base/xml/scoped_xml_ptr.h
   base/xml/xml_node.cc
   base/xml/xml_node.h
-  public/mpd_params.h
   )
 
 target_link_libraries(mpd_builder
diff --git a/packager/mpd/base/adaptation_set.cc b/packager/mpd/base/adaptation_set.cc
index d0b4cbb65a..36229a897f 100644
--- a/packager/mpd/base/adaptation_set.cc
+++ b/packager/mpd/base/adaptation_set.cc
@@ -13,7 +13,8 @@
 #include <absl/strings/numbers.h>
 #include <absl/strings/str_format.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
+#include <packager/macros/logging.h>
 #include <packager/mpd/base/media_info.pb.h>
 #include <packager/mpd/base/mpd_options.h>
 #include <packager/mpd/base/mpd_utils.h>
diff --git a/packager/mpd/base/bandwidth_estimator.cc b/packager/mpd/base/bandwidth_estimator.cc
index 2ac7c4b277..98080afb10 100644
--- a/packager/mpd/base/bandwidth_estimator.cc
+++ b/packager/mpd/base/bandwidth_estimator.cc
@@ -13,7 +13,7 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 
 namespace shaka {
 
diff --git a/packager/mpd/base/mock_mpd_builder.h b/packager/mpd/base/mock_mpd_builder.h
index 916972bebd..b771c300b7 100644
--- a/packager/mpd/base/mock_mpd_builder.h
+++ b/packager/mpd/base/mock_mpd_builder.h
@@ -10,7 +10,7 @@
 #include <absl/synchronization/mutex.h>
 #include <gmock/gmock.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/mpd/base/adaptation_set.h>
 #include <packager/mpd/base/content_protection_element.h>
 #include <packager/mpd/base/mpd_builder.h>
diff --git a/packager/mpd/base/mpd_builder.cc b/packager/mpd/base/mpd_builder.cc
index 289bcf4d6e..105d8efee1 100644
--- a/packager/mpd/base/mpd_builder.cc
+++ b/packager/mpd/base/mpd_builder.cc
@@ -18,6 +18,8 @@
 #include <absl/synchronization/mutex.h>
 
 #include <packager/file/file_util.h>
+#include <packager/macros/classes.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/rcheck.h>
 #include <packager/mpd/base/adaptation_set.h>
 #include <packager/mpd/base/mpd_utils.h>
diff --git a/packager/mpd/base/mpd_builder.h b/packager/mpd/base/mpd_builder.h
index 6c02b018cd..b0b42ec8f3 100644
--- a/packager/mpd/base/mpd_builder.h
+++ b/packager/mpd/base/mpd_builder.h
@@ -19,7 +19,7 @@
 
 #include <libxml/tree.h>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/mpd/base/mpd_options.h>
 #include <packager/mpd/base/xml/xml_node.h>
 #include <packager/utils/clock.h>
diff --git a/packager/mpd/base/mpd_builder_unittest.cc b/packager/mpd/base/mpd_builder_unittest.cc
index d413f5d64e..09e074f92b 100644
--- a/packager/mpd/base/mpd_builder_unittest.cc
+++ b/packager/mpd/base/mpd_builder_unittest.cc
@@ -11,6 +11,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <packager/macros/classes.h>
 #include <packager/mpd/base/adaptation_set.h>
 #include <packager/mpd/base/period.h>
 #include <packager/mpd/base/representation.h>
diff --git a/packager/mpd/base/mpd_notifier.h b/packager/mpd/base/mpd_notifier.h
index fc25255c3f..d75143899d 100644
--- a/packager/mpd/base/mpd_notifier.h
+++ b/packager/mpd/base/mpd_notifier.h
@@ -14,7 +14,8 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
+#include <packager/macros/compiler.h>
 #include <packager/mpd/base/mpd_options.h>
 
 namespace shaka {
diff --git a/packager/mpd/base/mpd_notifier_util.cc b/packager/mpd/base/mpd_notifier_util.cc
index eca1f3e8d8..59995623bb 100644
--- a/packager/mpd/base/mpd_notifier_util.cc
+++ b/packager/mpd/base/mpd_notifier_util.cc
@@ -9,7 +9,8 @@
 #include <absl/log/check.h>
 #include <absl/log/log.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
+#include <packager/macros/logging.h>
 #include <packager/mpd/base/mpd_utils.h>
 
 namespace shaka {
diff --git a/packager/mpd/base/mpd_options.h b/packager/mpd/base/mpd_options.h
index f8c45b6f07..69dd13b65a 100644
--- a/packager/mpd/base/mpd_options.h
+++ b/packager/mpd/base/mpd_options.h
@@ -9,7 +9,7 @@
 
 #include <string>
 
-#include <packager/mpd/public/mpd_params.h>
+#include <packager/mpd_params.h>
 
 namespace shaka {
 
diff --git a/packager/mpd/base/mpd_utils.cc b/packager/mpd/base/mpd_utils.cc
index bcc57ca9c9..0cc771ed21 100644
--- a/packager/mpd/base/mpd_utils.cc
+++ b/packager/mpd/base/mpd_utils.cc
@@ -14,7 +14,7 @@
 #include <absl/strings/str_format.h>
 #include <libxml/tree.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.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/representation.cc b/packager/mpd/base/representation.cc
index cae8210208..806c5b8ea5 100644
--- a/packager/mpd/base/representation.cc
+++ b/packager/mpd/base/representation.cc
@@ -13,8 +13,8 @@
 #include <absl/log/log.h>
 #include <absl/strings/str_format.h>
 
-#include <packager/file/file.h>
-#include <packager/macros.h>
+#include <packager/file.h>
+#include <packager/macros/logging.h>
 #include <packager/media/base/muxer_util.h>
 #include <packager/mpd/base/mpd_options.h>
 #include <packager/mpd/base/mpd_utils.h>
diff --git a/packager/mpd/base/representation_unittest.cc b/packager/mpd/base/representation_unittest.cc
index cc73618a3c..66b6564048 100644
--- a/packager/mpd/base/representation_unittest.cc
+++ b/packager/mpd/base/representation_unittest.cc
@@ -15,7 +15,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/file/file_closer.h>
 #include <packager/flag_saver.h>
 #include <packager/mpd/base/mpd_options.h>
diff --git a/packager/mpd/base/xml/xml_node.cc b/packager/mpd/base/xml/xml_node.cc
index c67291bf2e..7d4d3523d4 100644
--- a/packager/mpd/base/xml/xml_node.cc
+++ b/packager/mpd/base/xml/xml_node.cc
@@ -20,7 +20,7 @@
 #include <absl/strings/str_format.h>
 #include <libxml/tree.h>
 
-#include <packager/macros.h>
+#include <packager/macros/compiler.h>
 #include <packager/media/base/rcheck.h>
 #include <packager/mpd/base/media_info.pb.h>
 #include <packager/mpd/base/mpd_utils.h>
diff --git a/packager/mpd/base/xml/xml_node.h b/packager/mpd/base/xml/xml_node.h
index 2df3ce5758..541132a6a5 100644
--- a/packager/mpd/base/xml/xml_node.h
+++ b/packager/mpd/base/xml/xml_node.h
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/mpd/base/content_protection_element.h>
 #include <packager/mpd/base/media_info.pb.h>
 
diff --git a/packager/mpd/test/xml_compare.cc b/packager/mpd/test/xml_compare.cc
index 654b6ed80b..e27c8ca0be 100644
--- a/packager/mpd/test/xml_compare.cc
+++ b/packager/mpd/test/xml_compare.cc
@@ -17,7 +17,7 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 
 namespace shaka {
 
diff --git a/packager/mpd/util/mpd_writer.cc b/packager/mpd/util/mpd_writer.cc
index c3593abbb2..12cdfa783a 100644
--- a/packager/mpd/util/mpd_writer.cc
+++ b/packager/mpd/util/mpd_writer.cc
@@ -13,7 +13,7 @@
 #include <absl/log/log.h>
 #include <google/protobuf/text_format.h>
 
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/mpd/base/mpd_builder.h>
 #include <packager/mpd/base/mpd_notifier.h>
 #include <packager/mpd/base/mpd_utils.h>
diff --git a/packager/mpd/util/mpd_writer.h b/packager/mpd/util/mpd_writer.h
index 652cbf6fd0..01c2771473 100644
--- a/packager/mpd/util/mpd_writer.h
+++ b/packager/mpd/util/mpd_writer.h
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include <packager/macros.h>
+#include <packager/macros/classes.h>
 #include <packager/mpd/base/mpd_notifier.h>
 #include <packager/mpd/base/mpd_options.h>
 
diff --git a/packager/packager.cc b/packager/packager.cc
index c5c2afa8b3..84f0fe4b6c 100644
--- a/packager/packager.cc
+++ b/packager/packager.cc
@@ -19,10 +19,11 @@
 #include <packager/app/muxer_factory.h>
 #include <packager/app/packager_util.h>
 #include <packager/app/single_thread_job_manager.h>
-#include <packager/file/file.h>
+#include <packager/file.h>
 #include <packager/hls/base/hls_notifier.h>
 #include <packager/hls/base/simple_hls_notifier.h>
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
+#include <packager/macros/status.h>
 #include <packager/media/base/cc_stream_filter.h>
 #include <packager/media/base/language_utils.h>
 #include <packager/media/base/muxer.h>
@@ -41,7 +42,6 @@
 #include <packager/media/trick_play/trick_play_handler.h>
 #include <packager/mpd/base/media_info.pb.h>
 #include <packager/mpd/base/simple_mpd_notifier.h>
-#include <packager/status/status_macros.h>
 #include <packager/version/version.h>
 
 namespace shaka {
diff --git a/packager/status/status.cc b/packager/status/status.cc
index 3d5c5fc6b9..8ea3dfbe9a 100644
--- a/packager/status/status.cc
+++ b/packager/status/status.cc
@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 #include <absl/log/log.h>
 #include <absl/strings/str_format.h>
 
-#include <packager/macros.h>
+#include <packager/macros/logging.h>
 
 namespace shaka {
 
diff --git a/packager/status/status_test_util.h b/packager/status/status_test_util.h
index f92319520e..1a216b73a6 100644
--- a/packager/status/status_test_util.h
+++ b/packager/status/status_test_util.h
@@ -9,7 +9,7 @@
 
 #include <gtest/gtest.h>
 
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 #define EXPECT_OK(val) EXPECT_EQ(shaka::Status::OK, (val))
 #define ASSERT_OK(val) ASSERT_EQ(shaka::Status::OK, (val))
diff --git a/packager/status/status_unittest.cc b/packager/status/status_unittest.cc
index b2d3c78ea7..c363826c4d 100644
--- a/packager/status/status_unittest.cc
+++ b/packager/status/status_unittest.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include <packager/status/status.h>
+#include <packager/status.h>
 
 #include <absl/strings/str_format.h>
 #include <gmock/gmock.h>