modified cmake and make file
fix bugs,add header includes