modify h files and Makefile