diff --git a/makefiles/lint/include.mk b/makefiles/lint/include.mk
index 66834a6..357b6f5 100644
--- a/makefiles/lint/include.mk
+++ b/makefiles/lint/include.mk
@@ -9,17 +9,15 @@
 	@echo
 	@echo "[LINT]"
 
+include $(ONF_MAKE)/lint/groovy.mk
 include $(ONF_MAKE)/lint/jjb.mk
+include $(ONF_MAKE)/lint/json.mk
 include $(ONF_MAKE)/lint/makefile.mk
 include $(ONF_MAKE)/lint/python.mk
 include $(ONF_MAKE)/lint/shell.mk
-include $(ONF_MAKE)/lint/help.mk
+include $(ONF_MAKE)/lint/yaml.mk
 
-ifdef YAML_FILES
-  include $(ONF_MAKE)/lint/yaml/python.mk
-else
-  include $(ONF_MAKE)/lint/yaml/yamllint.mk
-endif
+include $(ONF_MAKE)/lint/help.mk
 
 $(if $(DEBUG),$(warning LEAVE))