Updated makefile, moved include directives