[ADD][UPD] Add of makefile and update of includes of CPP files.