diff --git a/makefiles/lint/make/include.mk b/makefiles/lint/make/include.mk
index 2f49e88..03cb9e1 100644
--- a/makefiles/lint/make/include.mk
+++ b/makefiles/lint/make/include.mk
@@ -24,9 +24,9 @@
 $(if $(DEBUG),$(warning ENTER))
 
 ## Bleeding early import handled by makefiles/include.mk
-# include $(ONF_MAKEDIR)/lint/make/warn-undef-vars.mk
+# include $(onf-mk-dir)/lint/make/warn-undef-vars.mk
 
-include $(ONF_MAKEDIR)/lint/make/makefile.mk
+include $(onf-mk-dir)/lint/make/makefile.mk
 
 $(if $(DEBUG),$(warning LEAVE))
 
diff --git a/makefiles/lint/make/warn-undef-vars.mk b/makefiles/lint/make/warn-undef-vars.mk
index 048d56d..36e25f9 100644
--- a/makefiles/lint/make/warn-undef-vars.mk
+++ b/makefiles/lint/make/warn-undef-vars.mk
@@ -26,7 +26,9 @@
 ##   o Definitions only exist for lint target use.
 ##   o Decrease warning volume until undef sources can be cleaned up.
 ## -----------------------------------------------------------------------
-$(if $(findstring --warn-undefined-variables,$(MAKEFLAGS)),\
+$(if $(findstring $(MAKEFLAGS),--warn-undefined-variables),\
+	$(eval IS-WARN-UNDEFINED-VARIABLES := true))
+$(if $(findstring $(MAKECMDGOALS),int lint-make),\
 	$(eval IS-WARN-UNDEFINED-VARIABLES := true))
 
 ifdef IS-WARN-UNDEFINED-VARIABLES
@@ -64,6 +66,13 @@
   $(call define-if-undef,DOC8_SOURCE)
   $(call define-if-undef,have-python-files)
 
+  $(call define-if-undef,DEBUG-onf-mk-paths)
+  $(call define-if-undef,LINT_DOC8_DEBUG)
+
+  $(call define-if-undef,lint-shell-all)
+  $(call define-if-undef,lint-shell-mod)
+  $(call define-if-undef,lint-shell-src)
+
 endif # IS-WARN-UNDEFINED-VARIABLES
 
 $(if $(DEBUG),$(warning LEAVE))