Clean up header includes for lexer, env_context still needs to go