Fix cyclic dependency issues in CPP-AST.