re-added include files and modified makefile

small changes