Tweaked includes, added linux makefile