Fixed makefile, and added proper include for parser.cc