Properly handle recursive includes

Uggh. I didn't want to get into this game, but I suppose I have no
choice.
handle globs in Includes