Index: head/Mk/Uses/bison.mk
===================================================================
--- head/Mk/Uses/bison.mk	(revision 313854)
+++ head/Mk/Uses/bison.mk	(revision 313855)
@@ -1,32 +1,32 @@
 # $FreeBSD$
 #
 # handle dependency on the bison port
 #
 # MAINTAINER: portmgr@FreeBSD.org
 #
 # Feature:	bison
 # Usage:	USES=bison or USES=bison:ARGS
-# Valid ARGS	build (default, implicit), run, both
+# Valid ARGS:	build (default, implicit), run, both
 #
 #
-.if !defined(_INCLUDE_BISON_MK)
-_INCLUDE_BISON_MK=	yes
+.if !defined(_INCLUDE_USES_BISON_MK)
+_INCLUDE_USES_BISON_MK=	yes
 
 _BISON_DEPENDS=	bison:${PORTSDIR}/devel/bison
 
 .if !defined(bison_ARGS)
 bison_ARGS=	build
 .endif
 
 .if ${bison_ARGS} == "build"
 BUILD_DEPENDS+=	${_BISON_DEPENDS}
 .elif ${bison_ARGS} == "run"
 RUN_DEPENDS+=	${_BISON_DEPENDS}
 .elif ${bison_ARGS} == "both"
 BUILD_DEPENDS+=	${_BISON_DEPENDS}
 RUN_DEPENDS+=	${_BISON_DEPENDS}
 .else
 IGNORE=	USES=bison - invalid args: [${bison_ARGS}] specifed
 .endif
 
 .endif
Index: head/Mk/Uses/fuse.mk
===================================================================
--- head/Mk/Uses/fuse.mk	(revision 313854)
+++ head/Mk/Uses/fuse.mk	(revision 313855)
@@ -1,24 +1,24 @@
 # $FreeBSD$
 #
 # handle dependency on the fuse port
 #
 # MAINTAINER: portmgr@FreeBSD.org
 #
 # Feature:	fuse
 # Usage:	USES=fuse
-# Valid ARGS	does not require args
+# Valid ARGS:	does not require args
 #
 #
-.if !defined(_INCLUDE_FUSE_MK)
-_INCLUDE_FUSE_MK=	yes
+.if !defined(_INCLUDE_USES_FUSE_MK)
+_INCLUDE_USES_FUSE_MK=	yes
 
 .if defined(fuse_ARGS)
 IGNORE=	USES=fuse does not require args
 .endif
 
 LIB_DEPENDS+=	fuse:${PORTSDIR}/sysutils/fusefs-libs
 .if !exists(/sbin/mount_fusefs)
 RUN_DEPENDS+=	mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
 .endif
 
 .endif
Index: head/Mk/Uses/pathfix.mk
===================================================================
--- head/Mk/Uses/pathfix.mk	(revision 313854)
+++ head/Mk/Uses/pathfix.mk	(revision 313855)
@@ -1,36 +1,36 @@
 # $FreeBSD$
 #
 # Lookup in Makefile.in and configure for common incorrect paths and set them
 # to respect FreeBSD hier
 #
 # MAINTAINER: portmgr@FreeBSD.org
 #
 # Feature:	pathfix
 # Usage:	USES=pathfix
-# Valid ARGS	does not require args
+# Valid ARGS:	does not require args
 #
 #
-.if !defined(_INCLUDE_PATHFIX_MK)
-_INCLUDE_PATHFIX_MK=	yes
+.if !defined(_INCLUDE_USES_PATHFIX_MK)
+_INCLUDE_USES_PATHFIX_MK=	yes
 
 .if defined(pathfix_ARGS)
 IGNORE=	USES=pathfix does not require args
 .endif
 
 PATHFIX_MAKEFILEIN?=	Makefile.in
 
 pre-patch: pathfix-pre-patch
 
 pathfix-pre-patch:
 	@${FIND} ${WRKSRC} -name "${PATHFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
 		s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
 			s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' ; \
 	${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
 		's|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		s|{libdir}/locale|{prefix}/share/locale|g'
 
 .endif