Fixed makefiles since some include folders changed.