Fixed a few include related bugs; snailsoft::Grammar is no longer exported