188 files changed, 160 insertions, 160 deletions

diff --git a/.gitignore b/.gitignore
index 152516c5c3..2816c034a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -484,11 +484,11 @@ lib/cpluff/stamp-h1
 # /xbmc/addons/
 /xbmc/addons/Makefile
 
-# /xbmc/android
-/xbmc/android/Makefile
-/xbmc/android/activity/Makefile
-/xbmc/android/loader/Makefile
-/xbmc/android/jni/Makefile
+# /xbmc/platform/android
+/xbmc/platform/android/Makefile
+/xbmc/platform/android/activity/Makefile
+/xbmc/platform/android/loader/Makefile
+/xbmc/platform/android/jni/Makefile
 
 # /xbmc/cdrip/
 /xbmc/cdrip/Makefile
diff --git a/Makefile.in b/Makefile.in
index 302b6dc8c1..0842547c3b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -173,10 +173,10 @@ DIRECTORY_ARCHIVES += lib/UnrarXLib/UnrarXLib.a
 endif
 
 ifeq (@USE_ANDROID@,1)
-DIRECTORY_ARCHIVES += xbmc/android/loader/AndroidDyload.a
+DIRECTORY_ARCHIVES += xbmc/platform/android/loader/AndroidDyload.a
 DIRECTORY_ARCHIVES += xbmc/windowing/android/windowing_android.a
-DIRECTORY_ARCHIVES += xbmc/android/bionic_supplement/bionic_supplement.a
-DIRECTORY_ARCHIVES += xbmc/android/jni/jni.a
+DIRECTORY_ARCHIVES += xbmc/platform/android/bionic_supplement/bionic_supplement.a
+DIRECTORY_ARCHIVES += xbmc/platform/android/jni/jni.a
 endif
 
 ifeq (@USE_OMXPLAYER@,1)
@@ -394,7 +394,7 @@ $(FFMPEGOBJS): dvdpcodecs
 endif
 
 ifeq (@USE_ANDROID@,1)
-MAINOBJS+=xbmc/android/activity/activity.a
+MAINOBJS+=xbmc/platform/android/activity/activity.a
 else
 MAINOBJS+=xbmc/main/main.a
 endif # USE_ANDROID
diff --git a/configure.ac b/configure.ac
index 559f9ece31..7a1a59739c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2408,9 +2408,9 @@ OUTPUT_FILES="Makefile \
     tools/EventClients/Clients/OSXRemote/Makefile \
     xbmc/peripherals/bus/Makefile \
     xbmc/peripherals/devices/Makefile \
-    xbmc/android/activity/Makefile \
-    xbmc/android/loader/Makefile \
-    xbmc/android/jni/Makefile \
+    xbmc/platform/android/activity/Makefile \
+    xbmc/platform/android/loader/Makefile \
+    xbmc/platform/android/jni/Makefile \
     xbmc/utils/Makefile \
     xbmc/main/Makefile \
     xbmc/platform/Makefile \
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index b4bc51b0b1..d271427a60 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -204,9 +204,9 @@
 #endif
 
 #if defined(TARGET_ANDROID)
-#include "android/activity/XBMCApp.h"
-#include "android/activity/AndroidFeatures.h"
-#include "android/jni/Build.h"
+#include "platform/android/activity/XBMCApp.h"
+#include "platform/android/activity/AndroidFeatures.h"
+#include "platform/android/jni/Build.h"
 #endif
 
 #ifdef TARGET_WINDOWS
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index 66c33012fb..cad7ac6f10 100644
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -38,7 +38,7 @@
 #include <sys/wait.h>
 #endif
 #if defined(TARGET_ANDROID)
-#include "android/bionic_supplement/bionic_supplement.h"
+#include "platform/android/bionic_supplement/bionic_supplement.h"
 #endif
 #include <stdlib.h>
 #include <algorithm>
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
index 06034700f1..a2509dc33c 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
@@ -21,16 +21,16 @@
 #include "AESinkAUDIOTRACK.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"
 #include "cores/AudioEngine/Utils/AERingBuffer.h"
-#include "android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 #include "settings/Settings.h"
 #if defined(HAS_LIBAMCODEC)
 #include "utils/AMLUtils.h"
 #endif
 #include "utils/log.h"
 
-#include "android/jni/AudioFormat.h"
-#include "android/jni/AudioManager.h"
-#include "android/jni/AudioTrack.h"
+#include "platform/android/jni/AudioFormat.h"
+#include "platform/android/jni/AudioManager.h"
+#include "platform/android/jni/AudioTrack.h"
 
 using namespace jni;
 
diff --git a/xbmc/cores/DllLoader/SoLoader.cpp b/xbmc/cores/DllLoader/SoLoader.cpp
index e337b38199..12f0d5ab7b 100644
--- a/xbmc/cores/DllLoader/SoLoader.cpp
+++ b/xbmc/cores/DllLoader/SoLoader.cpp
@@ -23,7 +23,7 @@
 #include "filesystem/SpecialProtocol.h"
 #include "utils/log.h"
 #if defined(TARGET_ANDROID)
-#include "android/loader/AndroidDyload.h"
+#include "platform/android/loader/AndroidDyload.h"
 #endif
 
 SoLoader::SoLoader(const std::string &so, bool bGlobal) : LibraryLoader(so)
diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
index b659de3a6d..5ae0c41d55 100644
--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
@@ -72,7 +72,7 @@
 #include "utils/URIUtils.h"
 #endif
 #if defined(TARGET_ANDROID)
-#include "android/loader/AndroidDyload.h"
+#include "platform/android/loader/AndroidDyload.h"
 #elif !defined(TARGET_WINDOWS)
 #include <dlfcn.h>
 #endif
diff --git a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
index eeb12d599a..a4427777a9 100644
--- a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
+++ b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
@@ -43,7 +43,7 @@
   #include "Windows.h"
 #endif
 #if defined(TARGET_ANDROID)
-  #include "android/activity/XBMCApp.h"
+  #include "platform/android/activity/XBMCApp.h"
 #endif
 
 // If the process ends in less than this time (ms), we assume it's a launcher
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.cpp
index c8237a0b01..3374908dde 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -47,7 +47,7 @@
 #endif
 #if defined(TARGET_ANDROID)
 #include "Video/DVDVideoCodecAndroidMediaCodec.h"
-#include "android/activity/AndroidFeatures.h"
+#include "platform/android/activity/AndroidFeatures.h"
 #endif
 #include "Audio/DVDAudioCodecFFmpeg.h"
 #include "Audio/DVDAudioCodecPassthrough.h"
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
index 647af1e4c8..9b3925b4bf 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
@@ -37,7 +37,7 @@
 #include "utils/TimeUtils.h"
 
 #if defined(TARGET_ANDROID)
-#include "android/activity/AndroidFeatures.h"
+#include "platform/android/activity/AndroidFeatures.h"
 #include "utils/BitstreamConverter.h"
 #endif
 
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp
index 14c2e112a9..2e85e0b87e 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp
@@ -36,19 +36,19 @@
 #include "utils/CPUInfo.h"
 #include "utils/log.h"
 #include "settings/AdvancedSettings.h"
-#include "android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 
-#include "android/jni/ByteBuffer.h"
-#include "android/jni/MediaCodec.h"
-#include "android/jni/MediaCrypto.h"
-#include "android/jni/MediaFormat.h"
-#include "android/jni/MediaCodecList.h"
-#include "android/jni/MediaCodecInfo.h"
-#include "android/jni/Surface.h"
-#include "android/jni/SurfaceTexture.h"
-#include "android/activity/AndroidFeatures.h"
+#include "platform/android/jni/ByteBuffer.h"
+#include "platform/android/jni/MediaCodec.h"
+#include "platform/android/jni/MediaCrypto.h"
+#include "platform/android/jni/MediaFormat.h"
+#include "platform/android/jni/MediaCodecList.h"
+#include "platform/android/jni/MediaCodecInfo.h"
+#include "platform/android/jni/Surface.h"
+#include "platform/android/jni/SurfaceTexture.h"
+#include "platform/android/activity/AndroidFeatures.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h
index c320a84495..270c4dfea7 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h
@@ -28,7 +28,7 @@
 #include "DVDStreamInfo.h"
 #include "threads/Thread.h"
 #include "threads/SingleLock.h"
-#include "android/jni/Surface.h"
+#include "platform/android/jni/Surface.h"
 #include "guilib/Geometry.h"
 
 class CJNISurface;
diff --git a/xbmc/dialogs/GUIDialogMediaSource.cpp b/xbmc/dialogs/GUIDialogMediaSource.cpp
index 2fc7fd37ef..4eb4c4de0b 100644
--- a/xbmc/dialogs/GUIDialogMediaSource.cpp
+++ b/xbmc/dialogs/GUIDialogMediaSource.cpp
@@ -41,7 +41,7 @@
 #include "URL.h"
 
 #if defined(TARGET_ANDROID)
-#include "android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 #include "filesystem/File.h"
 #endif
 
diff --git a/xbmc/filesystem/AndroidAppDirectory.cpp b/xbmc/filesystem/AndroidAppDirectory.cpp
index 69732bda57..b87286c00d 100644
--- a/xbmc/filesystem/AndroidAppDirectory.cpp
+++ b/xbmc/filesystem/AndroidAppDirectory.cpp
@@ -22,7 +22,7 @@
 
 #if defined(TARGET_ANDROID)
 #include "AndroidAppDirectory.h"
-#include "xbmc/android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 #include "FileItem.h"
 #include "File.h"
 #include "utils/URIUtils.h"
diff --git a/xbmc/filesystem/AndroidAppFile.cpp b/xbmc/filesystem/AndroidAppFile.cpp
index 7df2026b84..cd5f84e8ff 100644
--- a/xbmc/filesystem/AndroidAppFile.cpp
+++ b/xbmc/filesystem/AndroidAppFile.cpp
@@ -23,7 +23,7 @@
 #if defined(TARGET_ANDROID)
 
 #include "AndroidAppFile.h"
-#include "android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 #include <sys/stat.h>
 #include "Util.h"
 #include "URL.h"
@@ -31,13 +31,13 @@
 #include "utils/URIUtils.h"
 #include <jni.h>
 #include <android/bitmap.h>
-#include "android/jni/Context.h"
-#include "android/jni/Build.h"
-#include "android/jni/DisplayMetrics.h"
-#include "android/jni/Resources.h"
-#include "android/jni/Bitmap.h"
-#include "android/jni/BitmapDrawable.h"
-#include "android/jni/PackageManager.h"
+#include "platform/android/jni/Context.h"
+#include "platform/android/jni/Build.h"
+#include "platform/android/jni/DisplayMetrics.h"
+#include "platform/android/jni/Resources.h"
+#include "platform/android/jni/Bitmap.h"
+#include "platform/android/jni/BitmapDrawable.h"
+#include "platform/android/jni/PackageManager.h"
 using namespace XFILE;
 
 CFileAndroidApp::CFileAndroidApp(void)
diff --git a/xbmc/linux/LinuxTimezone.cpp b/xbmc/linux/LinuxTimezone.cpp
index ce96708fc1..bd93712065 100644
--- a/xbmc/linux/LinuxTimezone.cpp
+++ b/xbmc/linux/LinuxTimezone.cpp
@@ -21,7 +21,7 @@
 #include <time.h>
 #include "system.h"
 #ifdef TARGET_ANDROID
-#include "android/bionic_supplement/bionic_supplement.h"
+#include "platform/android/bionic_supplement/bionic_supplement.h"
 #endif
 #include "PlatformInclude.h"
 #include "LinuxTimezone.h"
diff --git a/xbmc/network/linux/NetworkLinux.cpp b/xbmc/network/linux/NetworkLinux.cpp
index 1230c61799..5f0486e47b 100644
--- a/xbmc/network/linux/NetworkLinux.cpp
+++ b/xbmc/network/linux/NetworkLinux.cpp
@@ -30,7 +30,7 @@
   #include <linux/sockios.h>
 #endif
 #ifdef TARGET_ANDROID
-#include "android/bionic_supplement/bionic_supplement.h"
+#include "platform/android/bionic_supplement/bionic_supplement.h"
 #include "sys/system_properties.h"
 #include <sys/wait.h>
 #endif
diff --git a/xbmc/android/activity/AndroidExtra.h b/xbmc/platform/android/activity/AndroidExtra.h
index cd4e8c15c8..cd4e8c15c8 100644
--- a/xbmc/android/activity/AndroidExtra.h
+++ b/xbmc/platform/android/activity/AndroidExtra.h
diff --git a/xbmc/android/activity/AndroidFeatures.cpp b/xbmc/platform/android/activity/AndroidFeatures.cpp
index 7526cd0c81..d30b12df0c 100644
--- a/xbmc/android/activity/AndroidFeatures.cpp
+++ b/xbmc/platform/android/activity/AndroidFeatures.cpp
@@ -22,7 +22,7 @@
 #include "utils/log.h"
 
 #include <cpu-features.h>
-#include "android/jni/JNIThreading.h"
+#include "platform/android/jni/JNIThreading.h"
 
 bool CAndroidFeatures::HasNeon()
 {
@@ -41,7 +41,7 @@ int CAndroidFeatures::GetVersion()
 
     JNIEnv *jenv = xbmc_jnienv();
 
-    jclass jcOsBuild = jenv->FindClass("android/os/Build$VERSION");
+    jclass jcOsBuild = jenv->FindClass("platform/android/os/Build$VERSION");
     if (jcOsBuild == NULL) 
     {
       CLog::Log(LOGERROR, "%s: Error getting class android.os.Build.VERSION", __PRETTY_FUNCTION__);
diff --git a/xbmc/android/activity/AndroidFeatures.h b/xbmc/platform/android/activity/AndroidFeatures.h
index 9d0c20b8cf..9d0c20b8cf 100644
--- a/xbmc/android/activity/AndroidFeatures.h
+++ b/xbmc/platform/android/activity/AndroidFeatures.h
diff --git a/xbmc/android/activity/AndroidJoyStick.cpp b/xbmc/platform/android/activity/AndroidJoyStick.cpp
index ece5692e69..0363743593 100644
--- a/xbmc/android/activity/AndroidJoyStick.cpp
+++ b/xbmc/platform/android/activity/AndroidJoyStick.cpp
@@ -21,8 +21,8 @@
 #include "AndroidJoyStick.h"
 #include "AndroidExtra.h"
 #include "XBMCApp.h"
-#include "android/jni/View.h"
-#include "android/activity/AndroidFeatures.h"
+#include "platform/android/jni/View.h"
+#include "platform/android/activity/AndroidFeatures.h"
 #include "utils/log.h"
 #include "windowing/WinEvents.h"
 #include "windowing/XBMC_events.h"
diff --git a/xbmc/android/activity/AndroidJoyStick.h b/xbmc/platform/android/activity/AndroidJoyStick.h
index 722c977a9c..722c977a9c 100644
--- a/xbmc/android/activity/AndroidJoyStick.h
+++ b/xbmc/platform/android/activity/AndroidJoyStick.h
diff --git a/xbmc/android/activity/AndroidKey.cpp b/xbmc/platform/android/activity/AndroidKey.cpp
index 19e76191d4..302d90023f 100644
--- a/xbmc/android/activity/AndroidKey.cpp
+++ b/xbmc/platform/android/activity/AndroidKey.cpp
@@ -23,7 +23,7 @@
 #include "XBMCApp.h"
 #include "input/Key.h"
 #include "windowing/WinEvents.h"
-#include "android/jni/KeyCharacterMap.h"
+#include "platform/android/jni/KeyCharacterMap.h"
 
 
 typedef struct {
diff --git a/xbmc/android/activity/AndroidKey.h b/xbmc/platform/android/activity/AndroidKey.h
index 6de2e9bfbc..6de2e9bfbc 100644
--- a/xbmc/android/activity/AndroidKey.h
+++ b/xbmc/platform/android/activity/AndroidKey.h
diff --git a/xbmc/android/activity/AndroidMouse.cpp b/xbmc/platform/android/activity/AndroidMouse.cpp
index 0665bbb05a..0665bbb05a 100644
--- a/xbmc/android/activity/AndroidMouse.cpp
+++ b/xbmc/platform/android/activity/AndroidMouse.cpp
diff --git a/xbmc/android/activity/AndroidMouse.h b/xbmc/platform/android/activity/AndroidMouse.h
index 10199a25f4..10199a25f4 100644
--- a/xbmc/android/activity/AndroidMouse.h
+++ b/xbmc/platform/android/activity/AndroidMouse.h
diff --git a/xbmc/android/activity/AndroidTouch.cpp b/xbmc/platform/android/activity/AndroidTouch.cpp
index ed695f66ed..9588c7409e 100644
--- a/xbmc/android/activity/AndroidTouch.cpp
+++ b/xbmc/platform/android/activity/AndroidTouch.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "AndroidTouch.h"
-#include "android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 #include "input/touch/generic/GenericTouchActionHandler.h"
 #include "input/touch/generic/GenericTouchInputHandler.h"
 
diff --git a/xbmc/android/activity/AndroidTouch.h b/xbmc/platform/android/activity/AndroidTouch.h
index 31ff94d57a..31ff94d57a 100644
--- a/xbmc/android/activity/AndroidTouch.h
+++ b/xbmc/platform/android/activity/AndroidTouch.h
diff --git a/xbmc/android/activity/DllGraphicBuffer.h b/xbmc/platform/android/activity/DllGraphicBuffer.h
index 4e4d98a3e9..4e4d98a3e9 100644
--- a/xbmc/android/activity/DllGraphicBuffer.h
+++ b/xbmc/platform/android/activity/DllGraphicBuffer.h
diff --git a/xbmc/android/activity/EventLoop.cpp b/xbmc/platform/android/activity/EventLoop.cpp
index e96f42fa03..e96f42fa03 100644
--- a/xbmc/android/activity/EventLoop.cpp
+++ b/xbmc/platform/android/activity/EventLoop.cpp
diff --git a/xbmc/android/activity/EventLoop.h b/xbmc/platform/android/activity/EventLoop.h
index be5d8fc7ad..be5d8fc7ad 100644
--- a/xbmc/android/activity/EventLoop.h
+++ b/xbmc/platform/android/activity/EventLoop.h
diff --git a/xbmc/android/activity/GraphicBuffer.cpp b/xbmc/platform/android/activity/GraphicBuffer.cpp
index 7b764d7fd5..7b764d7fd5 100644
--- a/xbmc/android/activity/GraphicBuffer.cpp
+++ b/xbmc/platform/android/activity/GraphicBuffer.cpp
diff --git a/xbmc/android/activity/GraphicBuffer.h b/xbmc/platform/android/activity/GraphicBuffer.h
index f51706f725..f51706f725 100644
--- a/xbmc/android/activity/GraphicBuffer.h
+++ b/xbmc/platform/android/activity/GraphicBuffer.h
diff --git a/xbmc/android/activity/IActivityHandler.h b/xbmc/platform/android/activity/IActivityHandler.h
index 7f32484c2e..7f32484c2e 100644
--- a/xbmc/android/activity/IActivityHandler.h
+++ b/xbmc/platform/android/activity/IActivityHandler.h
diff --git a/xbmc/android/activity/IInputHandler.h b/xbmc/platform/android/activity/IInputHandler.h
index f0f162710b..f0f162710b 100644
--- a/xbmc/android/activity/IInputHandler.h
+++ b/xbmc/platform/android/activity/IInputHandler.h
diff --git a/xbmc/android/activity/JNIMainActivity.cpp b/xbmc/platform/android/activity/JNIMainActivity.cpp
index 3cdbdec0d3..43729272e8 100644
--- a/xbmc/android/activity/JNIMainActivity.cpp
+++ b/xbmc/platform/android/activity/JNIMainActivity.cpp
@@ -20,9 +20,9 @@
 
 #include "JNIMainActivity.h"
 
-#include "android/jni/Activity.h"
-#include "android/jni/Intent.h"
-#include "android/jni/jutils/jutils-details.hpp"
+#include "platform/android/jni/Activity.h"
+#include "platform/android/jni/Intent.h"
+#include "platform/android/jni/jutils/jutils-details.hpp"
 
 using namespace jni;
 
diff --git a/xbmc/android/activity/JNIMainActivity.h b/xbmc/platform/android/activity/JNIMainActivity.h
index c03ca86461..a018feff22 100644
--- a/xbmc/android/activity/JNIMainActivity.h
+++ b/xbmc/platform/android/activity/JNIMainActivity.h
@@ -19,8 +19,8 @@
  *
  */
 
-#include "android/jni/Activity.h"
-#include "android/jni/Surface.h"
+#include "platform/android/jni/Activity.h"
+#include "platform/android/jni/Surface.h"
 
 class CJNIMainActivity : public CJNIActivity
 {
diff --git a/xbmc/android/activity/Makefile.in b/xbmc/platform/android/activity/Makefile.in
index 9c791ea368..9c791ea368 100644
--- a/xbmc/android/activity/Makefile.in
+++ b/xbmc/platform/android/activity/Makefile.in
diff --git a/xbmc/android/activity/XBMCApp.cpp b/xbmc/platform/android/activity/XBMCApp.cpp
index aceb7f9170..46b51818ef 100644
--- a/xbmc/android/activity/XBMCApp.cpp
+++ b/xbmc/platform/android/activity/XBMCApp.cpp
@@ -50,33 +50,33 @@
 #include "platform/XbmcContext.h"
 #include <android/bitmap.h>
 #include "cores/AudioEngine/AEFactory.h"
-#include "android/jni/JNIThreading.h"
-#include "android/jni/BroadcastReceiver.h"
-#include "android/jni/Intent.h"
-#include "android/jni/PackageManager.h"
-#include "android/jni/Context.h"
-#include "android/jni/PowerManager.h"
-#include "android/jni/WakeLock.h"
-#include "android/jni/Environment.h"
-#include "android/jni/File.h"
-#include "android/jni/IntentFilter.h"
-#include "android/jni/NetworkInfo.h"
-#include "android/jni/ConnectivityManager.h"
-#include "android/jni/System.h"
-#include "android/jni/ApplicationInfo.h"
-#include "android/jni/StatFs.h"
-#include "android/jni/CharSequence.h"
-#include "android/jni/URI.h"
-#include "android/jni/Cursor.h"
-#include "android/jni/ContentResolver.h"
-#include "android/jni/MediaStore.h"
-#include "android/jni/Build.h"
+#include "platform/android/jni/JNIThreading.h"
+#include "platform/android/jni/BroadcastReceiver.h"
+#include "platform/android/jni/Intent.h"
+#include "platform/android/jni/PackageManager.h"
+#include "platform/android/jni/Context.h"
+#include "platform/android/jni/PowerManager.h"
+#include "platform/android/jni/WakeLock.h"
+#include "platform/android/jni/Environment.h"
+#include "platform/android/jni/File.h"
+#include "platform/android/jni/IntentFilter.h"
+#include "platform/android/jni/NetworkInfo.h"
+#include "platform/android/jni/ConnectivityManager.h"
+#include "platform/android/jni/System.h"
+#include "platform/android/jni/ApplicationInfo.h"
+#include "platform/android/jni/StatFs.h"
+#include "platform/android/jni/CharSequence.h"
+#include "platform/android/jni/URI.h"
+#include "platform/android/jni/Cursor.h"
+#include "platform/android/jni/ContentResolver.h"
+#include "platform/android/jni/MediaStore.h"
+#include "platform/android/jni/Build.h"
 #if defined(HAS_LIBAMCODEC)
 #include "utils/AMLUtils.h"
 #endif
-#include "android/jni/Window.h"
-#include "android/jni/WindowManager.h"
-#include "android/jni/KeyEvent.h"
+#include "platform/android/jni/Window.h"
+#include "platform/android/jni/WindowManager.h"
+#include "platform/android/jni/KeyEvent.h"
 #include "AndroidKey.h"
 
 #include "CompileInfo.h"
diff --git a/xbmc/android/activity/XBMCApp.h b/xbmc/platform/android/activity/XBMCApp.h
index 36240fe79c..21b0e4d12f 100644
--- a/xbmc/android/activity/XBMCApp.h
+++ b/xbmc/platform/android/activity/XBMCApp.h
@@ -30,9 +30,9 @@
 #include "IInputHandler.h"
 
 #include "xbmc.h"
-#include "android/jni/Activity.h"
-#include "android/jni/BroadcastReceiver.h"
-#include "android/jni/AudioManager.h"
+#include "platform/android/jni/Activity.h"
+#include "platform/android/jni/BroadcastReceiver.h"
+#include "platform/android/jni/AudioManager.h"
 #include "threads/Event.h"
 
 #include "JNIMainActivity.h"
diff --git a/xbmc/android/activity/android_main.cpp b/xbmc/platform/android/activity/android_main.cpp
index b8252054a8..efafe37fe6 100644
--- a/xbmc/android/activity/android_main.cpp
+++ b/xbmc/platform/android/activity/android_main.cpp
@@ -23,11 +23,11 @@
 #include <android_native_app_glue.h>
 #include "EventLoop.h"
 #include "XBMCApp.h"
-#include "android/jni/SurfaceTexture.h"
+#include "platform/android/jni/SurfaceTexture.h"
 #include "utils/StringUtils.h"
 #include "CompileInfo.h"
 
-#include "android/activity/JNIMainActivity.h"
+#include "platform/android/activity/JNIMainActivity.h"
 
 // copied from new android_native_app_glue.c
 static void process_input(struct android_app* app, struct android_poll_source* source) {
diff --git a/xbmc/android/bionic_supplement/Makefile b/xbmc/platform/android/bionic_supplement/Makefile
index 74c1585384..d35fe22d34 100644
--- a/xbmc/android/bionic_supplement/Makefile
+++ b/xbmc/platform/android/bionic_supplement/Makefile
@@ -2,5 +2,5 @@ SRCS     = rand_r.c
 SRCS    += getdelim.c
 LIB      = bionic_supplement.a
 
-include ../../../Makefile.include
+include ../../../../Makefile.include
 -include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
diff --git a/xbmc/android/bionic_supplement/bionic_supplement.h b/xbmc/platform/android/bionic_supplement/bionic_supplement.h
index a9b6cc5b19..a9b6cc5b19 100644
--- a/xbmc/android/bionic_supplement/bionic_supplement.h
+++ b/xbmc/platform/android/bionic_supplement/bionic_supplement.h
diff --git a/xbmc/android/bionic_supplement/getdelim.c b/xbmc/platform/android/bionic_supplement/getdelim.c
index aab1641911..aab1641911 100644
--- a/xbmc/android/bionic_supplement/getdelim.c
+++ b/xbmc/platform/android/bionic_supplement/getdelim.c
diff --git a/xbmc/android/bionic_supplement/rand_r.c b/xbmc/platform/android/bionic_supplement/rand_r.c
index 6100440838..6100440838 100644
--- a/xbmc/android/bionic_supplement/rand_r.c
+++ b/xbmc/platform/android/bionic_supplement/rand_r.c
diff --git a/xbmc/android/jni/Activity.cpp b/xbmc/platform/android/jni/Activity.cpp
index 2862c4822f..2862c4822f 100644
--- a/xbmc/android/jni/Activity.cpp
+++ b/xbmc/platform/android/jni/Activity.cpp
diff --git a/xbmc/android/jni/Activity.h b/xbmc/platform/android/jni/Activity.h
index 6df9f4aa8c..6df9f4aa8c 100644
--- a/xbmc/android/jni/Activity.h
+++ b/xbmc/platform/android/jni/Activity.h
diff --git a/xbmc/android/jni/ApplicationInfo.cpp b/xbmc/platform/android/jni/ApplicationInfo.cpp
index 4f97940b53..4f97940b53 100644
--- a/xbmc/android/jni/ApplicationInfo.cpp
+++ b/xbmc/platform/android/jni/ApplicationInfo.cpp
diff --git a/xbmc/android/jni/ApplicationInfo.h b/xbmc/platform/android/jni/ApplicationInfo.h
index edf6ccfdde..edf6ccfdde 100644
--- a/xbmc/android/jni/ApplicationInfo.h
+++ b/xbmc/platform/android/jni/ApplicationInfo.h
diff --git a/xbmc/android/jni/AudioFormat.cpp b/xbmc/platform/android/jni/AudioFormat.cpp
index 9d33886928..1045496992 100644
--- a/xbmc/android/jni/AudioFormat.cpp
+++ b/xbmc/platform/android/jni/AudioFormat.cpp
@@ -48,7 +48,7 @@ void CJNIAudioFormat::PopulateStaticFields()
   int sdk = CJNIBase::GetSDKVersion();
   if (sdk >= 3)
   {
-    jhclass c = find_class("android/media/AudioFormat");
+    jhclass c = find_class("platform/android/media/AudioFormat");
     CJNIAudioFormat::ENCODING_PCM_16BIT = get_static_field<int>(c, "ENCODING_PCM_16BIT");
     if (sdk >= 5)
     {
diff --git a/xbmc/android/jni/AudioFormat.h b/xbmc/platform/android/jni/AudioFormat.h
index a90992ea51..a90992ea51 100644
--- a/xbmc/android/jni/AudioFormat.h
+++ b/xbmc/platform/android/jni/AudioFormat.h
diff --git a/xbmc/android/jni/AudioManager.cpp b/xbmc/platform/android/jni/AudioManager.cpp
index ab6d574118..0fe321be60 100644
--- a/xbmc/android/jni/AudioManager.cpp
+++ b/xbmc/platform/android/jni/AudioManager.cpp
@@ -24,7 +24,7 @@
 
 #include "jutils/jutils-details.hpp"
 
-#include "android/activity/JNIMainActivity.h"
+#include "platform/android/activity/JNIMainActivity.h"
 #include <algorithm>
 
 using namespace jni;
@@ -38,7 +38,7 @@ int CJNIAudioManager::AUDIOFOCUS_REQUEST_FAILED(0x00000000);
 
 void CJNIAudioManager::PopulateStaticFields()
 {
-  jhclass clazz = find_class("android/media/AudioManager");
+  jhclass clazz = find_class("platform/android/media/AudioManager");
   STREAM_MUSIC  = (get_static_field<int>(clazz, "STREAM_MUSIC"));
   AUDIOFOCUS_GAIN  = (get_static_field<int>(clazz, "AUDIOFOCUS_GAIN"));
   AUDIOFOCUS_LOSS  = (get_static_field<int>(clazz, "AUDIOFOCUS_LOSS"));
diff --git a/xbmc/android/jni/AudioManager.h b/xbmc/platform/android/jni/AudioManager.h
index 85d7d104b1..85d7d104b1 100644
--- a/xbmc/android/jni/AudioManager.h
+++ b/xbmc/platform/android/jni/AudioManager.h
diff --git a/xbmc/android/jni/AudioTrack.cpp b/xbmc/platform/android/jni/AudioTrack.cpp
index 7098a9888d..fa4190e249 100644
--- a/xbmc/android/jni/AudioTrack.cpp
+++ b/xbmc/platform/android/jni/AudioTrack.cpp
@@ -30,7 +30,7 @@ void CJNIAudioTrack::PopulateStaticFields()
 {
   if (CJNIBase::GetSDKVersion() >= 3)
   {
-    jhclass c = find_class("android/media/AudioTrack");
+    jhclass c = find_class("platform/android/media/AudioTrack");
     CJNIAudioTrack::PLAYSTATE_PLAYING = get_static_field<int>(c, "PLAYSTATE_PLAYING");
     if (CJNIBase::GetSDKVersion() >= 5)
       CJNIAudioTrack::MODE_STREAM = get_static_field<int>(c, "MODE_STREAM");
@@ -38,7 +38,7 @@ void CJNIAudioTrack::PopulateStaticFields()
 }
 
 CJNIAudioTrack::CJNIAudioTrack(int streamType, int sampleRateInHz, int channelConfig, int audioFormat, int bufferSizeInBytes, int mode) throw(std::invalid_argument)
-  : CJNIBase("android/media/AudioTrack")
+  : CJNIBase("platform/android/media/AudioTrack")
 {
   m_object = new_object(GetClassName(), "<init>", "(IIIIII)V",
                         streamType, sampleRateInHz, channelConfig,
@@ -126,13 +126,13 @@ int CJNIAudioTrack::getPlaybackHeadPosition()
 
 int CJNIAudioTrack::getMinBufferSize(int sampleRateInHz, int channelConfig, int audioFormat)
 {
-  return call_static_method<int>( "android/media/AudioTrack", "getMinBufferSize", "(III)I",
+  return call_static_method<int>( "platform/android/media/AudioTrack", "getMinBufferSize", "(III)I",
                                   sampleRateInHz, channelConfig, audioFormat);
 }
 
 int CJNIAudioTrack::getNativeOutputSampleRate(int streamType)
 {
-  return call_static_method<int>( "android/media/AudioTrack", "getNativeOutputSampleRate", "(I)I",
+  return call_static_method<int>( "platform/android/media/AudioTrack", "getNativeOutputSampleRate", "(I)I",
                                   streamType);
 }
 
diff --git a/xbmc/android/jni/AudioTrack.h b/xbmc/platform/android/jni/AudioTrack.h
index 23a587b88e..23a587b88e 100644
--- a/xbmc/android/jni/AudioTrack.h
+++ b/xbmc/platform/android/jni/AudioTrack.h
diff --git a/xbmc/android/jni/BaseColumns.cpp b/xbmc/platform/android/jni/BaseColumns.cpp
index 8156650f44..4239ec4ddf 100644
--- a/xbmc/android/jni/BaseColumns.cpp
+++ b/xbmc/platform/android/jni/BaseColumns.cpp
@@ -28,7 +28,7 @@ std::string CJNIBaseColumns::_COUNT;
 
 void CJNIBaseColumns::PopulateStaticFields()
 {
-  jhclass clazz = find_class("android/provider/BaseColumns");
+  jhclass clazz = find_class("platform/android/provider/BaseColumns");
   _ID    = (jcast<std::string>(get_static_field<jhstring>(clazz, "_ID")));
   _COUNT = (jcast<std::string>(get_static_field<jhstring>(clazz, "_COUNT")));
 }
diff --git a/xbmc/android/jni/BaseColumns.h b/xbmc/platform/android/jni/BaseColumns.h
index 59e4bf2979..59e4bf2979 100644
--- a/xbmc/android/jni/BaseColumns.h
+++ b/xbmc/platform/android/jni/BaseColumns.h
diff --git a/xbmc/android/jni/BitSet.cpp b/xbmc/platform/android/jni/BitSet.cpp
index b573c87cdc..b573c87cdc 100644
--- a/xbmc/android/jni/BitSet.cpp
+++ b/xbmc/platform/android/jni/BitSet.cpp
diff --git a/xbmc/android/jni/BitSet.h b/xbmc/platform/android/jni/BitSet.h
index fe33610403..fe33610403 100644
--- a/xbmc/android/jni/BitSet.h
+++ b/xbmc/platform/android/jni/BitSet.h
diff --git a/xbmc/android/jni/Bitmap.h b/xbmc/platform/android/jni/Bitmap.h
index 81b4d0880f..81b4d0880f 100644
--- a/xbmc/android/jni/Bitmap.h
+++ b/xbmc/platform/android/jni/Bitmap.h
diff --git a/xbmc/android/jni/BitmapDrawable.cpp b/xbmc/platform/android/jni/BitmapDrawable.cpp
index d7789ca1dd..f1b4981b43 100644
--- a/xbmc/android/jni/BitmapDrawable.cpp
+++ b/xbmc/platform/android/jni/BitmapDrawable.cpp
@@ -24,7 +24,7 @@
 
 using namespace jni;
 
-CJNIBitmapDrawable::CJNIBitmapDrawable() : CJNIDrawable("android/graphics/drawable/BitmapDrawable")
+CJNIBitmapDrawable::CJNIBitmapDrawable() : CJNIDrawable("platform/android/graphics/drawable/BitmapDrawable")
 {
   m_object = new_object(GetClassName(), "<init>", "()V");
   m_object.setGlobal();
diff --git a/xbmc/android/jni/BitmapDrawable.h b/xbmc/platform/android/jni/BitmapDrawable.h
index e4c7666bbd..e4c7666bbd 100644
--- a/xbmc/android/jni/BitmapDrawable.h
+++ b/xbmc/platform/android/jni/BitmapDrawable.h
diff --git a/xbmc/android/jni/BroadcastReceiver.cpp b/xbmc/platform/android/jni/BroadcastReceiver.cpp
index 053dd889c7..922b04fcfb 100644
--- a/xbmc/android/jni/BroadcastReceiver.cpp
+++ b/xbmc/platform/android/jni/BroadcastReceiver.cpp
@@ -25,7 +25,7 @@
 #include "ClassLoader.h"
 #include "jutils/jutils-details.hpp"
 
-#include "android/activity/JNIMainActivity.h"
+#include "platform/android/activity/JNIMainActivity.h"
 
 using namespace jni;
 
diff --git a/xbmc/android/jni/BroadcastReceiver.h b/xbmc/platform/android/jni/BroadcastReceiver.h
index 1cf6998694..1cf6998694 100644
--- a/xbmc/android/jni/BroadcastReceiver.h
+++ b/xbmc/platform/android/jni/BroadcastReceiver.h
diff --git a/xbmc/android/jni/Buffer.cpp b/xbmc/platform/android/jni/Buffer.cpp
index 9034b9fa6b..9034b9fa6b 100644
--- a/xbmc/android/jni/Buffer.cpp
+++ b/xbmc/platform/android/jni/Buffer.cpp
diff --git a/xbmc/android/jni/Buffer.h b/xbmc/platform/android/jni/Buffer.h
index 075982937c..075982937c 100644
--- a/xbmc/android/jni/Buffer.h
+++ b/xbmc/platform/android/jni/Buffer.h
diff --git a/xbmc/android/jni/Build.cpp b/xbmc/platform/android/jni/Build.cpp
index 2df505e82f..29bb1ae994 100644
--- a/xbmc/android/jni/Build.cpp
+++ b/xbmc/platform/android/jni/Build.cpp
@@ -22,7 +22,7 @@
 #include "jutils/jutils-details.hpp"
 
 using namespace jni;
-const char *CJNIBuild::m_classname = "android/os/Build";
+const char *CJNIBuild::m_classname = "platform/android/os/Build";
 
 std::string CJNIBuild::UNKNOWN;
 std::string CJNIBuild::DISPLAY;
diff --git a/xbmc/android/jni/Build.h b/xbmc/platform/android/jni/Build.h
index bd55076d66..bd55076d66 100644
--- a/xbmc/android/jni/Build.h
+++ b/xbmc/platform/android/jni/Build.h
diff --git a/xbmc/android/jni/ByteBuffer.cpp b/xbmc/platform/android/jni/ByteBuffer.cpp
index 45983c74f9..45983c74f9 100644
--- a/xbmc/android/jni/ByteBuffer.cpp
+++ b/xbmc/platform/android/jni/ByteBuffer.cpp
diff --git a/xbmc/android/jni/ByteBuffer.h b/xbmc/platform/android/jni/ByteBuffer.h
index e74a78b582..e74a78b582 100644
--- a/xbmc/android/jni/ByteBuffer.h
+++ b/xbmc/platform/android/jni/ByteBuffer.h
diff --git a/xbmc/android/jni/CharSequence.cpp b/xbmc/platform/android/jni/CharSequence.cpp
index 625984ee44..625984ee44 100644
--- a/xbmc/android/jni/CharSequence.cpp
+++ b/xbmc/platform/android/jni/CharSequence.cpp
diff --git a/xbmc/android/jni/CharSequence.h b/xbmc/platform/android/jni/CharSequence.h
index 9da74f6c24..9da74f6c24 100644
--- a/xbmc/android/jni/CharSequence.h
+++ b/xbmc/platform/android/jni/CharSequence.h
diff --git a/xbmc/android/jni/ClassLoader.cpp b/xbmc/platform/android/jni/ClassLoader.cpp
index 581af5d334..581af5d334 100644
--- a/xbmc/android/jni/ClassLoader.cpp
+++ b/xbmc/platform/android/jni/ClassLoader.cpp
diff --git a/xbmc/android/jni/ClassLoader.h b/xbmc/platform/android/jni/ClassLoader.h
index 7bf70225ba..7bf70225ba 100644
--- a/xbmc/android/jni/ClassLoader.h
+++ b/xbmc/platform/android/jni/ClassLoader.h
diff --git a/xbmc/android/jni/ConnectivityManager.cpp b/xbmc/platform/android/jni/ConnectivityManager.cpp
index 2acd939cdb..d5146412cb 100644
--- a/xbmc/android/jni/ConnectivityManager.cpp
+++ b/xbmc/platform/android/jni/ConnectivityManager.cpp
@@ -38,7 +38,7 @@ int CJNIConnectivityManager::DEFAULT_NETWORK_PREFERENCE(0);
 
 void CJNIConnectivityManager::PopulateStaticFields()
 {
-  jhclass clazz = find_class("android/net/ConnectivityManager");
+  jhclass clazz = find_class("platform/android/net/ConnectivityManager");
   TYPE_MOBILE       = (get_static_field<int>(clazz, "TYPE_MOBILE"));
   TYPE_WIFI         = (get_static_field<int>(clazz, "TYPE_WIFI"));
   TYPE_MOBILE_MMS   = (get_static_field<int>(clazz, "TYPE_MOBILE_MMS"));
diff --git a/xbmc/android/jni/ConnectivityManager.h b/xbmc/platform/android/jni/ConnectivityManager.h
index 38433ce971..38433ce971 100644
--- a/xbmc/android/jni/ConnectivityManager.h
+++ b/xbmc/platform/android/jni/ConnectivityManager.h
diff --git a/xbmc/android/jni/ContentResolver.cpp b/xbmc/platform/android/jni/ContentResolver.cpp
index 16e5c96224..a17e6db3b6 100644
--- a/xbmc/android/jni/ContentResolver.cpp
+++ b/xbmc/platform/android/jni/ContentResolver.cpp
@@ -33,7 +33,7 @@ std::string CJNIContentResolver::CURSOR_DIR_BASE_TYPE;
 
 void CJNIContentResolver::PopulateStaticFields()
 {
-  jhclass clazz = find_class("android/content/ContentResolver");
+  jhclass clazz = find_class("platform/android/content/ContentResolver");
   SCHEME_CONTENT          = jcast<std::string>(get_static_field<jhstring>(clazz,"SCHEME_CONTENT"));
   SCHEME_ANDROID_RESOURCE = jcast<std::string>(get_static_field<jhstring>(clazz,"SCHEME_ANDROID_RESOURCE"));
   SCHEME_FILE             = jcast<std::string>(get_static_field<jhstring>(clazz,"SCHEME_FILE"));
diff --git a/xbmc/android/jni/ContentResolver.h b/xbmc/platform/android/jni/ContentResolver.h
index 8c63f2514b..8c63f2514b 100644
--- a/xbmc/android/jni/ContentResolver.h
+++ b/xbmc/platform/android/jni/ContentResolver.h
diff --git a/xbmc/android/jni/Context.cpp b/xbmc/platform/android/jni/Context.cpp
index fd7bea2fda..fd7bea2fda 100644
--- a/xbmc/android/jni/Context.cpp
+++ b/xbmc/platform/android/jni/Context.cpp
diff --git a/xbmc/android/jni/Context.h b/xbmc/platform/android/jni/Context.h
index 354b9ea2fe..354b9ea2fe 100644
--- a/xbmc/android/jni/Context.h
+++ b/xbmc/platform/android/jni/Context.h
diff --git a/xbmc/android/jni/Cursor.cpp b/xbmc/platform/android/jni/Cursor.cpp
index 7625dbcabd..36aa88e35a 100644
--- a/xbmc/android/jni/Cursor.cpp
+++ b/xbmc/platform/android/jni/Cursor.cpp
@@ -32,7 +32,7 @@ int CJNICursor::FIELD_TYPE_BLOB(0);
 
 void CJNICursor::PopulateStaticFields()
 {
-  jhclass clazz = find_class("android/database/Cursor");
+  jhclass clazz = find_class("platform/android/database/Cursor");
   FIELD_TYPE_NULL     = (get_static_field<int>(clazz, "FIELD_TYPE_NULL"));
   FIELD_TYPE_INTEGER  = (get_static_field<int>(clazz, "FIELD_TYPE_INTEGER"));
   FIELD_TYPE_FLOAT    = (get_static_field<int>(clazz, "FIELD_TYPE_FLOAT"));
diff --git a/xbmc/android/jni/Cursor.h b/xbmc/platform/android/jni/Cursor.h
index 30521ca5fb..30521ca5fb 100644
--- a/xbmc/android/jni/Cursor.h
+++ b/xbmc/platform/android/jni/Cursor.h
diff --git a/xbmc/android/jni/DhcpInfo.cpp b/xbmc/platform/android/jni/DhcpInfo.cpp
index 2a97cf0bbd..2a97cf0bbd 100644
--- a/xbmc/android/jni/DhcpInfo.cpp
+++ b/xbmc/platform/android/jni/DhcpInfo.cpp
diff --git a/xbmc/android/jni/DhcpInfo.h b/xbmc/platform/android/jni/DhcpInfo.h
index a240ac4b0c..a240ac4b0c 100644
--- a/xbmc/android/jni/DhcpInfo.h
+++ b/xbmc/platform/android/jni/DhcpInfo.h
diff --git a/xbmc/android/jni/Display.cpp b/xbmc/platform/android/jni/Display.cpp
index 088802aa71..088802aa71 100644
--- a/xbmc/android/jni/Display.cpp
+++ b/xbmc/platform/android/jni/Display.cpp
diff --git a/xbmc/android/jni/Display.h b/xbmc/platform/android/jni/Display.h
index 536a753bd0..536a753bd0 100644
--- a/xbmc/android/jni/Display.h
+++ b/xbmc/platform/android/jni/Display.h
diff --git a/xbmc/android/jni/DisplayMetrics.cpp b/xbmc/platform/android/jni/DisplayMetrics.cpp
index 0a2c39685d..a4f467766a 100644
--- a/xbmc/android/jni/DisplayMetrics.cpp
+++ b/xbmc/platform/android/jni/DisplayMetrics.cpp
@@ -22,7 +22,7 @@
 #include "jutils/jutils-details.hpp"
 
 using namespace jni;
-const char *CJNIDisplayMetrics::m_classname = "android/util/DisplayMetrics";
+const char *CJNIDisplayMetrics::m_classname = "platform/android/util/DisplayMetrics";
 
 int 	CJNIDisplayMetrics::DENSITY_DEFAULT(-1);
 int 	CJNIDisplayMetrics::DENSITY_HIGH(-1);
diff --git a/xbmc/android/jni/DisplayMetrics.h b/xbmc/platform/android/jni/DisplayMetrics.h
index 578ef54b46..578ef54b46 100644
--- a/xbmc/android/jni/DisplayMetrics.h
+++ b/xbmc/platform/android/jni/DisplayMetrics.h
diff --git a/xbmc/android/jni/Drawable.h b/xbmc/platform/android/jni/Drawable.h
index 8db43f4f3e..8db43f4f3e 100644
--- a/xbmc/android/jni/Drawable.h
+++ b/xbmc/platform/android/jni/Drawable.h
diff --git a/xbmc/android/jni/Enum.cpp b/xbmc/platform/android/jni/Enum.cpp
index 818e424596..818e424596 100644
--- a/xbmc/android/jni/Enum.cpp
+++ b/xbmc/platform/android/jni/Enum.cpp
diff --git a/xbmc/android/jni/Enum.h b/xbmc/platform/android/jni/Enum.h
index 4eea448174..4eea448174 100644
--- a/xbmc/android/jni/Enum.h
+++ b/xbmc/platform/android/jni/Enum.h
diff --git a/xbmc/android/jni/Environment.cpp b/xbmc/platform/android/jni/Environment.cpp
index 6726c6e49a..f9efebeaa1 100644
--- a/xbmc/android/jni/Environment.cpp
+++ b/xbmc/platform/android/jni/Environment.cpp
@@ -26,19 +26,19 @@ using namespace jni;
 
 std::string CJNIEnvironment::getExternalStorageState()
 {
-  return jcast<std::string>(call_static_method<jhstring>("android/os/Environment",
+  return jcast<std::string>(call_static_method<jhstring>("platform/android/os/Environment",
     "getExternalStorageState", "()Ljava/lang/String;"));
 }
 
 CJNIFile CJNIEnvironment::getExternalStorageDirectory()
 {
-  return (CJNIFile)call_static_method<jhobject>("android/os/Environment",
+  return (CJNIFile)call_static_method<jhobject>("platform/android/os/Environment",
     "getExternalStorageDirectory", "()Ljava/io/File;");
 }
 
 CJNIFile CJNIEnvironment::getExternalStoragePublicDirectory(const std::string &type)
 {
-  return (CJNIFile)call_static_method<jhobject>("android/os/Environment",
+  return (CJNIFile)call_static_method<jhobject>("platform/android/os/Environment",
     "getExternalStoragePublicDirectory", "(Ljava/lang/String;)Ljava/io/File;",
     jcast<jhstring>(type));
 }
diff --git a/xbmc/android/jni/Environment.h b/xbmc/platform/android/jni/Environment.h
index fc9d308b53..fc9d308b53 100644
--- a/xbmc/android/jni/Environment.h
+++ b/xbmc/platform/android/jni/Environment.h
diff --git a/xbmc/android/jni/File.cpp b/xbmc/platform/android/jni/File.cpp
index 22abf4bb8b..22abf4bb8b 100644
--- a/xbmc/android/jni/File.cpp
+++ b/xbmc/platform/android/jni/File.cpp
diff --git a/xbmc/android/jni/File.h b/xbmc/platform/android/jni/File.h
index 3900a73b11..3900a73b11 100644
--- a/xbmc/android/jni/File.h
+++ b/xbmc/platform/android/jni/File.h
diff --git a/xbmc/android/jni/Intent.cpp b/xbmc/platform/android/jni/Intent.cpp
index 264a629d8c..03a4450cde 100644
--- a/xbmc/android/jni/Intent.cpp
+++ b/xbmc/platform/android/jni/Intent.cpp
@@ -28,11 +28,11 @@ std::string CJNIIntent::EXTRA_KEY_EVENT;
 
 void CJNIIntent::PopulateStaticFields()
 {
-  jhclass clazz = find_class("android/content/Intent");
+  jhclass clazz = find_class("platform/android/content/Intent");
   EXTRA_KEY_EVENT  = jcast<std::string>(get_static_field<jhstring>(clazz,"EXTRA_KEY_EVENT"));
 }
 
-CJNIIntent::CJNIIntent(const std::string &action) : CJNIBase("android/content/Intent")
+CJNIIntent::CJNIIntent(const std::string &action) : CJNIBase("platform/android/content/Intent")
 {
   if(action.empty())
     m_object = new_object(GetClassName());
diff --git a/xbmc/android/jni/Intent.h b/xbmc/platform/android/jni/Intent.h
index 6855fba284..6855fba284 100644
--- a/xbmc/android/jni/Intent.h
+++ b/xbmc/platform/android/jni/Intent.h
diff --git a/xbmc/android/jni/IntentFilter.cpp b/xbmc/platform/android/jni/IntentFilter.cpp
index 5c18a6127e..7dee386ad0 100644
--- a/xbmc/android/jni/IntentFilter.cpp
+++ b/xbmc/platform/android/jni/IntentFilter.cpp
@@ -23,12 +23,12 @@
 
 using namespace jni;
 
-CJNIIntentFilter::CJNIIntentFilter() : CJNIBase("android/content/IntentFilter")
+CJNIIntentFilter::CJNIIntentFilter() : CJNIBase("platform/android/content/IntentFilter")
 {
   m_object = new_object(GetClassName());
 }
 
-CJNIIntentFilter::CJNIIntentFilter(const std::string &action) : CJNIBase("android/content/IntentFilter")
+CJNIIntentFilter::CJNIIntentFilter(const std::string &action) : CJNIBase("platform/android/content/IntentFilter")
 {
   m_object = new_object(GetClassName(),
     "<init>", "(Ljava/lang/String;)V",
diff --git a/xbmc/android/jni/IntentFilter.h b/xbmc/platform/android/jni/IntentFilter.h
index f51d99d857..f51d99d857 100644
--- a/xbmc/android/jni/IntentFilter.h
+++ b/xbmc/platform/android/jni/IntentFilter.h
diff --git a/xbmc/android/jni/JNIBase.cpp b/xbmc/platform/android/jni/JNIBase.cpp
index 78ec6e5557..78ec6e5557 100644
--- a/xbmc/android/jni/JNIBase.cpp
+++ b/xbmc/platform/android/jni/JNIBase.cpp
diff --git a/xbmc/android/jni/JNIBase.h b/xbmc/platform/android/jni/JNIBase.h
index 3f567202a5..3f567202a5 100644
--- a/xbmc/android/jni/JNIBase.h
+++ b/xbmc/platform/android/jni/JNIBase.h
diff --git a/xbmc/android/jni/JNIThreading.cpp b/xbmc/platform/android/jni/JNIThreading.cpp
index 9f3e58ee91..9f3e58ee91 100644
--- a/xbmc/android/jni/JNIThreading.cpp
+++ b/xbmc/platform/android/jni/JNIThreading.cpp
diff --git a/xbmc/android/jni/JNIThreading.h b/xbmc/platform/android/jni/JNIThreading.h
index 84f371869d..84f371869d 100644
--- a/xbmc/android/jni/JNIThreading.h
+++ b/xbmc/platform/android/jni/JNIThreading.h
diff --git a/xbmc/android/jni/KeyCharacterMap.cpp b/xbmc/platform/android/jni/KeyCharacterMap.cpp
index 610717fb1b..9c0385930b 100644
--- a/xbmc/android/jni/KeyCharacterMap.cpp
+++ b/xbmc/platform/android/jni/KeyCharacterMap.cpp
@@ -25,7 +25,7 @@ using namespace jni;
 
 CJNIKeyCharacterMap CJNIKeyCharacterMap::load(int deviceId)
 {
-  return (CJNIKeyCharacterMap)call_static_method<jhobject>("android/view/KeyCharacterMap",
+  return (CJNIKeyCharacterMap)call_static_method<jhobject>("platform/android/view/KeyCharacterMap",
     "load", "(I)Landroid/view/KeyCharacterMap;",
     deviceId);
 }
diff --git a/xbmc/android/jni/KeyCharacterMap.h b/xbmc/platform/android/jni/KeyCharacterMap.h
index 22eba959e0..22eba959e0 100644
--- a/xbmc/android/jni/KeyCharacterMap.h
+++ b/xbmc/platform/android/jni/KeyCharacterMap.h
diff --git a/xbmc/android/jni/KeyEvent.cpp b/xbmc/platform/android/jni/KeyEvent.cpp
index 55c38c824d..4a82b097cb 100644
--- a/xbmc/android/jni/KeyEvent.cpp
+++ b/xbmc/platform/android/jni/KeyEvent.cpp
@@ -40,7 +40,7 @@ int CJNIKeyEvent::KEYCODE_MEDIA_STOP;
 
 void CJNIKeyEvent::PopulateStaticFields()
 {
-  jhclass clazz = find_class("android/view/KeyEvent");
+  jhclass clazz = find_class("platform/android/view/KeyEvent");
   ACTION_DOWN  = (get_static_field<int>(clazz, "ACTION_DOWN"));
   ACTION_UP  = (get_static_field<int>(clazz, "ACTION_UP"));
   KEYCODE_MEDIA_RECORD  = (get_static_field<int>(clazz, "KEYCODE_MEDIA_RECORD"));
diff --git a/xbmc/android/jni/KeyEvent.h b/xbmc/platform/android/jni/KeyEvent.h
index 5ad8474610..5ad8474610 100644
--- a/xbmc/android/jni/KeyEvent.h
+++ b/xbmc/platform/android/jni/KeyEvent.h
diff --git a/xbmc/android/jni/List.cpp b/xbmc/platform/android/jni/List.cpp
index bd2e7dc03b..bd2e7dc03b 100644
--- a/xbmc/android/jni/List.cpp
+++ b/xbmc/platform/android/jni/List.cpp
diff --git a/xbmc/android/jni/List.h b/xbmc/platform/android/jni/List.h
index c7f3f16f83..c7f3f16f83 100644
--- a/xbmc/android/jni/List.h
+++ b/xbmc/platform/android/jni/List.h
diff --git a/xbmc/android/jni/Makefile.in b/xbmc/platform/android/jni/Makefile.in
index 7e1eeff619..7e1eeff619 100644
--- a/xbmc/android/jni/Makefile.in
+++ b/xbmc/platform/android/jni/Makefile.in
diff --git a/xbmc/android/jni/MediaCodec.cpp b/xbmc/platform/android/jni/MediaCodec.cpp
index 0615862fea..8053b49889 100644
--- a/xbmc/android/jni/MediaCodec.cpp
+++ b/xbmc/platform/android/jni/MediaCodec.cpp
@@ -40,13 +40,13 @@ int CJNIMediaCodec::INFO_OUTPUT_FORMAT_CHANGED(-2);
 int CJNIMediaCodec::INFO_TRY_AGAIN_LATER(-1);
 int CJNIMediaCodec::VIDEO_SCALING_MODE_SCALE_TO_FIT(1);
 int CJNIMediaCodec::VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING(2);
-const char *CJNIMediaCodec::m_classname = "android/media/MediaCodec";
+const char *CJNIMediaCodec::m_classname = "platform/android/media/MediaCodec";
 
 void CJNIMediaCodec::PopulateStaticFields()
 {
   if(GetSDKVersion() >= 16)
   {
-    jhclass clazz = find_class("android/media/MediaCodec");
+    jhclass clazz = find_class("platform/android/media/MediaCodec");
     BUFFER_FLAG_CODEC_CONFIG  = (get_static_field<int>(clazz, "BUFFER_FLAG_CODEC_CONFIG"));
     BUFFER_FLAG_END_OF_STREAM = (get_static_field<int>(clazz, "BUFFER_FLAG_END_OF_STREAM"));
     BUFFER_FLAG_SYNC_FRAME    = (get_static_field<int>(clazz, "BUFFER_FLAG_SYNC_FRAME"));
diff --git a/xbmc/android/jni/MediaCodec.h b/xbmc/platform/android/jni/MediaCodec.h
index a0b63b1f3e..a0b63b1f3e 100644
--- a/xbmc/android/jni/MediaCodec.h
+++ b/xbmc/platform/android/jni/MediaCodec.h
diff --git a/xbmc/android/jni/MediaCodecBufferInfo.cpp b/xbmc/platform/android/jni/MediaCodecBufferInfo.cpp
index e966e7363b..bf680f825e 100644
--- a/xbmc/android/jni/MediaCodecBufferInfo.cpp
+++ b/xbmc/platform/android/jni/MediaCodecBufferInfo.cpp
@@ -26,7 +26,7 @@
 
 using namespace jni;
 
-CJNIMediaCodecBufferInfo::CJNIMediaCodecBufferInfo() : CJNIBase("android/media/MediaCodec$BufferInfo")
+CJNIMediaCodecBufferInfo::CJNIMediaCodecBufferInfo() : CJNIBase("platform/android/media/MediaCodec$BufferInfo")
 {
   m_object = new_object(GetClassName(), "<init>", "()V");
   m_object.setGlobal();
diff --git a/xbmc/android/jni/MediaCodecBufferInfo.h b/xbmc/platform/android/jni/MediaCodecBufferInfo.h
index 0befc009ca..0befc009ca 100644
--- a/xbmc/android/jni/MediaCodecBufferInfo.h
+++ b/xbmc/platform/android/jni/MediaCodecBufferInfo.h
diff --git a/xbmc/android/jni/MediaCodecCryptoInfo.cpp b/xbmc/platform/android/jni/MediaCodecCryptoInfo.cpp
index 72a6d82561..72a6d82561 100644
--- a/xbmc/android/jni/MediaCodecCryptoInfo.cpp
+++ b/xbmc/platform/android/jni/MediaCodecCryptoInfo.cpp
diff --git a/xbmc/android/jni/MediaCodecCryptoInfo.h b/xbmc/platform/android/jni/MediaCodecCryptoInfo.h
index ada3f076cd..ada3f076cd 100644
--- a/xbmc/android/jni/MediaCodecCryptoInfo.h
+++ b/xbmc/platform/android/jni/MediaCodecCryptoInfo.h
diff --git a/xbmc/android/jni/MediaCodecInfo.cpp b/xbmc/platform/android/jni/MediaCodecInfo.cpp
index 933542a0f6..f6b77e5776 100644
--- a/xbmc/android/jni/MediaCodecInfo.cpp
+++ b/xbmc/platform/android/jni/MediaCodecInfo.cpp
@@ -98,7 +98,7 @@ int CJNIMediaCodecInfoCodecProfileLevel::AACObjectERLC(0);
 int CJNIMediaCodecInfoCodecProfileLevel::AACObjectLD(0);
 int CJNIMediaCodecInfoCodecProfileLevel::AACObjectHE_PS(0);
 int CJNIMediaCodecInfoCodecProfileLevel::AACObjectELD(0);
-const char *CJNIMediaCodecInfoCodecProfileLevel::m_classname = "android/media/MediaCodecInfo$CodecProfileLevel";
+const char *CJNIMediaCodecInfoCodecProfileLevel::m_classname = "platform/android/media/MediaCodecInfo$CodecProfileLevel";
 
 void CJNIMediaCodecInfoCodecProfileLevel::PopulateStaticFields()
 {
@@ -241,7 +241,7 @@ int CJNIMediaCodecInfoCodecCapabilities::COLOR_TI_FormatYUV420PackedSemiPlanar(0
 int CJNIMediaCodecInfoCodecCapabilities::COLOR_QCOM_FormatYUV420SemiPlanar(0);
 /* This one isn't exposed in 4.4 */
 int CJNIMediaCodecInfoCodecCapabilities::OMX_QCOM_COLOR_FormatYVU420SemiPlanarInterlace(0x7FA30C04);
-const char *CJNIMediaCodecInfoCodecCapabilities::m_classname = "android/media/MediaCodecInfo$CodecCapabilities";
+const char *CJNIMediaCodecInfoCodecCapabilities::m_classname = "platform/android/media/MediaCodecInfo$CodecCapabilities";
 
 void CJNIMediaCodecInfoCodecCapabilities::PopulateStaticFields()
 {
diff --git a/xbmc/android/jni/MediaCodecInfo.h b/xbmc/platform/android/jni/MediaCodecInfo.h
index 6810e13128..6810e13128 100644
--- a/xbmc/android/jni/MediaCodecInfo.h
+++ b/xbmc/platform/android/jni/MediaCodecInfo.h
diff --git a/xbmc/android/jni/MediaCodecList.cpp b/xbmc/platform/android/jni/MediaCodecList.cpp
index 4042fb7268..da4c6e3a7f 100644
--- a/xbmc/android/jni/MediaCodecList.cpp
+++ b/xbmc/platform/android/jni/MediaCodecList.cpp
@@ -25,7 +25,7 @@
 
 using namespace jni;
 
-const char* CJNIMediaCodecList::m_classname = "android/media/MediaCodecList";
+const char* CJNIMediaCodecList::m_classname = "platform/android/media/MediaCodecList";
 
 int CJNIMediaCodecList::getCodecCount()
 {
diff --git a/xbmc/android/jni/MediaCodecList.h b/xbmc/platform/android/jni/MediaCodecList.h
index 85b16accd8..85b16accd8 100644
--- a/xbmc/android/jni/MediaCodecList.h
+++ b/xbmc/platform/android/jni/MediaCodecList.h
diff --git a/xbmc/android/jni/MediaCrypto.h b/xbmc/platform/android/jni/MediaCrypto.h
index 26827ee741..26827ee741 100644
--- a/xbmc/android/jni/MediaCrypto.h
+++ b/xbmc/platform/android/jni/MediaCrypto.h
diff --git a/xbmc/android/jni/MediaFormat.cpp b/xbmc/platform/android/jni/MediaFormat.cpp
index 09bc55cc0e..1fe269bc6e 100644
--- a/xbmc/android/jni/MediaFormat.cpp
+++ b/xbmc/platform/android/jni/MediaFormat.cpp
@@ -40,13 +40,13 @@ std::string CJNIMediaFormat::KEY_IS_ADTS;
 std::string CJNIMediaFormat::KEY_CHANNEL_MASK;
 std::string CJNIMediaFormat::KEY_AAC_PROFILE;
 std::string CJNIMediaFormat::KEY_FLAC_COMPRESSION_LEVEL;
-const char *CJNIMediaFormat::m_classname = "android/media/MediaFormat";
+const char *CJNIMediaFormat::m_classname = "platform/android/media/MediaFormat";
 
 void CJNIMediaFormat::PopulateStaticFields()
 {
   if(GetSDKVersion() >= 16)
   {
-    jhclass clazz = find_class("android/media/MediaFormat");
+    jhclass clazz = find_class("platform/android/media/MediaFormat");
     KEY_MIME            = jcast<std::string>(get_static_field<jhstring>(clazz, "KEY_MIME"));
     KEY_SAMPLE_RATE     = jcast<std::string>(get_static_field<jhstring>(clazz, "KEY_SAMPLE_RATE"));
     KEY_CHANNEL_COUNT   = jcast<std::string>(get_static_field<jhstring>(clazz, "KEY_CHANNEL_COUNT"));
diff --git a/xbmc/android/jni/MediaFormat.h b/xbmc/platform/android/jni/MediaFormat.h
index 8380604d6d..8380604d6d 100644
--- a/xbmc/android/jni/MediaFormat.h
+++ b/xbmc/platform/android/jni/MediaFormat.h
diff --git a/xbmc/android/jni/MediaStore.cpp b/xbmc/platform/android/jni/MediaStore.cpp
index 6c188f170c..da758ce63c 100644
--- a/xbmc/android/jni/MediaStore.cpp
+++ b/xbmc/platform/android/jni/MediaStore.cpp
@@ -33,7 +33,7 @@ std::string CJNIMediaStoreMediaColumns::MIME_TYPE;
 
 void CJNIMediaStoreMediaColumns::PopulateStaticFields()
 {
-  jhclass clazz = find_class("android/provider/MediaStore$MediaColumns");
+  jhclass clazz = find_class("platform/android/provider/MediaStore$MediaColumns");
   DATA          = (jcast<std::string>(get_static_field<jhstring>(clazz, "DATA")));
   SIZE          = (jcast<std::string>(get_static_field<jhstring>(clazz, "SIZE")));
   DISPLAY_NAME  = (jcast<std::string>(get_static_field<jhstring>(clazz, "DISPLAY_NAME")));
diff --git a/xbmc/android/jni/MediaStore.h b/xbmc/platform/android/jni/MediaStore.h
index 3ea6f28995..3ea6f28995 100644
--- a/xbmc/android/jni/MediaStore.h
+++ b/xbmc/platform/android/jni/MediaStore.h
diff --git a/xbmc/android/jni/NetworkInfo.cpp b/xbmc/platform/android/jni/NetworkInfo.cpp
index f792b33524..f792b33524 100644
--- a/xbmc/android/jni/NetworkInfo.cpp
+++ b/xbmc/platform/android/jni/NetworkInfo.cpp
diff --git a/xbmc/android/jni/NetworkInfo.h b/xbmc/platform/android/jni/NetworkInfo.h
index 1186b27b31..1186b27b31 100644
--- a/xbmc/android/jni/NetworkInfo.h
+++ b/xbmc/platform/android/jni/NetworkInfo.h
diff --git a/xbmc/android/jni/PackageItemInfo.cpp b/xbmc/platform/android/jni/PackageItemInfo.cpp
index c0d4f2ccff..1dd5c544ed 100644
--- a/xbmc/android/jni/PackageItemInfo.cpp
+++ b/xbmc/platform/android/jni/PackageItemInfo.cpp
@@ -22,7 +22,7 @@
 #include "jutils/jutils-details.hpp"
 
 using namespace jni;
-const char *CJNIPackageItemInfo::m_classname = "android/content/pm/PackageItemInfo";
+const char *CJNIPackageItemInfo::m_classname = "platform/android/content/pm/PackageItemInfo";
 
 CJNIPackageItemInfo::CJNIPackageItemInfo(const jhobject &object) : CJNIBase(object)
   ,icon(       get_field<int>(m_object, "icon"))
diff --git a/xbmc/android/jni/PackageItemInfo.h b/xbmc/platform/android/jni/PackageItemInfo.h
index 2924ef006a..2924ef006a 100644
--- a/xbmc/android/jni/PackageItemInfo.h
+++ b/xbmc/platform/android/jni/PackageItemInfo.h
diff --git a/xbmc/android/jni/PackageManager.cpp b/xbmc/platform/android/jni/PackageManager.cpp
index b9d510ef5c..dd1d17901a 100644
--- a/xbmc/android/jni/PackageManager.cpp
+++ b/xbmc/platform/android/jni/PackageManager.cpp
@@ -32,7 +32,7 @@ int CJNIPackageManager::GET_ACTIVITIES(0);
 
 void CJNIPackageManager::PopulateStaticFields()
 {
-  jhclass clazz  = find_class("android/content/pm/PackageManager");
+  jhclass clazz  = find_class("platform/android/content/pm/PackageManager");
   GET_ACTIVITIES = (get_static_field<int>(clazz, "GET_ACTIVITIES"));
 }
 
diff --git a/xbmc/android/jni/PackageManager.h b/xbmc/platform/android/jni/PackageManager.h
index bf22c33120..bf22c33120 100644
--- a/xbmc/android/jni/PackageManager.h
+++ b/xbmc/platform/android/jni/PackageManager.h
diff --git a/xbmc/android/jni/PowerManager.cpp b/xbmc/platform/android/jni/PowerManager.cpp
index ee447e5335..5c4163dc36 100644
--- a/xbmc/android/jni/PowerManager.cpp
+++ b/xbmc/platform/android/jni/PowerManager.cpp
@@ -29,7 +29,7 @@ int CJNIPowerManager::SCREEN_BRIGHT_WAKE_LOCK(0xa);
 
 void CJNIPowerManager::PopulateStaticFields()
 {
-  jhclass clazz  = find_class("android/os/PowerManager");
+  jhclass clazz  = find_class("platform/android/os/PowerManager");
   FULL_WAKE_LOCK = (get_static_field<int>(clazz, "FULL_WAKE_LOCK"));
   SCREEN_BRIGHT_WAKE_LOCK = (get_static_field<int>(clazz, "SCREEN_BRIGHT_WAKE_LOCK"));
 }
diff --git a/xbmc/android/jni/PowerManager.h b/xbmc/platform/android/jni/PowerManager.h
index ca4a478fe7..ca4a478fe7 100644
--- a/xbmc/android/jni/PowerManager.h
+++ b/xbmc/platform/android/jni/PowerManager.h
diff --git a/xbmc/android/jni/README b/xbmc/platform/android/jni/README
index 8da8cddb1e..eeb53c8802 100644
--- a/xbmc/android/jni/README
+++ b/xbmc/platform/android/jni/README
@@ -120,7 +120,7 @@ Simplified Example:
     std::string getSomeString();
   };
 
-  CJNISomeClass::CJNISomeClass() : CJNIBase("android/some/ClassName")
+  CJNISomeClass::CJNISomeClass() : CJNIBase("platform/android/some/ClassName")
   {
     m_object = new_object(GetClassName());
   }
diff --git a/xbmc/android/jni/Resources.cpp b/xbmc/platform/android/jni/Resources.cpp
index 55e2a49389..55e2a49389 100644
--- a/xbmc/android/jni/Resources.cpp
+++ b/xbmc/platform/android/jni/Resources.cpp
diff --git a/xbmc/android/jni/Resources.h b/xbmc/platform/android/jni/Resources.h
index bb6751ab9c..bb6751ab9c 100644
--- a/xbmc/android/jni/Resources.h
+++ b/xbmc/platform/android/jni/Resources.h
diff --git a/xbmc/android/jni/ScanResult.cpp b/xbmc/platform/android/jni/ScanResult.cpp
index cdc5003d7d..cdc5003d7d 100644
--- a/xbmc/android/jni/ScanResult.cpp
+++ b/xbmc/platform/android/jni/ScanResult.cpp
diff --git a/xbmc/android/jni/ScanResult.h b/xbmc/platform/android/jni/ScanResult.h
index 0cb0fd83e3..0cb0fd83e3 100644
--- a/xbmc/android/jni/ScanResult.h
+++ b/xbmc/platform/android/jni/ScanResult.h
diff --git a/xbmc/android/jni/StatFs.cpp b/xbmc/platform/android/jni/StatFs.cpp
index bb0ae10d22..3946d8977c 100644
--- a/xbmc/android/jni/StatFs.cpp
+++ b/xbmc/platform/android/jni/StatFs.cpp
@@ -23,7 +23,7 @@
 
 using namespace jni;
 
-CJNIStatFs::CJNIStatFs(const std::string &path) : CJNIBase("android/os/StatFs")
+CJNIStatFs::CJNIStatFs(const std::string &path) : CJNIBase("platform/android/os/StatFs")
 {
   m_object = new_object(GetClassName(), "<init>",
     "(Ljava/lang/String;)V",
diff --git a/xbmc/android/jni/StatFs.h b/xbmc/platform/android/jni/StatFs.h
index bf414fd28f..bf414fd28f 100644
--- a/xbmc/android/jni/StatFs.h
+++ b/xbmc/platform/android/jni/StatFs.h
diff --git a/xbmc/android/jni/Surface.cpp b/xbmc/platform/android/jni/Surface.cpp
index c91b0d8a47..1c94c2942b 100644
--- a/xbmc/android/jni/Surface.cpp
+++ b/xbmc/platform/android/jni/Surface.cpp
@@ -30,7 +30,7 @@ int CJNISurface::ROTATION_0;
 int CJNISurface::ROTATION_90;
 int CJNISurface::ROTATION_180;
 int CJNISurface::ROTATION_270;
-const char* CJNISurface::m_classname = "android/view/Surface";
+const char* CJNISurface::m_classname = "platform/android/view/Surface";
 
 void CJNISurface::PopulateStaticFields()
 {
diff --git a/xbmc/android/jni/Surface.h b/xbmc/platform/android/jni/Surface.h
index 85fc1b8efb..85fc1b8efb 100644
--- a/xbmc/android/jni/Surface.h
+++ b/xbmc/platform/android/jni/Surface.h
diff --git a/xbmc/android/jni/SurfaceTexture.cpp b/xbmc/platform/android/jni/SurfaceTexture.cpp
index b8f4a9f413..330e5788ef 100644
--- a/xbmc/android/jni/SurfaceTexture.cpp
+++ b/xbmc/platform/android/jni/SurfaceTexture.cpp
@@ -26,7 +26,7 @@
 
 #include "jutils/jutils-details.hpp"
 
-#include "android/activity/JNIMainActivity.h"
+#include "platform/android/activity/JNIMainActivity.h"
 #include <algorithm>
 
 using namespace jni;
@@ -64,7 +64,7 @@ void CJNISurfaceTextureOnFrameAvailableListener::_onFrameAvailable(JNIEnv *env,
 
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
-CJNISurfaceTexture::CJNISurfaceTexture(int texName) : CJNIBase("android/graphics/SurfaceTexture")
+CJNISurfaceTexture::CJNISurfaceTexture(int texName) : CJNIBase("platform/android/graphics/SurfaceTexture")
 {
   m_object = new_object(GetClassName(), "<init>", "(I)V", texName);
   m_object.setGlobal();
diff --git a/xbmc/android/jni/SurfaceTexture.h b/xbmc/platform/android/jni/SurfaceTexture.h
index 7ea3598ad2..7ea3598ad2 100644
--- a/xbmc/android/jni/SurfaceTexture.h
+++ b/xbmc/platform/android/jni/SurfaceTexture.h
diff --git a/xbmc/android/jni/System.cpp b/xbmc/platform/android/jni/System.cpp
index e9e6cfdfcc..e9e6cfdfcc 100644
--- a/xbmc/android/jni/System.cpp
+++ b/xbmc/platform/android/jni/System.cpp
diff --git a/xbmc/android/jni/System.h b/xbmc/platform/android/jni/System.h
index e8f1a71f7e..e8f1a71f7e 100644
--- a/xbmc/android/jni/System.h
+++ b/xbmc/platform/android/jni/System.h
diff --git a/xbmc/android/jni/SystemClock.cpp b/xbmc/platform/android/jni/SystemClock.cpp
index 11ca959885..d94a4fb5ed 100644
--- a/xbmc/android/jni/SystemClock.cpp
+++ b/xbmc/platform/android/jni/SystemClock.cpp
@@ -25,7 +25,7 @@ using namespace jni;
 
 int64_t CJNISystemClock::uptimeMillis()
 {
-  return call_static_method<jlong>("android/os/SystemClock",
+  return call_static_method<jlong>("platform/android/os/SystemClock",
     "uptimeMillis", "()J");
 }
 
diff --git a/xbmc/android/jni/SystemClock.h b/xbmc/platform/android/jni/SystemClock.h
index 8de0bca86c..8de0bca86c 100644
--- a/xbmc/android/jni/SystemClock.h
+++ b/xbmc/platform/android/jni/SystemClock.h
diff --git a/xbmc/android/jni/SystemProperties.cpp b/xbmc/platform/android/jni/SystemProperties.cpp
index b720894323..b13c5b3872 100644
--- a/xbmc/android/jni/SystemProperties.cpp
+++ b/xbmc/platform/android/jni/SystemProperties.cpp
@@ -22,7 +22,7 @@
 #include "jutils/jutils-details.hpp"
 
 using namespace jni;
-const char *CJNISystemProperties::m_classname = "android/os/SystemProperties";
+const char *CJNISystemProperties::m_classname = "platform/android/os/SystemProperties";
 
 std::string CJNISystemProperties::get(const std::string& property, const std::string& defaultValue)
 {
diff --git a/xbmc/android/jni/SystemProperties.h b/xbmc/platform/android/jni/SystemProperties.h
index a044d47ac8..a044d47ac8 100644
--- a/xbmc/android/jni/SystemProperties.h
+++ b/xbmc/platform/android/jni/SystemProperties.h
diff --git a/xbmc/android/jni/URI.cpp b/xbmc/platform/android/jni/URI.cpp
index 2f76c0f50a..536df8fadc 100644
--- a/xbmc/android/jni/URI.cpp
+++ b/xbmc/platform/android/jni/URI.cpp
@@ -25,7 +25,7 @@ using namespace jni;
 
 CJNIURI CJNIURI::parse(std::string uriString)
 {
-  return call_static_method<jhobject>("android/net/Uri",
+  return call_static_method<jhobject>("platform/android/net/Uri",
     "parse", "(Ljava/lang/String;)Landroid/net/Uri;",
     jcast<jhstring>(uriString));
 }
diff --git a/xbmc/android/jni/URI.h b/xbmc/platform/android/jni/URI.h
index 98d30318aa..98d30318aa 100644
--- a/xbmc/android/jni/URI.h
+++ b/xbmc/platform/android/jni/URI.h
diff --git a/xbmc/android/jni/View.cpp b/xbmc/platform/android/jni/View.cpp
index 635f568e2b..bca97e9d01 100644
--- a/xbmc/android/jni/View.cpp
+++ b/xbmc/platform/android/jni/View.cpp
@@ -72,7 +72,7 @@ int CJNIViewInputDeviceMotionRange::getSource() const
 
 /************************************************************************/
 /************************************************************************/
-const char *CJNIViewInputDevice::m_classname = "android/view/InputDevice";
+const char *CJNIViewInputDevice::m_classname = "platform/android/view/InputDevice";
 
 const CJNIViewInputDevice CJNIViewInputDevice::getDevice(int id)
 {
@@ -125,7 +125,7 @@ int CJNIView::SYSTEM_UI_FLAG_VISIBLE(0);
 
 void CJNIView::PopulateStaticFields()
 {
-  jhclass clazz = find_class("android/view/View");
+  jhclass clazz = find_class("platform/android/view/View");
   if(GetSDKVersion() >= 16)
   {
     SYSTEM_UI_FLAG_FULLSCREEN              = (get_static_field<int>(clazz, "SYSTEM_UI_FLAG_FULLSCREEN"));
diff --git a/xbmc/android/jni/View.h b/xbmc/platform/android/jni/View.h
index cd22ad98c5..cd22ad98c5 100644
--- a/xbmc/android/jni/View.h
+++ b/xbmc/platform/android/jni/View.h
diff --git a/xbmc/android/jni/WakeLock.cpp b/xbmc/platform/android/jni/WakeLock.cpp
index 0eb48114cc..0eb48114cc 100644
--- a/xbmc/android/jni/WakeLock.cpp
+++ b/xbmc/platform/android/jni/WakeLock.cpp
diff --git a/xbmc/android/jni/WakeLock.h b/xbmc/platform/android/jni/WakeLock.h
index 44134999bd..44134999bd 100644
--- a/xbmc/android/jni/WakeLock.h
+++ b/xbmc/platform/android/jni/WakeLock.h
diff --git a/xbmc/android/jni/WifiConfiguration.cpp b/xbmc/platform/android/jni/WifiConfiguration.cpp
index 60e7ad82db..d8958a7dd0 100644
--- a/xbmc/android/jni/WifiConfiguration.cpp
+++ b/xbmc/platform/android/jni/WifiConfiguration.cpp
@@ -23,7 +23,7 @@
 
 using namespace jni;
 
-CJNIWifiConfiguration::CJNIWifiConfiguration() : CJNIBase("android/net/wifi/WifiConfiguration")
+CJNIWifiConfiguration::CJNIWifiConfiguration() : CJNIBase("platform/android/net/wifi/WifiConfiguration")
 {
   m_object = new_object(GetClassName());
   m_object.setGlobal();
diff --git a/xbmc/android/jni/WifiConfiguration.h b/xbmc/platform/android/jni/WifiConfiguration.h
index 9252efb593..9252efb593 100644
--- a/xbmc/android/jni/WifiConfiguration.h
+++ b/xbmc/platform/android/jni/WifiConfiguration.h
diff --git a/xbmc/android/jni/WifiInfo.cpp b/xbmc/platform/android/jni/WifiInfo.cpp
index 4aab7001b5..a67124d8ce 100644
--- a/xbmc/android/jni/WifiInfo.cpp
+++ b/xbmc/platform/android/jni/WifiInfo.cpp
@@ -91,7 +91,7 @@ CJNISupplicantState CJNIWifiInfo::getSupplicantState() const
 
 CJNINetworkInfoDetailedState CJNIWifiInfo::getDetailedStateOf(const CJNISupplicantState &suppState)
 {
-  return call_static_method<jhobject>("android/net/wifi/WifiInfo",
+  return call_static_method<jhobject>("platform/android/net/wifi/WifiInfo",
     "getDetailedStateOf", "(Landroid/net/wifi/SupplicantState;)Landroid/net/NetworkInfo$DetailedState;",
     suppState.get_raw());
 }
diff --git a/xbmc/android/jni/WifiInfo.h b/xbmc/platform/android/jni/WifiInfo.h
index ba2d159e26..ba2d159e26 100644
--- a/xbmc/android/jni/WifiInfo.h
+++ b/xbmc/platform/android/jni/WifiInfo.h
diff --git a/xbmc/android/jni/WifiManager.cpp b/xbmc/platform/android/jni/WifiManager.cpp
index a6eeb76b7d..13bd480f15 100644
--- a/xbmc/android/jni/WifiManager.cpp
+++ b/xbmc/platform/android/jni/WifiManager.cpp
@@ -140,13 +140,13 @@ bool CJNIWifiManager::isWifiEnabled()
 
 int CJNIWifiManager::calculateSignalLevel(int rssi, int numLevels)
 {
-  return call_static_method<jint>("android/net/wifi/WifiManager",
+  return call_static_method<jint>("platform/android/net/wifi/WifiManager",
     "calculateSignalLevel", "(II)I", rssi, numLevels);
 }
 
 int CJNIWifiManager::compareSignalLevel(int rssiA, int rssiB)
 {
-  return call_static_method<jint>("android/net/wifi/WifiManager",
+  return call_static_method<jint>("platform/android/net/wifi/WifiManager",
     "compareSignalLevel", "(II)I", rssiA, rssiB);
 }
 
diff --git a/xbmc/android/jni/WifiManager.h b/xbmc/platform/android/jni/WifiManager.h
index 12aa7e98cb..12aa7e98cb 100644
--- a/xbmc/android/jni/WifiManager.h
+++ b/xbmc/platform/android/jni/WifiManager.h
diff --git a/xbmc/android/jni/WifiManagerMulticastLock.cpp b/xbmc/platform/android/jni/WifiManagerMulticastLock.cpp
index 7cf8b4f4a3..7cf8b4f4a3 100644
--- a/xbmc/android/jni/WifiManagerMulticastLock.cpp
+++ b/xbmc/platform/android/jni/WifiManagerMulticastLock.cpp
diff --git a/xbmc/android/jni/WifiManagerMulticastLock.h b/xbmc/platform/android/jni/WifiManagerMulticastLock.h
index fa9efa638b..fa9efa638b 100644
--- a/xbmc/android/jni/WifiManagerMulticastLock.h
+++ b/xbmc/platform/android/jni/WifiManagerMulticastLock.h
diff --git a/xbmc/android/jni/Window.cpp b/xbmc/platform/android/jni/Window.cpp
index 969e9aa067..969e9aa067 100644
--- a/xbmc/android/jni/Window.cpp
+++ b/xbmc/platform/android/jni/Window.cpp
diff --git a/xbmc/android/jni/Window.h b/xbmc/platform/android/jni/Window.h
index eb63f8b8f6..eb63f8b8f6 100644
--- a/xbmc/android/jni/Window.h
+++ b/xbmc/platform/android/jni/Window.h
diff --git a/xbmc/android/jni/WindowManager.cpp b/xbmc/platform/android/jni/WindowManager.cpp
index 8e0f352b6d..8e0f352b6d 100644
--- a/xbmc/android/jni/WindowManager.cpp
+++ b/xbmc/platform/android/jni/WindowManager.cpp
diff --git a/xbmc/android/jni/WindowManager.h b/xbmc/platform/android/jni/WindowManager.h
index 0ea37fc16b..0ea37fc16b 100644
--- a/xbmc/android/jni/WindowManager.h
+++ b/xbmc/platform/android/jni/WindowManager.h
diff --git a/xbmc/android/jni/jutils.cpp b/xbmc/platform/android/jni/jutils.cpp
index 9cc693c094..9cc693c094 100644
--- a/xbmc/android/jni/jutils.cpp
+++ b/xbmc/platform/android/jni/jutils.cpp
diff --git a/xbmc/android/jni/jutils/jni.inc b/xbmc/platform/android/jni/jutils/jni.inc
index 4f6917762c..4f6917762c 100644
--- a/xbmc/android/jni/jutils/jni.inc
+++ b/xbmc/platform/android/jni/jutils/jni.inc
diff --git a/xbmc/android/jni/jutils/jutils-details.hpp b/xbmc/platform/android/jni/jutils/jutils-details.hpp
index b67a6aa545..b67a6aa545 100644
--- a/xbmc/android/jni/jutils/jutils-details.hpp
+++ b/xbmc/platform/android/jni/jutils/jutils-details.hpp
diff --git a/xbmc/android/jni/jutils/jutils.hpp b/xbmc/platform/android/jni/jutils/jutils.hpp
index 059a2c09bc..059a2c09bc 100644
--- a/xbmc/android/jni/jutils/jutils.hpp
+++ b/xbmc/platform/android/jni/jutils/jutils.hpp
diff --git a/xbmc/android/loader/AndroidDyload.cpp b/xbmc/platform/android/loader/AndroidDyload.cpp
index 93dc4063d6..783e934679 100644
--- a/xbmc/android/loader/AndroidDyload.cpp
+++ b/xbmc/platform/android/loader/AndroidDyload.cpp
@@ -6,7 +6,7 @@
 #include <vector>
 #include <dlfcn.h>
 #include <fcntl.h>
-#include "android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 #include "AndroidDyload.h"
 #include "utils/StringUtils.h"
 #include "CompileInfo.h"
diff --git a/xbmc/android/loader/AndroidDyload.h b/xbmc/platform/android/loader/AndroidDyload.h
index a906f0f9f2..a906f0f9f2 100644
--- a/xbmc/android/loader/AndroidDyload.h
+++ b/xbmc/platform/android/loader/AndroidDyload.h
diff --git a/xbmc/android/loader/Makefile.in b/xbmc/platform/android/loader/Makefile.in
index d2cf65f08b..d2cf65f08b 100644
--- a/xbmc/android/loader/Makefile.in
+++ b/xbmc/platform/android/loader/Makefile.in
diff --git a/xbmc/powermanagement/android/AndroidPowerSyscall.cpp b/xbmc/powermanagement/android/AndroidPowerSyscall.cpp
index ed5ea1ff0b..44d243b79d 100644
--- a/xbmc/powermanagement/android/AndroidPowerSyscall.cpp
+++ b/xbmc/powermanagement/android/AndroidPowerSyscall.cpp
@@ -21,7 +21,7 @@
 #if defined (TARGET_ANDROID)
 
 #include "AndroidPowerSyscall.h"
-#include "android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 
 CAndroidPowerSyscall::CAndroidPowerSyscall()
 { }
diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp
index 60f8cd217c..c038e5be96 100644
--- a/xbmc/settings/SettingConditions.cpp
+++ b/xbmc/settings/SettingConditions.cpp
@@ -26,7 +26,7 @@
 #include "addons/AddonManager.h"
 #include "addons/Skin.h"
 #if defined(TARGET_ANDROID)
-#include "android/activity/AndroidFeatures.h"
+#include "platform/android/activity/AndroidFeatures.h"
 #endif // defined(TARGET_ANDROID)
 #include "cores/AudioEngine/AEFactory.h"
 #include "cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h"
diff --git a/xbmc/storage/android/AndroidStorageProvider.cpp b/xbmc/storage/android/AndroidStorageProvider.cpp
index dc0c4189ab..e4df7ae2af 100644
--- a/xbmc/storage/android/AndroidStorageProvider.cpp
+++ b/xbmc/storage/android/AndroidStorageProvider.cpp
@@ -24,7 +24,7 @@
 #include <map>
 
 #include "AndroidStorageProvider.h"
-#include "android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 #include "guilib/LocalizeStrings.h"
 #include "filesystem/File.h"
 #include "filesystem/Directory.h"
diff --git a/xbmc/utils/CPUInfo.cpp b/xbmc/utils/CPUInfo.cpp
index 660d355012..9e895e76a3 100644
--- a/xbmc/utils/CPUInfo.cpp
+++ b/xbmc/utils/CPUInfo.cpp
@@ -51,7 +51,7 @@
 #endif
 
 #if defined(TARGET_ANDROID)
-#include "android/activity/AndroidFeatures.h"
+#include "platform/android/activity/AndroidFeatures.h"
 #endif
 
 #ifdef TARGET_WINDOWS
diff --git a/xbmc/utils/StringUtils.cpp b/xbmc/utils/StringUtils.cpp
index df7a85a631..f8c7991207 100644
--- a/xbmc/utils/StringUtils.cpp
+++ b/xbmc/utils/StringUtils.cpp
@@ -33,7 +33,7 @@
 #include "StringUtils.h"
 #include "CharsetConverter.h"
 #if defined(TARGET_ANDROID)
-#include "android/jni/JNIThreading.h"
+#include "platform/android/jni/JNIThreading.h"
 #endif
 #include "utils/fstrcmp.h"
 #include "Util.h"
diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index d38502c8df..f0a7fa8959 100644
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -54,7 +54,7 @@
 #include "utils/StringUtils.h"
 #include "utils/XMLUtils.h"
 #if defined(TARGET_ANDROID)
-#include "android/jni/Build.h"
+#include "platform/android/jni/Build.h"
 #include "utils/AMLUtils.h"
 #endif
 
diff --git a/xbmc/utils/posix/PosixInterfaceForCLog.cpp b/xbmc/utils/posix/PosixInterfaceForCLog.cpp
index 4b7d09648b..39b1de7dd7 100644
--- a/xbmc/utils/posix/PosixInterfaceForCLog.cpp
+++ b/xbmc/utils/posix/PosixInterfaceForCLog.cpp
@@ -25,7 +25,7 @@
 #if defined(TARGET_DARWIN)
 #include "DarwinUtils.h"
 #elif defined(TARGET_ANDROID)
-#include "android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 #endif // TARGET_ANDROID
 
 struct FILEWRAP : public FILE
diff --git a/xbmc/windowing/android/WinEventsAndroid.cpp b/xbmc/windowing/android/WinEventsAndroid.cpp
index b6402434e8..4c0b4c275f 100644
--- a/xbmc/windowing/android/WinEventsAndroid.cpp
+++ b/xbmc/windowing/android/WinEventsAndroid.cpp
@@ -30,7 +30,7 @@
 #include "utils/log.h"
 #include "windowing/WindowingFactory.h"
 
-#include "android/jni/View.h"
+#include "platform/android/jni/View.h"
 
 #define DEBUG_MESSAGEPUMP 0
 
diff --git a/xbmc/windowing/egl/EGLNativeTypeAmlAndroid.cpp b/xbmc/windowing/egl/EGLNativeTypeAmlAndroid.cpp
index bd095444bd..ff900d53d1 100644
--- a/xbmc/windowing/egl/EGLNativeTypeAmlAndroid.cpp
+++ b/xbmc/windowing/egl/EGLNativeTypeAmlAndroid.cpp
@@ -23,7 +23,7 @@
 #include "EGLNativeTypeAmlAndroid.h"
 #include "utils/log.h"
 #include "guilib/gui3d.h"
-#include "android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 #include "utils/StringUtils.h"
 #include "utils/SysfsUtils.h"
 #include "utils/AMLUtils.h"
diff --git a/xbmc/windowing/egl/EGLNativeTypeAndroid.cpp b/xbmc/windowing/egl/EGLNativeTypeAndroid.cpp
index 8b7b695c03..cfdc69ab2f 100644
--- a/xbmc/windowing/egl/EGLNativeTypeAndroid.cpp
+++ b/xbmc/windowing/egl/EGLNativeTypeAndroid.cpp
@@ -24,15 +24,15 @@
 #include "EGLNativeTypeAndroid.h"
 #include "utils/log.h"
 #include "guilib/gui3d.h"
-#include "android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 #include "utils/StringUtils.h"
-#include "android/jni/SystemProperties.h"
-#include "android/jni/Display.h"
-#include "android/jni/View.h"
-#include "android/jni/Window.h"
-#include "android/jni/WindowManager.h"
-#include "android/jni/Build.h"
-#include "android/jni/System.h"
+#include "platform/android/jni/SystemProperties.h"
+#include "platform/android/jni/Display.h"
+#include "platform/android/jni/View.h"
+#include "platform/android/jni/Window.h"
+#include "platform/android/jni/WindowManager.h"
+#include "platform/android/jni/Build.h"
+#include "platform/android/jni/System.h"
 
 CEGLNativeTypeAndroid::CEGLNativeTypeAndroid()
 {
diff --git a/xbmc/windowing/egl/EGLNativeTypeRKAndroid.cpp b/xbmc/windowing/egl/EGLNativeTypeRKAndroid.cpp
index a8af8ad52e..c368592b96 100644
--- a/xbmc/windowing/egl/EGLNativeTypeRKAndroid.cpp
+++ b/xbmc/windowing/egl/EGLNativeTypeRKAndroid.cpp
@@ -25,8 +25,8 @@
 #include "EGLNativeTypeRKAndroid.h"
 #include "utils/log.h"
 #include "guilib/gui3d.h"
-#include "android/activity/XBMCApp.h"
-#include "android/jni/Build.h"
+#include "platform/android/activity/XBMCApp.h"
+#include "platform/android/jni/Build.h"
 #include "utils/StringUtils.h"
 #include "utils/SysfsUtils.h"
 #include "utils/RegExp.h"
diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
index 08aa7a86f4..5773260782 100644
--- a/xbmc/windows/GUIMediaWindow.cpp
+++ b/xbmc/windows/GUIMediaWindow.cpp
@@ -33,7 +33,7 @@
 #include "addons/GUIDialogAddonSettings.h"
 #include "addons/PluginSource.h"
 #if defined(TARGET_ANDROID)
-#include "android/activity/XBMCApp.h"
+#include "platform/android/activity/XBMCApp.h"
 #endif
 #include "dialogs/GUIDialogKaiToast.h"
 #include "dialogs/GUIDialogMediaFilter.h"