diff --git a/libwvdrmengine/cdm/core/include/clock.h b/libwvdrmengine/cdm/core/include/clock.h
index d3c0ba27..10dc6b4f 100644
--- a/libwvdrmengine/cdm/core/include/clock.h
+++ b/libwvdrmengine/cdm/core/include/clock.h
@@ -19,6 +19,6 @@ class Clock {
   virtual int64_t GetCurrentTime();
 };
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // WVCDM_CORE_CLOCK_H_
diff --git a/libwvdrmengine/cdm/core/include/crypto_key.h b/libwvdrmengine/cdm/core/include/crypto_key.h
index d87c239a..d973a021 100644
--- a/libwvdrmengine/cdm/core/include/crypto_key.h
+++ b/libwvdrmengine/cdm/core/include/crypto_key.h
@@ -35,6 +35,6 @@ class CryptoKey {
   std::string key_control_iv_;
 };
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // WVCDM_CORE_CRYPTO_KEY_H_
diff --git a/libwvdrmengine/cdm/core/include/crypto_session.h b/libwvdrmengine/cdm/core/include/crypto_session.h
index 25f85ee6..ac5ac9f5 100644
--- a/libwvdrmengine/cdm/core/include/crypto_session.h
+++ b/libwvdrmengine/cdm/core/include/crypto_session.h
@@ -138,6 +138,6 @@ class CryptoSession {
   CORE_DISALLOW_COPY_AND_ASSIGN(CryptoSession);
 };
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // WVCDM_CORE_CRYPTO_SESSSION_H_
diff --git a/libwvdrmengine/cdm/core/include/lock.h b/libwvdrmengine/cdm/core/include/lock.h
index 5cbc6e31..26258826 100644
--- a/libwvdrmengine/cdm/core/include/lock.h
+++ b/libwvdrmengine/cdm/core/include/lock.h
@@ -50,6 +50,6 @@ class AutoLock {
   CORE_DISALLOW_COPY_AND_ASSIGN(AutoLock);
 };
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // WVCDM_CORE_LOCK_H_
diff --git a/libwvdrmengine/cdm/core/include/log.h b/libwvdrmengine/cdm/core/include/log.h
index c531d267..d7a0a593 100644
--- a/libwvdrmengine/cdm/core/include/log.h
+++ b/libwvdrmengine/cdm/core/include/log.h
@@ -34,6 +34,6 @@ void Log(const char* file, int line, LogPriority level, const char* fmt, ...);
 #define LOGD(...) Log(__FILE__, __LINE__, wvcdm::LOG_DEBUG, __VA_ARGS__)
 #define LOGV(...) Log(__FILE__, __LINE__, wvcdm::LOG_VERBOSE, __VA_ARGS__)
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // WVCDM_CORE_LOG_H_
diff --git a/libwvdrmengine/cdm/core/include/scoped_ptr.h b/libwvdrmengine/cdm/core/include/scoped_ptr.h
index 515b0ec4..edaaacd9 100644
--- a/libwvdrmengine/cdm/core/include/scoped_ptr.h
+++ b/libwvdrmengine/cdm/core/include/scoped_ptr.h
@@ -60,6 +60,6 @@ class scoped_ptr {
   CORE_DISALLOW_COPY_AND_ASSIGN(scoped_ptr);
 };
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // WVCDM_CORE_SCOPED_PTR_H_
diff --git a/libwvdrmengine/cdm/core/include/string_conversions.h b/libwvdrmengine/cdm/core/include/string_conversions.h
index d0c7ea2f..e3427c64 100644
--- a/libwvdrmengine/cdm/core/include/string_conversions.h
+++ b/libwvdrmengine/cdm/core/include/string_conversions.h
@@ -24,6 +24,6 @@ std::string UintToString(unsigned int value);
 int64_t htonll64(int64_t x);
 int64_t ntohll64(int64_t x);
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // WVCDM_CORE_STRING_CONVERSIONS_H_
diff --git a/libwvdrmengine/cdm/core/include/timer.h b/libwvdrmengine/cdm/core/include/timer.h
index 9e3f8e10..6b535d57 100644
--- a/libwvdrmengine/cdm/core/include/timer.h
+++ b/libwvdrmengine/cdm/core/include/timer.h
@@ -46,6 +46,6 @@ class Timer {
   CORE_DISALLOW_COPY_AND_ASSIGN(Timer);
 };
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // WVCDM_CORE_TIMER_H_
diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
index b8b82784..73318c80 100644
--- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
@@ -21,7 +21,7 @@
 namespace {
 const uint32_t kUpdateUsageInformationPeriod = 60;  // seconds
 const size_t kUsageReportsPerRequest = 1;
-}  // unnamed namespace
+}  // namespace
 
 namespace wvcdm {
 
diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp
index 010b270c..0585510e 100644
--- a/libwvdrmengine/cdm/core/src/crypto_session.cpp
+++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp
@@ -1004,4 +1004,4 @@ bool CryptoSession::GetMaxNumberOfSessions(size_t* max) {
   return true;
 }
 
-};  // namespace wvcdm
+}  // namespace wvcdm
diff --git a/libwvdrmengine/cdm/core/src/device_files.cpp b/libwvdrmengine/cdm/core/src/device_files.cpp
index 2016c8d2..17098919 100644
--- a/libwvdrmengine/cdm/core/src/device_files.cpp
+++ b/libwvdrmengine/cdm/core/src/device_files.cpp
@@ -55,7 +55,7 @@ bool Hash(const std::string& data, std::string* hash) {
   return true;
 }
 
-}  // unnamed namespace
+}  // namespace
 
 namespace wvcdm {
 
diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
index 90c038c9..100b3bb7 100644
--- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
+++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
@@ -503,7 +503,7 @@ bool OEMCrypto_SupportsUsageTable(SecurityLevel level) {
   return fcn->SupportsUsageTable();
 }
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 extern "C" OEMCryptoResult OEMCrypto_Initialize(void) {
   if (kAdapter) {
diff --git a/libwvdrmengine/cdm/core/src/string_conversions.cpp b/libwvdrmengine/cdm/core/src/string_conversions.cpp
index d8cc0a6e..40eaf72d 100644
--- a/libwvdrmengine/cdm/core/src/string_conversions.cpp
+++ b/libwvdrmengine/cdm/core/src/string_conversions.cpp
@@ -202,4 +202,4 @@ int64_t ntohll64(int64_t x) {  // Convert from big endian (network-byte-order)
   }
 }
 
-};  // namespace wvcdm
+}  // namespace wvcdm
diff --git a/libwvdrmengine/cdm/core/test/base64_test.cpp b/libwvdrmengine/cdm/core/test/base64_test.cpp
index d8b2b2b5..4f0dc73d 100644
--- a/libwvdrmengine/cdm/core/test/base64_test.cpp
+++ b/libwvdrmengine/cdm/core/test/base64_test.cpp
@@ -50,7 +50,7 @@ const std::pair<const std::string*, const std::string*> kBase64TestVectors[] = {
     make_pair(&kTwoBytesOverData, &kTwoBytesOverB64Data),
     make_pair(&kTestData, &kB64TestData)};
 
-}  // unnamed namespace
+}  // namespace
 
 namespace wvcdm {
 
diff --git a/libwvdrmengine/cdm/core/test/config_test_env.h b/libwvdrmengine/cdm/core/test/config_test_env.h
index fd7c7000..407acc8b 100644
--- a/libwvdrmengine/cdm/core/test/config_test_env.h
+++ b/libwvdrmengine/cdm/core/test/config_test_env.h
@@ -59,6 +59,6 @@ class ConfigTestEnv {
   CORE_DISALLOW_COPY_AND_ASSIGN(ConfigTestEnv);
 };
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // CDM_TEST_CONFIG_TEST_ENV_H_
diff --git a/libwvdrmengine/cdm/core/test/http_socket.h b/libwvdrmengine/cdm/core/test/http_socket.h
index 1977f5c4..8775f0e0 100644
--- a/libwvdrmengine/cdm/core/test/http_socket.h
+++ b/libwvdrmengine/cdm/core/test/http_socket.h
@@ -51,6 +51,6 @@ class HttpSocket {
   CORE_DISALLOW_COPY_AND_ASSIGN(HttpSocket);
 };
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // CDM_TEST_HTTP_SOCKET_H_
diff --git a/libwvdrmengine/cdm/core/test/license_request.h b/libwvdrmengine/cdm/core/test/license_request.h
index 11576c55..8e228dd7 100644
--- a/libwvdrmengine/cdm/core/test/license_request.h
+++ b/libwvdrmengine/cdm/core/test/license_request.h
@@ -25,6 +25,6 @@ class LicenseRequest {
   CORE_DISALLOW_COPY_AND_ASSIGN(LicenseRequest);
 };
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // CDM_TEST_LICENSE_REQUEST_H_
diff --git a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
index 23feff51..73c499ad 100644
--- a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
@@ -40,7 +40,7 @@ int64_t GetLicenseRenewalDelay(int64_t license_duration) {
              ? license_duration - kLicenseRenewalPeriod
              : 0;
 }
-}  // unnamed namespace
+}  // namespace
 
 namespace wvcdm {
 
diff --git a/libwvdrmengine/cdm/core/test/test_printers.cpp b/libwvdrmengine/cdm/core/test/test_printers.cpp
index 13ceb328..b912832d 100644
--- a/libwvdrmengine/cdm/core/test/test_printers.cpp
+++ b/libwvdrmengine/cdm/core/test/test_printers.cpp
@@ -90,4 +90,4 @@ void PrintTo(const enum CdmCertificateType& value, ::std::ostream* os) {
   }
 };
 
-};  // namespace wvcdm
+}  // namespace wvcdm
diff --git a/libwvdrmengine/cdm/core/test/test_printers.h b/libwvdrmengine/cdm/core/test/test_printers.h
index a50c4cc8..f639b4ca 100644
--- a/libwvdrmengine/cdm/core/test/test_printers.h
+++ b/libwvdrmengine/cdm/core/test/test_printers.h
@@ -14,6 +14,6 @@ void PrintTo(const enum CdmEventType& value, ::std::ostream* os);
 void PrintTo(const enum CdmLicenseType& value, ::std::ostream* os);
 void PrintTo(const enum CdmSecurityLevel& value, ::std::ostream* os);
 void PrintTo(const enum CdmCertificateType& value, ::std::ostream* os);
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // CDM_TEST_PRINTERS_H_
diff --git a/libwvdrmengine/cdm/core/test/url_request.h b/libwvdrmengine/cdm/core/test/url_request.h
index 5cbabf99..7c7c187c 100644
--- a/libwvdrmengine/cdm/core/test/url_request.h
+++ b/libwvdrmengine/cdm/core/test/url_request.h
@@ -34,6 +34,6 @@ class UrlRequest {
   CORE_DISALLOW_COPY_AND_ASSIGN(UrlRequest);
 };
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 #endif  // CDM_TEST_URL_REQUEST_H_
diff --git a/libwvdrmengine/cdm/src/clock.cpp b/libwvdrmengine/cdm/src/clock.cpp
index 4dd0e6dc..26a073c5 100644
--- a/libwvdrmengine/cdm/src/clock.cpp
+++ b/libwvdrmengine/cdm/src/clock.cpp
@@ -15,5 +15,4 @@ int64_t Clock::GetCurrentTime() {
   return tv.tv_sec;
 }
 
-
-};  // namespace wvcdm
+}  // namespace wvcdm
diff --git a/libwvdrmengine/cdm/src/lock.cpp b/libwvdrmengine/cdm/src/lock.cpp
index d118c24f..12c4da64 100644
--- a/libwvdrmengine/cdm/src/lock.cpp
+++ b/libwvdrmengine/cdm/src/lock.cpp
@@ -31,6 +31,6 @@ bool Lock::Try() {
   return (impl_->lock_.tryLock() == 0);
 }
 
-};  // namespace wvcdm
+}  // namespace wvcdm
 
 
diff --git a/libwvdrmengine/cdm/src/log.cpp b/libwvdrmengine/cdm/src/log.cpp
index 287be9af..2267ca70 100644
--- a/libwvdrmengine/cdm/src/log.cpp
+++ b/libwvdrmengine/cdm/src/log.cpp
@@ -52,4 +52,4 @@ void Log(const char* file, int line, LogPriority level, const char* fmt, ...) {
   __android_log_write(prio, LOG_TAG, buf);
 }
 
-};  // namespace wvcdm
+}  // namespace wvcdm