diff --git a/makefiles/lint/include.mk b/makefiles/lint/include.mk
index 979a6fb..32beda2 100644
--- a/makefiles/lint/include.mk
+++ b/makefiles/lint/include.mk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2017-2022 Open Networking Foundation
+# Copyright 2017-2023 Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,10 +19,20 @@
 	@echo
 	@echo "[LINT]"
 
-include $(MAKEDIR)/lint/json.mk
-include $(MAKEDIR)/lint/python.mk
-include $(MAKEDIR)/lint/robot.mk
-include $(MAKEDIR)/lint/shell.mk
-include $(MAKEDIR)/lint/yaml.mk
+ONF_MAKE := $(MAKEDIR)
+
+include $(ONF_MAKE)/lint/json.mk
+include $(ONF_MAKE)/lint/makefile.mk
+include $(ONF_MAKE)/lint/python.mk
+include $(ONF_MAKE)/lint/robot.mk
+include $(ONF_MAKE)/lint/shell.mk
+
+ifndef NO-LINT-YAML
+  ifdef YAML_FILES
+    include $(ONF_MAKE)/lint/yaml/python.mk
+  else
+    include $(ONF_MAKE)/lint/yaml/yamllint.mk
+  endif
+endif
 
 # [EOF]