Update makefile & headers