diff --git a/common/client_cert.cc b/common/client_cert.cc
index da0d33e..78b9f5f 100644
--- a/common/client_cert.cc
+++ b/common/client_cert.cc
@@ -17,7 +17,7 @@
 #include "absl/strings/escaping.h"
 #include "absl/synchronization/mutex.h"
 #include "util/gtl/map_util.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "common/crypto_util.h"
 #include "common/drm_root_certificate.h"
 #include "common/error_space.h"
diff --git a/common/client_cert.h b/common/client_cert.h
index 11812af..4ae4c5a 100644
--- a/common/client_cert.h
+++ b/common/client_cert.h
@@ -13,7 +13,7 @@
 #include <memory>
 #include <string>
 
-#include "util/status.h"
+#include "common/status.h"
 #include "common/rsa_key.h"
 #include "protos/public/client_identification.pb.h"
 #include "protos/public/license_protocol.pb.h"
diff --git a/common/client_id_util.h b/common/client_id_util.h
index 1f0e8b1..b0afa41 100644
--- a/common/client_id_util.h
+++ b/common/client_id_util.h
@@ -14,7 +14,7 @@
 #define COMMON_CLIENT_ID_UTIL_H_
 
 #include "absl/strings/string_view.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "protos/public/client_identification.pb.h"
 
 namespace widevine {
diff --git a/common/device_status_list.h b/common/device_status_list.h
index d46767f..e96971f 100644
--- a/common/device_status_list.h
+++ b/common/device_status_list.h
@@ -16,7 +16,7 @@
 
 #include "base/macros.h"
 #include "absl/synchronization/mutex.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "protos/public/device_certificate_status.pb.h"
 #include "protos/public/provisioned_device_info.pb.h"
 
diff --git a/common/drm_root_certificate.h b/common/drm_root_certificate.h
index a18ae44..993ef77 100644
--- a/common/drm_root_certificate.h
+++ b/common/drm_root_certificate.h
@@ -19,7 +19,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "util/status.h"
+#include "common/status.h"
 
 #include "common/certificate_type.h"
 
diff --git a/common/drm_service_certificate.h b/common/drm_service_certificate.h
index 69a3036..008b8a1 100644
--- a/common/drm_service_certificate.h
+++ b/common/drm_service_certificate.h
@@ -18,7 +18,7 @@
 
 #include <cstdint>
 #include "base/macros.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "common/certificate_type.h"
 #include "common/rsa_key.h"
 
diff --git a/common/remote_attestation_verifier.h b/common/remote_attestation_verifier.h
index 34be518..740a69b 100644
--- a/common/remote_attestation_verifier.h
+++ b/common/remote_attestation_verifier.h
@@ -19,7 +19,7 @@
 #include "base/macros.h"
 #include "base/thread_annotations.h"
 #include "absl/synchronization/mutex.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "common/x509_cert.h"
 #include "protos/public/client_identification.pb.h"
 #include "protos/public/remote_attestation.pb.h"
diff --git a/common/signature_util.cc b/common/signature_util.cc
index b223233..05c9e21 100644
--- a/common/signature_util.cc
+++ b/common/signature_util.cc
@@ -11,7 +11,7 @@
 #include <memory>
 #include <string>
 
-#include "util/status.h"
+#include "common/status.h"
 #include "common/aes_cbc_util.h"
 #include "common/rsa_key.h"
 #include "common/sha_util.h"
diff --git a/common/signature_util.h b/common/signature_util.h
index f66693f..b770d28 100644
--- a/common/signature_util.h
+++ b/common/signature_util.h
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include "util/status.h"
+#include "common/status.h"
 
 namespace widevine {
 namespace signature_util {
diff --git a/common/status.cc b/common/status.cc
index 51c5ada..bccf3ad 100644
--- a/common/status.cc
+++ b/common/status.cc
@@ -12,7 +12,7 @@
 
 #include "absl/base/macros.h"
 #include "absl/strings/str_cat.h"
-#include "util/status.h"
+#include "common/status.h"
 
 namespace widevine {
 namespace util {
diff --git a/common/string_util.cc b/common/string_util.cc
index e2d580b..5da8e4f 100644
--- a/common/string_util.cc
+++ b/common/string_util.cc
@@ -11,7 +11,7 @@
 #include <bitset>
 #include <sstream>
 #include <string>
-#include "util/status.h"
+#include "common/status.h"
 
 namespace widevine {
 namespace string_util {
diff --git a/common/string_util.h b/common/string_util.h
index 57b3b6f..b5b8845 100644
--- a/common/string_util.h
+++ b/common/string_util.h
@@ -10,7 +10,7 @@
 #define COMMON_STRING_UTIL_H_
 
 #include <string>
-#include "util/status.h"
+#include "common/status.h"
 
 namespace widevine {
 namespace string_util {
diff --git a/common/test_utils.h b/common/test_utils.h
index e78ef12..448ccf0 100644
--- a/common/test_utils.h
+++ b/common/test_utils.h
@@ -14,7 +14,7 @@
 
 #include <string>
 
-#include "util/status.h"
+#include "common/status.h"
 
 namespace widevine {
 
diff --git a/common/verified_media_pipeline.h b/common/verified_media_pipeline.h
index 64a9582..fd0aaf0 100644
--- a/common/verified_media_pipeline.h
+++ b/common/verified_media_pipeline.h
@@ -13,7 +13,7 @@
 #define COMMON_VERIFIED_MEDIA_PIPELINE_H_
 
 #include <string>
-#include "util/status.h"
+#include "common/status.h"
 #include "protos/public/license_protocol.pb.h"
 
 namespace widevine {
diff --git a/common/vmp_checker.h b/common/vmp_checker.h
index b16107c..f77ac65 100644
--- a/common/vmp_checker.h
+++ b/common/vmp_checker.h
@@ -16,7 +16,7 @@
 #include <memory>
 #include <string>
 
-#include "util/status.h"
+#include "common/status.h"
 #include "common/certificate_type.h"
 
 namespace widevine {
diff --git a/common/wvm_token_handler.cc b/common/wvm_token_handler.cc
index 99986cf..9099b65 100644
--- a/common/wvm_token_handler.cc
+++ b/common/wvm_token_handler.cc
@@ -16,7 +16,7 @@
 #include "absl/synchronization/mutex.h"
 #include "util/endian/endian.h"
 #include "util/gtl/map_util.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "common/aes_cbc_util.h"
 #include "common/ecb_util.h"
 #include "common/sha_util.h"
diff --git a/common/wvm_token_handler.h b/common/wvm_token_handler.h
index 0bd34d5..6fca42a 100644
--- a/common/wvm_token_handler.h
+++ b/common/wvm_token_handler.h
@@ -14,7 +14,7 @@
 
 #include "base/macros.h"
 #include "absl/strings/string_view.h"
-#include "util/status.h"
+#include "common/status.h"
 
 namespace widevine {
 
diff --git a/common/x509_cert.h b/common/x509_cert.h
index e303006..2bb9bb3 100644
--- a/common/x509_cert.h
+++ b/common/x509_cert.h
@@ -24,7 +24,7 @@
 #include "openssl/pem.h"
 #include "openssl/x509.h"
 #include "openssl/x509v3.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "common/openssl_util.h"
 #include "common/rsa_key.h"
 
diff --git a/example/wv_cas_key_fetcher_example.cc b/example/wv_cas_key_fetcher_example.cc
index aee22e3..f8a48a9 100644
--- a/example/wv_cas_key_fetcher_example.cc
+++ b/example/wv_cas_key_fetcher_example.cc
@@ -12,7 +12,7 @@
 
 #include "gflags/gflags.h"
 #include "glog/logging.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "media_cas_packager_sdk/public/wv_cas_key_fetcher.h"
 #include "protos/public/media_cas_encryption.pb.h"
 
diff --git a/media_cas_packager_sdk/internal/ecm.cc b/media_cas_packager_sdk/internal/ecm.cc
index 1a1d629..d3da0e7 100644
--- a/media_cas_packager_sdk/internal/ecm.cc
+++ b/media_cas_packager_sdk/internal/ecm.cc
@@ -14,7 +14,7 @@
 
 #include "glog/logging.h"
 #include "absl/strings/str_cat.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "common/aes_cbc_util.h"
 #include "common/random_util.h"
 #include "common/string_util.h"
diff --git a/media_cas_packager_sdk/internal/ecm.h b/media_cas_packager_sdk/internal/ecm.h
index fca0b4a..9e55b64 100644
--- a/media_cas_packager_sdk/internal/ecm.h
+++ b/media_cas_packager_sdk/internal/ecm.h
@@ -16,7 +16,7 @@
 #include <utility>
 #include <vector>
 
-#include "util/status.h"
+#include "common/status.h"
 #include "media_cas_packager_sdk/public/wv_cas_types.h"
 #include "protos/public/media_cas.pb.h"
 
diff --git a/media_cas_packager_sdk/internal/ecm_generator.h b/media_cas_packager_sdk/internal/ecm_generator.h
index 8de6801..5021172 100644
--- a/media_cas_packager_sdk/internal/ecm_generator.h
+++ b/media_cas_packager_sdk/internal/ecm_generator.h
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include <cstdint>
-#include "util/status.h"
+#include "common/status.h"
 #include "media_cas_packager_sdk/internal/ecm.h"
 
 namespace widevine {
diff --git a/media_cas_packager_sdk/internal/ecm_test.cc b/media_cas_packager_sdk/internal/ecm_test.cc
index 2bab89e..a172d11 100644
--- a/media_cas_packager_sdk/internal/ecm_test.cc
+++ b/media_cas_packager_sdk/internal/ecm_test.cc
@@ -13,7 +13,7 @@
 
 #include "testing/gmock.h"
 #include "testing/gunit.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "media_cas_packager_sdk/public/wv_cas_types.h"
 #include "protos/public/media_cas_encryption.pb.h"
 
diff --git a/media_cas_packager_sdk/internal/ecmg.cc b/media_cas_packager_sdk/internal/ecmg.cc
index 9b7187f..1bc9663 100644
--- a/media_cas_packager_sdk/internal/ecmg.cc
+++ b/media_cas_packager_sdk/internal/ecmg.cc
@@ -18,7 +18,7 @@
 #include "glog/logging.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "example/constants.h"
 #include "media_cas_packager_sdk/internal/ecm_generator.h"
 #include "media_cas_packager_sdk/internal/ecmg_constants.h"
diff --git a/media_cas_packager_sdk/internal/ecmg.h b/media_cas_packager_sdk/internal/ecmg.h
index ab1c209..8c2bf7f 100644
--- a/media_cas_packager_sdk/internal/ecmg.h
+++ b/media_cas_packager_sdk/internal/ecmg.h
@@ -19,7 +19,7 @@
 #include <vector>
 
 #include <cstdint>
-#include "util/status.h"
+#include "common/status.h"
 #include "media_cas_packager_sdk/internal/ecm.h"
 #include "media_cas_packager_sdk/internal/fixed_key_fetcher.h"
 
diff --git a/media_cas_packager_sdk/internal/fixed_key_fetcher.cc b/media_cas_packager_sdk/internal/fixed_key_fetcher.cc
index 2624465..8550b75 100644
--- a/media_cas_packager_sdk/internal/fixed_key_fetcher.cc
+++ b/media_cas_packager_sdk/internal/fixed_key_fetcher.cc
@@ -8,7 +8,7 @@
 
 #include "media_cas_packager_sdk/internal/fixed_key_fetcher.h"
 
-#include "util/status.h"
+#include "common/status.h"
 #include "protos/public/media_cas_encryption.pb.h"
 
 namespace widevine {
diff --git a/media_cas_packager_sdk/internal/key_fetcher.h b/media_cas_packager_sdk/internal/key_fetcher.h
index cd06f14..00999e9 100644
--- a/media_cas_packager_sdk/internal/key_fetcher.h
+++ b/media_cas_packager_sdk/internal/key_fetcher.h
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include "util/status.h"
+#include "common/status.h"
 
 namespace widevine {
 namespace cas {
diff --git a/media_cas_packager_sdk/internal/simulcrypt.cc b/media_cas_packager_sdk/internal/simulcrypt.cc
index 1880d72..1e9b206 100644
--- a/media_cas_packager_sdk/internal/simulcrypt.cc
+++ b/media_cas_packager_sdk/internal/simulcrypt.cc
@@ -13,7 +13,7 @@
 
 #include "glog/logging.h"
 #include "absl/strings/str_cat.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "media_cas_packager_sdk/internal/ecmg.h"
 #include "media_cas_packager_sdk/internal/simulcrypt_constants.h"
 #include "media_cas_packager_sdk/internal/util.h"
diff --git a/media_cas_packager_sdk/internal/simulcrypt.h b/media_cas_packager_sdk/internal/simulcrypt.h
index a5d65ed..c43c28e 100644
--- a/media_cas_packager_sdk/internal/simulcrypt.h
+++ b/media_cas_packager_sdk/internal/simulcrypt.h
@@ -17,7 +17,7 @@
 #include <vector>
 
 #include <cstdint>
-#include "util/status.h"
+#include "common/status.h"
 #include "media_cas_packager_sdk/internal/ecmg.h"
 
 namespace widevine {
diff --git a/media_cas_packager_sdk/internal/ts_packet.cc b/media_cas_packager_sdk/internal/ts_packet.cc
index 95e0ae9..11b9698 100644
--- a/media_cas_packager_sdk/internal/ts_packet.cc
+++ b/media_cas_packager_sdk/internal/ts_packet.cc
@@ -12,7 +12,7 @@
 
 #include "glog/logging.h"
 #include "absl/strings/str_cat.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "common/string_util.h"
 
 namespace widevine {
diff --git a/media_cas_packager_sdk/internal/ts_packet.h b/media_cas_packager_sdk/internal/ts_packet.h
index 9afb234..797156e 100644
--- a/media_cas_packager_sdk/internal/ts_packet.h
+++ b/media_cas_packager_sdk/internal/ts_packet.h
@@ -39,7 +39,7 @@
 #include <cstdint>
 #include "base/macros.h"
 #include "absl/strings/string_view.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "media_cas_packager_sdk/internal/mpeg2ts.h"
 
 namespace widevine {
diff --git a/media_cas_packager_sdk/internal/util.h b/media_cas_packager_sdk/internal/util.h
index 0b66276..d55f6d8 100644
--- a/media_cas_packager_sdk/internal/util.h
+++ b/media_cas_packager_sdk/internal/util.h
@@ -13,7 +13,7 @@
 #include <string>
 
 #include <cstdint>
-#include "util/status.h"
+#include "common/status.h"
 #include "media_cas_packager_sdk/internal/mpeg2ts.h"
 
 namespace widevine {
diff --git a/media_cas_packager_sdk/public/wv_cas_ca_descriptor.cc b/media_cas_packager_sdk/public/wv_cas_ca_descriptor.cc
index 124621d..678f657 100644
--- a/media_cas_packager_sdk/public/wv_cas_ca_descriptor.cc
+++ b/media_cas_packager_sdk/public/wv_cas_ca_descriptor.cc
@@ -12,7 +12,7 @@
 
 #include "glog/logging.h"
 #include "absl/strings/str_cat.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "common/string_util.h"
 #include "media_cas_packager_sdk/public/wv_cas_types.h"
 #include "protos/public/media_cas.pb.h"
diff --git a/media_cas_packager_sdk/public/wv_cas_ecm.cc b/media_cas_packager_sdk/public/wv_cas_ecm.cc
index e243a74..9f83c5d 100644
--- a/media_cas_packager_sdk/public/wv_cas_ecm.cc
+++ b/media_cas_packager_sdk/public/wv_cas_ecm.cc
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "glog/logging.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "common/crypto_util.h"
diff --git a/media_cas_packager_sdk/public/wv_cas_key_fetcher.cc b/media_cas_packager_sdk/public/wv_cas_key_fetcher.cc
index a1e5056..17e3cef 100644
--- a/media_cas_packager_sdk/public/wv_cas_key_fetcher.cc
+++ b/media_cas_packager_sdk/public/wv_cas_key_fetcher.cc
@@ -20,7 +20,7 @@
 #include "absl/strings/string_view.h"
 #include "curl/curl.h"
 #include "curl/easy.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "common/signature_util.h"
 #include "protos/public/media_cas_encryption.pb.h"
 
diff --git a/media_cas_packager_sdk/public/wv_cas_key_fetcher.h b/media_cas_packager_sdk/public/wv_cas_key_fetcher.h
index 91de195..60ee3a3 100644
--- a/media_cas_packager_sdk/public/wv_cas_key_fetcher.h
+++ b/media_cas_packager_sdk/public/wv_cas_key_fetcher.h
@@ -12,7 +12,7 @@
 #include <string>
 
 #include "base/commandlineflags_declare.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "media_cas_packager_sdk/internal/key_fetcher.h"
 
 DECLARE_string(license_server);
diff --git a/media_cas_packager_sdk/public/wv_cas_key_fetcher_test.cc b/media_cas_packager_sdk/public/wv_cas_key_fetcher_test.cc
index dd3491f..b032845 100644
--- a/media_cas_packager_sdk/public/wv_cas_key_fetcher_test.cc
+++ b/media_cas_packager_sdk/public/wv_cas_key_fetcher_test.cc
@@ -14,7 +14,7 @@
 #include "testing/gmock.h"
 #include "testing/gunit.h"
 #include "absl/strings/escaping.h"
-#include "util/status.h"
+#include "common/status.h"
 #include "protos/public/media_cas_encryption.pb.h"
 
 using testing::_;