Reorganize runtime header files
Remove unused import in generated parsers