Adjusting Makefile and include directives