diff --git a/packager/media/base/aes_encryptor.h b/packager/media/base/aes_encryptor.h
index c8830d5a3d..8f74e5c321 100644
--- a/packager/media/base/aes_encryptor.h
+++ b/packager/media/base/aes_encryptor.h
@@ -6,8 +6,8 @@
 //
 // AES Encryptor implementation using openssl.
 
-#ifndef MEDIA_BASE_AES_ENCRYPTOR_H_
-#define MEDIA_BASE_AES_ENCRYPTOR_H_
+#ifndef PACKAGER_MEDIA_BASE_AES_ENCRYPTOR_H_
+#define PACKAGER_MEDIA_BASE_AES_ENCRYPTOR_H_
 
 #include <string>
 #include <vector>
@@ -112,4 +112,4 @@ class AesCbcEncryptor : public AesEncryptor {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_AES_ENCRYPTOR_H_
+#endif  // PACKAGER_MEDIA_BASE_AES_ENCRYPTOR_H_
diff --git a/packager/media/base/audio_stream_info.h b/packager/media/base/audio_stream_info.h
index 2177bbf3b3..55a547ca23 100644
--- a/packager/media/base/audio_stream_info.h
+++ b/packager/media/base/audio_stream_info.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 MEDIA_BASE_AUDIO_STREAM_INFO_H_
-#define MEDIA_BASE_AUDIO_STREAM_INFO_H_
+#ifndef PACKAGER_MEDIA_BASE_AUDIO_STREAM_INFO_H_
+#define PACKAGER_MEDIA_BASE_AUDIO_STREAM_INFO_H_
 
 #include <vector>
 
@@ -73,4 +73,4 @@ class AudioStreamInfo : public StreamInfo {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_AUDIO_STREAM_INFO_H_
+#endif  // PACKAGER_MEDIA_BASE_AUDIO_STREAM_INFO_H_
diff --git a/packager/media/base/audio_timestamp_helper.h b/packager/media/base/audio_timestamp_helper.h
index ad7abb6ab2..b6dd7bad71 100644
--- a/packager/media/base/audio_timestamp_helper.h
+++ b/packager/media/base/audio_timestamp_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_
-#define MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_
+#ifndef PACKAGER_MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_
+#define PACKAGER_MEDIA_BASE_AUDIO_TIMESTAMP_HELPER_H_
 
 #include <stdint.h>
 
diff --git a/packager/media/base/bit_reader.h b/packager/media/base/bit_reader.h
index d0cc8f90fb..7741f80db5 100644
--- a/packager/media/base/bit_reader.h
+++ b/packager/media/base/bit_reader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_BIT_READER_H_
-#define MEDIA_BASE_BIT_READER_H_
+#ifndef PACKAGER_MEDIA_BASE_BIT_READER_H_
+#define PACKAGER_MEDIA_BASE_BIT_READER_H_
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -121,4 +121,4 @@ class BitReader {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_BIT_READER_H_
+#endif  // PACKAGER_MEDIA_BASE_BIT_READER_H_
diff --git a/packager/media/base/buffer_reader.h b/packager/media/base/buffer_reader.h
index 16d3b1abca..d4aa735aba 100644
--- a/packager/media/base/buffer_reader.h
+++ b/packager/media/base/buffer_reader.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 MEDIA_BASE_BUFFER_READER_H_
-#define MEDIA_BASE_BUFFER_READER_H_
+#ifndef PACKAGER_MEDIA_BASE_BUFFER_READER_H_
+#define PACKAGER_MEDIA_BASE_BUFFER_READER_H_
 
 #include <stdint.h>
 
@@ -82,4 +82,4 @@ class BufferReader {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_BUFFER_READER_H_
+#endif  // PACKAGER_MEDIA_BASE_BUFFER_READER_H_
diff --git a/packager/media/base/buffer_writer.h b/packager/media/base/buffer_writer.h
index 39667c7794..4ae0e60e06 100644
--- a/packager/media/base/buffer_writer.h
+++ b/packager/media/base/buffer_writer.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 MEDIA_BASE_BUFFER_WRITER_H_
-#define MEDIA_BASE_BUFFER_WRITER_H_
+#ifndef PACKAGER_MEDIA_BASE_BUFFER_WRITER_H_
+#define PACKAGER_MEDIA_BASE_BUFFER_WRITER_H_
 
 #include <vector>
 
@@ -78,4 +78,4 @@ class BufferWriter {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_BUFFER_WRITER_H_
+#endif  // PACKAGER_MEDIA_BASE_BUFFER_WRITER_H_
diff --git a/packager/media/base/byte_queue.h b/packager/media/base/byte_queue.h
index c8c05405a4..f517264920 100644
--- a/packager/media/base/byte_queue.h
+++ b/packager/media/base/byte_queue.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_BYTE_QUEUE_H_
-#define MEDIA_BASE_BYTE_QUEUE_H_
+#ifndef PACKAGER_MEDIA_BASE_BYTE_QUEUE_H_
+#define PACKAGER_MEDIA_BASE_BYTE_QUEUE_H_
 
 #include <stdint.h>
 
@@ -59,4 +59,4 @@ class ByteQueue {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_BYTE_QUEUE_H_
+#endif  // PACKAGER_MEDIA_BASE_BYTE_QUEUE_H_
diff --git a/packager/media/base/closure_thread.h b/packager/media/base/closure_thread.h
index 755637b1ad..db336ff4ac 100644
--- a/packager/media/base/closure_thread.h
+++ b/packager/media/base/closure_thread.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 MEDIA_BASE_CLOSURE_THREAD_H_
-#define MEDIA_BASE_CLOSURE_THREAD_H_
+#ifndef PACKAGER_MEDIA_BASE_CLOSURE_THREAD_H_
+#define PACKAGER_MEDIA_BASE_CLOSURE_THREAD_H_
 
 #include "packager/base/callback.h"
 #include "packager/base/threading/simple_thread.h"
@@ -46,4 +46,4 @@ class ClosureThread : public base::SimpleThread {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_CLOSURE_THREAD_H_
+#endif  // PACKAGER_MEDIA_BASE_CLOSURE_THREAD_H_
diff --git a/packager/media/base/container_names.h b/packager/media/base/container_names.h
index 0175804eb9..16fb7dc172 100644
--- a/packager/media/base/container_names.h
+++ b/packager/media/base/container_names.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_CONTAINER_NAMES_H_
-#define MEDIA_BASE_CONTAINER_NAMES_H_
+#ifndef PACKAGER_MEDIA_BASE_CONTAINER_NAMES_H_
+#define PACKAGER_MEDIA_BASE_CONTAINER_NAMES_H_
 
 #include <stdint.h>
 
@@ -73,4 +73,4 @@ MediaContainerName DetermineContainerFromFileName(const std::string& file_name);
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_CONTAINER_NAMES_H_
+#endif  // PACKAGER_MEDIA_BASE_CONTAINER_NAMES_H_
diff --git a/packager/media/base/decrypt_config.h b/packager/media/base/decrypt_config.h
index 7adb7d8fdd..a28aae951a 100644
--- a/packager/media/base/decrypt_config.h
+++ b/packager/media/base/decrypt_config.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_DECRYPT_CONFIG_H_
-#define MEDIA_BASE_DECRYPT_CONFIG_H_
+#ifndef PACKAGER_MEDIA_BASE_DECRYPT_CONFIG_H_
+#define PACKAGER_MEDIA_BASE_DECRYPT_CONFIG_H_
 
 #include <stdint.h>
 
@@ -112,4 +112,4 @@ class DecryptConfig {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_DECRYPT_CONFIG_H_
+#endif  // PACKAGER_MEDIA_BASE_DECRYPT_CONFIG_H_
diff --git a/packager/media/base/decryptor_source.h b/packager/media/base/decryptor_source.h
index 6d7f8e962b..5628eb77a8 100644
--- a/packager/media/base/decryptor_source.h
+++ b/packager/media/base/decryptor_source.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 MEDIA_BASE_DECRYPTOR_SOURCE_H_
-#define MEDIA_BASE_DECRYPTOR_SOURCE_H_
+#ifndef PACKAGER_MEDIA_BASE_DECRYPTOR_SOURCE_H_
+#define PACKAGER_MEDIA_BASE_DECRYPTOR_SOURCE_H_
 
 #include <map>
 #include <memory>
@@ -50,4 +50,4 @@ class DecryptorSource {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_DECRYPTOR_SOURCE_H_
+#endif  // PACKAGER_MEDIA_BASE_DECRYPTOR_SOURCE_H_
diff --git a/packager/media/base/http_key_fetcher.h b/packager/media/base/http_key_fetcher.h
index da4e650cdd..f62e1a4864 100644
--- a/packager/media/base/http_key_fetcher.h
+++ b/packager/media/base/http_key_fetcher.h
@@ -8,8 +8,8 @@
 ///       curl_global_cleanup to be called at static initialization /
 ///       deinitialization time.
 
-#ifndef MEDIA_BASE_HTTP_KEY_FETCHER_H_
-#define MEDIA_BASE_HTTP_KEY_FETCHER_H_
+#ifndef PACKAGER_MEDIA_BASE_HTTP_KEY_FETCHER_H_
+#define PACKAGER_MEDIA_BASE_HTTP_KEY_FETCHER_H_
 
 #include "packager/base/compiler_specific.h"
 #include "packager/media/base/key_fetcher.h"
@@ -94,4 +94,4 @@ class HttpKeyFetcher : public KeyFetcher {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_HTTP_KEY_FETCHER_H_
+#endif  // PACKAGER_MEDIA_BASE_HTTP_KEY_FETCHER_H_
diff --git a/packager/media/base/key_fetcher.h b/packager/media/base/key_fetcher.h
index c94cbdff33..21bf709d93 100644
--- a/packager/media/base/key_fetcher.h
+++ b/packager/media/base/key_fetcher.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 MEDIA_BASE_KEY_FETCHER_H_
-#define MEDIA_BASE_KEY_FETCHER_H_
+#ifndef PACKAGER_MEDIA_BASE_KEY_FETCHER_H_
+#define PACKAGER_MEDIA_BASE_KEY_FETCHER_H_
 
 #include "base/macros.h"
 #include "packager/status.h"
@@ -36,5 +36,5 @@ class KeyFetcher {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_KEY_FETCHER_H_
+#endif  // PACKAGER_MEDIA_BASE_KEY_FETCHER_H_
 
diff --git a/packager/media/base/key_source.h b/packager/media/base/key_source.h
index 1cf1fc87d6..6cd279505c 100644
--- a/packager/media/base/key_source.h
+++ b/packager/media/base/key_source.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 MEDIA_BASE_KEY_SOURCE_H_
-#define MEDIA_BASE_KEY_SOURCE_H_
+#ifndef PACKAGER_MEDIA_BASE_KEY_SOURCE_H_
+#define PACKAGER_MEDIA_BASE_KEY_SOURCE_H_
 
 #include <string>
 #include <vector>
@@ -88,4 +88,4 @@ class KeySource {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_KEY_SOURCE_H_
+#endif  // PACKAGER_MEDIA_BASE_KEY_SOURCE_H_
diff --git a/packager/media/base/language_utils.h b/packager/media/base/language_utils.h
index fc01d984f1..74c6782367 100644
--- a/packager/media/base/language_utils.h
+++ b/packager/media/base/language_utils.h
@@ -6,8 +6,8 @@
 //
 // Funtions used by MpdBuilder class to generate an MPD file.
 
-#ifndef MEDIA_BASE_LANGUAGE_UTILS_H_
-#define MEDIA_BASE_LANGUAGE_UTILS_H_
+#ifndef PACKAGER_MEDIA_BASE_LANGUAGE_UTILS_H_
+#define PACKAGER_MEDIA_BASE_LANGUAGE_UTILS_H_
 
 #include <string>
 
@@ -28,4 +28,4 @@ std::string LanguageToISO_639_2(const std::string& language);
 
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_LANGUAGE_UTILS_H_
+#endif  // PACKAGER_MEDIA_BASE_LANGUAGE_UTILS_H_
diff --git a/packager/media/base/limits.h b/packager/media/base/limits.h
index ab700c1186..90549a37a4 100644
--- a/packager/media/base/limits.h
+++ b/packager/media/base/limits.h
@@ -4,8 +4,8 @@
 
 // Contains limit definition constants for the media subsystem.
 
-#ifndef MEDIA_BASE_LIMITS_H_
-#define MEDIA_BASE_LIMITS_H_
+#ifndef PACKAGER_MEDIA_BASE_LIMITS_H_
+#define PACKAGER_MEDIA_BASE_LIMITS_H_
 
 namespace shaka {
 namespace media {
@@ -48,4 +48,4 @@ enum {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_LIMITS_H_
+#endif  // PACKAGER_MEDIA_BASE_LIMITS_H_
diff --git a/packager/media/base/macros.h b/packager/media/base/macros.h
index 980af75eb8..73cc07d5f9 100644
--- a/packager/media/base/macros.h
+++ b/packager/media/base/macros.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 MEDIA_BASE_MACROS_H_
-#define MEDIA_BASE_MACROS_H_
+#ifndef PACKAGER_MEDIA_BASE_MACROS_H_
+#define PACKAGER_MEDIA_BASE_MACROS_H_
 
 // The FALLTHROUGH_INTENDED macro can be used to annotate implicit fall-through
 // between switch labels:
@@ -51,4 +51,4 @@
   } while (0)
 #endif
 
-#endif  // MEDIA_BASE_MACROS_H_
+#endif  // PACKAGER_MEDIA_BASE_MACROS_H_
diff --git a/packager/media/base/media_parser.h b/packager/media/base/media_parser.h
index 585f31a2d4..6339e3c06f 100644
--- a/packager/media/base/media_parser.h
+++ b/packager/media/base/media_parser.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 MEDIA_BASE_MEDIA_PARSER_H_
-#define MEDIA_BASE_MEDIA_PARSER_H_
+#ifndef PACKAGER_MEDIA_BASE_MEDIA_PARSER_H_
+#define PACKAGER_MEDIA_BASE_MEDIA_PARSER_H_
 
 #include <memory>
 #include <string>
@@ -69,4 +69,4 @@ class MediaParser {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_MEDIA_PARSER_H_
+#endif  // PACKAGER_MEDIA_BASE_MEDIA_PARSER_H_
diff --git a/packager/media/base/media_sample.h b/packager/media/base/media_sample.h
index 7e9823b563..f376310fd4 100644
--- a/packager/media/base/media_sample.h
+++ b/packager/media/base/media_sample.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 MEDIA_BASE_MEDIA_SAMPLE_H_
-#define MEDIA_BASE_MEDIA_SAMPLE_H_
+#ifndef PACKAGER_MEDIA_BASE_MEDIA_SAMPLE_H_
+#define PACKAGER_MEDIA_BASE_MEDIA_SAMPLE_H_
 
 #include <deque>
 #include <memory>
@@ -195,4 +195,4 @@ typedef std::deque<std::shared_ptr<MediaSample>> BufferQueue;
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_MEDIA_SAMPLE_H_
+#endif  // PACKAGER_MEDIA_BASE_MEDIA_SAMPLE_H_
diff --git a/packager/media/base/muxer.h b/packager/media/base/muxer.h
index f05ec014e4..f3bcc87d86 100644
--- a/packager/media/base/muxer.h
+++ b/packager/media/base/muxer.h
@@ -6,8 +6,8 @@
 //
 // Defines the muxer interface.
 
-#ifndef MEDIA_BASE_MUXER_H_
-#define MEDIA_BASE_MUXER_H_
+#ifndef PACKAGER_MEDIA_BASE_MUXER_H_
+#define PACKAGER_MEDIA_BASE_MUXER_H_
 
 #include <memory>
 #include <vector>
@@ -105,4 +105,4 @@ class Muxer : public MediaHandler {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_MUXER_H_
+#endif  // PACKAGER_MEDIA_BASE_MUXER_H_
diff --git a/packager/media/base/muxer_options.h b/packager/media/base/muxer_options.h
index 79cc0d18ce..f409e19fdf 100644
--- a/packager/media/base/muxer_options.h
+++ b/packager/media/base/muxer_options.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 MEDIA_BASE_MUXER_OPTIONS_H_
-#define MEDIA_BASE_MUXER_OPTIONS_H_
+#ifndef PACKAGER_MEDIA_BASE_MUXER_OPTIONS_H_
+#define PACKAGER_MEDIA_BASE_MUXER_OPTIONS_H_
 
 #include <stdint.h>
 
@@ -46,4 +46,4 @@ struct MuxerOptions {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_MUXER_OPTIONS_H_
+#endif  // PACKAGER_MEDIA_BASE_MUXER_OPTIONS_H_
diff --git a/packager/media/base/muxer_util.h b/packager/media/base/muxer_util.h
index 49d6fb2bb5..9bc936a902 100644
--- a/packager/media/base/muxer_util.h
+++ b/packager/media/base/muxer_util.h
@@ -6,8 +6,8 @@
 //
 // Muxer utility functions.
 
-#ifndef MEDIA_BASE_MUXER_UTIL_H_
-#define MEDIA_BASE_MUXER_UTIL_H_
+#ifndef PACKAGER_MEDIA_BASE_MUXER_UTIL_H_
+#define PACKAGER_MEDIA_BASE_MUXER_UTIL_H_
 
 #include <stdint.h>
 
@@ -42,4 +42,4 @@ std::string GetSegmentName(const std::string& segment_template,
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_MUXER_UTIL_H_
+#endif  // PACKAGER_MEDIA_BASE_MUXER_UTIL_H_
diff --git a/packager/media/base/network_util.h b/packager/media/base/network_util.h
index 7028f0d033..df0b3c81ff 100644
--- a/packager/media/base/network_util.h
+++ b/packager/media/base/network_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_NETWORK_UTIL_H_
-#define MEDIA_BASE_NETWORK_UTIL_H_
+#ifndef PACKAGER_MEDIA_BASE_NETWORK_UTIL_H_
+#define PACKAGER_MEDIA_BASE_NETWORK_UTIL_H_
 
 #include <stdint.h>
 
@@ -17,4 +17,4 @@ uint64_t ntohllFromBuffer(const unsigned char* buf);
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_NETWORK_UTIL_H_
+#endif  // PACKAGER_MEDIA_BASE_NETWORK_UTIL_H_
diff --git a/packager/media/base/offset_byte_queue.h b/packager/media/base/offset_byte_queue.h
index 3e848b9c77..c4fc8b6cb0 100644
--- a/packager/media/base/offset_byte_queue.h
+++ b/packager/media/base/offset_byte_queue.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_OFFSET_BYTE_QUEUE_H_
-#define MEDIA_BASE_OFFSET_BYTE_QUEUE_H_
+#ifndef PACKAGER_MEDIA_BASE_OFFSET_BYTE_QUEUE_H_
+#define PACKAGER_MEDIA_BASE_OFFSET_BYTE_QUEUE_H_
 
 #include <stdint.h>
 
@@ -69,4 +69,4 @@ class OffsetByteQueue {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_OFFSET_BYTE_QUEUE_H_
+#endif  // PACKAGER_MEDIA_BASE_OFFSET_BYTE_QUEUE_H_
diff --git a/packager/media/base/playready_key_source.h b/packager/media/base/playready_key_source.h
index 778ecf4091..c3576ec43f 100644
--- a/packager/media/base/playready_key_source.h
+++ b/packager/media/base/playready_key_source.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 MEDIA_BASE_PLAYREADY_SOURCE_H_
-#define MEDIA_BASE_PLAYREADY_SOURCE_H_
+#ifndef PACKAGER_MEDIA_BASE_PLAYREADY_SOURCE_H_
+#define PACKAGER_MEDIA_BASE_PLAYREADY_SOURCE_H_
 
 #include <memory>
 #include <string>
@@ -81,4 +81,4 @@ class PlayReadyKeySource : public KeySource {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_PLAYREADY_SOURCE_H_
+#endif  // PACKAGER_MEDIA_BASE_PLAYREADY_SOURCE_H_
diff --git a/packager/media/base/producer_consumer_queue.h b/packager/media/base/producer_consumer_queue.h
index b88ba49221..73de807caa 100644
--- a/packager/media/base/producer_consumer_queue.h
+++ b/packager/media/base/producer_consumer_queue.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 MEDIA_BASE_PRODUCER_CONSUMER_QUEUE_H_
-#define MEDIA_BASE_PRODUCER_CONSUMER_QUEUE_H_
+#ifndef PACKAGER_MEDIA_BASE_PRODUCER_CONSUMER_QUEUE_H_
+#define PACKAGER_MEDIA_BASE_PRODUCER_CONSUMER_QUEUE_H_
 
 #include <deque>
 
@@ -317,4 +317,4 @@ void ProducerConsumerQueue<T>::SlideHeadOnCenter(size_t pos) {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_PRODUCER_CONSUMER_QUEUE_H_
+#endif  // PACKAGER_MEDIA_BASE_PRODUCER_CONSUMER_QUEUE_H_
diff --git a/packager/media/base/protection_system_specific_info.h b/packager/media/base/protection_system_specific_info.h
index 54c1d04b3e..b25703d982 100644
--- a/packager/media/base/protection_system_specific_info.h
+++ b/packager/media/base/protection_system_specific_info.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 MEDIA_BASE_PSSH_H_
-#define MEDIA_BASE_PSSH_H_
+#ifndef PACKAGER_MEDIA_BASE_PSSH_H_
+#define PACKAGER_MEDIA_BASE_PSSH_H_
 
 #include <stdint.h>
 #include <vector>
@@ -70,4 +70,4 @@ class ProtectionSystemSpecificInfo {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_PSSH_H_
+#endif  // PACKAGER_MEDIA_BASE_PSSH_H_
diff --git a/packager/media/base/request_signer.h b/packager/media/base/request_signer.h
index a89ee153d9..2f0f9adddd 100644
--- a/packager/media/base/request_signer.h
+++ b/packager/media/base/request_signer.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 MEDIA_BASE_REQUEST_SIGNER_H_
-#define MEDIA_BASE_REQUEST_SIGNER_H_
+#ifndef PACKAGER_MEDIA_BASE_REQUEST_SIGNER_H_
+#define PACKAGER_MEDIA_BASE_REQUEST_SIGNER_H_
 
 #include <memory>
 #include <string>
@@ -91,4 +91,4 @@ class RsaRequestSigner : public RequestSigner {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_REQUEST_SIGNER_H_
+#endif  // PACKAGER_MEDIA_BASE_REQUEST_SIGNER_H_
diff --git a/packager/media/base/rsa_key.h b/packager/media/base/rsa_key.h
index 42ce07c770..18f4f78013 100644
--- a/packager/media/base/rsa_key.h
+++ b/packager/media/base/rsa_key.h
@@ -7,8 +7,8 @@
 // Declaration of classes representing RSA private and public keys used
 // for message signing, signature verification, encryption and decryption.
 
-#ifndef MEDIA_BASE_RSA_KEY_H_
-#define MEDIA_BASE_RSA_KEY_H_
+#ifndef PACKAGER_MEDIA_BASE_RSA_KEY_H_
+#define PACKAGER_MEDIA_BASE_RSA_KEY_H_
 
 #include <string>
 
@@ -81,4 +81,4 @@ class RsaPublicKey {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_RSA_KEY_H_
+#endif  // PACKAGER_MEDIA_BASE_RSA_KEY_H_
diff --git a/packager/media/base/stream_info.h b/packager/media/base/stream_info.h
index bf53746724..9019850036 100644
--- a/packager/media/base/stream_info.h
+++ b/packager/media/base/stream_info.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 MEDIA_BASE_STREAM_INFO_H_
-#define MEDIA_BASE_STREAM_INFO_H_
+#ifndef PACKAGER_MEDIA_BASE_STREAM_INFO_H_
+#define PACKAGER_MEDIA_BASE_STREAM_INFO_H_
 
 #include <memory>
 #include <string>
@@ -137,4 +137,4 @@ class StreamInfo {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_STREAM_INFO_H_
+#endif  // PACKAGER_MEDIA_BASE_STREAM_INFO_H_
diff --git a/packager/media/base/test/fake_prng.h b/packager/media/base/test/fake_prng.h
index 02bd7ed117..2bf668c397 100644
--- a/packager/media/base/test/fake_prng.h
+++ b/packager/media/base/test/fake_prng.h
@@ -6,8 +6,8 @@
 //
 // Fake, deterministic PRNG for OpenSSL to be used for unit testing.
 
-#ifndef MEDIA_BASE_FAKE_PRNG_H
-#define MEDIA_BASE_FAKE_PRNG_H
+#ifndef PACKAGER_MEDIA_BASE_FAKE_PRNG_H
+#define PACKAGER_MEDIA_BASE_FAKE_PRNG_H
 
 namespace shaka {
 namespace media {
@@ -24,4 +24,4 @@ void StopFakePrng();
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_FAKE_PRNG_H
+#endif  // PACKAGER_MEDIA_BASE_FAKE_PRNG_H
diff --git a/packager/media/base/test/rsa_test_data.h b/packager/media/base/test/rsa_test_data.h
index 60b1882bbe..be9e623b8e 100644
--- a/packager/media/base/test/rsa_test_data.h
+++ b/packager/media/base/test/rsa_test_data.h
@@ -6,8 +6,8 @@
 //
 // RSA test data generated using fake_prng for purposes of testing.
 
-#ifndef MEDIA_BASE_RSA_TEST_DATA_H_
-#define MEDIA_BASE_RSA_TEST_DATA_H_
+#ifndef PACKAGER_MEDIA_BASE_RSA_TEST_DATA_H_
+#define PACKAGER_MEDIA_BASE_RSA_TEST_DATA_H_
 
 #include <string>
 
@@ -47,4 +47,4 @@ class RsaTestData {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_RSA_TEST_DATA_H_
+#endif  // PACKAGER_MEDIA_BASE_RSA_TEST_DATA_H_
diff --git a/packager/media/base/text_sample.h b/packager/media/base/text_sample.h
index db8b94aa04..6ad8d2403a 100644
--- a/packager/media/base/text_sample.h
+++ b/packager/media/base/text_sample.h
@@ -44,4 +44,4 @@ class TextSample {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_TEXT_SAMPLE_H_
+#endif  // PACKAGER_MEDIA_BASE_TEXT_SAMPLE_H_
diff --git a/packager/media/base/text_track.h b/packager/media/base/text_track.h
index a3f71528a4..30c68f57bd 100644
--- a/packager/media/base/text_track.h
+++ b/packager/media/base/text_track.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_TEXT_TRACK_H_
-#define MEDIA_BASE_TEXT_TRACK_H_
+#ifndef PACKAGER_MEDIA_BASE_TEXT_TRACK_H_
+#define PACKAGER_MEDIA_BASE_TEXT_TRACK_H_
 
 #include <memory>
 #include <string>
@@ -41,4 +41,4 @@ typedef base::Callback<std::unique_ptr<TextTrack>(TextKind kind,
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_TEXT_TRACK_H_
+#endif  // PACKAGER_MEDIA_BASE_TEXT_TRACK_H_
diff --git a/packager/media/base/timestamp.h b/packager/media/base/timestamp.h
index 92b502fa68..21ee1fc867 100644
--- a/packager/media/base/timestamp.h
+++ b/packager/media/base/timestamp.h
@@ -5,8 +5,8 @@
 // https://developers.google.com/open-source/licenses/bsd
 
 
-#ifndef MEDIA_BASE_TIMESTAMP_H_
-#define MEDIA_BASE_TIMESTAMP_H_
+#ifndef PACKAGER_MEDIA_BASE_TIMESTAMP_H_
+#define PACKAGER_MEDIA_BASE_TIMESTAMP_H_
 
 #include <stdint.h>
 
@@ -21,4 +21,4 @@ const int64_t kInfiniteDuration = std::numeric_limits<int64_t>::max();
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_TIMESTAMP_H_
+#endif  // PACKAGER_MEDIA_BASE_TIMESTAMP_H_
diff --git a/packager/media/base/video_stream_info.h b/packager/media/base/video_stream_info.h
index 4981f92c0d..20d5f66a79 100644
--- a/packager/media/base/video_stream_info.h
+++ b/packager/media/base/video_stream_info.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 MEDIA_BASE_VIDEO_STREAM_INFO_H_
-#define MEDIA_BASE_VIDEO_STREAM_INFO_H_
+#ifndef PACKAGER_MEDIA_BASE_VIDEO_STREAM_INFO_H_
+#define PACKAGER_MEDIA_BASE_VIDEO_STREAM_INFO_H_
 
 #include "packager/media/base/stream_info.h"
 
@@ -123,4 +123,4 @@ class VideoStreamInfo : public StreamInfo {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_VIDEO_STREAM_INFO_H_
+#endif  // PACKAGER_MEDIA_BASE_VIDEO_STREAM_INFO_H_
diff --git a/packager/media/base/widevine_key_source.h b/packager/media/base/widevine_key_source.h
index 9df4ddcdd3..c8e3b92cf0 100644
--- a/packager/media/base/widevine_key_source.h
+++ b/packager/media/base/widevine_key_source.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 MEDIA_BASE_WIDEVINE_KEY_SOURCE_H_
-#define MEDIA_BASE_WIDEVINE_KEY_SOURCE_H_
+#ifndef PACKAGER_MEDIA_BASE_WIDEVINE_KEY_SOURCE_H_
+#define PACKAGER_MEDIA_BASE_WIDEVINE_KEY_SOURCE_H_
 
 #include <map>
 #include <memory>
@@ -139,4 +139,4 @@ class WidevineKeySource : public KeySource {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_WIDEVINE_KEY_SOURCE_H_
+#endif  // PACKAGER_MEDIA_BASE_WIDEVINE_KEY_SOURCE_H_
diff --git a/packager/media/codecs/aac_audio_specific_config.h b/packager/media/codecs/aac_audio_specific_config.h
index 5be25b8276..3360925fd7 100644
--- a/packager/media/codecs/aac_audio_specific_config.h
+++ b/packager/media/codecs/aac_audio_specific_config.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CODECS_AAC_AUDIO_SPECIFIC_CONFIG_H_
-#define MEDIA_CODECS_AAC_AUDIO_SPECIFIC_CONFIG_H_
+#ifndef PACKAGER_MEDIA_CODECS_AAC_AUDIO_SPECIFIC_CONFIG_H_
+#define PACKAGER_MEDIA_CODECS_AAC_AUDIO_SPECIFIC_CONFIG_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -136,4 +136,4 @@ class AACAudioSpecificConfig {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_AAC_AUDIO_SPECIFIC_CONFIG_H_
+#endif  // PACKAGER_MEDIA_CODECS_AAC_AUDIO_SPECIFIC_CONFIG_H_
diff --git a/packager/media/codecs/avc_decoder_configuration_record.h b/packager/media/codecs/avc_decoder_configuration_record.h
index 91a4419c14..d15a63bb67 100644
--- a/packager/media/codecs/avc_decoder_configuration_record.h
+++ b/packager/media/codecs/avc_decoder_configuration_record.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 MEDIA_CODECS_AVC_DECODER_CONFIGURATION_RECORD_H_
-#define MEDIA_CODECS_AVC_DECODER_CONFIGURATION_RECORD_H_
+#ifndef PACKAGER_MEDIA_CODECS_AVC_DECODER_CONFIGURATION_RECORD_H_
+#define PACKAGER_MEDIA_CODECS_AVC_DECODER_CONFIGURATION_RECORD_H_
 
 #include <stdint.h>
 #include <string>
@@ -63,4 +63,4 @@ class AVCDecoderConfigurationRecord : public DecoderConfigurationRecord {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_AVC_DECODER_CONFIGURATION_RECORD_H_
+#endif  // PACKAGER_MEDIA_CODECS_AVC_DECODER_CONFIGURATION_RECORD_H_
diff --git a/packager/media/codecs/decoder_configuration_record.h b/packager/media/codecs/decoder_configuration_record.h
index 533bf97d55..7d1018b1fd 100644
--- a/packager/media/codecs/decoder_configuration_record.h
+++ b/packager/media/codecs/decoder_configuration_record.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 MEDIA_CODECS_DECODER_CONFIGURATION_RECORD_H_
-#define MEDIA_CODECS_DECODER_CONFIGURATION_RECORD_H_
+#ifndef PACKAGER_MEDIA_CODECS_DECODER_CONFIGURATION_RECORD_H_
+#define PACKAGER_MEDIA_CODECS_DECODER_CONFIGURATION_RECORD_H_
 
 #include <vector>
 
@@ -77,4 +77,4 @@ class DecoderConfigurationRecord {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_DECODER_CONFIGURATION_RECORD_H_
+#endif  // PACKAGER_MEDIA_CODECS_DECODER_CONFIGURATION_RECORD_H_
diff --git a/packager/media/codecs/ec3_audio_util.h b/packager/media/codecs/ec3_audio_util.h
index be85e915be..15d24ef574 100644
--- a/packager/media/codecs/ec3_audio_util.h
+++ b/packager/media/codecs/ec3_audio_util.h
@@ -6,8 +6,8 @@
 //
 // Enhanced AC3 audio utility functions.
 
-#ifndef MEDIA_CODECS_EC3_AUDIO_UTIL_H_
-#define MEDIA_CODECS_EC3_AUDIO_UTIL_H_
+#ifndef PACKAGER_MEDIA_CODECS_EC3_AUDIO_UTIL_H_
+#define PACKAGER_MEDIA_CODECS_EC3_AUDIO_UTIL_H_
 
 #include <stdint.h>
 #include <vector>
@@ -24,4 +24,4 @@ bool CalculateEC3ChannelMap(const std::vector<uint8_t>& ec3_data,
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_EC3_AUDIO_UTIL_H_
+#endif  // PACKAGER_MEDIA_CODECS_EC3_AUDIO_UTIL_H_
diff --git a/packager/media/codecs/es_descriptor.h b/packager/media/codecs/es_descriptor.h
index c49bbe719f..e09a2894bf 100644
--- a/packager/media/codecs/es_descriptor.h
+++ b/packager/media/codecs/es_descriptor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CODECS_ES_DESCRIPTOR_H_
-#define MEDIA_CODECS_ES_DESCRIPTOR_H_
+#ifndef PACKAGER_MEDIA_CODECS_ES_DESCRIPTOR_H_
+#define PACKAGER_MEDIA_CODECS_ES_DESCRIPTOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -91,4 +91,4 @@ class ESDescriptor {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_ES_DESCRIPTOR_H_
+#endif  // PACKAGER_MEDIA_CODECS_ES_DESCRIPTOR_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 79074eadf8..ad3523434a 100644
--- a/packager/media/codecs/h264_byte_to_unit_stream_converter.h
+++ b/packager/media/codecs/h264_byte_to_unit_stream_converter.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 MEDIA_CODECS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_
-#define MEDIA_CODECS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_
+#ifndef PACKAGER_MEDIA_CODECS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_
+#define PACKAGER_MEDIA_CODECS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -49,4 +49,4 @@ class H264ByteToUnitStreamConverter : public H26xByteToUnitStreamConverter {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_
+#endif  // PACKAGER_MEDIA_CODECS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_
diff --git a/packager/media/codecs/h264_parser.h b/packager/media/codecs/h264_parser.h
index 76e75a5c72..f1b470c66d 100644
--- a/packager/media/codecs/h264_parser.h
+++ b/packager/media/codecs/h264_parser.h
@@ -4,8 +4,8 @@
 //
 // This file contains an implementation of an H264 Annex-B video stream parser.
 
-#ifndef MEDIA_CODECS_H264_PARSER_H_
-#define MEDIA_CODECS_H264_PARSER_H_
+#ifndef PACKAGER_MEDIA_CODECS_H264_PARSER_H_
+#define PACKAGER_MEDIA_CODECS_H264_PARSER_H_
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -339,4 +339,4 @@ class H264Parser {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_H264_PARSER_H_
+#endif  // PACKAGER_MEDIA_CODECS_H264_PARSER_H_
diff --git a/packager/media/codecs/h265_byte_to_unit_stream_converter.h b/packager/media/codecs/h265_byte_to_unit_stream_converter.h
index 889e86bd2c..ab077cbf9f 100644
--- a/packager/media/codecs/h265_byte_to_unit_stream_converter.h
+++ b/packager/media/codecs/h265_byte_to_unit_stream_converter.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 MEDIA_CODECS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_
-#define MEDIA_CODECS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_
+#ifndef PACKAGER_MEDIA_CODECS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_
+#define PACKAGER_MEDIA_CODECS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -50,4 +50,4 @@ class H265ByteToUnitStreamConverter : public H26xByteToUnitStreamConverter {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_
+#endif  // PACKAGER_MEDIA_CODECS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_
diff --git a/packager/media/codecs/h265_parser.h b/packager/media/codecs/h265_parser.h
index 7db12d0b8a..9b6215def5 100644
--- a/packager/media/codecs/h265_parser.h
+++ b/packager/media/codecs/h265_parser.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 MEDIA_CODECS_H265_PARSER_H_
-#define MEDIA_CODECS_H265_PARSER_H_
+#ifndef PACKAGER_MEDIA_CODECS_H265_PARSER_H_
+#define PACKAGER_MEDIA_CODECS_H265_PARSER_H_
 
 #include <map>
 #include <memory>
@@ -358,4 +358,4 @@ class H265Parser {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_H265_PARSER_H_
+#endif  // PACKAGER_MEDIA_CODECS_H265_PARSER_H_
diff --git a/packager/media/codecs/h26x_bit_reader.h b/packager/media/codecs/h26x_bit_reader.h
index fdd36981e5..853ed160aa 100644
--- a/packager/media/codecs/h26x_bit_reader.h
+++ b/packager/media/codecs/h26x_bit_reader.h
@@ -4,8 +4,8 @@
 //
 // This file contains an implementation of an H264 Annex-B video stream parser.
 
-#ifndef MEDIA_CODECS_H264_BIT_READER_H_
-#define MEDIA_CODECS_H264_BIT_READER_H_
+#ifndef PACKAGER_MEDIA_CODECS_H264_BIT_READER_H_
+#define PACKAGER_MEDIA_CODECS_H264_BIT_READER_H_
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -98,4 +98,4 @@ class H26xBitReader {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_H264_BIT_READER_H_
+#endif  // PACKAGER_MEDIA_CODECS_H264_BIT_READER_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 bb4bc94275..782b345246 100644
--- a/packager/media/codecs/h26x_byte_to_unit_stream_converter.h
+++ b/packager/media/codecs/h26x_byte_to_unit_stream_converter.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 MEDIA_CODECS_H26X_BYTE_TO_UNIT_STREAM_CONVERTER_H_
-#define MEDIA_CODECS_H26X_BYTE_TO_UNIT_STREAM_CONVERTER_H_
+#ifndef PACKAGER_MEDIA_CODECS_H26X_BYTE_TO_UNIT_STREAM_CONVERTER_H_
+#define PACKAGER_MEDIA_CODECS_H26X_BYTE_TO_UNIT_STREAM_CONVERTER_H_
 
 #include <stdint.h>
 
@@ -84,4 +84,4 @@ class H26xByteToUnitStreamConverter {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_H26x_BYTE_TO_UNIT_STREAM_CONVERTER_H_
+#endif  // PACKAGER_MEDIA_CODECS_H26x_BYTE_TO_UNIT_STREAM_CONVERTER_H_
diff --git a/packager/media/codecs/hevc_decoder_configuration_record.h b/packager/media/codecs/hevc_decoder_configuration_record.h
index 5b94f77645..188f1342d0 100644
--- a/packager/media/codecs/hevc_decoder_configuration_record.h
+++ b/packager/media/codecs/hevc_decoder_configuration_record.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 MEDIA_CODECS_HEVC_DECODER_CONFIGURATION_RECORD_H_
-#define MEDIA_CODECS_HEVC_DECODER_CONFIGURATION_RECORD_H_
+#ifndef PACKAGER_MEDIA_CODECS_HEVC_DECODER_CONFIGURATION_RECORD_H_
+#define PACKAGER_MEDIA_CODECS_HEVC_DECODER_CONFIGURATION_RECORD_H_
 
 #include <stdint.h>
 #include <string>
@@ -45,4 +45,4 @@ class HEVCDecoderConfigurationRecord : public DecoderConfigurationRecord {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_HEVC_DECODER_CONFIGURATION_RECORD_H_
+#endif  // PACKAGER_MEDIA_CODECS_HEVC_DECODER_CONFIGURATION_RECORD_H_
diff --git a/packager/media/codecs/nalu_reader.h b/packager/media/codecs/nalu_reader.h
index b74de38e75..0a3041bc54 100644
--- a/packager/media/codecs/nalu_reader.h
+++ b/packager/media/codecs/nalu_reader.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 MEDIA_CODECS_NALU_READER_H_
-#define MEDIA_CODECS_NALU_READER_H_
+#ifndef PACKAGER_MEDIA_CODECS_NALU_READER_H_
+#define PACKAGER_MEDIA_CODECS_NALU_READER_H_
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -254,4 +254,4 @@ class NaluReader {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_NALU_READER_H_
+#endif  // PACKAGER_MEDIA_CODECS_NALU_READER_H_
diff --git a/packager/media/codecs/video_slice_header_parser.h b/packager/media/codecs/video_slice_header_parser.h
index 3a2b57bc85..85e4853942 100644
--- a/packager/media/codecs/video_slice_header_parser.h
+++ b/packager/media/codecs/video_slice_header_parser.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 MEDIA_CODECS_VIDEO_SLICE_HEADER_PARSER_H_
-#define MEDIA_CODECS_VIDEO_SLICE_HEADER_PARSER_H_
+#ifndef PACKAGER_MEDIA_CODECS_VIDEO_SLICE_HEADER_PARSER_H_
+#define PACKAGER_MEDIA_CODECS_VIDEO_SLICE_HEADER_PARSER_H_
 
 #include <vector>
 
@@ -70,5 +70,5 @@ class H265VideoSliceHeaderParser : public VideoSliceHeaderParser {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_VIDEO_SLICE_HEADER_PARSER_H_
+#endif  // PACKAGER_MEDIA_CODECS_VIDEO_SLICE_HEADER_PARSER_H_
 
diff --git a/packager/media/codecs/vp8_parser.h b/packager/media/codecs/vp8_parser.h
index 73b88fd003..2f5f0d137a 100644
--- a/packager/media/codecs/vp8_parser.h
+++ b/packager/media/codecs/vp8_parser.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 MEDIA_CODECS_VP8_PARSER_H_
-#define MEDIA_CODECS_VP8_PARSER_H_
+#ifndef PACKAGER_MEDIA_CODECS_VP8_PARSER_H_
+#define PACKAGER_MEDIA_CODECS_VP8_PARSER_H_
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -52,4 +52,4 @@ class VP8Parser : public VPxParser {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_VP8_PARSER_H_
+#endif  // PACKAGER_MEDIA_CODECS_VP8_PARSER_H_
diff --git a/packager/media/codecs/vp9_parser.h b/packager/media/codecs/vp9_parser.h
index a2a791107c..be43c790eb 100644
--- a/packager/media/codecs/vp9_parser.h
+++ b/packager/media/codecs/vp9_parser.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 MEDIA_CODECS_VP9_PARSER_H_
-#define MEDIA_CODECS_VP9_PARSER_H_
+#ifndef PACKAGER_MEDIA_CODECS_VP9_PARSER_H_
+#define PACKAGER_MEDIA_CODECS_VP9_PARSER_H_
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -51,4 +51,4 @@ class VP9Parser : public VPxParser {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_VP9_PARSER_H_
+#endif  // PACKAGER_MEDIA_CODECS_VP9_PARSER_H_
diff --git a/packager/media/codecs/vp_codec_configuration_record.h b/packager/media/codecs/vp_codec_configuration_record.h
index 9433c42a16..798c3dfda5 100644
--- a/packager/media/codecs/vp_codec_configuration_record.h
+++ b/packager/media/codecs/vp_codec_configuration_record.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 MEDIA_CODECS_VP_CODEC_CONFIGURATION_RECORD_H_
-#define MEDIA_CODECS_VP_CODEC_CONFIGURATION_RECORD_H_
+#ifndef PACKAGER_MEDIA_CODECS_VP_CODEC_CONFIGURATION_RECORD_H_
+#define PACKAGER_MEDIA_CODECS_VP_CODEC_CONFIGURATION_RECORD_H_
 
 #include <stdint.h>
 #include <string>
@@ -290,4 +290,4 @@ class VPCodecConfigurationRecord {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_VP_CODEC_CONFIGURATION_RECORD_H_
+#endif  // PACKAGER_MEDIA_CODECS_VP_CODEC_CONFIGURATION_RECORD_H_
diff --git a/packager/media/codecs/vpx_parser.h b/packager/media/codecs/vpx_parser.h
index 3b18a8f745..8981a768c1 100644
--- a/packager/media/codecs/vpx_parser.h
+++ b/packager/media/codecs/vpx_parser.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 MEDIA_CODECS_VPX_PARSER_H_
-#define MEDIA_CODECS_VPX_PARSER_H_
+#ifndef PACKAGER_MEDIA_CODECS_VPX_PARSER_H_
+#define PACKAGER_MEDIA_CODECS_VPX_PARSER_H_
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -57,4 +57,4 @@ class VPxParser {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_CODECS_VPX_PARSER_H_
+#endif  // PACKAGER_MEDIA_CODECS_VPX_PARSER_H_
diff --git a/packager/media/demuxer/demuxer.h b/packager/media/demuxer/demuxer.h
index 722b199a58..631208dde1 100644
--- a/packager/media/demuxer/demuxer.h
+++ b/packager/media/demuxer/demuxer.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 MEDIA_BASE_DEMUXER_H_
-#define MEDIA_BASE_DEMUXER_H_
+#ifndef PACKAGER_MEDIA_BASE_DEMUXER_H_
+#define PACKAGER_MEDIA_BASE_DEMUXER_H_
 
 #include <deque>
 #include <memory>
@@ -147,4 +147,4 @@ class Demuxer : public OriginHandler {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_BASE_DEMUXER_H_
+#endif  // PACKAGER_MEDIA_BASE_DEMUXER_H_
diff --git a/packager/media/event/mpd_notify_muxer_listener.h b/packager/media/event/mpd_notify_muxer_listener.h
index d6ab9cc699..cb37e0f555 100644
--- a/packager/media/event/mpd_notify_muxer_listener.h
+++ b/packager/media/event/mpd_notify_muxer_listener.h
@@ -6,8 +6,8 @@
 //
 // Implementation of MuxerListener that deals with MpdNotifier.
 
-#ifndef MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_
-#define MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_
+#ifndef PACKAGER_MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_
+#define PACKAGER_MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_
 
 #include <list>
 #include <memory>
@@ -83,4 +83,4 @@ class MpdNotifyMuxerListener : public MuxerListener {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_
+#endif  // PACKAGER_MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_
diff --git a/packager/media/event/muxer_listener.h b/packager/media/event/muxer_listener.h
index 1c44d3b1bb..f486fc43b6 100644
--- a/packager/media/event/muxer_listener.h
+++ b/packager/media/event/muxer_listener.h
@@ -6,8 +6,8 @@
 //
 // Event handler for events fired by Muxer.
 
-#ifndef MEDIA_EVENT_MUXER_LISTENER_H_
-#define MEDIA_EVENT_MUXER_LISTENER_H_
+#ifndef PACKAGER_MEDIA_EVENT_MUXER_LISTENER_H_
+#define PACKAGER_MEDIA_EVENT_MUXER_LISTENER_H_
 
 #include <stdint.h>
 
@@ -134,4 +134,4 @@ class MuxerListener {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_EVENT_MUXER_LISTENER_H_
+#endif  // PACKAGER_MEDIA_EVENT_MUXER_LISTENER_H_
diff --git a/packager/media/event/muxer_listener_internal.h b/packager/media/event/muxer_listener_internal.h
index ef2ee4b37d..d08dcce2a1 100644
--- a/packager/media/event/muxer_listener_internal.h
+++ b/packager/media/event/muxer_listener_internal.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 MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
-#define MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
+#ifndef PACKAGER_MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
+#define PACKAGER_MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
 
 #include <stdint.h>
 
@@ -59,4 +59,4 @@ std::string CreateUUIDString(const std::vector<uint8_t>& data);
 }  // namespace internal
 }  // namespace media
 }  // namespace shaka
-#endif  // MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
+#endif  // PACKAGER_MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
diff --git a/packager/media/event/muxer_listener_test_helper.h b/packager/media/event/muxer_listener_test_helper.h
index 5b568e90c6..3b96d00e5f 100644
--- a/packager/media/event/muxer_listener_test_helper.h
+++ b/packager/media/event/muxer_listener_test_helper.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 MEDIA_EVENT_MUXER_LISTENER_TEST_HELPER_H_
-#define MEDIA_EVENT_MUXER_LISTENER_TEST_HELPER_H_
+#ifndef PACKAGER_MEDIA_EVENT_MUXER_LISTENER_TEST_HELPER_H_
+#define PACKAGER_MEDIA_EVENT_MUXER_LISTENER_TEST_HELPER_H_
 
 #include <stdint.h>
 #include <vector>
@@ -104,4 +104,4 @@ bool MediaInfoEqual(const MediaInfo& expect, const MediaInfo& actual);
 
 }  // namespace shaka
 
-#endif  // MEDIA_EVENT_MUXER_LISTENER_TEST_HELPER_H_
+#endif  // PACKAGER_MEDIA_EVENT_MUXER_LISTENER_TEST_HELPER_H_
diff --git a/packager/media/event/progress_listener.h b/packager/media/event/progress_listener.h
index a9cfd5a5fd..6bae68ae69 100644
--- a/packager/media/event/progress_listener.h
+++ b/packager/media/event/progress_listener.h
@@ -6,8 +6,8 @@
 //
 // Event handler for progress updates.
 
-#ifndef MEDIA_EVENT_PROGRESS_LISTENER_H_
-#define MEDIA_EVENT_PROGRESS_LISTENER_H_
+#ifndef PACKAGER_MEDIA_EVENT_PROGRESS_LISTENER_H_
+#define PACKAGER_MEDIA_EVENT_PROGRESS_LISTENER_H_
 
 #include <stdint.h>
 
@@ -35,4 +35,4 @@ class ProgressListener {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_EVENT_PROGRESS_LISTENER_H_
+#endif  // PACKAGER_MEDIA_EVENT_PROGRESS_LISTENER_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 2e180a1b0d..9ddcfe0823 100644
--- a/packager/media/event/vod_media_info_dump_muxer_listener.h
+++ b/packager/media/event/vod_media_info_dump_muxer_listener.h
@@ -8,8 +8,8 @@
 // protobuf and dumps it to a file.
 // This is specifically for VOD.
 
-#ifndef MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_H_
-#define MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_H_
+#ifndef PACKAGER_MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_H_
+#define PACKAGER_MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_H_
 
 #include <memory>
 #include <string>
@@ -77,4 +77,4 @@ class VodMediaInfoDumpMuxerListener : public MuxerListener {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_H_
+#endif  // PACKAGER_MEDIA_EVENT_VOD_MEDIA_INFO_DUMP_MUXER_LISTENER_H_
diff --git a/packager/media/formats/mp2t/adts_header.h b/packager/media/formats/mp2t/adts_header.h
index 26a7315e9c..c1b6839c7b 100644
--- a/packager/media/formats/mp2t/adts_header.h
+++ b/packager/media/formats/mp2t/adts_header.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 MEDIA_FORMATS_MP2T_ADTS_HEADER_H_
-#define MEDIA_FORMATS_MP2T_ADTS_HEADER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_ADTS_HEADER_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_ADTS_HEADER_H_
 
 #include <stdint.h>
 
@@ -53,4 +53,4 @@ class AdtsHeader : public AudioHeader {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP2T_ADTS_HEADER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP2T_ADTS_HEADER_H_
diff --git a/packager/media/formats/mp2t/es_parser.h b/packager/media/formats/mp2t/es_parser.h
index 2c40b1bcc1..bcb4136f4e 100644
--- a/packager/media/formats/mp2t/es_parser.h
+++ b/packager/media/formats/mp2t/es_parser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP2T_ES_PARSER_H_
-#define MEDIA_FORMATS_MP2T_ES_PARSER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H_
 
 #include <stdint.h>
 
diff --git a/packager/media/formats/mp2t/es_parser_h264.h b/packager/media/formats/mp2t/es_parser_h264.h
index 0fd8f601bf..5db7fa4d8e 100644
--- a/packager/media/formats/mp2t/es_parser_h264.h
+++ b/packager/media/formats/mp2t/es_parser_h264.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
-#define MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
 
 #include <stdint.h>
 #include <memory>
diff --git a/packager/media/formats/mp2t/es_parser_h265.h b/packager/media/formats/mp2t/es_parser_h265.h
index cdbff11ad5..02944d661d 100644
--- a/packager/media/formats/mp2t/es_parser_h265.h
+++ b/packager/media/formats/mp2t/es_parser_h265.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 MEDIA_FORMATS_MP2T_ES_PARSER_H265_H_
-#define MEDIA_FORMATS_MP2T_ES_PARSER_H265_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H265_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H265_H_
 
 #include <stdint.h>
 
@@ -56,4 +56,4 @@ class EsParserH265 : public EsParserH26x {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP2T_ES_PARSER_H265_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H265_H_
diff --git a/packager/media/formats/mp2t/es_parser_h26x.h b/packager/media/formats/mp2t/es_parser_h26x.h
index 45a1a9f04e..124e2cdb43 100644
--- a/packager/media/formats/mp2t/es_parser_h26x.h
+++ b/packager/media/formats/mp2t/es_parser_h26x.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP2T_ES_PARSER_H26x_H_
-#define MEDIA_FORMATS_MP2T_ES_PARSER_H26x_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H26x_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_ES_PARSER_H26x_H_
 
 #include <stdint.h>
 
diff --git a/packager/media/formats/mp2t/mp2t_common.h b/packager/media/formats/mp2t/mp2t_common.h
index 36237e3c4e..40cdd9b45c 100644
--- a/packager/media/formats/mp2t/mp2t_common.h
+++ b/packager/media/formats/mp2t/mp2t_common.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP2T_MP2T_COMMON_H_
-#define MEDIA_FORMATS_MP2T_MP2T_COMMON_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_MP2T_COMMON_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_MP2T_COMMON_H_
 
 #define LOG_LEVEL_TS  5
 #define LOG_LEVEL_PES 4
diff --git a/packager/media/formats/mp2t/mp2t_media_parser.h b/packager/media/formats/mp2t/mp2t_media_parser.h
index a74b20570c..2ad7fbd733 100644
--- a/packager/media/formats/mp2t/mp2t_media_parser.h
+++ b/packager/media/formats/mp2t/mp2t_media_parser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP2T_MP2T_MEDIA_PARSER_H_
-#define MEDIA_FORMATS_MP2T_MP2T_MEDIA_PARSER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_MP2T_MEDIA_PARSER_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_MP2T_MEDIA_PARSER_H_
 
 #include <deque>
 #include <map>
diff --git a/packager/media/formats/mp2t/ts_packet.h b/packager/media/formats/mp2t/ts_packet.h
index 7874af2eaf..b5b1c0048d 100644
--- a/packager/media/formats/mp2t/ts_packet.h
+++ b/packager/media/formats/mp2t/ts_packet.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP2T_TS_PACKET_H_
-#define MEDIA_FORMATS_MP2T_TS_PACKET_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_PACKET_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_TS_PACKET_H_
 
 #include <stdint.h>
 
diff --git a/packager/media/formats/mp2t/ts_section.h b/packager/media/formats/mp2t/ts_section.h
index 2bd06c9b84..88bf084218 100644
--- a/packager/media/formats/mp2t/ts_section.h
+++ b/packager/media/formats/mp2t/ts_section.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_H_
-#define MEDIA_FORMATS_MP2T_TS_SECTION_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_H_
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/formats/mp2t/ts_section_pat.h b/packager/media/formats/mp2t/ts_section_pat.h
index 38e08be6c3..c9efd96ccb 100644
--- a/packager/media/formats/mp2t/ts_section_pat.h
+++ b/packager/media/formats/mp2t/ts_section_pat.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_
-#define MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_
 
 #include "packager/base/callback.h"
 #include "packager/base/compiler_specific.h"
diff --git a/packager/media/formats/mp2t/ts_section_pes.h b/packager/media/formats/mp2t/ts_section_pes.h
index d96d16ebe0..7ece99d58f 100644
--- a/packager/media/formats/mp2t/ts_section_pes.h
+++ b/packager/media/formats/mp2t/ts_section_pes.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_
-#define MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_
 
 #include <stdint.h>
 #include <memory>
diff --git a/packager/media/formats/mp2t/ts_section_pmt.h b/packager/media/formats/mp2t/ts_section_pmt.h
index cf226f3679..7b14d82b70 100644
--- a/packager/media/formats/mp2t/ts_section_pmt.h
+++ b/packager/media/formats/mp2t/ts_section_pmt.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
-#define MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
 
 #include "packager/base/callback.h"
 #include "packager/base/compiler_specific.h"
diff --git a/packager/media/formats/mp2t/ts_section_psi.h b/packager/media/formats/mp2t/ts_section_psi.h
index cffa01d911..83280d8512 100644
--- a/packager/media/formats/mp2t/ts_section_psi.h
+++ b/packager/media/formats/mp2t/ts_section_psi.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_
-#define MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_
+#define PACKAGER_MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_
 
 #include "packager/base/compiler_specific.h"
 #include "packager/media/base/byte_queue.h"
diff --git a/packager/media/formats/mp4/box.h b/packager/media/formats/mp4/box.h
index de204bae04..fe6d2de2b7 100644
--- a/packager/media/formats/mp4/box.h
+++ b/packager/media/formats/mp4/box.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 MEDIA_FORMATS_MP4_BOX_H_
-#define MEDIA_FORMATS_MP4_BOX_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_BOX_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_BOX_H_
 
 #include <stdint.h>
 
@@ -101,4 +101,4 @@ struct FullBox : Box {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_BOX_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_BOX_H_
diff --git a/packager/media/formats/mp4/box_buffer.h b/packager/media/formats/mp4/box_buffer.h
index 59af585f0d..a9bad80d9d 100644
--- a/packager/media/formats/mp4/box_buffer.h
+++ b/packager/media/formats/mp4/box_buffer.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 MEDIA_FORMATS_MP4_BOX_BUFFER_H_
-#define MEDIA_FORMATS_MP4_BOX_BUFFER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_BOX_BUFFER_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_BOX_BUFFER_H_
 
 #include <string>
 
@@ -210,4 +210,4 @@ class BoxBuffer {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_BOX_BUFFER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_BOX_BUFFER_H_
diff --git a/packager/media/formats/mp4/box_definitions.h b/packager/media/formats/mp4/box_definitions.h
index 96c9cdd45f..6b7c494dc0 100644
--- a/packager/media/formats/mp4/box_definitions.h
+++ b/packager/media/formats/mp4/box_definitions.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
-#define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
 
 #include <vector>
 
@@ -836,4 +836,4 @@ struct VTTCueBox : Box {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
diff --git a/packager/media/formats/mp4/box_definitions_comparison.h b/packager/media/formats/mp4/box_definitions_comparison.h
index 85aeec88bb..d866a543d1 100644
--- a/packager/media/formats/mp4/box_definitions_comparison.h
+++ b/packager/media/formats/mp4/box_definitions_comparison.h
@@ -6,8 +6,8 @@
 //
 // Overloads operator== for mp4 boxes, mainly used for testing.
 
-#ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_
-#define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_
 
 #include "packager/media/formats/mp4/box_definitions.h"
 
@@ -499,4 +499,4 @@ inline bool operator==(const VTTCueBox& lhs,
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_
diff --git a/packager/media/formats/mp4/box_reader.h b/packager/media/formats/mp4/box_reader.h
index 4df0b1b34c..fb49eb0c6f 100644
--- a/packager/media/formats/mp4/box_reader.h
+++ b/packager/media/formats/mp4/box_reader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP4_BOX_READER_H_
-#define MEDIA_FORMATS_MP4_BOX_READER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_BOX_READER_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_BOX_READER_H_
 
 #include <map>
 #include <memory>
@@ -177,4 +177,4 @@ bool BoxReader::ReadAllChildren(std::vector<T>* children) {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_BOX_READER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_BOX_READER_H_
diff --git a/packager/media/formats/mp4/chunk_info_iterator.h b/packager/media/formats/mp4/chunk_info_iterator.h
index 04eeb9b8ae..198de40957 100644
--- a/packager/media/formats/mp4/chunk_info_iterator.h
+++ b/packager/media/formats/mp4/chunk_info_iterator.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 MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
-#define MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
 
 #include <stdint.h>
 
@@ -72,4 +72,4 @@ class ChunkInfoIterator {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
diff --git a/packager/media/formats/mp4/composition_offset_iterator.h b/packager/media/formats/mp4/composition_offset_iterator.h
index 413b32e1ea..51036512e3 100644
--- a/packager/media/formats/mp4/composition_offset_iterator.h
+++ b/packager/media/formats/mp4/composition_offset_iterator.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 MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
-#define MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
 
 #include <stdint.h>
 
@@ -57,4 +57,4 @@ class CompositionOffsetIterator {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
diff --git a/packager/media/formats/mp4/decoding_time_iterator.h b/packager/media/formats/mp4/decoding_time_iterator.h
index 3c02bcfb0e..8b388191e0 100644
--- a/packager/media/formats/mp4/decoding_time_iterator.h
+++ b/packager/media/formats/mp4/decoding_time_iterator.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 MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
-#define MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
 
 #include <stdint.h>
 
@@ -57,4 +57,4 @@ class DecodingTimeIterator {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
diff --git a/packager/media/formats/mp4/fragmenter.h b/packager/media/formats/mp4/fragmenter.h
index 1d2ca36054..77525eb5cd 100644
--- a/packager/media/formats/mp4/fragmenter.h
+++ b/packager/media/formats/mp4/fragmenter.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 MEDIA_FORMATS_MP4_FRAGMENTER_H_
-#define MEDIA_FORMATS_MP4_FRAGMENTER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_FRAGMENTER_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_FRAGMENTER_H_
 
 #include <memory>
 #include <vector>
@@ -123,4 +123,4 @@ bool Fragmenter::OptimizeSampleEntries(std::vector<T>* entries,
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_FRAGMENTER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_FRAGMENTER_H_
diff --git a/packager/media/formats/mp4/mp4_media_parser.h b/packager/media/formats/mp4/mp4_media_parser.h
index 8f7ede4d7d..4b51b9e4a0 100644
--- a/packager/media/formats/mp4/mp4_media_parser.h
+++ b/packager/media/formats/mp4/mp4_media_parser.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 MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
-#define MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
 
 #include <stdint.h>
 
@@ -108,4 +108,4 @@ class MP4MediaParser : public MediaParser {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
diff --git a/packager/media/formats/mp4/mp4_muxer.h b/packager/media/formats/mp4/mp4_muxer.h
index 421d65bb21..185b16ae71 100644
--- a/packager/media/formats/mp4/mp4_muxer.h
+++ b/packager/media/formats/mp4/mp4_muxer.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 MEDIA_FORMATS_MP4_MP4_MUXER_H_
-#define MEDIA_FORMATS_MP4_MP4_MUXER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_MP4_MUXER_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_MP4_MUXER_H_
 
 #include <vector>
 
@@ -79,4 +79,4 @@ class MP4Muxer : public Muxer {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_MP4_MUXER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_MP4_MUXER_H_
diff --git a/packager/media/formats/mp4/multi_segment_segmenter.h b/packager/media/formats/mp4/multi_segment_segmenter.h
index f3c35e9f20..2309d24164 100644
--- a/packager/media/formats/mp4/multi_segment_segmenter.h
+++ b/packager/media/formats/mp4/multi_segment_segmenter.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 MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
-#define MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
 
 #include "packager/media/formats/mp4/segmenter.h"
 
@@ -61,4 +61,4 @@ class MultiSegmentSegmenter : public Segmenter {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
diff --git a/packager/media/formats/mp4/segmenter.h b/packager/media/formats/mp4/segmenter.h
index 9955ab4a3a..d528dd2f55 100644
--- a/packager/media/formats/mp4/segmenter.h
+++ b/packager/media/formats/mp4/segmenter.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 MEDIA_FORMATS_MP4_SEGMENTER_H_
-#define MEDIA_FORMATS_MP4_SEGMENTER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_SEGMENTER_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_SEGMENTER_H_
 
 #include <map>
 #include <memory>
@@ -150,4 +150,4 @@ class Segmenter {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_SEGMENTER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_SEGMENTER_H_
diff --git a/packager/media/formats/mp4/single_segment_segmenter.h b/packager/media/formats/mp4/single_segment_segmenter.h
index 616a1ca560..37268c2e8f 100644
--- a/packager/media/formats/mp4/single_segment_segmenter.h
+++ b/packager/media/formats/mp4/single_segment_segmenter.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 MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_
-#define MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_
 
 #include "packager/file/file_closer.h"
 #include "packager/media/event/muxer_listener.h"
@@ -57,4 +57,4 @@ class SingleSegmentSegmenter : public Segmenter {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_
diff --git a/packager/media/formats/mp4/sync_sample_iterator.h b/packager/media/formats/mp4/sync_sample_iterator.h
index a2fc5f76dc..65b2a9b5ba 100644
--- a/packager/media/formats/mp4/sync_sample_iterator.h
+++ b/packager/media/formats/mp4/sync_sample_iterator.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 MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
-#define MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
 
 #include <stdint.h>
 
@@ -49,4 +49,4 @@ class SyncSampleIterator {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
diff --git a/packager/media/formats/mp4/track_run_iterator.h b/packager/media/formats/mp4/track_run_iterator.h
index 892c254f3a..5629678679 100644
--- a/packager/media/formats/mp4/track_run_iterator.h
+++ b/packager/media/formats/mp4/track_run_iterator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
-#define MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
+#ifndef PACKAGER_MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
+#define PACKAGER_MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
 
 #include <memory>
 #include <vector>
@@ -124,4 +124,4 @@ class TrackRunIterator {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
+#endif  // PACKAGER_MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
diff --git a/packager/media/formats/webm/cluster_builder.h b/packager/media/formats/webm/cluster_builder.h
index 2491bb2828..83269016c8 100644
--- a/packager/media/formats/webm/cluster_builder.h
+++ b/packager/media/formats/webm/cluster_builder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_
-#define MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_
 
 #include <stdint.h>
 #include <memory>
@@ -86,4 +86,4 @@ class ClusterBuilder {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_
diff --git a/packager/media/formats/webm/encryptor.h b/packager/media/formats/webm/encryptor.h
index e284be078b..78ee082589 100644
--- a/packager/media/formats/webm/encryptor.h
+++ b/packager/media/formats/webm/encryptor.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 MEDIA_FORMATS_WEBM_ENCRYPTOR_H_
-#define MEDIA_FORMATS_WEBM_ENCRYPTOR_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_ENCRYPTOR_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_ENCRYPTOR_H_
 
 #include <vector>
 
@@ -32,4 +32,4 @@ void UpdateFrameForEncryption(MediaSample* sample);
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_ENCRYPTOR_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_ENCRYPTOR_H_
diff --git a/packager/media/formats/webm/mkv_writer.h b/packager/media/formats/webm/mkv_writer.h
index 2f17d1348f..cfed034a83 100644
--- a/packager/media/formats/webm/mkv_writer.h
+++ b/packager/media/formats/webm/mkv_writer.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 MEDIA_FORMATS_WEBM_MKV_WRITER_H_
-#define MEDIA_FORMATS_WEBM_MKV_WRITER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_MKV_WRITER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_MKV_WRITER_H_
 
 #include <memory>
 #include <string>
@@ -72,4 +72,4 @@ class MkvWriter : public mkvmuxer::IMkvWriter {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_MKV_WRITER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_MKV_WRITER_H_
diff --git a/packager/media/formats/webm/multi_segment_segmenter.h b/packager/media/formats/webm/multi_segment_segmenter.h
index 66b509b1fb..4d788ca793 100644
--- a/packager/media/formats/webm/multi_segment_segmenter.h
+++ b/packager/media/formats/webm/multi_segment_segmenter.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 MEDIA_FORMATS_WEBM_MULTI_SEGMENT_SEGMENTER_H_
-#define MEDIA_FORMATS_WEBM_MULTI_SEGMENT_SEGMENTER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_MULTI_SEGMENT_SEGMENTER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_MULTI_SEGMENT_SEGMENTER_H_
 
 #include <memory>
 #include "packager/media/formats/webm/mkv_writer.h"
@@ -55,4 +55,4 @@ class MultiSegmentSegmenter : public Segmenter {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_MULTI_SEGMENT_SEGMENTER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_MULTI_SEGMENT_SEGMENTER_H_
diff --git a/packager/media/formats/webm/seek_head.h b/packager/media/formats/webm/seek_head.h
index a4c3c019d6..5f020bdaa9 100644
--- a/packager/media/formats/webm/seek_head.h
+++ b/packager/media/formats/webm/seek_head.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 MEDIA_FORMATS_WEBM_SEEK_HEAD_H_
-#define MEDIA_FORMATS_WEBM_SEEK_HEAD_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_SEEK_HEAD_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_SEEK_HEAD_H_
 
 #include <stdint.h>
 #include <vector>
@@ -62,4 +62,4 @@ class SeekHead {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_SEEK_HEAD_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_SEEK_HEAD_H_
diff --git a/packager/media/formats/webm/segmenter.h b/packager/media/formats/webm/segmenter.h
index c361b077c4..f6c7c2184d 100644
--- a/packager/media/formats/webm/segmenter.h
+++ b/packager/media/formats/webm/segmenter.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 MEDIA_FORMATS_WEBM_SEGMENTER_H_
-#define MEDIA_FORMATS_WEBM_SEGMENTER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_SEGMENTER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_SEGMENTER_H_
 
 #include <memory>
 
@@ -163,4 +163,4 @@ class Segmenter {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_SEGMENTER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_SEGMENTER_H_
diff --git a/packager/media/formats/webm/segmenter_test_base.h b/packager/media/formats/webm/segmenter_test_base.h
index 4d190574a4..9e1a6342c7 100644
--- a/packager/media/formats/webm/segmenter_test_base.h
+++ b/packager/media/formats/webm/segmenter_test_base.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 MEDIA_FORMATS_WEBM_SEGMENTER_TEST_UTILS_H_
-#define MEDIA_FORMATS_WEBM_SEGMENTER_TEST_UTILS_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_SEGMENTER_TEST_UTILS_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_SEGMENTER_TEST_UTILS_H_
 
 #include <gtest/gtest.h>
 
@@ -114,4 +114,4 @@ class SegmentTestBase : public ::testing::Test {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_SEGMENTER_TEST_UTILS_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_SEGMENTER_TEST_UTILS_H_
diff --git a/packager/media/formats/webm/single_segment_segmenter.h b/packager/media/formats/webm/single_segment_segmenter.h
index 8bed12a723..0115fcd0af 100644
--- a/packager/media/formats/webm/single_segment_segmenter.h
+++ b/packager/media/formats/webm/single_segment_segmenter.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 MEDIA_FORMATS_WEBM_SINGLE_SEGMENT_SEGMENTER_H_
-#define MEDIA_FORMATS_WEBM_SINGLE_SEGMENT_SEGMENTER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_SINGLE_SEGMENT_SEGMENTER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_SINGLE_SEGMENT_SEGMENTER_H_
 
 #include "packager/media/formats/webm/segmenter.h"
 
@@ -68,4 +68,4 @@ class SingleSegmentSegmenter : public Segmenter {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_SINGLE_SEGMENT_SEGMENTER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_SINGLE_SEGMENT_SEGMENTER_H_
diff --git a/packager/media/formats/webm/tracks_builder.h b/packager/media/formats/webm/tracks_builder.h
index 9de52f434d..87ca4cb5e8 100644
--- a/packager/media/formats/webm/tracks_builder.h
+++ b/packager/media/formats/webm/tracks_builder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
-#define MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
 
 #include <stdint.h>
 
@@ -116,4 +116,4 @@ class TracksBuilder {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
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 ce916a3a33..bc19f3b06d 100644
--- a/packager/media/formats/webm/two_pass_single_segment_segmenter.h
+++ b/packager/media/formats/webm/two_pass_single_segment_segmenter.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 MEDIA_FORMATS_WEBM_TWO_PASS_SINGLE_SEGMENT_SEGMENTER_H_
-#define MEDIA_FORMATS_WEBM_TWO_PASS_SINGLE_SEGMENT_SEGMENTER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_TWO_PASS_SINGLE_SEGMENT_SEGMENTER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_TWO_PASS_SINGLE_SEGMENT_SEGMENTER_H_
 
 #include <memory>
 #include <string>
@@ -50,4 +50,4 @@ class TwoPassSingleSegmentSegmenter : public SingleSegmentSegmenter {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_TWO_PASS_SINGLE_SEGMENT_SEGMENTER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_TWO_PASS_SINGLE_SEGMENT_SEGMENTER_H_
diff --git a/packager/media/formats/webm/webm_audio_client.h b/packager/media/formats/webm/webm_audio_client.h
index 9b94f6df6c..99ea853701 100644
--- a/packager/media/formats/webm/webm_audio_client.h
+++ b/packager/media/formats/webm/webm_audio_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_
-#define MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_
 
 #include <memory>
 #include <string>
@@ -64,4 +64,4 @@ class WebMAudioClient : public WebMParserClient {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_
diff --git a/packager/media/formats/webm/webm_cluster_parser.h b/packager/media/formats/webm/webm_cluster_parser.h
index 47664d38aa..e4e7a7a8b7 100644
--- a/packager/media/formats/webm/webm_cluster_parser.h
+++ b/packager/media/formats/webm/webm_cluster_parser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
-#define MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
 
 #include <deque>
 #include <map>
@@ -236,4 +236,4 @@ class WebMClusterParser : public WebMParserClient {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
diff --git a/packager/media/formats/webm/webm_constants.h b/packager/media/formats/webm/webm_constants.h
index 154e5b8a0b..e5e5f35e89 100644
--- a/packager/media/formats/webm/webm_constants.h
+++ b/packager/media/formats/webm/webm_constants.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
-#define MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -247,4 +247,4 @@ extern const char kWebMCodecMetadata[];
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
diff --git a/packager/media/formats/webm/webm_content_encodings.h b/packager/media/formats/webm/webm_content_encodings.h
index ed853a9999..0c7d86d09e 100644
--- a/packager/media/formats/webm/webm_content_encodings.h
+++ b/packager/media/formats/webm/webm_content_encodings.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
-#define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
 
 #include <stdint.h>
 #include <memory>
@@ -86,4 +86,4 @@ class ContentEncoding {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
diff --git a/packager/media/formats/webm/webm_content_encodings_client.h b/packager/media/formats/webm/webm_content_encodings_client.h
index e2421ec4e2..e73058c976 100644
--- a/packager/media/formats/webm/webm_content_encodings_client.h
+++ b/packager/media/formats/webm/webm_content_encodings_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
-#define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
 
 #include <memory>
 #include <vector>
@@ -45,4 +45,4 @@ class WebMContentEncodingsClient : public WebMParserClient {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
diff --git a/packager/media/formats/webm/webm_crypto_helpers.h b/packager/media/formats/webm/webm_crypto_helpers.h
index 2a4e10aba6..56307a6c43 100644
--- a/packager/media/formats/webm/webm_crypto_helpers.h
+++ b/packager/media/formats/webm/webm_crypto_helpers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_
-#define MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_
 
 #include <stdint.h>
 #include <memory>
@@ -30,4 +30,4 @@ bool WebMCreateDecryptConfig(const uint8_t* data,
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_CRYPT_HELPERS_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_CRYPT_HELPERS_H_
diff --git a/packager/media/formats/webm/webm_info_parser.h b/packager/media/formats/webm/webm_info_parser.h
index 4a963978e2..e547754c48 100644
--- a/packager/media/formats/webm/webm_info_parser.h
+++ b/packager/media/formats/webm/webm_info_parser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_
-#define MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_
 
 #include "packager/base/compiler_specific.h"
 #include "packager/base/time/time.h"
@@ -47,4 +47,4 @@ class WebMInfoParser : public WebMParserClient {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_
diff --git a/packager/media/formats/webm/webm_media_parser.h b/packager/media/formats/webm/webm_media_parser.h
index e5031be8ac..b0ba0c7492 100644
--- a/packager/media/formats/webm/webm_media_parser.h
+++ b/packager/media/formats/webm/webm_media_parser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_WEBM_MEDIA_PARSER_H_
-#define MEDIA_FORMATS_WEBM_WEBM_MEDIA_PARSER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_MEDIA_PARSER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_MEDIA_PARSER_H_
 
 #include "packager/base/callback_forward.h"
 #include "packager/base/compiler_specific.h"
@@ -79,4 +79,4 @@ class WebMMediaParser : public MediaParser {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_MEDIA_PARSER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_MEDIA_PARSER_H_
diff --git a/packager/media/formats/webm/webm_muxer.h b/packager/media/formats/webm/webm_muxer.h
index 0ae2043667..86bd94e55d 100644
--- a/packager/media/formats/webm/webm_muxer.h
+++ b/packager/media/formats/webm/webm_muxer.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 MEDIA_FORMATS_WEBM_WEBM_MUXER_H_
-#define MEDIA_FORMATS_WEBM_WEBM_MUXER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_MUXER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_MUXER_H_
 
 #include "packager/media/base/muxer.h"
 
@@ -42,4 +42,4 @@ class WebMMuxer : public Muxer {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_MUXER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_MUXER_H_
diff --git a/packager/media/formats/webm/webm_parser.h b/packager/media/formats/webm/webm_parser.h
index 81dd6da4fb..b62ff86b66 100644
--- a/packager/media/formats/webm/webm_parser.h
+++ b/packager/media/formats/webm/webm_parser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
-#define MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
 
 #include <stdint.h>
 
@@ -160,4 +160,4 @@ int WebMParseElementHeader(const uint8_t* buf,
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
diff --git a/packager/media/formats/webm/webm_tracks_parser.h b/packager/media/formats/webm/webm_tracks_parser.h
index 71d7096ae2..7e33a6f708 100644
--- a/packager/media/formats/webm/webm_tracks_parser.h
+++ b/packager/media/formats/webm/webm_tracks_parser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
-#define MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
 
 #include <map>
 #include <memory>
@@ -114,4 +114,4 @@ class WebMTracksParser : public WebMParserClient {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
diff --git a/packager/media/formats/webm/webm_video_client.h b/packager/media/formats/webm/webm_video_client.h
index 308855c45e..1bf8892dd2 100644
--- a/packager/media/formats/webm/webm_video_client.h
+++ b/packager/media/formats/webm/webm_video_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_
-#define MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_
 
 #include <memory>
 #include <string>
@@ -77,4 +77,4 @@ class WebMVideoClient : public WebMParserClient {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_
diff --git a/packager/media/formats/webm/webm_webvtt_parser.h b/packager/media/formats/webm/webm_webvtt_parser.h
index 95dd1e09df..8fbd150380 100644
--- a/packager/media/formats/webm/webm_webvtt_parser.h
+++ b/packager/media/formats/webm/webm_webvtt_parser.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_FORMATS_WEBM_WEBM_WEBVTT_PARSER_H_
-#define MEDIA_FORMATS_WEBM_WEBM_WEBVTT_PARSER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBM_WEBM_WEBVTT_PARSER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBM_WEBM_WEBVTT_PARSER_H_
 
 #include <stdint.h>
 
@@ -50,4 +50,4 @@ class WebMWebVTTParser {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBM_WEBM_WEBVTT_PARSER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBM_WEBM_WEBVTT_PARSER_H_
diff --git a/packager/media/formats/webvtt/webvtt_media_parser.h b/packager/media/formats/webvtt/webvtt_media_parser.h
index 0a800a8efc..4b64994de7 100644
--- a/packager/media/formats/webvtt/webvtt_media_parser.h
+++ b/packager/media/formats/webvtt/webvtt_media_parser.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 MEDIA_FORMATS_WEBVTT_WEBVTT_MEDIA_PARSER_H_
-#define MEDIA_FORMATS_WEBVTT_WEBVTT_MEDIA_PARSER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WEBVTT_WEBVTT_MEDIA_PARSER_H_
+#define PACKAGER_MEDIA_FORMATS_WEBVTT_WEBVTT_MEDIA_PARSER_H_
 
 #include <stdint.h>
 
@@ -81,4 +81,4 @@ class WebVttMediaParser : public MediaParser {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WEBVTT_WEBVTT_MEDIA_PARSER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WEBVTT_WEBVTT_MEDIA_PARSER_H_
diff --git a/packager/media/formats/wvm/wvm_media_parser.h b/packager/media/formats/wvm/wvm_media_parser.h
index 4242625168..e1f79cfe1c 100644
--- a/packager/media/formats/wvm/wvm_media_parser.h
+++ b/packager/media/formats/wvm/wvm_media_parser.h
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 // Media parser for a Widevine Media Format (WVM) file.
 
-#ifndef MEDIA_FORMATS_WVM_WVM_MEDIA_PARSER_H_
-#define MEDIA_FORMATS_WVM_WVM_MEDIA_PARSER_H_
+#ifndef PACKAGER_MEDIA_FORMATS_WVM_WVM_MEDIA_PARSER_H_
+#define PACKAGER_MEDIA_FORMATS_WVM_WVM_MEDIA_PARSER_H_
 
 #include <deque>
 #include <map>
@@ -260,4 +260,4 @@ class WvmMediaParser : public MediaParser {
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_FORMATS_WVM_WVM_MEDIA_PARSER_H_
+#endif  // PACKAGER_MEDIA_FORMATS_WVM_WVM_MEDIA_PARSER_H_
diff --git a/packager/media/test/test_data_util.h b/packager/media/test/test_data_util.h
index 459f6bfa32..477a2bf3d4 100644
--- a/packager/media/test/test_data_util.h
+++ b/packager/media/test/test_data_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_TEST_TEST_DATA_UTIL_H_
-#define MEDIA_TEST_TEST_DATA_UTIL_H_
+#ifndef PACKAGER_MEDIA_TEST_TEST_DATA_UTIL_H_
+#define PACKAGER_MEDIA_TEST_TEST_DATA_UTIL_H_
 
 #include <stdint.h>
 
@@ -26,4 +26,4 @@ std::vector<uint8_t> ReadTestDataFile(const std::string& name);
 }  // namespace media
 }  // namespace shaka
 
-#endif  // MEDIA_TEST_TEST_DATA_UTIL_H_
+#endif  // PACKAGER_MEDIA_TEST_TEST_DATA_UTIL_H_