diff --git a/src/target/mem_ap.c b/src/target/mem_ap.c
index 89c0c02c0..0c3d7f78a 100644
--- a/src/target/mem_ap.c
+++ b/src/target/mem_ap.c
@@ -18,14 +18,16 @@
 
 #include "target.h"
 #include "target_type.h"
-#include "arm.h"
 #include "arm_adi_v5.h"
 #include "register.h"
 
 #include <jtag/jtag.h>
 
+#define MEM_AP_COMMON_MAGIC 0x4DE4DA50
+
 struct mem_ap {
-	struct arm arm;
+	int common_magic;
+	struct adiv5_dap *dap;
 	struct adiv5_ap *ap;
 	int ap_num;
 };
@@ -51,8 +53,8 @@ static int mem_ap_target_create(struct target *target, Jim_Interp *interp)
 	}
 
 	mem_ap->ap_num = pc->ap_num;
-	mem_ap->arm.common_magic = ARM_COMMON_MAGIC;
-	mem_ap->arm.dap = pc->dap;
+	mem_ap->common_magic = MEM_AP_COMMON_MAGIC;
+	mem_ap->dap = pc->dap;
 
 	target->arch_info = mem_ap;
 
@@ -137,7 +139,7 @@ static int mem_ap_examine(struct target *target)
 	struct mem_ap *mem_ap = target->arch_info;
 
 	if (!target_was_examined(target)) {
-		mem_ap->ap = dap_ap(mem_ap->arm.dap, mem_ap->ap_num);
+		mem_ap->ap = dap_ap(mem_ap->dap, mem_ap->ap_num);
 		target_set_examined(target);
 		target->state = TARGET_UNKNOWN;
 		target->debug_reason = DBG_REASON_UNDEFINED;