fixed vpath and include file search path