diff --git a/sys/modules/e6000sw/Makefile b/sys/modules/e6000sw/Makefile
index da08f80b0a29..73cbaea801f0 100644
--- a/sys/modules/e6000sw/Makefile
+++ b/sys/modules/e6000sw/Makefile
@@ -1,8 +1,8 @@
 .PATH: ${SRCTOP}/sys/dev/etherswitch/e6000sw
 
 KMOD=   e6000sw
 SRCS=   e6000sw.c
 
-SRCS+=	bus_if.h etherswitch_if.h mdio_if.h miibus_if.h ofw_bus_if.h opt_platform.h
+SRCS+=	bus_if.h device_if.h etherswitch_if.h mdio_if.h miibus_if.h ofw_bus_if.h opt_platform.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/etherswitch/Makefile b/sys/modules/etherswitch/Makefile
index 087231545cd4..0b16a19e5117 100644
--- a/sys/modules/etherswitch/Makefile
+++ b/sys/modules/etherswitch/Makefile
@@ -1,9 +1,9 @@
 .PATH:  ${SRCTOP}/sys/dev/etherswitch
 
 KMOD    = etherswitch
 
 SRCS=	etherswitch.c
-SRCS+=	mdio_if.h miibus_if.h etherswitch_if.h etherswitch_if.c
+SRCS+=	bus_if.h device_if.h mdio_if.h miibus_if.h etherswitch_if.h etherswitch_if.c
 CFLAGS+= -I${SRCTOP}/sys/dev/etherswitch
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/evdev/Makefile b/sys/modules/evdev/Makefile
index bd66013885db..20813b73f6dd 100644
--- a/sys/modules/evdev/Makefile
+++ b/sys/modules/evdev/Makefile
@@ -1,9 +1,9 @@
 .PATH: ${SRCTOP}/sys/dev/evdev
 
 KMOD=	evdev
 SRCS=	cdev.c evdev.c evdev_mt.c evdev_utils.c
-SRCS+=	opt_evdev.h bus_if.h device_if.h
+SRCS+=	opt_evdev.h opt_kbd.h bus_if.h device_if.h
 
 EXPORT_SYMS=	YES
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/gpio/gpioaei/Makefile b/sys/modules/gpio/gpioaei/Makefile
index 8f856af48eb7..1f0f1d0e53a6 100644
--- a/sys/modules/gpio/gpioaei/Makefile
+++ b/sys/modules/gpio/gpioaei/Makefile
@@ -1,15 +1,17 @@
 .PATH:	${SRCTOP}/sys/dev/gpio/
 
 KMOD=	gpioaei
 SRCS=	gpioaei.c
 
 SRCS+=	\
 	acpi_if.h \
 	bus_if.h \
 	device_if.h \
 	gpio_if.h \
 	gpiobus_if.h
 
+SRCS+=	opt_acpi.h opt_platform.h
+
 CFLAGS+=  -I. -I${SRCTOP}/sys/dev/gpio/
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/gve/Makefile b/sys/modules/gve/Makefile
index 08b26a994e36..ece275485df7 100644
--- a/sys/modules/gve/Makefile
+++ b/sys/modules/gve/Makefile
@@ -1,44 +1,44 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 # Copyright (c) 2023-2024 Google LLC
 #
 # Redistribution and use in source and binary forms, with or without modification,
 # are permitted provided that the following conditions are met:
 #
 # 1. Redistributions of source code must retain the above copyright notice, this
 #    list of conditions and the following disclaimer.
 #
 # 2. Redistributions in binary form must reproduce the above copyright notice,
 #    this list of conditions and the following disclaimer in the documentation
 #    and/or other materials provided with the distribution.
 #
 # 3. Neither the name of the copyright holder nor the names of its contributors
 #    may be used to endorse or promote products derived from this software without
 #    specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 .PATH:	${SRCTOP}/sys/dev/gve
 
 KMOD=   if_gve
 SRCS=	gve_main.c \
 	gve_adminq.c \
 	gve_utils.c \
 	gve_qpl.c \
 	gve_rx.c \
 	gve_rx_dqo.c \
 	gve_tx.c \
 	gve_tx_dqo.c \
 	gve_sysctl.c
 SRCS+=  device_if.h bus_if.h pci_if.h
-
+SRCS+=  opt_inet6.h
 .include <bsd.kmod.mk>
diff --git a/sys/modules/if_infiniband/Makefile b/sys/modules/if_infiniband/Makefile
index 01e3164b1271..7ec343999da1 100644
--- a/sys/modules/if_infiniband/Makefile
+++ b/sys/modules/if_infiniband/Makefile
@@ -1,10 +1,11 @@
 .PATH: ${SRCTOP}/sys/net
 
 KMOD=	if_infiniband
 SRCS=	if_infiniband.c \
 	opt_inet.h \
-	opt_inet6.h
+	opt_inet6.h \
+	opt_kbd.h
 
 EXPORT_SYMS=	YES
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile
index 3077f4289d5a..0cdab3f7653a 100644
--- a/sys/modules/if_vlan/Makefile
+++ b/sys/modules/if_vlan/Makefile
@@ -1,7 +1,7 @@
 .PATH: ${SRCTOP}/sys/net
 
 KMOD=	if_vlan
 SRCS=	if_vlan.c
-SRCS+=	opt_inet.h opt_inet6.h opt_kern_tls.h opt_vlan.h opt_ratelimit.h
+SRCS+=	opt_inet.h opt_inet6.h opt_ipsec.h opt_kern_tls.h opt_vlan.h opt_ratelimit.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile
index b23891a65a4f..327da11afdaf 100644
--- a/sys/modules/linux64/Makefile
+++ b/sys/modules/linux64/Makefile
@@ -1,100 +1,101 @@
 .PATH: ${SRCTOP}/sys/compat/linux ${SRCTOP}/sys/${MACHINE}/linux
 .if ${MACHINE_CPUARCH} == "amd64"
 .PATH: ${SRCTOP}/sys/x86/linux
 .endif
 
 KMOD=	linux64
 SRCS=	linux_dummy_machdep.c \
 	linux_elf64.c \
 	linux_event.c \
 	linux_file.c \
 	linux_fork.c \
 	linux_futex.c \
 	linux_getcwd.c \
 	linux_ioctl.c \
 	linux_ipc.c \
 	linux_machdep.c \
 	linux_misc.c \
 	linux_ptrace.c \
 	linux_rseq.c \
 	linux_signal.c \
 	linux_socket.c \
 	linux_stats.c \
 	linux_syscalls.c \
 	linux_sysctl.c \
 	linux_sysent.c \
 	linux_sysvec.c \
 	linux_time.c \
 	linux_vdso.c \
 	linux_timer.c \
 	linux_xattr.c \
 	opt_ktrace.h \
 	opt_inet6.h \
 	opt_posix.h \
+	opt_usb.h \
 	bus_if.h \
 	device_if.h \
 	vnode_if.h \
 	linux_support.S \
 	linux_vdso_inc.S
 .if ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	linux_dummy_x86.c
 .endif
 DPSRCS=	assym.inc linux_genassym.c
 
 # XXX: for assym.inc
 SRCS+=  opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h
 
 CLEANFILES=	linux_assym.h linux_genassym.o linux_locore.o \
 		genassym.o linux_vdso_gtod.o linux_vdso.so.o
 
 
 linux_assym.h: linux_genassym.o
 	sh ${SYSDIR}/kern/genassym.sh linux_genassym.o > ${.TARGET}
 
 .if ${MACHINE_CPUARCH} == "amd64"
 VDSOFLAGS=-mcmodel=small -msoft-float
 VDSODEPS=linux_vdso_gettc_x86.inc
 .elif ${MACHINE_CPUARCH} == "aarch64"
 # The Linux uses tiny memory model, but our ld does not know about
 # some of relocation types which is generated by cc
 VDSOFLAGS=-mgeneral-regs-only -mcmodel=small -ffixed-x18
 .endif
 
 linux_locore.o: linux_assym.h assym.inc
 	${CC} -c -x assembler-with-cpp -DLOCORE \
 	-fPIC -pipe -O2 -Werror ${VDSOFLAGS} \
 	-nostdinc -fasynchronous-unwind-tables \
 	-fno-omit-frame-pointer -foptimize-sibling-calls \
 	-fno-stack-protector -I. -I${SYSDIR} -I${SRCTOP}/include \
 	    ${.IMPSRC} -o ${.TARGET}
 
 linux_vdso_gtod.o: linux_vdso_gtod.inc ${VDSODEPS}
 	${CC} -c -fPIC -pipe -O2 -Werror ${VDSOFLAGS} \
 	-nostdinc -fasynchronous-unwind-tables \
 	-fno-omit-frame-pointer -foptimize-sibling-calls \
 	-fno-stack-protector -I. -I${SYSDIR} -I${SRCTOP}/include \
 	    ${.IMPSRC} -o ${.TARGET}
 
 linux_vdso.so.o: linux_locore.o linux_vdso_gtod.o
 	${LD} --shared --eh-frame-hdr -soname=linux-vdso.so.1 \
 	--no-undefined --hash-style=both -warn-common -nostdlib \
 	--strip-debug -s --build-id=sha1 -Bsymbolic \
 	-T${SRCTOP}/sys/${MACHINE}/linux/linux_vdso.lds.s \
 	-o ${.TARGET} ${.ALLSRC:M*.o}
 
 linux_vdso_inc.o: linux_vdso.so.o
 
 linux_support.o: linux_support.S assym.inc linux_assym.h
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.ALLSRC:M*.S:u} -o ${.TARGET}
 
 linux_genassym.o: offset.inc
 	${CC} -c ${NOSAN_CFLAGS:N-flto*:N-fno-common} -fcommon ${.IMPSRC}
 
 .if !defined(KERNBUILDDIR)
 .warning Building Linuxulator outside of a kernel does not make sense
 .endif
 
 EXPORT_SYMS=	YES
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/md/Makefile b/sys/modules/md/Makefile
index 2b0586c44717..3f16e04860a1 100644
--- a/sys/modules/md/Makefile
+++ b/sys/modules/md/Makefile
@@ -1,6 +1,6 @@
 .PATH: ${SRCTOP}/sys/dev/md
 
 KMOD=	geom_md
-SRCS=	md.c opt_md.h opt_geom.h opt_rootdevname.h vnode_if.h
+SRCS=  bus_if.h device_if.h md.c opt_md.h opt_geom.h opt_rootdevname.h vnode_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/miiproxy/Makefile b/sys/modules/miiproxy/Makefile
index 5173358989da..730bef4220cd 100644
--- a/sys/modules/miiproxy/Makefile
+++ b/sys/modules/miiproxy/Makefile
@@ -1,9 +1,9 @@
 .PATH:  ${SRCTOP}/sys/dev/etherswitch
 
 KMOD    = miiproxy
 
 SRCS=	miiproxy.c
-SRCS+=	mdio_if.h miibus_if.h
+SRCS+=	bus_if.h mdio_if.h miibus_if.h opt_platform.h
 CFLAGS+= -I${SRCTOP}/sys/dev/etherswitch
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/mlx5/Makefile b/sys/modules/mlx5/Makefile
index 506c045ab0ce..65341fdfb8aa 100644
--- a/sys/modules/mlx5/Makefile
+++ b/sys/modules/mlx5/Makefile
@@ -1,69 +1,69 @@
 .PATH:	${SRCTOP}/sys/dev/mlx5/mlx5_core \
 	${SRCTOP}/sys/dev/mlx5/mlx5_lib \
 	${SRCTOP}/sys/dev/mlx5/mlx5_fpga \
 	${SRCTOP}/sys/dev/mlx5/mlx5_accel
 
 KMOD=mlx5
 SRCS= \
 mlx5_alloc.c \
 mlx5_aso.c \
 mlx5_cmd.c \
 mlx5_crypto.c \
 mlx5_cq.c \
 mlx5_diag_cnt.c \
 mlx5_diagnostics.c \
 mlx5_eq.c \
 mlx5_eswitch.c \
 mlx5_fs_chains.c \
 mlx5_fs_cmd.c \
 mlx5_fs_core.c \
 mlx5_fs_counters.c \
 mlx5_fs_ft_pool.c \
 mlx5_fs_tcp.c \
 mlx5_fw.c \
 mlx5_fwdump.c \
 mlx5_health.c \
 mlx5_mad.c \
 mlx5_main.c \
 mlx5_mcg.c \
 mlx5_mpfs.c \
 mlx5_mr.c \
 mlx5_pagealloc.c \
 mlx5_pd.c \
 mlx5_port.c \
 mlx5_qp.c \
 mlx5_rl.c \
 mlx5_srq.c \
 mlx5_tls.c \
 mlx5_transobj.c \
 mlx5_uar.c \
 mlx5_vport.c \
 mlx5_vsc.c \
 mlx5_wq.c \
 mlx5_gid.c \
 mlx5_ipsec_fs.c \
 mlx5_ipsec_offload.c \
 mlx5_ipsec.c \
 mlx5_ipsec_rxtx.c
 SRCS+=	${LINUXKPI_GENSRCS}
-SRCS+=	opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h
+SRCS+=	opt_inet.h opt_inet6.h opt_ipsec.h opt_rss.h opt_ratelimit.h
 
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
 CFLAGS+= ${LINUXKPI_INCLUDES}
 
 .if defined(CONFIG_BUILD_FPGA)
 SRCS+= \
 	mlx5fpga_cmd.c \
 	mlx5fpga_core.c \
 	mlx5fpga_sdk.c \
 	mlx5fpga_trans.c \
 	mlx5fpga_xfer.c \
 	mlx5fpga_ipsec.c
 .endif
 
 EXPORT_SYMS=	YES
 
 .include <bsd.kmod.mk>
 
 CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
diff --git a/sys/modules/mlx5en/Makefile b/sys/modules/mlx5en/Makefile
index 03bf174e33b0..3697fa65dc83 100644
--- a/sys/modules/mlx5en/Makefile
+++ b/sys/modules/mlx5en/Makefile
@@ -1,38 +1,38 @@
 .PATH:	${SRCTOP}/sys/dev/mlx5/mlx5_en
 
 KMOD=mlx5en
 SRCS= \
 mlx5_en_dim.c \
 mlx5_en_ethtool.c \
 mlx5_en_main.c \
 mlx5_en_tx.c \
 mlx5_en_flow_table.c \
 mlx5_en_hw_tls.c \
 mlx5_en_hw_tls_rx.c \
 mlx5_en_iq.c \
 mlx5_en_rx.c \
 mlx5_en_rl.c \
 mlx5_en_txrx.c \
 mlx5_en_port_buffer.c
 SRCS+=	${LINUXKPI_GENSRCS}
-SRCS+=	opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h opt_kern_tls.h
+SRCS+=	opt_inet.h opt_inet6.h opt_ipsec.h opt_rss.h opt_ratelimit.h opt_kern_tls.h
 
 .if defined(HAVE_PER_CQ_EVENT_PACKET)
 CFLAGS+= -DHAVE_PER_CQ_EVENT_PACKET
 .endif
 
 .if defined(HAVE_TCP_LRO_RX)
 CFLAGS+= -DHAVE_TCP_LRO_RX
 .endif
 
 .if defined(CONFIG_BUILD_FPGA)
 CFLAGS+= -DCONFIG_MLX5_FPGA
 .endif
 
 CFLAGS+= -I${SRCTOP}/sys/ofed/include
 CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
 CFLAGS+= ${LINUXKPI_INCLUDES}
 
 .include <bsd.kmod.mk>
 
 CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
diff --git a/sys/modules/netgraph/ksocket/Makefile b/sys/modules/netgraph/ksocket/Makefile
index 395fdbd7b3e3..7099648f6219 100644
--- a/sys/modules/netgraph/ksocket/Makefile
+++ b/sys/modules/netgraph/ksocket/Makefile
@@ -1,4 +1,6 @@
 KMOD=	ng_ksocket
 SRCS= 	ng_ksocket.c
 
+SRCS+=	opt_inet6.h
+
 .include <bsd.kmod.mk>
diff --git a/sys/modules/nvmf/nvmf/Makefile b/sys/modules/nvmf/nvmf/Makefile
index 7ebe614998bd..21d73d363d2f 100644
--- a/sys/modules/nvmf/nvmf/Makefile
+++ b/sys/modules/nvmf/nvmf/Makefile
@@ -1,13 +1,16 @@
 .PATH: ${SRCTOP}/sys/dev/nvmf/host
 
 KMOD=	nvmf
 
 SRCS=	nvmf.c \
 	nvmf_aer.c \
 	nvmf_cmd.c \
 	nvmf_ctldev.c \
 	nvmf_ns.c \
 	nvmf_qpair.c \
 	nvmf_sim.c
 
+SRCS+=	bus_if.h device_if.h
+SRCS+=	opt_cam.h
+
 .include <bsd.kmod.mk>
diff --git a/sys/modules/qlnx/qlnxev/Makefile b/sys/modules/qlnx/qlnxev/Makefile
index ed62f1f1dd40..766a5a950032 100644
--- a/sys/modules/qlnx/qlnxev/Makefile
+++ b/sys/modules/qlnx/qlnxev/Makefile
@@ -1,75 +1,76 @@
 #/*
 # * Copyright (c) 2017-2018 Cavium, Inc.
 # * All rights reserved.
 # *
 # *  Redistribution and use in source and binary forms, with or without
 # *  modification, are permitted provided that the following conditions
 # *  are met:
 # *
 # *  1. Redistributions of source code must retain the above copyright
 # *     notice, this list of conditions and the following disclaimer.
 # *  2. Redistributions in binary form must reproduce the above copyright
 # *     notice, this list of conditions and the following disclaimer in the
 # *     documentation and/or other materials provided with the distribution.
 # *
 # *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
 # *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # *  POSSIBILITY OF SUCH DAMAGE.
 # */
 # /*
 # * File : Makefile
 # * Author : David C Somayajulu, Cavium, Inc., San Jose, CA 95131.
 # */
 #
 #
 
 .PATH: ${SRCTOP}/sys/dev/qlnx/qlnxe
 
 #.PATH: ${.CURDIR}/../qlnxe
 
 KMOD=if_qlnxev
 
 SRCS=ecore_cxt.c ecore_dcbx.c ecore_dev.c ecore_hw.c
 SRCS+=ecore_init_fw_funcs.c ecore_int.c ecore_mcp.c
 SRCS+=ecore_sp_commands.c ecore_spq.c ecore_l2.c
 SRCS+=ecore_init_ops.c ecore_dbg_fw_funcs.c
 SRCS+=ecore_mng_tlv.c
 
 #SRIOV related
 SRCS+=ecore_sriov.c
 SRCS+=ecore_vf.c
 
 SRCS+=qlnx_ioctl.c
 SRCS+=qlnx_os.c
+SRCS+=opt_inet.h
 
 SRCS+=	${LINUXKPI_GENSRCS}
 
 .include <bsd.kmod.mk>
 
 CFLAGS += -DQLNX_DEBUG
 CFLAGS += -DECORE_PACKAGE
 CFLAGS += -DCONFIG_ECORE_L2
 CFLAGS += -DECORE_CONFIG_DIRECT_HWFN
 
 CFLAGS+= ${LINUXKPI_INCLUDES}
 
 CFLAGS += -g
 CFLAGS += -fno-inline
 
 #CFLAGS += -DQLNX_SOFT_LRO
 #CFLAGS += -DQLNX_QSORT_LRO
 #CFLAGS += -DQLNX_MAX_COALESCE
 
 #SRIOV related
 CFLAGS += -DCONFIG_ECORE_SRIOV
 CFLAGS += -DQLNX_VF
 
 CWARNFLAGS+= -Wno-cast-qual
diff --git a/sys/modules/uinput/Makefile b/sys/modules/uinput/Makefile
index 66ade2a5bb33..a9e2ec867b91 100644
--- a/sys/modules/uinput/Makefile
+++ b/sys/modules/uinput/Makefile
@@ -1,7 +1,7 @@
 .PATH: ${SRCTOP}/sys/dev/evdev
 
 KMOD=	uinput
 SRCS=	uinput.c
-SRCS+=	opt_evdev.h
+SRCS+=	opt_evdev.h opt_kbd.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb/usie/Makefile b/sys/modules/usb/usie/Makefile
index 6a5f79248ff8..9edeed082f8d 100644
--- a/sys/modules/usb/usie/Makefile
+++ b/sys/modules/usb/usie/Makefile
@@ -1,34 +1,34 @@
 #
 #
 # Copyright (c) 2011 Hans Petter Selasky. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 
 .PATH: ${SRCTOP}/sys/dev/usb/net
 
 KMOD = usie
 SRCS = if_usie.c
 SRCS += opt_bus.h opt_usb.h device_if.h bus_if.h \
-	usb_if.h usbdevs.h opt_inet.h
+	usb_if.h usbdevs.h opt_inet.h opt_inet6.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb/wmt/Makefile b/sys/modules/usb/wmt/Makefile
index 72cf1d814908..8cb5abd7383e 100644
--- a/sys/modules/usb/wmt/Makefile
+++ b/sys/modules/usb/wmt/Makefile
@@ -1,8 +1,8 @@
 S=     ${SRCTOP}/sys
 
 .PATH: $S/dev/usb/input
 
 KMOD=	wmt
-SRCS=	opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h wmt.c
+SRCS=	opt_bus.h opt_kbd.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h wmt.c
 
 .include <bsd.kmod.mk>