diff --git a/gnu/usr.bin/gdb/kgdb/trgt_arm.c b/gnu/usr.bin/gdb/kgdb/trgt_arm.c
index ca18ae3696ab..489c046cd791 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_arm.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_arm.c
@@ -50,7 +50,11 @@ __FBSDID("$FreeBSD$");
 CORE_ADDR
 kgdb_trgt_core_pcb(u_int cpuid)
 {
+#ifndef CROSS_DEBUGGER
 	return (kgdb_trgt_stop_pcb(cpuid, sizeof(struct pcb)));
+#else
+	return -1;
+#endif
 }
 
 void
diff --git a/lib/libkvm/kvm_arm.c b/lib/libkvm/kvm_arm.c
index b1274e9c3641..d221f6af13fc 100644
--- a/lib/libkvm/kvm_arm.c
+++ b/lib/libkvm/kvm_arm.c
@@ -42,11 +42,15 @@ __FBSDID("$FreeBSD$");
 #include <sys/elf32.h>
 #include <sys/mman.h>
 
+#ifndef CROSS_LIBKVM
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-
 #include <machine/pmap.h>
+#else
+#include "../../sys/arm/include/pte.h"
+#include "../../sys/arm/include/vmparam.h"
+#endif
 
 #include <db.h>
 #include <limits.h>
diff --git a/lib/libkvm/kvm_minidump_arm.c b/lib/libkvm/kvm_minidump_arm.c
index f6147d071407..f4ba6044e4ea 100644
--- a/lib/libkvm/kvm_minidump_arm.c
+++ b/lib/libkvm/kvm_minidump_arm.c
@@ -34,7 +34,9 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/param.h>
+#ifndef CROSS_LIBKVM
 #include <sys/user.h>
+#endif
 #include <sys/proc.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -45,12 +47,18 @@ __FBSDID("$FreeBSD$");
 #include <nlist.h>
 #include <kvm.h>
 
+#ifndef CROSS_LIBKVM
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 
 #include <machine/elf.h>
 #include <machine/cpufunc.h>
 #include <machine/minidump.h>
+#else
+#include "../../sys/arm/include/pte.h"
+#include "../../sys/arm/include/vmparam.h"
+#include "../../sys/arm/include/minidump.h"
+#endif
 
 #include <limits.h>