diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
index a84b349509..b32b8a6fbe 100644
--- a/android/native/jni/Android.mk
+++ b/android/native/jni/Android.mk
@@ -15,8 +15,8 @@ LOCAL_CFLAGS += -DANDROID_X86 -DHAVE_SSSE3
 endif
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-LOCAL_CFLAGS += -mfpu=neon
-LOCAL_CFLAGS += -DANDROID_ARM_V7 -DHAVE_NEON
+LOCAL_CFLAGS += -DANDROID_ARM_V7
+LOCAL_CFLAGS += -DWANT_NEON
 LOCAL_SRC_FILES += ../../../audio/sinc_neon.S.neon
 endif
 
diff --git a/audio/sinc.c b/audio/sinc.c
index e4ab461755..519254d116 100644
--- a/audio/sinc.c
+++ b/audio/sinc.c
@@ -123,7 +123,7 @@ rarch_resampler_t *resampler_new(void)
    RARCH_LOG("Sinc resampler [AVX]\n");
 #elif defined(__SSE__)
    RARCH_LOG("Sinc resampler [SSE]\n");
-#elif defined(HAVE_NEON)
+#elif defined(WANT_NEON)
    RARCH_LOG("Sinc resampler [NEON]\n");
 #else
    RARCH_LOG("Sinc resampler [C]\n");
@@ -210,7 +210,7 @@ static void process_sinc(rarch_resampler_t *resamp, float *out_buffer)
    // movehl { X, R, X, L } == { X, R, X, R }
    _mm_store_ss(out_buffer + 1, _mm_movehl_ps(sum, sum));
 }
-#elif defined(HAVE_NEON)
+#elif defined(WANT_NEON)
 void process_sinc_neon_asm(float *out, const float *left, const float *right, const float *coeff);
 static void process_sinc(rarch_resampler_t *resamp, float *out_buffer)
 {
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index e5e7cdd580..c355d5fa64 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -247,7 +247,7 @@ FIFO BUFFER
 /*============================================================
 AUDIO HERMITE
 ============================================================ */
-#ifdef HAVE_NEON
+#ifdef WANT_NEON
 #include "../../audio/sinc.c"
 #else
 #include "../../audio/hermite.c"