diff --git a/Core/MIPS/ARM/ArmJit.cpp b/Core/MIPS/ARM/ArmJit.cpp
index a557bc41d5..d8557da697 100644
--- a/Core/MIPS/ARM/ArmJit.cpp
+++ b/Core/MIPS/ARM/ArmJit.cpp
@@ -476,7 +476,7 @@ void ArmJit::UnlinkBlock(u8 *checkedEntry, u32 originalAddress) {
 }
 
 bool ArmJit::ReplaceJalTo(u32 dest) {
-#ifdef ARM
+#if PPSSPP_ARCH(ARM)
 	const ReplacementTableEntry *entry = nullptr;
 	u32 funcSize = 0;
 	if (!CanReplaceJalTo(dest, &entry, &funcSize)) {
diff --git a/Core/MIPS/MIPSInt.cpp b/Core/MIPS/MIPSInt.cpp
index 4864c63336..0ad48fa874 100644
--- a/Core/MIPS/MIPSInt.cpp
+++ b/Core/MIPS/MIPSInt.cpp
@@ -74,11 +74,7 @@ static inline void SkipLikely()
 
 int MIPS_SingleStep()
 {
-#if defined(ARM)
-	MIPSOpcode op = MIPSOpcode(Memory::ReadUnchecked_U32(mipsr4k.pc));
-#else
 	MIPSOpcode op = Memory::Read_Opcode_JIT(mipsr4k.pc);
-#endif
 	if (mipsr4k.inDelaySlot) {
 		MIPSInterpret(op);
 		if (mipsr4k.inDelaySlot) {
diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp
index 24c0eabe78..60d23e8039 100644
--- a/GPU/Common/VertexDecoderCommon.cpp
+++ b/GPU/Common/VertexDecoderCommon.cpp
@@ -1383,7 +1383,7 @@ VertexDecoderJitCache::VertexDecoderJitCache()
 		MOV(32, R(EAX), R(EBX));
 		RET();
 	}
-#elif defined(ARM)
+#elif PPSSPP_ARCH(ARM)
 	BKPT(0);
 	BKPT(0);
 #endif
diff --git a/GPU/Software/Sampler.cpp b/GPU/Software/Sampler.cpp
index 63a0f79b0d..14398b4a10 100644
--- a/GPU/Software/Sampler.cpp
+++ b/GPU/Software/Sampler.cpp
@@ -95,7 +95,7 @@ SamplerJitCache::SamplerJitCache()
 		MOV(32, R(EAX), R(EBX));
 		RET();
 	}
-#elif defined(ARM)
+#elif PPSSPP_ARCH(ARM)
 	BKPT(0);
 	BKPT(0);
 #endif
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index c012adab9b..7475abcf13 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -627,10 +627,6 @@ LOCAL_SRC_FILES := \
   $(SRC)/UI/TextureUtil.cpp \
   $(SRC)/UI/ComboKeyMappingScreen.cpp
 
-ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
-LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM
-endif
-
 ifneq ($(SKIPAPP),1)
   include $(BUILD_SHARED_LIBRARY)
 endif
diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
index 532693d05b..0841c6cb3e 100644
--- a/android/jni/Locals.mk
+++ b/android/jni/Locals.mk
@@ -38,7 +38,7 @@ ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv7/lib/libavutil.a
   LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/armv7/include
 
-  LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -DARM -DARMEABI_V7A
+  LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32
 endif
 ifeq ($(TARGET_ARCH_ABI),armeabi)
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavformat.a
@@ -48,7 +48,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi)
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavutil.a
   LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/armv6/include
 
-  LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -DARM -DARMEABI -march=armv6
+  LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -march=armv6
 endif
 ifeq ($(TARGET_ARCH_ABI),x86)
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86/lib/libavformat.a
diff --git a/ext/glslang-build/Android.mk b/ext/glslang-build/Android.mk
index c192cd94e4..f7d27de667 100644
--- a/ext/glslang-build/Android.mk
+++ b/ext/glslang-build/Android.mk
@@ -62,9 +62,9 @@ LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../libzip $(LOCAL_PATH)/../glslang ..
 
 ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
-LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A
+LOCAL_CFLAGS := $(LOCAL_CFLAGS)
 else ifeq ($(TARGET_ARCH_ABI),armeabi)
-LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI -march=armv6
+LOCAL_CFLAGS := $(LOCAL_CFLAGS) -march=armv6
 else ifeq ($(TARGET_ARCH_ABI),x86)
 LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86
 else ifeq ($(TARGET_ARCH_ABI),x86_64)
diff --git a/ext/miniupnp-build/Android.mk b/ext/miniupnp-build/Android.mk
index 6675d326a5..5412b339d4 100644
--- a/ext/miniupnp-build/Android.mk
+++ b/ext/miniupnp-build/Android.mk
@@ -28,9 +28,9 @@ LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../miniupnp ..
 
 ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
-LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A
+LOCAL_CFLAGS := $(LOCAL_CFLAGS)
 else ifeq ($(TARGET_ARCH_ABI),armeabi)
-LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI -march=armv6
+LOCAL_CFLAGS := $(LOCAL_CFLAGS) -march=armv6
 else ifeq ($(TARGET_ARCH_ABI),x86)
 LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86
 else ifeq ($(TARGET_ARCH_ABI),x86_64)
diff --git a/ext/xxhash.h b/ext/xxhash.h
index 1790daf267..8f61dd6276 100644
--- a/ext/xxhash.h
+++ b/ext/xxhash.h
@@ -71,6 +71,7 @@ XXH64       13.8 GB/s            1.9 GB/s
 XXH32        6.8 GB/s            6.0 GB/s
 */
 
+#include "ppsspp_config.h"
 #if defined (__cplusplus)
 extern "C" {
 #endif
@@ -1366,7 +1367,7 @@ XXH32_endian_align(const xxh_u8* input, size_t len, xxh_u32 seed, XXH_alignment
         xxh_u32 v4 = seed - XXH_PRIME32_1;
 
         do {
-#if defined(ARM) && defined(__GNUC__)
+#if PPSSPP_ARCH(ARM) && defined(__GNUC__)
             __builtin_prefetch(input + 0xc0, 0, 0);
 #endif
             v1 = XXH32_round(v1, XXH_get32bits(input)); input += 4;
diff --git a/libretro/Makefile b/libretro/Makefile
index b6d399a518..a79d4f71ea 100644
--- a/libretro/Makefile
+++ b/libretro/Makefile
@@ -105,7 +105,6 @@ else ifneq (,$(findstring arm64,$(platform)))
 		GL_LIB := -lGL
 	endif
 	CPUFLAGS += -D__arm64__ -DARM64_ASM -D__NEON_OPT
-	PLATCFLAGS += -DARM64
 	LDFLAGS += -lrt -ldl
 	PLATFORM_EXT := unix
 
@@ -252,7 +251,6 @@ else ifneq (,$(findstring armv,$(platform)))
 		CPUFLAGS += -mfloat-abi=hard
 	endif
 	CPUFLAGS += -D__arm__ -DARM_ASM
-	PLATCFLAGS += -DARM
 	LDFLAGS += -lrt -ldl
 
 # emscripten
diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk
index f5703ba4c4..96f0b93b40 100644
--- a/libretro/jni/Android.mk
+++ b/libretro/jni/Android.mk
@@ -12,14 +12,14 @@ FFMPEGLIBS += libavformat libavcodec libavutil libswresample libswscale
 WITH_DYNAREC := 1
 
 ifeq ($(TARGET_ARCH),arm64)
-  COREFLAGS += -DARM64 -D_ARCH_64
+  COREFLAGS += -D_ARCH_64
   HAVE_NEON := 1
   FFMPEGLIBDIR := $(FFMPEGDIR)/android/arm64/lib
   FFMPEGINCFLAGS := -I$(FFMPEGDIR)/android/arm64/include
 endif
 
 ifeq ($(TARGET_ARCH),arm)
-  COREFLAGS += -DARM -DARMEABI_V7A -D__arm__ -DARM_ASM -D_ARCH_32 -mfpu=neon
+  COREFLAGS += -D__arm__ -DARM_ASM -D_ARCH_32 -mfpu=neon
   HAVE_NEON := 1
   FFMPEGLIBDIR := $(FFMPEGDIR)/android/armv7/lib
   FFMPEGINCFLAGS := -I$(FFMPEGDIR)/android/armv7/include
diff --git a/ppsspp_config.h b/ppsspp_config.h
index 8a5a699175..5725778144 100644
--- a/ppsspp_config.h
+++ b/ppsspp_config.h
@@ -48,10 +48,6 @@
         #define PPSSPP_ARCH_ARMV7 1
         #define PPSSPP_ARCH_ARM_NEON 1
     #endif
-    //TODO: Remove this compat define
-    #ifndef ARM
-        #define ARM 1
-    #endif
 #endif
 
 #if defined(__aarch64__) || defined(_M_ARM64)