Further header cleanups, and work to fix in-source NDDL3 generation and
depdenency between grammar files and generated source files
Plan database header cleanup