diff --git a/sys/conf/files b/sys/conf/files
index 2cd151267b5f..981a3f9ef053 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -54,7 +54,7 @@ usbdevs.h			optional usb				   \
 	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 	no-obj no-implicit-rule before-depend				   \
-	clean		"usbdevs.h"
+	clean		"usbdevs.h usbdevs_data.h"
 kern/device_if.m		standard
 kern/bus_if.m			standard
 kern/clock_if.m			optional genclock
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 4703863fa6b4..8cf8066eb740 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -333,6 +333,10 @@ vnode_if.${_ext}: @/tools/vnode_if.awk @/kern/vnode_if.src
 .for _i in mii pccard usb
 .if ${SRCS:M${_i}devs.h} != ""
 CLEANFILES+=	${_i}devs.h
+_i=		${_i:Musb}
+.if !empty(_i)
+CLEANFILES+=	${_i}devs_data.h
+.endif
 .if !exists(@)
 ${_i}devs.h: @
 .endif