diff --git a/libfreerdp/codec/CMakeLists.txt b/libfreerdp/codec/CMakeLists.txt
index f69801897..4bf327a64 100644
--- a/libfreerdp/codec/CMakeLists.txt
+++ b/libfreerdp/codec/CMakeLists.txt
@@ -69,13 +69,6 @@ if(WITH_SSE2)
 endif()
 
 if(WITH_NEON)
-	if(ANDROID)
-		set(ANDROID_CPU_FEATURES_PATH "${ANDROID_NDK}/sources/android/cpufeatures")
-		include_directories(${ANDROID_CPU_FEATURES_PATH})
-		set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS}
-			${ANDROID_CPU_FEATURES_PATH}/cpu-features.c
-			${ANDROID_CPU_FEATURES_PATH}/cpu-features.h)
-	endif()
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${${MODULE_PREFIX}_NEON_SRCS})
 	set_source_files_properties(${${MODULE_PREFIX}_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -mfloat-abi=${ARM_FP_ABI} -Wno-unused-variable")
 endif()
diff --git a/libfreerdp/codec/rfx_neon.c b/libfreerdp/codec/rfx_neon.c
index fec028ba9..c78dc6c14 100644
--- a/libfreerdp/codec/rfx_neon.c
+++ b/libfreerdp/codec/rfx_neon.c
@@ -27,14 +27,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <arm_neon.h>
+#include <winpr/sysinfo.h>
 
 #include "rfx_types.h"
 #include "rfx_neon.h"
 
-#if ANDROID
-#include "cpu-features.h"
-#endif
-
 /* rfx_decode_YCbCr_to_RGB_NEON code now resides in the primitives library. */
 
 static __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__))
diff --git a/libfreerdp/primitives/CMakeLists.txt b/libfreerdp/primitives/CMakeLists.txt
index e8d1a7bfb..780ae94e1 100644
--- a/libfreerdp/primitives/CMakeLists.txt
+++ b/libfreerdp/primitives/CMakeLists.txt
@@ -63,15 +63,6 @@ elseif(WITH_NEON)
 	# TODO: Add MSVC equivalent
 endif()
 
-# required for android cpu detection
-if(ANDROID)
-	set(ANDROID_CPU_FEATURES_PATH "${ANDROID_NDK}/sources/android/cpufeatures")
-	include_directories(${ANDROID_CPU_FEATURES_PATH})
-	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS}
-		${ANDROID_CPU_FEATURES_PATH}/cpu-features.c
-		${ANDROID_CPU_FEATURES_PATH}/cpu-features.h)
-endif()
-
 set_property(SOURCE ${${MODULE_PREFIX}_OPT_SRCS} PROPERTY COMPILE_FLAGS ${OPTIMIZATION})
 
 set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${${MODULE_PREFIX}_OPT_SRCS})