fix makefile & header files