diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index df30e8c..4fc7f2d 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -99,7 +99,7 @@
      *          - EVENT_BUFFER_END: unused.
      */
 
-    typedef void (*callback_t)(int event, void* user, void *info);
+    typedef void (*callback_t)(event_type event, void* user, void *info);
 
     /* Returns the minimum frame count required for the successful creation of
      * an AudioTrack object.
diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h
index 1ad1f26..9da069c 100644
--- a/include/media/ToneGenerator.h
+++ b/include/media/ToneGenerator.h
@@ -270,7 +270,7 @@
     unsigned int mProcessSize;  // Size of audio blocks generated at a time by audioCallback() (in PCM frames).
 
     bool initAudioTrack();
-    static void audioCallback(int event, void* user, void *info);
+    static void audioCallback(AudioTrack::event_type event, void* user, void *info);
     bool prepareWave();
     unsigned int numWaves(unsigned int segmentIdx);
     void clearWaveGens();
diff --git a/include/media/stagefright/AudioPlayer.h b/include/media/stagefright/AudioPlayer.h
index 0b79324..05493d0 100644
--- a/include/media/stagefright/AudioPlayer.h
+++ b/include/media/stagefright/AudioPlayer.h
@@ -18,6 +18,7 @@
 
 #define AUDIO_PLAYER_H_
 
+#include <media/AudioTrack.h>
 #include <media/MediaPlayerInterface.h>
 #include <media/stagefright/MediaBuffer.h>
 #include <media/stagefright/TimeSource.h>
@@ -95,8 +96,8 @@
     sp<MediaPlayerBase::AudioSink> mAudioSink;
     AwesomePlayer *mObserver;
 
-    static void AudioCallback(int event, void *user, void *info);
-    void AudioCallback(int event, void *info);
+    static void AudioCallback(AudioTrack::event_type event, void *user, void *info);
+    void AudioCallback(AudioTrack::event_type event, void *info);
 
     static size_t AudioSinkCallback(
             MediaPlayerBase::AudioSink *audioSink,