Makefile: Update the paths in Makefile and change the includes to reflect the changes.