Update the include statements for new makefile