Fixed Makefile and added necesary includes