diff --git a/sys/modules/cc/cc_cdg/Makefile b/sys/modules/cc/cc_cdg/Makefile
index 83a4887af705..4e69e2d803a4 100644
--- a/sys/modules/cc/cc_cdg/Makefile
+++ b/sys/modules/cc/cc_cdg/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/netinet/cc
 KMOD=	cc_cdg
-SRCS=	cc_cdg.c
+SRCS=	cc_cdg.c opt_kern_tls.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cc/cc_chd/Makefile b/sys/modules/cc/cc_chd/Makefile
index db7e350d49fc..02242094860a 100644
--- a/sys/modules/cc/cc_chd/Makefile
+++ b/sys/modules/cc/cc_chd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/netinet/cc
 KMOD=	cc_chd
-SRCS=	cc_chd.c
+SRCS=	cc_chd.c opt_kern_tls.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cc/cc_dctcp/Makefile b/sys/modules/cc/cc_dctcp/Makefile
index cb6cb06682ef..73712583ff8b 100644
--- a/sys/modules/cc/cc_dctcp/Makefile
+++ b/sys/modules/cc/cc_dctcp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/netinet/cc
 KMOD=	cc_dctcp
-SRCS=	cc_dctcp.c
+SRCS=	cc_dctcp.c opt_kern_tls.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cc/cc_hd/Makefile b/sys/modules/cc/cc_hd/Makefile
index 49c0dfce84e0..9ff5ee3c4594 100644
--- a/sys/modules/cc/cc_hd/Makefile
+++ b/sys/modules/cc/cc_hd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/netinet/cc
 KMOD=	cc_hd
-SRCS=	cc_hd.c
+SRCS=	cc_hd.c opt_kern_tls.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cc/cc_htcp/Makefile b/sys/modules/cc/cc_htcp/Makefile
index 99f3f8f8f99d..3256bc6d9445 100644
--- a/sys/modules/cc/cc_htcp/Makefile
+++ b/sys/modules/cc/cc_htcp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/netinet/cc
 KMOD=	cc_htcp
-SRCS=	cc_htcp.c
+SRCS=	cc_htcp.c opt_kern_tls.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cc/cc_vegas/Makefile b/sys/modules/cc/cc_vegas/Makefile
index eda8ee62d88a..5e309c96ed5c 100644
--- a/sys/modules/cc/cc_vegas/Makefile
+++ b/sys/modules/cc/cc_vegas/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/netinet/cc
 KMOD=	cc_vegas
-SRCS=	cc_vegas.c
+SRCS=	cc_vegas.c opt_kern_tls.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cxgbe/cxgbei/Makefile b/sys/modules/cxgbe/cxgbei/Makefile
index ecd92218c8ef..7b575e320b20 100644
--- a/sys/modules/cxgbe/cxgbei/Makefile
+++ b/sys/modules/cxgbe/cxgbei/Makefile
@@ -1,22 +1,23 @@
 # $FreeBSD$
 
 CXGBE = ${SRCTOP}/sys/dev/cxgbe
 .PATH: ${CXGBE}/cxgbei
 
 KMOD=	cxgbei
 
 SRCS=	cxgbei.c
 SRCS+=	icl_cxgbei.c
 SRCS+=	bus_if.h
 SRCS+=	device_if.h
 SRCS+=	opt_inet.h
 SRCS+=	opt_inet6.h
+SRCS+=	opt_kern_tls.h
 SRCS+=	pci_if.h
 SRCS+=	opt_cam.h
 SRCS+=	icl_conn_if.h
 
 CFLAGS+= -I${CXGBE}
 
 MFILES=	kern/bus_if.m kern/device_if.m dev/iscsi/icl_conn_if.m dev/pci/pci_if.m
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cxgbe/iw_cxgbe/Makefile b/sys/modules/cxgbe/iw_cxgbe/Makefile
index 69ac1a4de752..72631f585bc4 100644
--- a/sys/modules/cxgbe/iw_cxgbe/Makefile
+++ b/sys/modules/cxgbe/iw_cxgbe/Makefile
@@ -1,25 +1,25 @@
 # $FreeBSD$
 
 CXGBE=	${SRCTOP}/sys/dev/cxgbe
 .PATH: ${CXGBE}/iw_cxgbe
 
 KMOD=	iw_cxgbe
 SRCS+=	cm.c
 SRCS+=	cq.c
 SRCS+=	device.c
 SRCS+=	ev.c
 SRCS+=	id_table.c
 SRCS+=	mem.c
 SRCS+=	provider.c
 SRCS+=	qp.c
 SRCS+=	resource.c
 SRCS+=	${LINUXKPI_GENSRCS}
-SRCS+=	opt_inet.h opt_inet6.h opt_ktr.h opt_ofed.h
+SRCS+=	opt_inet.h opt_inet6.h opt_kern_tls.h opt_ktr.h opt_ofed.h
 
 CFLAGS+= -I${CXGBE} -I${SRCTOP}/sys/ofed/include -DLINUX_TYPES_DEFINED
 CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
 CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
 CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
 CFLAGS+= -DINET6 -DINET
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile
index e8c8893bdf59..3c2ba2c74c08 100644
--- a/sys/modules/ipfilter/Makefile
+++ b/sys/modules/ipfilter/Makefile
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/contrib/ipfilter/netinet
 
 KMOD=	ipl
 SRCS=	mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \
 	ip_log.c ip_fil_freebsd.c fil.c ip_lookup.c ip_pool.c ip_htable.c \
 	ip_sync.c \
 	ip_nat6.c ip_rules.c ip_scan.c ip_dstlist.c radix_ipf.c
-SRCS+=	opt_bpf.h opt_inet6.h
+SRCS+=	opt_bpf.h opt_inet6.h opt_kern_tls.h
 
 CFLAGS+= -I${SRCTOP}/sys/contrib/ipfilter
 CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP
 #
 # If you don't want log functionality remove -DIPFILTER_LOG
 #
 
 .include <bsd.kmod.mk>
 
 CWARNFLAGS.fil.c=		${NO_WSELF_ASSIGN} -Wno-unused
 CWARNFLAGS.ip_auth.c=		-Wno-unused
 CWARNFLAGS.ip_fil_freebsd.c=	-Wno-unused
 CWARNFLAGS.ip_frag.c=		-Wno-unused
 CWARNFLAGS.ip_htable.c=		-Wno-unused ${NO_WTAUTOLOGICAL_POINTER_COMPARE}
 CWARNFLAGS.ip_dstlist.c=	-Wno-unused
 CWARNFLAGS.ip_lookup.c=		${NO_WSELF_ASSIGN} -Wno-unused
 CWARNFLAGS.ip_nat.c=		-Wno-unused
 CWARNFLAGS.ip_nat6.c=		-Wno-unused
 CWARNFLAGS.ip_pool.c=		-Wno-unused
 CWARNFLAGS.ip_proxy.c=		${NO_WSELF_ASSIGN} -Wno-unused
 CWARNFLAGS.ip_scan.c=		-Wno-unused
 CWARNFLAGS.ip_state.c=		-Wno-unused
 CWARNFLAGS.ip_sync.c=		-Wno-unused
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index ae1b597d08ce..274b1b1e6cf5 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -1,22 +1,22 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/netpfil/ipfw
 
 KMOD=	ipfw
 SRCS=	ip_fw2.c ip_fw_pfil.c ip_fw_bpf.c
 SRCS+=	ip_fw_dynamic.c ip_fw_log.c ip_fw_eaction.c
 SRCS+=	ip_fw_sockopt.c ip_fw_table.c ip_fw_table_algo.c ip_fw_iface.c
 SRCS+=	ip_fw_table_value.c
-SRCS+=	opt_inet.h opt_inet6.h opt_ipdivert.h opt_ipfw.h
+SRCS+=	opt_inet.h opt_inet6.h opt_ipdivert.h opt_ipfw.h opt_kern_tls.h
 
 CFLAGS+= -DIPFIREWALL -I${SRCTOP}/sys/contrib/ck/include
 #
 #If you want it verbose
 #CFLAGS+= -DIPFIREWALL_VERBOSE
 #CFLAGS+= -DIPFIREWALL_VERBOSE_LIMIT=100
 #
 #If you want it to pass all packets by default
 #CFLAGS+= -DIPFIREWALL_DEFAULT_TO_ACCEPT
 #
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ipsec/Makefile b/sys/modules/ipsec/Makefile
index 46472f910d16..8bc9f47bd99a 100644
--- a/sys/modules/ipsec/Makefile
+++ b/sys/modules/ipsec/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/net ${SRCTOP}/sys/netipsec
 
 KMOD=	ipsec
 SRCS=	if_ipsec.c ipsec.c ipsec_input.c ipsec_mbuf.c ipsec_mod.c \
 	ipsec_output.c xform_ah.c xform_esp.c xform_ipcomp.c \
-	opt_inet.h opt_inet6.h opt_ipsec.h opt_sctp.h 
+	opt_inet.h opt_inet6.h opt_ipsec.h opt_kern_tls.h opt_sctp.h
 SRCS.INET=	udpencap.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/khelp/h_ertt/Makefile b/sys/modules/khelp/h_ertt/Makefile
index fa58264c3190..e63154ea248f 100644
--- a/sys/modules/khelp/h_ertt/Makefile
+++ b/sys/modules/khelp/h_ertt/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/netinet/khelp
 KMOD=	h_ertt
-SRCS=	h_ertt.c
+SRCS=	h_ertt.c opt_kern_tls.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/nfscommon/Makefile b/sys/modules/nfscommon/Makefile
index 28d658db75fa..cc2d48c1b1bc 100644
--- a/sys/modules/nfscommon/Makefile
+++ b/sys/modules/nfscommon/Makefile
@@ -1,16 +1,17 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/fs/nfs
 KMOD=	nfscommon
 SRCS=	vnode_if.h \
 	nfs_commonacl.c \
 	nfs_commonkrpc.c \
 	nfs_commonport.c \
 	nfs_commonsubs.c \
 	opt_inet.h \
 	opt_inet6.h \
+	opt_kern_tls.h \
 	opt_kgssapi.h \
 	opt_nfs.h \
 	opt_ufs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index d361ea0802fb..fbf5e0cbfa89 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -1,25 +1,26 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/netpfil/pf
 
 KMOD=	pf
 SRCS=	pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \
 	pf_ruleset.c pf_nv.c pf_syncookies.c in4_cksum.c \
 	bus_if.h device_if.h \
-	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_sctp.h opt_global.h
+	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_sctp.h opt_global.h \
+	opt_kern_tls.h
 
 .if !defined(KERNBUILDDIR)
 # pflog can be loaded as a module, have the additional checks turned on
 # pfsync can be loaded as a module, have the additional checks turned on
 opt_pf.h:
 	echo "#define DEV_PF 1" > ${.TARGET}
 	echo "#define DEV_PFLOG 1" >> ${.TARGET}
 	echo "#define DEV_PFSYNC 1" >> ${.TARGET}
 
 .if defined(VIMAGE)
 opt_global.h:
 	echo "#define VIMAGE 1" >> ${.TARGET}
 .endif
 .endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sctp/Makefile b/sys/modules/sctp/Makefile
index 1896c22dd833..925f6ef5fdfb 100644
--- a/sys/modules/sctp/Makefile
+++ b/sys/modules/sctp/Makefile
@@ -1,30 +1,31 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/netinet
 .PATH: ${SRCTOP}/sys/netinet6
 
 KMOD=	sctp
 SRCS=	sctp_asconf.c \
 	sctp_auth.c \
 	sctp_bsd_addr.c \
 	sctp_cc_functions.c \
 	sctp_crc32.c \
 	sctp_indata.c \
 	sctp_input.c \
 	sctp_kdtrace.c \
 	sctp_module.c \
 	sctp_output.c \
 	sctp_pcb.c \
 	sctp_peeloff.c \
 	sctp_ss_functions.c \
 	sctp_syscalls.c \
 	sctp_sysctl.c \
 	sctp_timer.c \
 	sctp_usrreq.c \
 	sctp6_usrreq.c \
 	sctputil.c
 
 SRCS+=	device_if.h bus_if.h vnode_if.h
-SRCS+=	opt_capsicum.h opt_ktrace.h opt_inet.h opt_inet6.h opt_sctp.h
+SRCS+=	opt_capsicum.h opt_ktrace.h opt_inet.h opt_inet6.h opt_kern_tls.h \
+	opt_sctp.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/siftr/Makefile b/sys/modules/siftr/Makefile
index bb92bb2ac4c5..eac884ae6bab 100644
--- a/sys/modules/siftr/Makefile
+++ b/sys/modules/siftr/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 .PATH:  ${SRCTOP}/sys/netinet
 KMOD=	siftr
-SRCS=	siftr.c
+SRCS=	siftr.c opt_kern_tls.h
 
 # Uncomment to add IPv6 support
 #CFLAGS+=-DSIFTR_IPV6
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/tcp/tcpmd5/Makefile b/sys/modules/tcp/tcpmd5/Makefile
index e2d96195d806..0a10caea6845 100644
--- a/sys/modules/tcp/tcpmd5/Makefile
+++ b/sys/modules/tcp/tcpmd5/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/netipsec
 
 KMOD=   tcpmd5
-SRCS=   xform_tcp.c opt_inet.h opt_inet6.h opt_ipsec.h
+SRCS=   xform_tcp.c opt_inet.h opt_inet6.h opt_ipsec.h opt_kern_tls.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/toecore/Makefile b/sys/modules/toecore/Makefile
index d3bf3b820da3..48a311c38ebf 100644
--- a/sys/modules/toecore/Makefile
+++ b/sys/modules/toecore/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/netinet
 
 KMOD=	toecore
 SRCS=	toecore.c
-SRCS+=	opt_ofed.h opt_inet.h opt_inet6.h
+SRCS+=	opt_ofed.h opt_inet.h opt_inet6.h opt_kern_tls.h
 
 .include <bsd.kmod.mk>