5 files changed, 10 insertions, 5 deletions
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index efcee488a5..6502f94408 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -23,14 +23,14 @@
  *
  */
 
+#if defined(__ANDROID__)
+
 #include "backends/base-backend.h"
 #include "base/main.h"
 #include "graphics/surface.h"
 
 #include "backends/platform/android/video.h"
 
-#if defined(ANDROID_BACKEND)
-
 #include <jni.h>
 
 #include <string.h>
diff --git a/backends/platform/android/asset-archive.cpp b/backends/platform/android/asset-archive.cpp
index 20c6a653c0..bd32847f6a 100644
--- a/backends/platform/android/asset-archive.cpp
+++ b/backends/platform/android/asset-archive.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#if defined(ANDROID)
+#if defined(__ANDROID__)
 
 #include <jni.h>
 
diff --git a/backends/platform/android/asset-archive.h b/backends/platform/android/asset-archive.h
index b3f6993c50..28e48426e9 100644
--- a/backends/platform/android/asset-archive.h
+++ b/backends/platform/android/asset-archive.h
@@ -23,7 +23,7 @@
  *
  */
 
-#if defined(ANDROID)
+#if defined(__ANDROID__)
 
 #include <jni.h>
 
diff --git a/backends/platform/android/video.cpp b/backends/platform/android/video.cpp
index 3275335d97..a64e322c95 100644
--- a/backends/platform/android/video.cpp
+++ b/backends/platform/android/video.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#if defined(__ANDROID__)
+
 #include "base/main.h"
 #include "graphics/surface.h"
 
@@ -352,3 +354,6 @@ void GLESPaletteTexture::drawTexture(GLshort x, GLshort y, GLshort w, GLshort h)
 
 	GLESTexture::drawTexture(x, y, w, h);
 }
+
+#endif
+
diff --git a/backends/platform/android/video.h b/backends/platform/android/video.h
index 2ca07e0afd..4b73508907 100644
--- a/backends/platform/android/video.h
+++ b/backends/platform/android/video.h
@@ -23,7 +23,7 @@
  *
  */
 
-#if defined(ANDROID)
+#if defined(__ANDROID__)
 
 #include <GLES/gl.h>