diff --git a/lib/libkvm/kvm_arm.h b/lib/libkvm/kvm_arm.h
--- a/lib/libkvm/kvm_arm.h
+++ b/lib/libkvm/kvm_arm.h
@@ -83,11 +83,7 @@
 #ifdef __arm__
 #include <machine/acle-compat.h>
 
-#if __ARM_ARCH >= 6
-#include <machine/pte-v6.h>
-#else
-#include <machine/pte-v4.h>
-#endif
+#include <machine/pte.h>
 
 _Static_assert(PAGE_SHIFT == ARM_PAGE_SHIFT, "PAGE_SHIFT mismatch");
 _Static_assert(PAGE_SIZE == ARM_PAGE_SIZE, "PAGE_SIZE mismatch");
@@ -114,9 +110,6 @@
 _Static_assert(L2_TYPE_INV == ARM_L2_TYPE_INV, "L2_TYPE_INV mismatch");
 _Static_assert(L2_TYPE_L == ARM_L2_TYPE_L, "L2_TYPE_L mismatch");
 _Static_assert(L2_TYPE_S == ARM_L2_TYPE_S, "L2_TYPE_S mismatch");
-#if __ARM_ARCH < 6
-_Static_assert(L2_TYPE_T == ARM_L2_TYPE_T, "L2_TYPE_T mismatch");
-#endif
 _Static_assert(L2_TYPE_MASK == ARM_L2_TYPE_MASK, "L2_TYPE_MASK mismatch");
 #endif
 
diff --git a/sys/arm/arm/locore-v6.S b/sys/arm/arm/locore-v6.S
--- a/sys/arm/arm/locore-v6.S
+++ b/sys/arm/arm/locore-v6.S
@@ -34,7 +34,7 @@
 #include <machine/asmacros.h>
 #include <machine/armreg.h>
 #include <machine/sysreg.h>
-#include <machine/pte-v6.h>
+#include <machine/pte.h>
 
 __FBSDID("$FreeBSD$");
 
diff --git a/sys/arm/include/pmap_var.h b/sys/arm/include/pmap_var.h
--- a/sys/arm/include/pmap_var.h
+++ b/sys/arm/include/pmap_var.h
@@ -30,7 +30,7 @@
 #ifndef _MACHINE_PMAP_VAR_H_
 #define _MACHINE_PMAP_VAR_H_
 
-#include <machine/pte-v6.h>
+#include <machine/pte.h>
 
 /*
  *  Various PMAP defines, exports, and inline functions
diff --git a/sys/arm/include/pte-v6.h b/sys/arm/include/pte.h
rename from sys/arm/include/pte-v6.h
rename to sys/arm/include/pte.h
diff --git a/sys/arm/mv/mv_armv7_machdep.c b/sys/arm/mv/mv_armv7_machdep.c
--- a/sys/arm/mv/mv_armv7_machdep.c
+++ b/sys/arm/mv/mv_armv7_machdep.c
@@ -62,7 +62,7 @@
 #include <machine/machdep.h>
 #include <machine/platform.h>
 #include <machine/platformvar.h>
-#include <machine/pte-v6.h>
+#include <machine/pte.h>
 
 #include <arm/mv/mvreg.h>
 #include <arm/mv/mvvar.h>