diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 2d0cad43e1c..89e7fbe2c6a 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -3,7 +3,7 @@
 PROG=	ping6
 MAN=	ping6.8
 
-CFLAGS+=-DINET6 -DIPSEC -DKAME_SCOPEID -DUSE_RFC2292BIS \
+CFLAGS+=-DIPSEC -DKAME_SCOPEID -DUSE_RFC2292BIS \
 	-DHAVE_POLL_H -DHAVE_ARC4RANDOM
 WARNS?=	2
 
diff --git a/usr.sbin/mld6query/Makefile b/usr.sbin/mld6query/Makefile
index 7100520ad4d..0e9da492610 100644
--- a/usr.sbin/mld6query/Makefile
+++ b/usr.sbin/mld6query/Makefile
@@ -18,6 +18,6 @@ PROG=	mld6query
 MAN=	mld6query.8
 SRCS=	mld6.c
 
-CFLAGS+= -DINET6 -DIPSEC -DUSE_RFC2292BIS
+CFLAGS+= -DIPSEC -DUSE_RFC2292BIS
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile
index c35dfc7f5ea..f1566919a2f 100644
--- a/usr.sbin/ndp/Makefile
+++ b/usr.sbin/ndp/Makefile
@@ -19,7 +19,6 @@ PROG=	ndp
 MAN=	ndp.8
 SRCS=	ndp.c gmt2local.c
 
-CFLAGS+= -DINET6
 CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../contrib/tcpdump
 CFLAGS+= -D_U_=""
 
diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile
index 51438a18abc..e0ea62130bc 100644
--- a/usr.sbin/rip6query/Makefile
+++ b/usr.sbin/rip6query/Makefile
@@ -5,6 +5,6 @@ PROG=	rip6query
 MAN=	rip6query.8
 
 WARNS?=	2
-CFLAGS+= -DINET6 -I${.CURDIR}/../route6d
+CFLAGS+= -I${.CURDIR}/../route6d
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
index 1bed21a5e1d..308aad76133 100644
--- a/usr.sbin/route6d/Makefile
+++ b/usr.sbin/route6d/Makefile
@@ -4,6 +4,6 @@
 PROG=	route6d
 MAN=	route6d.8
 
-CFLAGS+= -DINET6 -DHAVE_POLL_H
+CFLAGS+= -DHAVE_POLL_H
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile
index c85911e09df..c31a7c7ce93 100644
--- a/usr.sbin/rrenumd/Makefile
+++ b/usr.sbin/rrenumd/Makefile
@@ -18,7 +18,7 @@ PROG=	rrenumd
 MAN=	rrenumd.conf.5 rrenumd.8
 SRCS=	rrenumd.c  parser.y lexer.l
 
-CFLAGS+= -DINET6 -DIPSEC -I. -I${.CURDIR}
+CFLAGS+= -DIPSEC -I. -I${.CURDIR}
 YFLAGS=	-d
 
 LDADD=	-lipsec -ll -ly
diff --git a/usr.sbin/rtadvd/Makefile b/usr.sbin/rtadvd/Makefile
index 7fa20987e59..f7e2021cd1f 100644
--- a/usr.sbin/rtadvd/Makefile
+++ b/usr.sbin/rtadvd/Makefile
@@ -18,6 +18,6 @@ PROG=	rtadvd
 MAN=	rtadvd.conf.5 rtadvd.8
 SRCS=	rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c
 
-CFLAGS+= -DINET6 -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DROUTEINFO
+CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DROUTEINFO
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rtsold/Makefile b/usr.sbin/rtsold/Makefile
index 6ae47e99b10..1afa0f6f454 100644
--- a/usr.sbin/rtsold/Makefile
+++ b/usr.sbin/rtsold/Makefile
@@ -19,7 +19,7 @@ MAN=	rtsold.8
 MLINKS=	rtsold.8 rtsol.8
 SRCS=	rtsold.c rtsol.c if.c probe.c dump.c rtsock.c
 
-CFLAGS+= -DINET6 -DHAVE_ARC4RANDOM -DHAVE_POLL_H
+CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H
 
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index ab4e52ce981..6ff72d2bf0c 100644
--- a/usr.sbin/traceroute6/Makefile
+++ b/usr.sbin/traceroute6/Makefile
@@ -18,7 +18,7 @@ MAN=	traceroute6.8
 BINOWN=	root
 BINMODE= 4555
 
-CFLAGS+= -DINET6 -DIPSEC -DUSE_RFC2292BIS -DHAVE_POLL
+CFLAGS+= -DIPSEC -DUSE_RFC2292BIS -DHAVE_POLL
 
 DPADD=	${LIBIPSEC}
 LDADD=	-lipsec