diff --git a/usr/src/cmd/vndadm/Makefile b/usr/src/cmd/vndadm/Makefile
index 2b9ca6c3c132..657d12b7b1f6 100644
--- a/usr/src/cmd/vndadm/Makefile
+++ b/usr/src/cmd/vndadm/Makefile
@@ -24,9 +24,7 @@ include ../Makefile.ctf
 CLEANFILES += $(OBJS)
 CFLAGS += $(CCVERBOSE)
 LDLIBS += -lvnd
-LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 all	:= TARGET += all
 clean	:= TARGET += clean
@@ -47,8 +45,6 @@ $(PROG): $(OBJS)
 clean: $(SUBDIRS)
 	-$(RM) $(CLEANFILES)
 
-lint: lint_PROG $(SUBDIRS)
-
 %.o: ../%.c
 	$(COMPILE.c) $<
 	$(POST_PROCESS_O)
diff --git a/usr/src/cmd/vndadm/test/Makefile.com b/usr/src/cmd/vndadm/test/Makefile.com
index cb096952ca46..d47d942c3f63 100644
--- a/usr/src/cmd/vndadm/test/Makefile.com
+++ b/usr/src/cmd/vndadm/test/Makefile.com
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright (c) 2014 Joyent, Inc.  All rights reserved.
+# Copyright (c) 2018 Joyent, Inc.
 #
 
 include $(SRC)/Makefile.master
@@ -19,8 +19,7 @@ include $(SRC)/cmd/Makefile.cmd
 #
 # Force c99 for everything
 #
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 #
 # Deal with odd lint bits.
diff --git a/usr/src/lib/brand/lx/lx_brand/Makefile.com b/usr/src/lib/brand/lx/lx_brand/Makefile.com
index b44137598460..6f0bba35e9e4 100644
--- a/usr/src/lib/brand/lx/lx_brand/Makefile.com
+++ b/usr/src/lib/brand/lx/lx_brand/Makefile.com
@@ -84,15 +84,12 @@ ZGUIDANCE =	-Wl,-zguidance=nounused
 # not linted
 SMATCH=off
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: lintcheck
-
 include ../../../../Makefile.targ
 include ../../../../Makefile.usdt
 
diff --git a/usr/src/lib/libvnd/Makefile.com b/usr/src/lib/libvnd/Makefile.com
index c567a9b942f8..0510de73fe21 100644
--- a/usr/src/lib/libvnd/Makefile.com
+++ b/usr/src/lib/libvnd/Makefile.com
@@ -30,8 +30,7 @@ SMOFF +=	free
 
 SRCDIR =	../common
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/varpd/svp/Makefile.com b/usr/src/lib/varpd/svp/Makefile.com
index 91baacb430ea..79a0344f4605 100644
--- a/usr/src/lib/varpd/svp/Makefile.com
+++ b/usr/src/lib/varpd/svp/Makefile.com
@@ -38,12 +38,9 @@ LDLIBS +=	-lc -lumem -lnvpair -lsocket -lavl \
 		-lcmdutils -lidspace -lbunyan
 CPPFLAGS +=	-I../common
 
-LINTFLAGS +=	-erroff=E_BAD_PTR_CAST_ALIGN
-LINTFLAGS64 +=	-erroff=E_BAD_PTR_CAST_ALIGN
 SRCDIR =	../common
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 .KEEP_STATE: