diff --git a/src/android/MediaPlayer_to_android.cpp b/src/android/MediaPlayer_to_android.cpp
index c204faf..981a6bd 100644
--- a/src/android/MediaPlayer_to_android.cpp
+++ b/src/android/MediaPlayer_to_android.cpp
@@ -14,15 +14,17 @@
  * limitations under the License.
  */
 
+#include <system/window.h>
+#include <utils/StrongPointer.h>
+#include <gui/Surface.h>
+
 #include "sles_allinclusive.h"
-#include "utils/RefBase.h"
 #include "android_prompts.h"
 // LocAVPlayer and StreamPlayer derive from GenericMediaPlayer,
 //    so no need to #include "android_GenericMediaPlayer.h"
 #include "android_LocAVPlayer.h"
 #include "android_StreamPlayer.h"
 
-
 //-----------------------------------------------------------------------------
 static void player_handleMediaPlayerEventNotifications(int event, int data1, int data2, void* user)
 {
diff --git a/src/android/MediaPlayer_to_android.h b/src/android/MediaPlayer_to_android.h
index e83439d..1b491cb 100644
--- a/src/android/MediaPlayer_to_android.h
+++ b/src/android/MediaPlayer_to_android.h
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#include <surfaceflinger/Surface.h>
-#include <gui/ISurfaceTexture.h>
-
+#include <system/window.h>
 
 /**************************************************************************************************
  * Player lifecycle
diff --git a/src/android/android_GenericMediaPlayer.cpp b/src/android/android_GenericMediaPlayer.cpp
index 1931bb9..04f4f8e 100644
--- a/src/android/android_GenericMediaPlayer.cpp
+++ b/src/android/android_GenericMediaPlayer.cpp
@@ -19,9 +19,9 @@
 #include "sles_allinclusive.h"
 #include "android_GenericMediaPlayer.h"
 
+#include <system/window.h>
+
 #include <media/IMediaPlayerService.h>
-#include <surfaceflinger/ISurfaceComposer.h>
-#include <surfaceflinger/SurfaceComposerClient.h>
 #include <media/stagefright/foundation/ADebug.h>
 #include <media/mediaplayer.h>  // media_event_type media_error_type media_info_type
 
diff --git a/src/android/android_GenericMediaPlayer.h b/src/android/android_GenericMediaPlayer.h
index 8ef66b2..c0497ba 100644
--- a/src/android/android_GenericMediaPlayer.h
+++ b/src/android/android_GenericMediaPlayer.h
@@ -20,7 +20,6 @@
 #include "android_GenericPlayer.h"
 
 #include <binder/IServiceManager.h>
-#include <surfaceflinger/Surface.h>
 #include <gui/ISurfaceTexture.h>
 
 
diff --git a/src/objects/CMediaPlayer.c b/src/objects/CMediaPlayer.c
index 7b995c5..f77720e 100644
--- a/src/objects/CMediaPlayer.c
+++ b/src/objects/CMediaPlayer.c
@@ -19,7 +19,6 @@
 #include "sles_allinclusive.h"
 
 #ifdef ANDROID
-#include <gui/SurfaceTextureClient.h>
 #include "android/android_GenericMediaPlayer.h"
 using namespace android;
 #endif
diff --git a/tests/sandbox/nativewindow.cpp b/tests/sandbox/nativewindow.cpp
index 8fe7fb0..9f5b6ae 100644
--- a/tests/sandbox/nativewindow.cpp
+++ b/tests/sandbox/nativewindow.cpp
@@ -20,8 +20,8 @@
 // that are not part of the NDK supported APIs, and are subject to change at any time.
 
 #include <binder/ProcessState.h>
-#include <surfaceflinger/ISurfaceComposer.h>
-#include <surfaceflinger/SurfaceComposerClient.h>
+#include <gui/Surface.h>
+#include <gui/SurfaceComposerClient.h>
 #include <utils/String8.h>
 
 #include "nativewindow.h"