Correct includes added to grammar.y and correct compile commands in makefile