Fix couple of header/Makefile issues to make the project compilable on ubuntu.