diff --git a/media/base/aes_encryptor.cc b/media/base/aes_encryptor.cc
index 5f5cc5e391..b548933b3e 100644
--- a/media/base/aes_encryptor.cc
+++ b/media/base/aes_encryptor.cc
@@ -11,7 +11,6 @@
 #include <openssl/rand.h>
 
 #include "base/logging.h"
-#include "base/rand_util.h"
 
 namespace {
 
diff --git a/media/base/muxer.h b/media/base/muxer.h
index c3fe0b1d40..e135f806f7 100644
--- a/media/base/muxer.h
+++ b/media/base/muxer.h
@@ -13,13 +13,10 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/time/clock.h"
 #include "media/base/muxer_options.h"
 #include "media/base/status.h"
 
-namespace base {
-class Clock;
-}
-
 namespace edash_packager {
 namespace media {
 
diff --git a/media/base/muxer_util.cc b/media/base/muxer_util.cc
index d00dbbe310..1b196bda8f 100644
--- a/media/base/muxer_util.cc
+++ b/media/base/muxer_util.cc
@@ -16,6 +16,7 @@
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 
+namespace edash_packager {
 namespace {
 bool ValidateFormatTag(const std::string& format_tag) {
   DCHECK(!format_tag.empty());
@@ -32,7 +33,6 @@ bool ValidateFormatTag(const std::string& format_tag) {
 }
 }  // namespace
 
-namespace edash_packager {
 namespace media {
 
 bool ValidateSegmentTemplate(const std::string& segment_template) {
diff --git a/media/base/widevine_key_source.cc b/media/base/widevine_key_source.cc
index 893dbaf99e..28e1454f65 100644
--- a/media/base/widevine_key_source.cc
+++ b/media/base/widevine_key_source.cc
@@ -24,6 +24,7 @@
     }                                                   \
   } while (0)
 
+namespace edash_packager {
 namespace {
 
 const bool kEnableKeyRotation = true;
@@ -110,7 +111,6 @@ bool GetPsshDataFromTrack(const base::DictionaryValue& track_dict,
 
 }  // namespace
 
-namespace edash_packager {
 namespace media {
 
 // A ref counted wrapper for EncryptionKeyMap.