diff --git a/sys/modules/hid/bcm5974/Makefile b/sys/modules/hid/bcm5974/Makefile
index 803a43c96107..5fdf39fb9649 100644
--- a/sys/modules/hid/bcm5974/Makefile
+++ b/sys/modules/hid/bcm5974/Makefile
@@ -1,8 +1,8 @@
 .PATH: ${SRCTOP}/sys/dev/hid
 
 KMOD=	bcm5974
 SRCS=	bcm5974.c
-SRCS+=	opt_hid.h opt_usb.h
+SRCS+=	opt_hid.h opt_kbd.h opt_usb.h
 SRCS+=	bus_if.h device_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hid/hcons/Makefile b/sys/modules/hid/hcons/Makefile
index d020ba08a22b..56edefb9fe9c 100644
--- a/sys/modules/hid/hcons/Makefile
+++ b/sys/modules/hid/hcons/Makefile
@@ -1,7 +1,8 @@
 .PATH: ${SRCTOP}/sys/dev/hid
 
 KMOD=	hcons
 SRCS=	hcons.c
+SRCS+=	opt_kbd.h
 SRCS+=	bus_if.h device_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hid/hgame/Makefile b/sys/modules/hid/hgame/Makefile
index a9d6dadbdbc6..7cf7cd858340 100644
--- a/sys/modules/hid/hgame/Makefile
+++ b/sys/modules/hid/hgame/Makefile
@@ -1,7 +1,8 @@
 .PATH: ${SRCTOP}/sys/dev/hid
 
 KMOD=	hgame
 SRCS=	hgame.c
+SRCS+=	opt_kbd.h
 SRCS+=	bus_if.h device_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hid/hidmap/Makefile b/sys/modules/hid/hidmap/Makefile
index 9be54e725d45..07e817a19197 100644
--- a/sys/modules/hid/hidmap/Makefile
+++ b/sys/modules/hid/hidmap/Makefile
@@ -1,10 +1,10 @@
 .PATH: ${SRCTOP}/sys/dev/hid
 
 KMOD=	hidmap
 SRCS=	hidmap.c
-SRCS+=	opt_hid.h
+SRCS+=	opt_hid.h opt_kbd.h
 SRCS+=	bus_if.h device_if.h
 
 EXPORT_SYMS=	YES
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hid/hms/Makefile b/sys/modules/hid/hms/Makefile
index 0c6e9c1b1ec2..014ecd7048bd 100644
--- a/sys/modules/hid/hms/Makefile
+++ b/sys/modules/hid/hms/Makefile
@@ -1,8 +1,8 @@
 .PATH: ${SRCTOP}/sys/dev/hid
 
 KMOD=	hms
 SRCS=	hms.c
-SRCS+=	opt_hid.h
+SRCS+=	opt_hid.h opt_kbd.h
 SRCS+=	bus_if.h device_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hid/hmt/Makefile b/sys/modules/hid/hmt/Makefile
index 0f46acba198c..36d9068bc7a7 100644
--- a/sys/modules/hid/hmt/Makefile
+++ b/sys/modules/hid/hmt/Makefile
@@ -1,8 +1,8 @@
 .PATH: ${SRCTOP}/sys/dev/hid
 
 KMOD=	hmt
 SRCS=	hmt.c
-SRCS+=	opt_hid.h
+SRCS+=	opt_hid.h opt_kbd.h
 SRCS+=	bus_if.h device_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hid/hpen/Makefile b/sys/modules/hid/hpen/Makefile
index e1db07a9c3f8..a693f36d5d79 100644
--- a/sys/modules/hid/hpen/Makefile
+++ b/sys/modules/hid/hpen/Makefile
@@ -1,7 +1,8 @@
 .PATH: ${SRCTOP}/sys/dev/hid
 
 KMOD=	hpen
 SRCS=	hpen.c
+SRCS+=	opt_kbd.h
 SRCS+=	bus_if.h device_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hid/hsctrl/Makefile b/sys/modules/hid/hsctrl/Makefile
index 68984958895e..f2ec2d99c881 100644
--- a/sys/modules/hid/hsctrl/Makefile
+++ b/sys/modules/hid/hsctrl/Makefile
@@ -1,7 +1,8 @@
 .PATH: ${SRCTOP}/sys/dev/hid
 
 KMOD=	hsctrl
 SRCS=	hsctrl.c
+SRCS+=	opt_kbd.h
 SRCS+=	bus_if.h device_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hid/ietp/Makefile b/sys/modules/hid/ietp/Makefile
index 1b8baf36ec80..5270701e480a 100644
--- a/sys/modules/hid/ietp/Makefile
+++ b/sys/modules/hid/ietp/Makefile
@@ -1,8 +1,8 @@
 .PATH: ${SRCTOP}/sys/dev/hid
 
 KMOD=	ietp
 SRCS=	ietp.c
-SRCS+=	opt_hid.h
+SRCS+=	opt_hid.h opt_kbd.h
 SRCS+=	bus_if.h device_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hid/ps4dshock/Makefile b/sys/modules/hid/ps4dshock/Makefile
index 0b00f16ca98c..0ecf31c3bc42 100644
--- a/sys/modules/hid/ps4dshock/Makefile
+++ b/sys/modules/hid/ps4dshock/Makefile
@@ -1,8 +1,8 @@
 .PATH: ${SRCTOP}/sys/dev/hid
 
 KMOD=	ps4dshock
 SRCS=	ps4dshock.c
-SRCS+=	opt_hid.h
+SRCS+=	opt_hid.h opt_kbd.h
 SRCS+=	bus_if.h device_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hid/xb360gp/Makefile b/sys/modules/hid/xb360gp/Makefile
index 3cc846292e67..f5a9df8baa9d 100644
--- a/sys/modules/hid/xb360gp/Makefile
+++ b/sys/modules/hid/xb360gp/Makefile
@@ -1,7 +1,8 @@
 .PATH: ${SRCTOP}/sys/dev/hid
 
 KMOD=	xb360gp
 SRCS=	xb360gp.c
+SRCS+=	opt_kbd.h
 SRCS+=	bus_if.h device_if.h opt_usb.h
 
 .include <bsd.kmod.mk>