Improve structure of grammar include and forward declarations.
Avoid unneccesary recompilations.