Bugfix: Add missing headers.
Bugfix: Update parser/lexer.