diff --git a/packager/media/base/http_key_fetcher.cc b/packager/media/base/http_key_fetcher.cc
index 7f774f4b32..3441d49361 100644
--- a/packager/media/base/http_key_fetcher.cc
+++ b/packager/media/base/http_key_fetcher.cc
@@ -10,6 +10,8 @@
 #include "packager/base/strings/stringprintf.h"
 #include "packager/base/synchronization/lock.h"
 
+namespace edash_packager {
+
 namespace {
 const char kUserAgentString[] = "edash-packager-http_fetcher/1.0";
 
@@ -64,7 +66,6 @@ class LibCurlInitializer {
 
 }  // namespace
 
-namespace edash_packager {
 namespace media {
 
 HttpKeyFetcher::HttpKeyFetcher() : timeout_in_seconds_(0) {}
diff --git a/packager/media/file/io_cache.cc b/packager/media/file/io_cache.cc
index d612d7335c..ae910328ef 100644
--- a/packager/media/file/io_cache.cc
+++ b/packager/media/file/io_cache.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/file/io_cache.h"
+#include "packager/media/file/io_cache.h"
 
 #include <string.h>
 
@@ -123,13 +123,13 @@ uint64_t IoCache::BytesFree() {
   return BytesFreeInternal();
 }
 
-uint64 IoCache::BytesCachedInternal() {
+uint64_t IoCache::BytesCachedInternal() {
   return (r_ptr_ <= w_ptr_) ?
       w_ptr_ - r_ptr_ :
       (end_ptr_ - r_ptr_) + (w_ptr_ - &circular_buffer_[0]);
 }
 
-uint64 IoCache::BytesFreeInternal() {
+uint64_t IoCache::BytesFreeInternal() {
   return cache_size_ - BytesCachedInternal();
 }