diff --git a/packager/file/callback_file.cc b/packager/file/callback_file.cc
index 49b3b811dd..1cd4b94363 100644
--- a/packager/file/callback_file.cc
+++ b/packager/file/callback_file.cc
@@ -7,7 +7,7 @@
 #include "packager/file/callback_file.h"
 
 #include "glog/logging.h"
-#include "packager/common.h"
+#include "packager/macros.h"
 
 namespace shaka {
 
diff --git a/packager/file/file.h b/packager/file/file.h
index db0bbf3796..d006b33581 100644
--- a/packager/file/file.h
+++ b/packager/file/file.h
@@ -11,8 +11,8 @@
 
 #include <string>
 
-#include "packager/common.h"
 #include "packager/file/public/buffer_callback_params.h"
+#include "packager/macros.h"
 #include "packager/status/status.h"
 
 namespace shaka {
diff --git a/packager/file/http_file.cc b/packager/file/http_file.cc
index 4cb065947b..1202a7306f 100644
--- a/packager/file/http_file.cc
+++ b/packager/file/http_file.cc
@@ -14,8 +14,8 @@
 #include "absl/strings/str_format.h"
 #include "glog/logging.h"
 
-#include "packager/common.h"
 #include "packager/file/thread_pool.h"
+#include "packager/macros.h"
 #include "packager/version/version.h"
 
 ABSL_FLAG(std::string,
diff --git a/packager/file/io_cache.h b/packager/file/io_cache.h
index 80e885bf13..b69e823086 100644
--- a/packager/file/io_cache.h
+++ b/packager/file/io_cache.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "absl/synchronization/mutex.h"
-#include "packager/common.h"
+#include "packager/macros.h"
 
 namespace shaka {
 
diff --git a/packager/file/thread_pool.h b/packager/file/thread_pool.h
index 8be949be82..4cc8bca298 100644
--- a/packager/file/thread_pool.h
+++ b/packager/file/thread_pool.h
@@ -7,13 +7,12 @@
 #ifndef PACKAGER_FILE_THREAD_POOL_H_
 #define PACKAGER_FILE_THREAD_POOL_H_
 
-#include "packager/common.h"
-
 #include <functional>
 #include <queue>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/synchronization/mutex.h"
+#include "packager/macros.h"
 
 namespace shaka {
 
diff --git a/packager/file/udp_options.cc b/packager/file/udp_options.cc
index b74a2b5774..6551cc951d 100644
--- a/packager/file/udp_options.cc
+++ b/packager/file/udp_options.cc
@@ -10,8 +10,8 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_split.h"
 #include "glog/logging.h"
-#include "packager/common.h"
 #include "packager/kv_pairs/kv_pairs.h"
+#include "packager/macros.h"
 
 ABSL_FLAG(std::string,
           udp_interface_address,
diff --git a/packager/common.h b/packager/macros.h
similarity index 89%
rename from packager/common.h
rename to packager/macros.h
index a48621b38e..0127d34bae 100644
--- a/packager/common.h
+++ b/packager/macros.h
@@ -4,15 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef PACKAGER_COMMON_H_
-#define PACKAGER_COMMON_H_
+#ifndef PACKAGER_MACROS_H_
+#define PACKAGER_MACROS_H_
 
 #include <type_traits>
 
 #include "absl/base/macros.h"
 
-namespace shaka {
-
 /// A macro to disable copying and assignment. Usage:
 /// class Foo {
 ///  private:
@@ -34,6 +32,4 @@ namespace shaka {
 /// You can use the insertion operator to add specific logs to this.
 #define NOTIMPLEMENTED() LOG(ERROR) << "NOTIMPLEMENTED: "
 
-}  // namespace shaka
-
-#endif  // PACKAGER_COMMON_H_
+#endif  // PACKAGER_MACROS_H_
diff --git a/packager/status/status.cc b/packager/status/status.cc
index 1945a89d8e..63e809470c 100644
--- a/packager/status/status.cc
+++ b/packager/status/status.cc
@@ -8,7 +8,7 @@
 
 #include "absl/strings/str_format.h"
 #include "glog/logging.h"
-#include "packager/common.h"
+#include "packager/macros.h"
 
 namespace shaka {