Drop incorrect forward decl.
Add non_terminal default constructor
Remove unneeded include