remove unused file
makefile update
header update, remove old include