diff --git a/sys/arch/evbarm/conf/files.evbarm b/sys/arch/evbarm/conf/files.evbarm
index 0fd79c3ddeb1..8baf581b94fd 100644
--- a/sys/arch/evbarm/conf/files.evbarm
+++ b/sys/arch/evbarm/conf/files.evbarm
@@ -1,4 +1,4 @@
-#	$NetBSD: files.evbarm,v 1.26 2017/07/05 01:08:44 jmcneill Exp $
+#	$NetBSD: files.evbarm,v 1.27 2017/08/30 23:57:27 jmcneill Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -53,4 +53,10 @@ file	arch/evbarm/dev/plcom.c			plcom needs-flag
 #
 defparam	opt_machdep.h			DRAM_BLOCKS
 
+#
+# Flattened Device Tree (FDT) support
+#
+include "dev/ofw/files.ofw"
+include "dev/fdt/files.fdt"
+
 include "arch/arm/conf/majors.arm32"
diff --git a/sys/arch/evbarm/conf/files.fdt b/sys/arch/evbarm/conf/files.fdt
index fb73fbd54fd5..08066a05655c 100644
--- a/sys/arch/evbarm/conf/files.fdt
+++ b/sys/arch/evbarm/conf/files.fdt
@@ -1,4 +1,4 @@
-#	$NetBSD: files.fdt,v 1.1 2017/05/30 10:27:53 jmcneill Exp $
+#	$NetBSD: files.fdt,v 1.2 2017/08/30 23:57:27 jmcneill Exp $
 #
 # FDT-based kernel configuration info
 #
@@ -7,6 +7,4 @@ file	arch/evbarm/fdt/fdt_machdep.c
 
 defparam opt_machdep.h				BOOT_ARGS
 
-include "dev/ofw/files.ofw"
-include "dev/fdt/files.fdt"
 include "arch/arm/fdt/files.fdt"