diff --git a/sbin/ifconfig/af_nd6.c b/sbin/ifconfig/af_nd6.c
--- a/sbin/ifconfig/af_nd6.c
+++ b/sbin/ifconfig/af_nd6.c
@@ -52,8 +52,7 @@
 #include "ifconfig.h"
 
 #define	MAX_SYSCTL_TRY	5
-#ifdef DRAFT_IETF_6MAN_IPV6ONLY_FLAG
-static const char	*ND6BITS[] = {
+static const char *ND6BITS[] = {
 	[0]  = "PERFORMNUD",
 	[1]  = "ACCEPT_RTADV",
 	[2]  = "PREFER_SOURCE",
@@ -63,24 +62,12 @@
 	[6]  = "NO_RADR",
 	[7]  = "NO_PREFER_IFACE",
 	[8]  = "NO_DAD",
+#ifdef DRAFT_IETF_6MAN_IPV6ONLY_FLAG
 	[9]  = "IPV6_ONLY",
 	[10] = "IPV6_ONLY_MANUAL",
+#endif
 	[15] = "DEFAULTIF",
 };
-#else
-static const char	*ND6BITS[] = {
-	[0]  = "PERFORMNUD",
-	[1]  = "ACCEPT_RTADV",
-	[2]  = "PREFER_SOURCE",
-	[3]  = "IFDISABLED",
-	[4]  = "DONT_SET_IFROUTE",
-	[5]  = "AUTO_LINKLOCAL",
-	[6]  = "NO_RADR",
-	[7]  = "NO_PREFER_IFACE",
-	[8]  = "NO_DAD",
-	[15] = "DEFAULTIF",
-};
-#endif
 
 static int isnd6defif(if_ctx *ctx, int s);
 void setnd6flags(if_ctx *, const char *, int);
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1617,7 +1617,7 @@
 
 #ifdef WITHOUT_NETLINK
 
-static const char	*IFFBITS[] = {
+static const char *IFFBITS[] = {
 	[0]  = "UP",
 	[1]  = "BROADCAST",
 	[2]  = "DEBUG",
@@ -1639,7 +1639,7 @@
 	[20] = "STICKYARP",
 };
 
-static const char	*IFCAPBITS[] = {
+static const char *IFCAPBITS[] = {
 	[0]  = "RXCSUM",
 	[1]  = "TXCSUM",
 	[2]  = "NETCONS",
diff --git a/sbin/ifconfig/ifgif.c b/sbin/ifconfig/ifgif.c
--- a/sbin/ifconfig/ifgif.c
+++ b/sbin/ifconfig/ifgif.c
@@ -48,7 +48,7 @@
 
 #include "ifconfig.h"
 
-static const char	*GIFBITS[] = {
+static const char *GIFBITS[] = {
 	[1] = "IGNORE_SOURCE",
 };
 
diff --git a/sbin/ifconfig/ifgre.c b/sbin/ifconfig/ifgre.c
--- a/sbin/ifconfig/ifgre.c
+++ b/sbin/ifconfig/ifgre.c
@@ -41,7 +41,7 @@
 
 #include "ifconfig.h"
 
-static const char	*GREBITS[] = {
+static const char *GREBITS[] = {
 	[0] = "ENABLE_CSUM",
 	[1] = "ENABLE_SEQ",
 	[2] = "UDPENCAP",