Index: head/sys/modules/if_gif/Makefile
===================================================================
--- head/sys/modules/if_gif/Makefile	(revision 278959)
+++ head/sys/modules/if_gif/Makefile	(revision 278960)
@@ -1,19 +1,13 @@
 # $FreeBSD$
 
 SYSDIR?=${.CURDIR}/../..
 .include "${SYSDIR}/conf/kern.opts.mk"
 
 .PATH: ${SYSDIR}/net ${SYSDIR}/netinet ${SYSDIR}/netinet6
 
 KMOD=	if_gif
 SRCS=	if_gif.c opt_inet.h opt_inet6.h
-
-.if ${MK_INET_SUPPORT} != "no"
-SRCS+=	in_gif.c
-.endif
-
-.if ${MK_INET6_SUPPORT} != "no"
-SRCS+=	in6_gif.c
-.endif
+SRCS.INET=in_gif.c
+SRCS.INET6=in6_gif.c
 
 .include <bsd.kmod.mk>
Index: head/sys/modules/if_gre/Makefile
===================================================================
--- head/sys/modules/if_gre/Makefile	(revision 278959)
+++ head/sys/modules/if_gre/Makefile	(revision 278960)
@@ -1,18 +1,12 @@
 # $FreeBSD$
 
 SYSDIR?=${.CURDIR}/../..
 .PATH: ${SYSDIR}/net ${SYSDIR}/netinet ${SYSDIR}/netinet6
 .include "${SYSDIR}/conf/kern.opts.mk"
 
 KMOD=	if_gre
 SRCS=	if_gre.c opt_inet.h opt_inet6.h
-
-.if ${MK_INET_SUPPORT} != "no"
-SRCS+=	ip_gre.c
-.endif
-
-.if ${MK_INET6_SUPPORT} != "no"
-SRCS+=	ip6_gre.c
-.endif
+SRCS.INET=	ip_gre.c
+SRCS.INET6=	ip6_gre.c
 
 .include <bsd.kmod.mk>