Added recursive includes and context to includes.