fix include path in lex; add nodes of derived parameters