Remove some header dependencies from NormalExpander
Remove some header dependencies from Node