diff --git a/make/yapp.mk b/make/yapp.mk
index 43e79f58..def6e8ab 100644
--- a/make/yapp.mk
+++ b/make/yapp.mk
@@ -1,7 +1,9 @@
 SRC_ALL_CPP      += main.cpp
-YAPP_CLASS       ?= $(firstword $(basename $(wildcard YApp*.h Y*.h *.h)))
+YAPP_INCLUDE_DIR ?= .
+YAPP_CLASS       ?= $(firstword $(basename $(notdir $(wildcard $(addprefix \
+		    $(YAPP_INCLUDE_DIR)/, YApp*.h Y*.h *.h)))))
 YAPP_CLASS_H     ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\
-	$(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h)
+	$(YAPP_INCLUDE_DIR) $(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h)
 YAPP_NAMESPACE  ?=
 
 ifneq ($(TARGET),mingw)