3 files changed, 3 insertions, 10 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc
index 4e3c9ab..781f377 100644
--- a/media/tools/player_wtl/movie.cc
+++ b/media/tools/player_wtl/movie.cc
@@ -20,13 +20,6 @@
 #include "media/filters/null_audio_renderer.h"
 #include "media/filters/video_renderer_base.h"
 
-using media::FFmpegAudioDecoder;
-using media::FFmpegDemuxer;
-using media::FFmpegVideoDecoder;
-using media::FileDataSource;
-using media::FilterCollection;
-using media::Pipeline;
-
 namespace media {
 
 Movie::Movie()
diff --git a/media/tools/player_wtl/movie.h b/media/tools/player_wtl/movie.h
index 54ddd49..0e04278 100644
--- a/media/tools/player_wtl/movie.h
+++ b/media/tools/player_wtl/movie.h
@@ -13,11 +13,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "media/base/message_loop_factory.h"
 
-class AudioManager;
 template <typename T> struct DefaultSingletonTraits;
 
 namespace media {
 
+class AudioManager;
 class Pipeline;
 class VideoRendererBase;
 
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index 467d92f..ce2ff07 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -37,7 +37,7 @@ static Display* g_display = NULL;
 static Window g_window = 0;
 static bool g_running = false;
 
-AudioManager* g_audio_manager = NULL;
+media::AudioManager* g_audio_manager = NULL;
 
 media::VideoRendererBase* g_video_renderer = NULL;
 
@@ -238,7 +238,7 @@ int main(int argc, char** argv) {
     return 1;
   }
 
-  scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
+  scoped_ptr<media::AudioManager> audio_manager(media::AudioManager::Create());
   g_audio_manager = audio_manager.get();
 
   logging::InitLogging(