Fix include, update makefile, some coding style