diff --git a/cheevos.c b/cheevos.c
index 40ec7538d9..16256971db 100644
--- a/cheevos.c
+++ b/cheevos.c
@@ -18,11 +18,8 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <configuration.h>
 #include <formats/jsonsax.h>
 #include <rhash.h>
-#include <performance.h>
-#include <runloop.h>
 #include <retro_log.h>
 #include <rthreads/async_job.h>
 
@@ -30,6 +27,10 @@
 #include "dynamic.h"
 #include "net_http_special.h"
 
+#include "configuration.h"
+#include "performance.h"
+#include "runloop.h"
+
 enum
 {
    CHEEVOS_VAR_SIZE_BIT_0,
diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk
index 0a207b69b6..4ed86bedae 100644
--- a/pkg/android/phoenix/jni/Android.mk
+++ b/pkg/android/phoenix/jni/Android.mk
@@ -67,6 +67,7 @@ endif
 
 LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_GLUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT
 LOCAL_CFLAGS += -DHAVE_7ZIP
+LOCAL_CFLAGS += -DHAVE_CHEEVOS
 
 ifeq ($(NDK_DEBUG),1)
 LOCAL_CFLAGS += -O0 -g
diff --git a/pkg/android/phoenix/jni/Android2.mk b/pkg/android/phoenix/jni/Android2.mk
index 5b69a4fbbf..0d50f750e3 100644
--- a/pkg/android/phoenix/jni/Android2.mk
+++ b/pkg/android/phoenix/jni/Android2.mk
@@ -67,6 +67,7 @@ endif
 
 LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_GLUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT
 LOCAL_CFLAGS += -DHAVE_7ZIP
+LOCAL_CFLAGS += -DHAVE_CHEEVOS
 LOCAL_CFLAGS += -DDEBUG_ANDROID
 
 ifeq ($(NDK_DEBUG),1)