refactor(includes): refactored based on grammar

- patched files from grammar parser