make file and includes altered