Fixed the makefile and includes.