fixed include and makefile