Modify makefile and *.h files